diff --git a/aqua/examples/stream.aqua b/aqua/examples/stream.aqua index f7dcf2f..0ecd510 100644 --- a/aqua/examples/stream.aqua +++ b/aqua/examples/stream.aqua @@ -9,3 +9,18 @@ func checkStreams(ch: []string) -> []string: stream <- Stringer.returnString(b) <- stream +func stringNil() -> *string: + valueNil: *string + <- valueNil + +func returnNil() -> *string: + relayNil <- stringNil() + <- relayNil + +func stringNone() -> ?string: + valueNone: ?string + <- valueNone + +func returnNone() -> ?string: + relayNone <- stringNone() + <- relayNone diff --git a/src/compiled/examples/assignment.ts b/src/compiled/examples/assignment.ts index ffee3a9..eabb0cb 100644 --- a/src/compiled/examples/assignment.ts +++ b/src/compiled/examples/assignment.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,21 +14,22 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface OpHaDef { - array: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string[]; - identity: (a: string, callParams: CallParams<'a'>) => string; -} + export interface OpHaDef { + array: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string[]; +identity: (a: string, callParams: CallParams<'a'>) => string; + } -export function registerOpHa(service: OpHaDef): void; + export function registerOpHa(service: OpHaDef): void; export function registerOpHa(serviceId: string, service: OpHaDef): void; export function registerOpHa(peer: FluencePeer, service: OpHaDef): void; export function registerOpHa(peer: FluencePeer, serviceId: string, service: OpHaDef): void; -export function registerOpHa(...args) { + export function registerOpHa(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -39,9 +40,10 @@ export function registerOpHa(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -51,63 +53,71 @@ export function registerOpHa(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'array') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.array(req.args[0], req.args[1], callParams) - if (req.fnName === 'array') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array(req.args[0], req.args[1], callParams); - } + } + - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } - next(); - }); -} + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.identity(req.args[0], callParams) + + } + + + next(); + }); + } + // Functions -export function doSmth(arg: { value: string }, config?: { ttl?: number }): Promise; -export function doSmth(peer: FluencePeer, arg: { value: string }, config?: { ttl?: number }): Promise; -export function doSmth(...args) { - let peer: FluencePeer; - let arg; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - arg = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - arg = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function doSmth(arg: {value:string}, config?: {ttl?: number}) : Promise; + export function doSmth(peer: FluencePeer, arg: {value:string}, config?: {ttl?: number}) : Promise; + export function doSmth(...args: any) { + let peer: FluencePeer; + let arg: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + arg = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + arg = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -129,18 +139,16 @@ export function doSmth(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'arg', () => { - return arg; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'arg', () => {return arg;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -150,12 +158,13 @@ export function doSmth(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for doSmth'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/callArrow.ts b/src/compiled/examples/callArrow.ts index 557a3a0..125b094 100644 --- a/src/compiled/examples/callArrow.ts +++ b/src/compiled/examples/callArrow.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,49 +14,40 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function passFunctionAsArg( - node: string, - str: string, - c: (arg0: string, callParams: CallParams<'arg0'>) => string, - config?: { ttl?: number }, -): Promise; -export function passFunctionAsArg( - peer: FluencePeer, - node: string, - str: string, - c: (arg0: string, callParams: CallParams<'arg0'>) => string, - config?: { ttl?: number }, -): Promise; -export function passFunctionAsArg(...args) { - let peer: FluencePeer; - let node; - let str; - let c; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node = args[1]; - str = args[2]; - c = args[3]; - config = args[4]; - } else { - peer = FluencePeer.default; - node = args[0]; - str = args[1]; - c = args[2]; - config = args[3]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function passFunctionAsArg(node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string, config?: {ttl?: number}) : Promise; + export function passFunctionAsArg(peer: FluencePeer, node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string, config?: {ttl?: number}) : Promise; + export function passFunctionAsArg(...args: any) { + let peer: FluencePeer; + let node: any; +let str: any; +let c: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node = args[1]; +str = args[2]; +c = args[3]; +config = args[4]; + } else { + peer = FluencePeer.default; + node = args[0]; +str = args[1]; +c = args[2]; +config = args[3]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -102,33 +93,33 @@ export function passFunctionAsArg(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node', () => { - return node; - }); - h.on('getDataSrv', 'str', () => { - return str; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node', () => {return node;}); +h.on('getDataSrv', 'str', () => {return str;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'c') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = c(req.args[0], callParams); - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'c') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = c(req.args[0], callParams) - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -138,12 +129,13 @@ export function passFunctionAsArg(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for passFunctionAsArg'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/co.ts b/src/compiled/examples/co.ts index bd59d53..b08dab9 100644 --- a/src/compiled/examples/co.ts +++ b/src/compiled/examples/co.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface CoServiceDef { - call: (callParams: CallParams) => string; -} + export interface CoServiceDef { + call: (callParams: CallParams) => string; + } -export function registerCoService(service: CoServiceDef): void; + export function registerCoService(service: CoServiceDef): void; export function registerCoService(serviceId: string, service: CoServiceDef): void; export function registerCoService(peer: FluencePeer, service: CoServiceDef): void; export function registerCoService(peer: FluencePeer, serviceId: string, service: CoServiceDef): void; -export function registerCoService(...args) { + export function registerCoService(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerCoService(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'coservice-id'; - } + } + else { + serviceId = "coservice-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,61 +52,59 @@ export function registerCoService(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'call') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.call(callParams) - if (req.fnName === 'call') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.call(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function coFunc( - node: string, - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function coFunc( - peer: FluencePeer, - node: string, - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function coFunc(...args) { - let peer: FluencePeer; - let node; - let c; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node = args[1]; - c = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - node = args[0]; - c = args[1]; - config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function coFunc(node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function coFunc(peer: FluencePeer, node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function coFunc(...args: any) { + let peer: FluencePeer; + let node: any; +let c: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node = args[1]; +c = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + node = args[0]; +c = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -141,31 +141,32 @@ export function coFunc(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node', () => { - return node; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node', () => {return node;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'c') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - c(req.args[0], callParams); - resp.result = {}; - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'c') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + c(req.args[0], callParams); resp.result = {} - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -175,12 +176,13 @@ export function coFunc(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for coFunc'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/complex.ts b/src/compiled/examples/complex.ts index 3822ef8..71050d8 100644 --- a/src/compiled/examples/complex.ts +++ b/src/compiled/examples/complex.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,21 +14,22 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface TestSDef { - multiline: (a: string, b: string, c: boolean, callParams: CallParams<'a' | 'b' | 'c'>) => string; - t: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface TestSDef { + multiline: (a: string, b: string, c: boolean, callParams: CallParams<'a' | 'b' | 'c'>) => string; +t: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerTestS(service: TestSDef): void; + export function registerTestS(service: TestSDef): void; export function registerTestS(serviceId: string, service: TestSDef): void; export function registerTestS(peer: FluencePeer, service: TestSDef): void; export function registerTestS(peer: FluencePeer, serviceId: string, service: TestSDef): void; -export function registerTestS(...args) { + export function registerTestS(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -39,9 +40,10 @@ export function registerTestS(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'some-id'; - } + } + else { + serviceId = "some-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -51,101 +53,89 @@ export function registerTestS(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'multiline') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.multiline(req.args[0], req.args[1], req.args[2], callParams) - if (req.fnName === 'multiline') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - c: req.tetraplets[2], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.multiline(req.args[0], req.args[1], req.args[2], callParams); - } + } + - if (req.fnName === 't') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.t(req.args[0], callParams); - } - next(); - }); -} + if (req.fnName === 't') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.t(req.args[0], callParams) + + } + + + next(); + }); + } + // Functions -export function doStuff( - a: string, - b: string, - c: boolean, - d: boolean, - e: string[], - g: string[], - str: string, - config?: { ttl?: number }, -): Promise; -export function doStuff( - peer: FluencePeer, - a: string, - b: string, - c: boolean, - d: boolean, - e: string[], - g: string[], - str: string, - config?: { ttl?: number }, -): Promise; -export function doStuff(...args) { - let peer: FluencePeer; - let a; - let b; - let c; - let d; - let e; - let g; - let str; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - a = args[1]; - b = args[2]; - c = args[3]; - d = args[4]; - e = args[5]; - g = args[6]; - str = args[7]; - config = args[8]; - } else { - peer = FluencePeer.default; - a = args[0]; - b = args[1]; - c = args[2]; - d = args[3]; - e = args[4]; - g = args[5]; - str = args[6]; - config = args[7]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function doStuff(a: string, b: string, c: boolean, d: boolean, e: string[], g: string[], str: string, config?: {ttl?: number}) : Promise; + export function doStuff(peer: FluencePeer, a: string, b: string, c: boolean, d: boolean, e: string[], g: string[], str: string, config?: {ttl?: number}) : Promise; + export function doStuff(...args: any) { + let peer: FluencePeer; + let a: any; +let b: any; +let c: any; +let d: any; +let e: any; +let g: any; +let str: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + a = args[1]; +b = args[2]; +c = args[3]; +d = args[4]; +e = args[5]; +g = args[6]; +str = args[7]; +config = args[8]; + } else { + peer = FluencePeer.default; + a = args[0]; +b = args[1]; +c = args[2]; +d = args[3]; +e = args[4]; +g = args[5]; +str = args[6]; +config = args[7]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -259,36 +249,22 @@ export function doStuff(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'a', () => { - return a; - }); - h.on('getDataSrv', 'b', () => { - return b; - }); - h.on('getDataSrv', 'c', () => { - return c; - }); - h.on('getDataSrv', 'd', () => { - return d; - }); - h.on('getDataSrv', 'e', () => { - return e; - }); - h.on('getDataSrv', 'g', () => { - return g; - }); - h.on('getDataSrv', 'str', () => { - return str; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'a', () => {return a;}); +h.on('getDataSrv', 'b', () => {return b;}); +h.on('getDataSrv', 'c', () => {return c;}); +h.on('getDataSrv', 'd', () => {return d;}); +h.on('getDataSrv', 'e', () => {return e;}); +h.on('getDataSrv', 'g', () => {return g;}); +h.on('getDataSrv', 'str', () => {return str;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -298,12 +274,13 @@ export function doStuff(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for doStuff'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/constants.ts b/src/compiled/examples/constants.ts index fd2c161..974f010 100644 --- a/src/compiled/examples/constants.ts +++ b/src/compiled/examples/constants.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface GetterDef { - createStr: (arg0: number, callParams: CallParams<'arg0'>) => string; -} + export interface GetterDef { + createStr: (arg0: number, callParams: CallParams<'arg0'>) => string; + } -export function registerGetter(service: GetterDef): void; + export function registerGetter(service: GetterDef): void; export function registerGetter(serviceId: string, service: GetterDef): void; export function registerGetter(peer: FluencePeer, service: GetterDef): void; export function registerGetter(peer: FluencePeer, serviceId: string, service: GetterDef): void; -export function registerGetter(...args) { + export function registerGetter(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerGetter(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test'; - } + } + else { + serviceId = "test" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,39 +52,45 @@ export function registerGetter(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'createStr') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.createStr(req.args[0], callParams) - if (req.fnName === 'createStr') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.createStr(req.args[0], callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface OpODef { - identity: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface OpODef { + identity: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerOpO(service: OpODef): void; + export function registerOpO(service: OpODef): void; export function registerOpO(serviceId: string, service: OpODef): void; export function registerOpO(peer: FluencePeer, service: OpODef): void; export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODef): void; -export function registerOpO(...args) { + export function registerOpO(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -93,9 +101,10 @@ export function registerOpO(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -105,49 +114,54 @@ export function registerOpO(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.identity(req.args[0], callParams) - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function callConstant(config?: { ttl?: number }): Promise; -export function callConstant(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function callConstant(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function callConstant(config?: {ttl?: number}) : Promise; + export function callConstant(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function callConstant(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -166,16 +180,16 @@ export function callConstant(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -185,12 +199,13 @@ export function callConstant(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for callConstant'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/dataAlias.ts b/src/compiled/examples/dataAlias.ts index 461cdc1..4e2de24 100644 --- a/src/compiled/examples/dataAlias.ts +++ b/src/compiled/examples/dataAlias.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface NodeIdGetterDef { - get: (callParams: CallParams) => { name: string; peerId: string }; -} + export interface NodeIdGetterDef { + get: (callParams: CallParams) => {name:string;peerId:string}; + } -export function registerNodeIdGetter(service: NodeIdGetterDef): void; + export function registerNodeIdGetter(service: NodeIdGetterDef): void; export function registerNodeIdGetter(serviceId: string, service: NodeIdGetterDef): void; export function registerNodeIdGetter(peer: FluencePeer, service: NodeIdGetterDef): void; export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, service: NodeIdGetterDef): void; -export function registerNodeIdGetter(...args) { + export function registerNodeIdGetter(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerNodeIdGetter(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'somesrv'; - } + } + else { + serviceId = "somesrv" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,47 +52,54 @@ export function registerNodeIdGetter(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'get') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.get(callParams) - if (req.fnName === 'get') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function getAliasedData(config?: { ttl?: number }): Promise; -export function getAliasedData(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function getAliasedData(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function getAliasedData(config?: {ttl?: number}) : Promise; + export function getAliasedData(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function getAliasedData(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -106,16 +115,16 @@ export function getAliasedData(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -125,12 +134,13 @@ export function getAliasedData(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for getAliasedData'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/example.ts b/src/compiled/examples/example.ts index 7690e9f..de4e3f6 100644 --- a/src/compiled/examples/example.ts +++ b/src/compiled/examples/example.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface PeerDef { - is_connected: (arg0: string, callParams: CallParams<'arg0'>) => boolean; -} + export interface PeerDef { + is_connected: (arg0: string, callParams: CallParams<'arg0'>) => boolean; + } -export function registerPeer(service: PeerDef): void; + export function registerPeer(service: PeerDef): void; export function registerPeer(serviceId: string, service: PeerDef): void; export function registerPeer(peer: FluencePeer, service: PeerDef): void; export function registerPeer(peer: FluencePeer, serviceId: string, service: PeerDef): void; -export function registerPeer(...args) { + export function registerPeer(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerPeer(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'peer'; - } + } + else { + serviceId = "peer" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,39 +52,45 @@ export function registerPeer(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'is_connected') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.is_connected(req.args[0], callParams) - if (req.fnName === 'is_connected') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.is_connected(req.args[0], callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface OpDef { - identity: (callParams: CallParams) => void; -} + export interface OpDef { + identity: (callParams: CallParams) => void; + } -export function registerOp(service: OpDef): void; + export function registerOp(service: OpDef): void; export function registerOp(serviceId: string, service: OpDef): void; export function registerOp(peer: FluencePeer, service: OpDef): void; export function registerOp(peer: FluencePeer, serviceId: string, service: OpDef): void; -export function registerOp(...args) { + export function registerOp(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -93,9 +101,10 @@ export function registerOp(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -105,39 +114,46 @@ export function registerOp(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + service.identity(callParams); resp.result = {} - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - service.identity(callParams); - resp.result = {}; - } + } + + + next(); + }); + } + - next(); - }); -} -export interface TestDef { - doSomething: (callParams: CallParams) => boolean; - getUserList: (callParams: CallParams) => { name: string; peer_id: string; relay_id: string }[]; -} + export interface TestDef { + doSomething: (callParams: CallParams) => boolean; +getUserList: (callParams: CallParams) => {name:string;peer_id:string;relay_id:string}[]; + } -export function registerTest(service: TestDef): void; + export function registerTest(service: TestDef): void; export function registerTest(serviceId: string, service: TestDef): void; export function registerTest(peer: FluencePeer, service: TestDef): void; export function registerTest(peer: FluencePeer, serviceId: string, service: TestDef): void; -export function registerTest(...args) { + export function registerTest(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -148,9 +164,10 @@ export function registerTest(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test'; - } + } + else { + serviceId = "test" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -160,58 +177,71 @@ export function registerTest(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'doSomething') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.doSomething(callParams) - if (req.fnName === 'doSomething') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.doSomething(callParams); - } + } + - if (req.fnName === 'getUserList') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getUserList(callParams); - } - next(); - }); -} + if (req.fnName === 'getUserList') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getUserList(callParams) + + } + + + next(); + }); + } + // Functions -export function betterMessage(relay: string, config?: { ttl?: number }): Promise; -export function betterMessage(peer: FluencePeer, relay: string, config?: { ttl?: number }): Promise; -export function betterMessage(...args) { - let peer: FluencePeer; - let relay; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - relay = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - relay = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function betterMessage(relay: string, config?: {ttl?: number}) : Promise; + export function betterMessage(peer: FluencePeer, relay: string, config?: {ttl?: number}) : Promise; + export function betterMessage(...args: any) { + let peer: FluencePeer; + let relay: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + relay = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + relay = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -247,15 +277,15 @@ export function betterMessage(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'relay', () => { - return relay; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'relay', () => {return relay;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -265,12 +295,13 @@ export function betterMessage(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for betterMessage'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/fldist-sample.ts b/src/compiled/examples/fldist-sample.ts index ce0b776..ca2da50 100644 --- a/src/compiled/examples/fldist-sample.ts +++ b/src/compiled/examples/fldist-sample.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface ReturnDef { - run: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void; -} + export interface ReturnDef { + run: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void; + } -export function registerReturn(service: ReturnDef): void; + export function registerReturn(service: ReturnDef): void; export function registerReturn(serviceId: string, service: ReturnDef): void; export function registerReturn(peer: FluencePeer, service: ReturnDef): void; export function registerReturn(peer: FluencePeer, serviceId: string, service: ReturnDef): void; -export function registerReturn(...args) { + export function registerReturn(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerReturn(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'returnService'; - } + } + else { + serviceId = "returnService" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,52 +52,56 @@ export function registerReturn(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'run') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.run(req.args[0], callParams); resp.result = {} - if (req.fnName === 'run') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.run(req.args[0], callParams); - resp.result = {}; - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function test(node: string, config?: { ttl?: number }): Promise; -export function test(peer: FluencePeer, node: string, config?: { ttl?: number }): Promise; -export function test(...args) { - let peer: FluencePeer; - let node; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - node = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function test(node: string, config?: {ttl?: number}) : Promise; + export function test(peer: FluencePeer, node: string, config?: {ttl?: number}) : Promise; + export function test(...args: any) { + let peer: FluencePeer; + let node: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + node = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -123,15 +129,15 @@ export function test(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'node', () => { - return node; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'node', () => {return node;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -141,12 +147,13 @@ export function test(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for test'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/fold.ts b/src/compiled/examples/fold.ts index e676c37..485a7ac 100644 --- a/src/compiled/examples/fold.ts +++ b/src/compiled/examples/fold.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,32 +14,34 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function iterateAndPrint(strings: string[], config?: { ttl?: number }): Promise; -export function iterateAndPrint(peer: FluencePeer, strings: string[], config?: { ttl?: number }): Promise; -export function iterateAndPrint(...args) { - let peer: FluencePeer; - let strings; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - strings = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - strings = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function iterateAndPrint(strings: string[], config?: {ttl?: number}) : Promise; + export function iterateAndPrint(peer: FluencePeer, strings: string[], config?: {ttl?: number}) : Promise; + export function iterateAndPrint(...args: any) { + let peer: FluencePeer; + let strings: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + strings = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + strings = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -57,15 +59,15 @@ export function iterateAndPrint(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'strings', () => { - return strings; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'strings', () => {return strings;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -75,50 +77,43 @@ export function iterateAndPrint(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for iterateAndPrint'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + -export function iterateAndPrintParallel( - nodes: string[], - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function iterateAndPrintParallel( - peer: FluencePeer, - nodes: string[], - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function iterateAndPrintParallel(...args) { - let peer: FluencePeer; - let nodes; - let c; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - nodes = args[1]; - c = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - nodes = args[0]; - c = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function iterateAndPrintParallel(nodes: string[], c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function iterateAndPrintParallel(peer: FluencePeer, nodes: string[], c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function iterateAndPrintParallel(...args: any) { + let peer: FluencePeer; + let nodes: any; +let c: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + nodes = args[1]; +c = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + nodes = args[0]; +c = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -151,31 +146,32 @@ export function iterateAndPrintParallel(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'nodes', () => { - return nodes; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'nodes', () => {return nodes;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'c') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - c(req.args[0], callParams); - resp.result = {}; - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'c') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + c(req.args[0], callParams); resp.result = {} - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -185,12 +181,13 @@ export function iterateAndPrintParallel(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for iterateAndPrintParallel'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/foldJoin.ts b/src/compiled/examples/foldJoin.ts index b4da209..9b315a4 100644 --- a/src/compiled/examples/foldJoin.ts +++ b/src/compiled/examples/foldJoin.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface Op2Def { - identity: (s: number, callParams: CallParams<'s'>) => void; -} + export interface Op2Def { + identity: (s: number, callParams: CallParams<'s'>) => void; + } -export function registerOp2(service: Op2Def): void; + export function registerOp2(service: Op2Def): void; export function registerOp2(serviceId: string, service: Op2Def): void; export function registerOp2(peer: FluencePeer, service: Op2Def): void; export function registerOp2(peer: FluencePeer, serviceId: string, service: Op2Def): void; -export function registerOp2(...args) { + export function registerOp2(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerOp2(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,52 +52,56 @@ export function registerOp2(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.identity(req.args[0], callParams); resp.result = {} - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.identity(req.args[0], callParams); - resp.result = {}; - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function getTwoResults(relay: string, config?: { ttl?: number }): Promise; -export function getTwoResults(peer: FluencePeer, relay: string, config?: { ttl?: number }): Promise; -export function getTwoResults(...args) { - let peer: FluencePeer; - let relay; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - relay = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - relay = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function getTwoResults(relay: string, config?: {ttl?: number}) : Promise; + export function getTwoResults(peer: FluencePeer, relay: string, config?: {ttl?: number}) : Promise; + export function getTwoResults(...args: any) { + let peer: FluencePeer; + let relay: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + relay = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + relay = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -152,18 +158,16 @@ export function getTwoResults(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'relay', () => { - return relay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'relay', () => {return relay;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -173,12 +177,13 @@ export function getTwoResults(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for getTwoResults'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/func.ts b/src/compiled/examples/func.ts index af9c394..d3df4e2 100644 --- a/src/compiled/examples/func.ts +++ b/src/compiled/examples/func.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface TestSrvDef { - str: (callParams: CallParams) => string; -} + export interface TestSrvDef { + str: (callParams: CallParams) => string; + } -export function registerTestSrv(service: TestSrvDef): void; + export function registerTestSrv(service: TestSrvDef): void; export function registerTestSrv(serviceId: string, service: TestSrvDef): void; export function registerTestSrv(peer: FluencePeer, service: TestSrvDef): void; export function registerTestSrv(peer: FluencePeer, serviceId: string, service: TestSrvDef): void; -export function registerTestSrv(...args) { + export function registerTestSrv(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerTestSrv(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test-service-id'; - } + } + else { + serviceId = "test-service-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,47 +52,54 @@ export function registerTestSrv(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'str') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.str(callParams) - if (req.fnName === 'str') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.str(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function testFunc(config?: { ttl?: number }): Promise; -export function testFunc(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function testFunc(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function testFunc(config?: {ttl?: number}) : Promise; + export function testFunc(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function testFunc(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -106,16 +115,16 @@ export function testFunc(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -125,12 +134,13 @@ export function testFunc(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for testFunc'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/helloWorld.ts b/src/compiled/examples/helloWorld.ts index 13aa038..8ebf89c 100644 --- a/src/compiled/examples/helloWorld.ts +++ b/src/compiled/examples/helloWorld.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface StringExtraDef { - addNameToHello: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface StringExtraDef { + addNameToHello: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerStringExtra(service: StringExtraDef): void; + export function registerStringExtra(service: StringExtraDef): void; export function registerStringExtra(serviceId: string, service: StringExtraDef): void; export function registerStringExtra(peer: FluencePeer, service: StringExtraDef): void; export function registerStringExtra(peer: FluencePeer, serviceId: string, service: StringExtraDef): void; -export function registerStringExtra(...args) { + export function registerStringExtra(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerStringExtra(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'service-id'; - } + } + else { + serviceId = "service-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,51 +52,56 @@ export function registerStringExtra(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'addNameToHello') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.addNameToHello(req.args[0], callParams) - if (req.fnName === 'addNameToHello') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.addNameToHello(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function helloWorld(name: string, config?: { ttl?: number }): Promise; -export function helloWorld(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise; -export function helloWorld(...args) { - let peer: FluencePeer; - let name; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - name = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - name = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function helloWorld(name: string, config?: {ttl?: number}) : Promise; + export function helloWorld(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise; + export function helloWorld(...args: any) { + let peer: FluencePeer; + let name: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + name = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + name = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -113,18 +120,16 @@ export function helloWorld(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'name', () => { - return name; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'name', () => {return name;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -134,12 +139,13 @@ export function helloWorld(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for helloWorld'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/if.ts b/src/compiled/examples/if.ts index 03b0507..8d8f35c 100644 --- a/src/compiled/examples/if.ts +++ b/src/compiled/examples/if.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,32 +14,34 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function ifElseCall(condition: boolean, config?: { ttl?: number }): Promise; -export function ifElseCall(peer: FluencePeer, condition: boolean, config?: { ttl?: number }): Promise; -export function ifElseCall(...args) { - let peer: FluencePeer; - let condition; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - condition = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - condition = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function ifElseCall(condition: boolean, config?: {ttl?: number}) : Promise; + export function ifElseCall(peer: FluencePeer, condition: boolean, config?: {ttl?: number}) : Promise; + export function ifElseCall(...args: any) { + let peer: FluencePeer; + let condition: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + condition = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + condition = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -60,15 +62,15 @@ export function ifElseCall(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'condition', () => { - return condition; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'condition', () => {return condition;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -78,38 +80,40 @@ export function ifElseCall(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for ifElseCall'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + -export function ifElseNumCall(condition: number, config?: { ttl?: number }): Promise; -export function ifElseNumCall(peer: FluencePeer, condition: number, config?: { ttl?: number }): Promise; -export function ifElseNumCall(...args) { - let peer: FluencePeer; - let condition; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - condition = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - condition = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function ifElseNumCall(condition: number, config?: {ttl?: number}) : Promise; + export function ifElseNumCall(peer: FluencePeer, condition: number, config?: {ttl?: number}) : Promise; + export function ifElseNumCall(...args: any) { + let peer: FluencePeer; + let condition: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + condition = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + condition = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -130,15 +134,15 @@ export function ifElseNumCall(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'condition', () => { - return condition; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'condition', () => {return condition;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -148,12 +152,13 @@ export function ifElseNumCall(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for ifElseNumCall'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/imports_exports/declare.ts b/src/compiled/examples/imports_exports/declare.ts index b461aca..9c95ed6 100644 --- a/src/compiled/examples/imports_exports/declare.ts +++ b/src/compiled/examples/imports_exports/declare.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface SuperFooDef { - small_foo: (callParams: CallParams) => string; -} + export interface SuperFooDef { + small_foo: (callParams: CallParams) => string; + } -export function registerSuperFoo(service: SuperFooDef): void; + export function registerSuperFoo(service: SuperFooDef): void; export function registerSuperFoo(serviceId: string, service: SuperFooDef): void; export function registerSuperFoo(peer: FluencePeer, service: SuperFooDef): void; export function registerSuperFoo(peer: FluencePeer, serviceId: string, service: SuperFooDef): void; -export function registerSuperFoo(...args) { + export function registerSuperFoo(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerSuperFoo(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'super_foo'; - } + } + else { + serviceId = "super_foo" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,23 +52,31 @@ export function registerSuperFoo(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'small_foo') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.small_foo(callParams) - if (req.fnName === 'small_foo') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.small_foo(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions + diff --git a/src/compiled/examples/imports_exports/exports.ts b/src/compiled/examples/imports_exports/exports.ts index 8c656f9..a3c44f8 100644 --- a/src/compiled/examples/imports_exports/exports.ts +++ b/src/compiled/examples/imports_exports/exports.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface MyExportSrvDef { - another_str: (callParams: CallParams) => string; -} + export interface MyExportSrvDef { + another_str: (callParams: CallParams) => string; + } -export function registerMyExportSrv(service: MyExportSrvDef): void; + export function registerMyExportSrv(service: MyExportSrvDef): void; export function registerMyExportSrv(serviceId: string, service: MyExportSrvDef): void; export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): void; export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void; -export function registerMyExportSrv(...args) { + export function registerMyExportSrv(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerMyExportSrv(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'my_export_srv'; - } + } + else { + serviceId = "my_export_srv" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,47 +52,54 @@ export function registerMyExportSrv(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'another_str') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.another_str(callParams) - if (req.fnName === 'another_str') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.another_str(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function string_from_lib(config?: { ttl?: number }): Promise; -export function string_from_lib(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function string_from_lib(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function string_from_lib(config?: {ttl?: number}) : Promise; + export function string_from_lib(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function string_from_lib(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -103,16 +112,16 @@ export function string_from_lib(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -122,12 +131,13 @@ export function string_from_lib(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for string_from_lib'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/imports_exports/gen/OneMore.ts b/src/compiled/examples/imports_exports/gen/OneMore.ts index 275d7a3..0a8c8fe 100644 --- a/src/compiled/examples/imports_exports/gen/OneMore.ts +++ b/src/compiled/examples/imports_exports/gen/OneMore.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,18 +14,19 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface OneMoreDef { - more_call: (callParams: CallParams) => void; -} + export interface OneMoreDef { + more_call: (callParams: CallParams) => void; + } -export function registerOneMore(serviceId: string, service: OneMoreDef): void; + export function registerOneMore(serviceId: string, service: OneMoreDef): void; export function registerOneMore(peer: FluencePeer, serviceId: string, service: OneMoreDef): void; -export function registerOneMore(...args) { + export function registerOneMore(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -36,7 +37,7 @@ export function registerOneMore(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -46,24 +47,31 @@ export function registerOneMore(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'more_call') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + service.more_call(callParams); resp.result = {} - if (req.fnName === 'more_call') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - service.more_call(callParams); - resp.result = {}; - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions + diff --git a/src/compiled/examples/imports_exports/import2.ts b/src/compiled/examples/imports_exports/import2.ts index ea48014..32e44fd 100644 --- a/src/compiled/examples/imports_exports/import2.ts +++ b/src/compiled/examples/imports_exports/import2.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,30 +14,32 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function wrap(config?: { ttl?: number }): Promise; -export function wrap(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function wrap(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function wrap(config?: {ttl?: number}) : Promise; + export function wrap(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function wrap(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -56,16 +58,16 @@ export function wrap(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -75,36 +77,38 @@ export function wrap(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for wrap'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function barfoo(config?: { ttl?: number }): Promise; -export function barfoo(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function barfoo(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function barfoo(config?: {ttl?: number}) : Promise; + export function barfoo(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function barfoo(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -123,16 +127,16 @@ export function barfoo(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -142,12 +146,13 @@ export function barfoo(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for barfoo'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/imports_exports/imports-empty.ts b/src/compiled/examples/imports_exports/imports-empty.ts index 0704770..8b9bc7a 100644 --- a/src/compiled/examples/imports_exports/imports-empty.ts +++ b/src/compiled/examples/imports_exports/imports-empty.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,42 +14,31 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface NoopDef { - array: ( - a: string, - b: string | null, - c: string | null, - d: string | null, - callParams: CallParams<'a' | 'b' | 'c' | 'd'>, - ) => string[]; - array_length: (array: string[], callParams: CallParams<'array'>) => number; - bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[]; - bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string; - concat: ( - a: string[], - b: string[] | null, - c: string[] | null, - d: string[] | null, - callParams: CallParams<'a' | 'b' | 'c' | 'd'>, - ) => string[]; - concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; - identity: (s: string | null, callParams: CallParams<'s'>) => string | null; - noop: (callParams: CallParams) => void; - sha256_string: (s: string, callParams: CallParams<'s'>) => string; - string_from_b58: (b: string, callParams: CallParams<'b'>) => string; - string_to_b58: (s: string, callParams: CallParams<'s'>) => string; -} + export interface NoopDef { + array: (a: string, b: string | null, c: string | null, d: string | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[]; +array_length: (array: string[], callParams: CallParams<'array'>) => number; +bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[]; +bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string; +concat: (a: string[], b: string[] | null, c: string[] | null, d: string[] | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[]; +concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; +identity: (s: string | null, callParams: CallParams<'s'>) => string | null; +noop: (callParams: CallParams) => void; +sha256_string: (s: string, callParams: CallParams<'s'>) => string; +string_from_b58: (b: string, callParams: CallParams<'b'>) => string; +string_to_b58: (s: string, callParams: CallParams<'s'>) => string; + } -export function registerNoop(service: NoopDef): void; + export function registerNoop(service: NoopDef): void; export function registerNoop(serviceId: string, service: NoopDef): void; export function registerNoop(peer: FluencePeer, service: NoopDef): void; export function registerNoop(peer: FluencePeer, serviceId: string, service: NoopDef): void; -export function registerNoop(...args) { + export function registerNoop(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -60,9 +49,10 @@ export function registerNoop(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -72,155 +62,198 @@ export function registerNoop(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'array') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2],d: req.tetraplets[3] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.array(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams) - if (req.fnName === 'array') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - c: req.tetraplets[2], - d: req.tetraplets[3], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array(req.args[0], req.args[1], req.args[2], req.args[3], callParams); - } + } + - if (req.fnName === 'array_length') { - const callParams = { - ...req.particleContext, - tetraplets: { - array: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.array_length(req.args[0], callParams); - } - if (req.fnName === 'bytes_from_b58') { - const callParams = { - ...req.particleContext, - tetraplets: { - b: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.bytes_from_b58(req.args[0], callParams); - } + if (req.fnName === 'array_length') { + + const callParams = { + ...req.particleContext, + tetraplets: { + array: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.array_length(req.args[0], callParams) - if (req.fnName === 'bytes_to_b58') { - const callParams = { - ...req.particleContext, - tetraplets: { - bs: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.bytes_to_b58(req.args[0], callParams); - } + } + - if (req.fnName === 'concat') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - c: req.tetraplets[2], - d: req.tetraplets[3], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.concat(req.args[0], req.args[1], req.args[2], req.args[3], callParams); - } - if (req.fnName === 'concat_strings') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.concat_strings(req.args[0], req.args[1], callParams); - } + if (req.fnName === 'bytes_from_b58') { + + const callParams = { + ...req.particleContext, + tetraplets: { + b: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.bytes_from_b58(req.args[0], callParams) - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } + } + - if (req.fnName === 'noop') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - service.noop(callParams); - resp.result = {}; - } - if (req.fnName === 'sha256_string') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.sha256_string(req.args[0], callParams); - } + if (req.fnName === 'bytes_to_b58') { + + const callParams = { + ...req.particleContext, + tetraplets: { + bs: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.bytes_to_b58(req.args[0], callParams) - if (req.fnName === 'string_from_b58') { - const callParams = { - ...req.particleContext, - tetraplets: { - b: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.string_from_b58(req.args[0], callParams); - } + } + - if (req.fnName === 'string_to_b58') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.string_to_b58(req.args[0], callParams); - } - next(); - }); -} + if (req.fnName === 'concat') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2],d: req.tetraplets[3] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.concat(req.args[0], req.args[1].length === 0 ? null : req.args[1][0], req.args[2].length === 0 ? null : req.args[2][0], req.args[3].length === 0 ? null : req.args[3][0], callParams) -export interface MyExportSrvDef { - another_str: (callParams: CallParams) => string; -} + } + -export function registerMyExportSrv(service: MyExportSrvDef): void; + + if (req.fnName === 'concat_strings') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.concat_strings(req.args[0], req.args[1], callParams) + + } + + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + + var respResult = service.identity(req.args[0].length === 0 ? null : req.args[0][0], callParams); + resp.result = respResult === null ? [] : [respResult] + + + } + + + + if (req.fnName === 'noop') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + service.noop(callParams); resp.result = {} + + } + + + + if (req.fnName === 'sha256_string') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.sha256_string(req.args[0], callParams) + + } + + + + if (req.fnName === 'string_from_b58') { + + const callParams = { + ...req.particleContext, + tetraplets: { + b: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.string_from_b58(req.args[0], callParams) + + } + + + + if (req.fnName === 'string_to_b58') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.string_to_b58(req.args[0], callParams) + + } + + + next(); + }); + } + + + + export interface MyExportSrvDef { + another_str: (callParams: CallParams) => string; + } + + export function registerMyExportSrv(service: MyExportSrvDef): void; export function registerMyExportSrv(serviceId: string, service: MyExportSrvDef): void; export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): void; export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void; -export function registerMyExportSrv(...args) { + export function registerMyExportSrv(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -231,9 +264,10 @@ export function registerMyExportSrv(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'my_export_srv'; - } + } + else { + serviceId = "my_export_srv" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -243,47 +277,54 @@ export function registerMyExportSrv(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'another_str') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.another_str(callParams) - if (req.fnName === 'another_str') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.another_str(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function some_str(config?: { ttl?: number }): Promise; -export function some_str(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function some_str(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function some_str(config?: {ttl?: number}) : Promise; + export function some_str(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function some_str(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -296,16 +337,16 @@ export function some_str(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -315,36 +356,38 @@ export function some_str(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for some_str'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function some_string(config?: { ttl?: number }): Promise; -export function some_string(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function some_string(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function some_string(config?: {ttl?: number}) : Promise; + export function some_string(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function some_string(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -357,16 +400,16 @@ export function some_string(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -376,36 +419,38 @@ export function some_string(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for some_string'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function decl_foo(config?: { ttl?: number }): Promise; -export function decl_foo(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function decl_foo(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function decl_foo(config?: {ttl?: number}) : Promise; + export function decl_foo(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function decl_foo(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -421,16 +466,16 @@ export function decl_foo(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -440,36 +485,38 @@ export function decl_foo(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for decl_foo'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function decl_bar(config?: { ttl?: number }): Promise; -export function decl_bar(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function decl_bar(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function decl_bar(config?: {ttl?: number}) : Promise; + export function decl_bar(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function decl_bar(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -482,16 +529,16 @@ export function decl_bar(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -501,36 +548,38 @@ export function decl_bar(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for decl_bar'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function some_random_func(config?: { ttl?: number }): Promise; -export function some_random_func(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function some_random_func(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function some_random_func(config?: {ttl?: number}) : Promise; + export function some_random_func(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function some_random_func(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -543,16 +592,16 @@ export function some_random_func(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -562,12 +611,13 @@ export function some_random_func(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for some_random_func'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/imports_exports/imports.ts b/src/compiled/examples/imports_exports/imports.ts index 9a154ca..1437e66 100644 --- a/src/compiled/examples/imports_exports/imports.ts +++ b/src/compiled/examples/imports_exports/imports.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface StringServiceDef { - concat: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; -} + export interface StringServiceDef { + concat: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; + } -export function registerStringService(service: StringServiceDef): void; + export function registerStringService(service: StringServiceDef): void; export function registerStringService(serviceId: string, service: StringServiceDef): void; export function registerStringService(peer: FluencePeer, service: StringServiceDef): void; export function registerStringService(peer: FluencePeer, serviceId: string, service: StringServiceDef): void; -export function registerStringService(...args) { + export function registerStringService(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerStringService(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'string_service'; - } + } + else { + serviceId = "string_service" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,50 +52,54 @@ export function registerStringService(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'concat') { + + const callParams = { + ...req.particleContext, + tetraplets: { + a: req.tetraplets[0],b: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.concat(req.args[0], req.args[1], callParams) - if (req.fnName === 'concat') { - const callParams = { - ...req.particleContext, - tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.concat(req.args[0], req.args[1], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function concat_foobars(config?: { ttl?: number }): Promise; -export function concat_foobars(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function concat_foobars(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function concat_foobars(config?: {ttl?: number}) : Promise; + export function concat_foobars(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function concat_foobars(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -127,16 +133,16 @@ export function concat_foobars(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -146,12 +152,13 @@ export function concat_foobars(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for concat_foobars'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/imports_exports/subImport.ts b/src/compiled/examples/imports_exports/subImport.ts index 194bbc9..4159d30 100644 --- a/src/compiled/examples/imports_exports/subImport.ts +++ b/src/compiled/examples/imports_exports/subImport.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface SubServiceDef { - sub: (s: string, callParams: CallParams<'s'>) => { one: string; two: number }; -} + export interface SubServiceDef { + sub: (s: string, callParams: CallParams<'s'>) => {one:string;two:number}; + } -export function registerSubService(service: SubServiceDef): void; + export function registerSubService(service: SubServiceDef): void; export function registerSubService(serviceId: string, service: SubServiceDef): void; export function registerSubService(peer: FluencePeer, service: SubServiceDef): void; export function registerSubService(peer: FluencePeer, serviceId: string, service: SubServiceDef): void; -export function registerSubService(...args) { + export function registerSubService(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerSubService(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'sub_service'; - } + } + else { + serviceId = "sub_service" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,49 +52,54 @@ export function registerSubService(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'sub') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.sub(req.args[0], callParams) - if (req.fnName === 'sub') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.sub(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function subImport(config?: { ttl?: number }): Promise<{ one: string; two: number }>; -export function subImport(peer: FluencePeer, config?: { ttl?: number }): Promise<{ one: string; two: number }>; -export function subImport(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise<{ one: string; two: number }>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function subImport(config?: {ttl?: number}) : Promise<{one:string;two:number}>; + export function subImport(peer: FluencePeer, config?: {ttl?: number}) : Promise<{one:string;two:number}>; + export function subImport(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise<{one:string;two:number}>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -108,16 +115,16 @@ export function subImport(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -127,12 +134,13 @@ export function subImport(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for subImport'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/multiReturn.ts b/src/compiled/examples/multiReturn.ts index eb89a1e..c5c8cf7 100644 --- a/src/compiled/examples/multiReturn.ts +++ b/src/compiled/examples/multiReturn.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface GetStrDef { - retStr: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface GetStrDef { + retStr: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerGetStr(service: GetStrDef): void; + export function registerGetStr(service: GetStrDef): void; export function registerGetStr(serviceId: string, service: GetStrDef): void; export function registerGetStr(peer: FluencePeer, service: GetStrDef): void; export function registerGetStr(peer: FluencePeer, serviceId: string, service: GetStrDef): void; -export function registerGetStr(...args) { + export function registerGetStr(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerGetStr(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'multiret-test'; - } + } + else { + serviceId = "multiret-test" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,39 +52,45 @@ export function registerGetStr(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'retStr') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.retStr(req.args[0], callParams) - if (req.fnName === 'retStr') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.retStr(req.args[0], callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface GetNumDef { - retNum: (callParams: CallParams) => number; -} + export interface GetNumDef { + retNum: (callParams: CallParams) => number; + } -export function registerGetNum(service: GetNumDef): void; + export function registerGetNum(service: GetNumDef): void; export function registerGetNum(serviceId: string, service: GetNumDef): void; export function registerGetNum(peer: FluencePeer, service: GetNumDef): void; export function registerGetNum(peer: FluencePeer, serviceId: string, service: GetNumDef): void; -export function registerGetNum(...args) { + export function registerGetNum(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -93,9 +101,10 @@ export function registerGetNum(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'multiret-num'; - } + } + else { + serviceId = "multiret-num" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -105,47 +114,54 @@ export function registerGetNum(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'retNum') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.retNum(callParams) - if (req.fnName === 'retNum') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.retNum(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function tupleFunc(config?: { ttl?: number }): Promise<[string, number]>; -export function tupleFunc(peer: FluencePeer, config?: { ttl?: number }): Promise<[string, number]>; -export function tupleFunc(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise<[string, number]>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function tupleFunc(config?: {ttl?: number}) : Promise<[string, number]>; + export function tupleFunc(peer: FluencePeer, config?: {ttl?: number}) : Promise<[string, number]>; + export function tupleFunc(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise<[string, number]>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -164,17 +180,17 @@ export function tupleFunc(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - let opt: any = args; + let opt: any = args; - return resolve(opt); - }); + return resolve(opt); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -184,50 +200,43 @@ export function tupleFunc(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for tupleFunc'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function multiReturnFunc( - somethingToReturn: number[], - smthOption: string | null, - config?: { ttl?: number }, -): Promise<[string[], number, string, number[], string | null, number]>; -export function multiReturnFunc( - peer: FluencePeer, - somethingToReturn: number[], - smthOption: string | null, - config?: { ttl?: number }, -): Promise<[string[], number, string, number[], string | null, number]>; -export function multiReturnFunc(...args) { - let peer: FluencePeer; - let somethingToReturn; - let smthOption; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - somethingToReturn = args[1]; - smthOption = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - somethingToReturn = args[0]; - smthOption = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise<[string[], number, string, number[], string | null, number]>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function multiReturnFunc(somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}) : Promise<[string[], number, string, number[], string | null, number]>; + export function multiReturnFunc(peer: FluencePeer, somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}) : Promise<[string[], number, string, number[], string | null, number]>; + export function multiReturnFunc(...args: any) { + let peer: FluencePeer; + let somethingToReturn: any; +let smthOption: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + somethingToReturn = args[1]; +smthOption = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + somethingToReturn = args[0]; +smthOption = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise<[string[], number, string, number[], string | null, number]>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -261,29 +270,22 @@ export function multiReturnFunc(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'somethingToReturn', () => { - return somethingToReturn; - }); - h.on('getDataSrv', 'smthOption', () => { - return smthOption === null ? [] : [smthOption]; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'somethingToReturn', () => {return somethingToReturn;}); +h.on('getDataSrv', 'smthOption', () => {return smthOption === null ? [] : [smthOption];}); h.onEvent('callbackSrv', 'response', (args) => { - let opt: any = args; + let opt: any = args; - if (Array.isArray(opt[4])) { - if (opt[4].length === 0) { - opt[4] = null; - } else { - opt[4] = opt[4][0]; - } - } - return resolve(opt); - }); + if(Array.isArray(opt[4])) { + if (opt[4].length === 0) { opt[4] = null; } + else {opt[4] = opt[4][0]; } + } + return resolve(opt); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -293,12 +295,13 @@ export function multiReturnFunc(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for multiReturnFunc'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/nestedFuncs.ts b/src/compiled/examples/nestedFuncs.ts index 745a46e..8cf1d91 100644 --- a/src/compiled/examples/nestedFuncs.ts +++ b/src/compiled/examples/nestedFuncs.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface OpHDef { - identity: (s: string, callParams: CallParams<'s'>) => string; -} + export interface OpHDef { + identity: (s: string, callParams: CallParams<'s'>) => string; + } -export function registerOpH(service: OpHDef): void; + export function registerOpH(service: OpHDef): void; export function registerOpH(serviceId: string, service: OpHDef): void; export function registerOpH(peer: FluencePeer, service: OpHDef): void; export function registerOpH(peer: FluencePeer, serviceId: string, service: OpHDef): void; -export function registerOpH(...args) { + export function registerOpH(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerOpH(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'opa'; - } + } + else { + serviceId = "opa" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,51 +52,56 @@ export function registerOpH(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.identity(req.args[0], callParams) - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function a(b: string, config?: { ttl?: number }): Promise; -export function a(peer: FluencePeer, b: string, config?: { ttl?: number }): Promise; -export function a(...args) { - let peer: FluencePeer; - let b; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - b = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - b = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function a(b: string, config?: {ttl?: number}) : Promise; + export function a(peer: FluencePeer, b: string, config?: {ttl?: number}) : Promise; + export function a(...args: any) { + let peer: FluencePeer; + let b: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + b = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + b = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -113,18 +120,16 @@ export function a(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'b', () => { - return b; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'b', () => {return b;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -134,38 +139,40 @@ export function a(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for a'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function d(e: string, config?: { ttl?: number }): Promise; -export function d(peer: FluencePeer, e: string, config?: { ttl?: number }): Promise; -export function d(...args) { - let peer: FluencePeer; - let e; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - e = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - e = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function d(e: string, config?: {ttl?: number}) : Promise; + export function d(peer: FluencePeer, e: string, config?: {ttl?: number}) : Promise; + export function d(...args: any) { + let peer: FluencePeer; + let e: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + e = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + e = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -184,18 +191,16 @@ export function d(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'e', () => { - return e; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'e', () => {return e;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -205,12 +210,13 @@ export function d(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for d'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/new-api-full.ts b/src/compiled/examples/new-api-full.ts index f4f5086..88ca33a 100644 --- a/src/compiled/examples/new-api-full.ts +++ b/src/compiled/examples/new-api-full.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,24 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface ServiceWithDefaultIdDef { - hello: (s: string, callParams: CallParams<'s'>) => void; -} + export interface ServiceWithDefaultIdDef { + hello: (s: string, callParams: CallParams<'s'>) => void; + } -export function registerServiceWithDefaultId(service: ServiceWithDefaultIdDef): void; + export function registerServiceWithDefaultId(service: ServiceWithDefaultIdDef): void; export function registerServiceWithDefaultId(serviceId: string, service: ServiceWithDefaultIdDef): void; export function registerServiceWithDefaultId(peer: FluencePeer, service: ServiceWithDefaultIdDef): void; -export function registerServiceWithDefaultId( - peer: FluencePeer, - serviceId: string, - service: ServiceWithDefaultIdDef, -): void; -export function registerServiceWithDefaultId(...args) { +export function registerServiceWithDefaultId(peer: FluencePeer, serviceId: string, service: ServiceWithDefaultIdDef): void; + export function registerServiceWithDefaultId(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -42,9 +39,10 @@ export function registerServiceWithDefaultId(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'defaultId'; - } + } + else { + serviceId = "defaultId" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -54,42 +52,43 @@ export function registerServiceWithDefaultId(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'hello') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.hello(req.args[0], callParams); resp.result = {} - if (req.fnName === 'hello') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.hello(req.args[0], callParams); - resp.result = {}; - } + } + + + next(); + }); + } + - next(); - }); -} -export interface ServiceWithOUTDefaultIdDef { - hello: (s: string, callParams: CallParams<'s'>) => void; -} + export interface ServiceWithOUTDefaultIdDef { + hello: (s: string, callParams: CallParams<'s'>) => void; + } -export function registerServiceWithOUTDefaultId(serviceId: string, service: ServiceWithOUTDefaultIdDef): void; -export function registerServiceWithOUTDefaultId( - peer: FluencePeer, - serviceId: string, - service: ServiceWithOUTDefaultIdDef, -): void; -export function registerServiceWithOUTDefaultId(...args) { + export function registerServiceWithOUTDefaultId(serviceId: string, service: ServiceWithOUTDefaultIdDef): void; +export function registerServiceWithOUTDefaultId(peer: FluencePeer, serviceId: string, service: ServiceWithOUTDefaultIdDef): void; + export function registerServiceWithOUTDefaultId(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -100,7 +99,7 @@ export function registerServiceWithOUTDefaultId(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -110,42 +109,47 @@ export function registerServiceWithOUTDefaultId(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'hello') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.hello(req.args[0], callParams); resp.result = {} - if (req.fnName === 'hello') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.hello(req.args[0], callParams); - resp.result = {}; - } + } + + + next(); + }); + } + - next(); - }); -} -export interface MoreMembersDef { - member1: (callParams: CallParams) => void; - member2: (s1: string, callParams: CallParams<'s1'>) => void; - member3: (s1: string, s2: string, callParams: CallParams<'s1' | 's2'>) => void; - member4: (s1: string, s2: string, i: number, callParams: CallParams<'s1' | 's2' | 'i'>) => number; - member5: (s1: string, s2: string, i: number, callParams: CallParams<'s1' | 's2' | 'i'>) => number; -} + export interface MoreMembersDef { + member1: (callParams: CallParams) => void; +member2: (s1: string, callParams: CallParams<'s1'>) => void; +member3: (s1: string, s2: string, callParams: CallParams<'s1' | 's2'>) => void; +member4: (s1: string, s2: string, i: number, callParams: CallParams<'s1' | 's2' | 'i'>) => number; +member5: (s1: string, s2: string, i: number, callParams: CallParams<'s1' | 's2' | 'i'>) => number; + } -export function registerMoreMembers(serviceId: string, service: MoreMembersDef): void; + export function registerMoreMembers(serviceId: string, service: MoreMembersDef): void; export function registerMoreMembers(peer: FluencePeer, serviceId: string, service: MoreMembersDef): void; -export function registerMoreMembers(...args) { + export function registerMoreMembers(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -156,7 +160,7 @@ export function registerMoreMembers(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -166,108 +170,116 @@ export function registerMoreMembers(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'member1') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + service.member1(callParams); resp.result = {} - if (req.fnName === 'member1') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - service.member1(callParams); - resp.result = {}; - } + } + - if (req.fnName === 'member2') { - const callParams = { - ...req.particleContext, - tetraplets: { - s1: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.member2(req.args[0], callParams); - resp.result = {}; - } - if (req.fnName === 'member3') { - const callParams = { - ...req.particleContext, - tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - service.member3(req.args[0], req.args[1], callParams); - resp.result = {}; - } + if (req.fnName === 'member2') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s1: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.member2(req.args[0], callParams); resp.result = {} - if (req.fnName === 'member4') { - const callParams = { - ...req.particleContext, - tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], - i: req.tetraplets[2], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.member4(req.args[0], req.args[1], req.args[2], callParams); - } + } + - if (req.fnName === 'member5') { - const callParams = { - ...req.particleContext, - tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], - i: req.tetraplets[2], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.member5(req.args[0], req.args[1], req.args[2], callParams); - } - next(); - }); -} + if (req.fnName === 'member3') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s1: req.tetraplets[0],s2: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + service.member3(req.args[0], req.args[1], callParams); resp.result = {} + + } + + + + if (req.fnName === 'member4') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s1: req.tetraplets[0],s2: req.tetraplets[1],i: req.tetraplets[2] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.member4(req.args[0], req.args[1], req.args[2], callParams) + + } + + + + if (req.fnName === 'member5') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s1: req.tetraplets[0],s2: req.tetraplets[1],i: req.tetraplets[2] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.member5(req.args[0], req.args[1], req.args[2], callParams) + + } + + + next(); + }); + } + // Functions -export function f1( - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f1( - peer: FluencePeer, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f1(...args) { - let peer: FluencePeer; - let callback; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - callback = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - callback = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function f1(callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f1(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f1(...args: any) { + let peer: FluencePeer; + let callback: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + callback = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + callback = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -280,29 +292,31 @@ export function f1(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0],arg1: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + callback(req.args[0], req.args[1], callParams); resp.result = {} - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - arg1: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - callback(req.args[0], req.args[1], callParams); - resp.result = {}; - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -312,50 +326,43 @@ export function f1(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for f1'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + -export function f2( - num: number, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f2( - peer: FluencePeer, - num: number, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f2(...args) { - let peer: FluencePeer; - let num; - let callback; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - num = args[1]; - callback = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - num = args[0]; - callback = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function f2(num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f2(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f2(...args: any) { + let peer: FluencePeer; + let num: any; +let callback: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + num = args[1]; +callback = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + num = args[0]; +callback = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -371,32 +378,32 @@ export function f2(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'num', () => { - return num; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'num', () => {return num;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - arg1: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - callback(req.args[0], req.args[1], callParams); - resp.result = {}; - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0],arg1: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + callback(req.args[0], req.args[1], callParams); resp.result = {} - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -406,50 +413,43 @@ export function f2(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for f2'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + -export function f3( - num: number, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f3( - peer: FluencePeer, - num: number, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function f3(...args) { - let peer: FluencePeer; - let num; - let callback; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - num = args[1]; - callback = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - num = args[0]; - callback = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function f3(num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f3(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function f3(...args: any) { + let peer: FluencePeer; + let num: any; +let callback: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + num = args[1]; +callback = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + num = args[0]; +callback = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -471,35 +471,33 @@ export function f3(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'num', () => { - return num; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'num', () => {return num;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - arg1: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - callback(req.args[0], req.args[1], callParams); - resp.result = {}; - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0],arg1: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + callback(req.args[0], req.args[1], callParams); resp.result = {} + } + next(); + }); + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -509,45 +507,40 @@ export function f3(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for f3'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function callBackZeroArgs( - callback: (callParams: CallParams) => void, - config?: { ttl?: number }, -): Promise; -export function callBackZeroArgs( - peer: FluencePeer, - callback: (callParams: CallParams) => void, - config?: { ttl?: number }, -): Promise; -export function callBackZeroArgs(...args) { - let peer: FluencePeer; - let callback; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - callback = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - callback = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function callBackZeroArgs(callback: (callParams: CallParams) => void, config?: {ttl?: number}) : Promise; + export function callBackZeroArgs(peer: FluencePeer, callback: (callParams: CallParams) => void, config?: {ttl?: number}) : Promise; + export function callBackZeroArgs(...args: any) { + let peer: FluencePeer; + let callback: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + callback = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + callback = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -560,26 +553,31 @@ export function callBackZeroArgs(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + callback(callParams); resp.result = {} - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - callback(callParams); - resp.result = {}; - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -589,12 +587,13 @@ export function callBackZeroArgs(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for callBackZeroArgs'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/new-api.ts b/src/compiled/examples/new-api.ts index 9700091..0ecec7c 100644 --- a/src/compiled/examples/new-api.ts +++ b/src/compiled/examples/new-api.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,21 +14,22 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface HelloWorldDef { - getNumber: (callParams: CallParams) => number; - sayHello: (s: string, callParams: CallParams<'s'>) => void; -} + export interface HelloWorldDef { + getNumber: (callParams: CallParams) => number; +sayHello: (s: string, callParams: CallParams<'s'>) => void; + } -export function registerHelloWorld(service: HelloWorldDef): void; + export function registerHelloWorld(service: HelloWorldDef): void; export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, serviceId: string, service: HelloWorldDef): void; -export function registerHelloWorld(...args) { + export function registerHelloWorld(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -39,9 +40,10 @@ export function registerHelloWorld(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'default'; - } + } + else { + serviceId = "default" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -51,68 +53,71 @@ export function registerHelloWorld(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'getNumber') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getNumber(callParams) - if (req.fnName === 'getNumber') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getNumber(callParams); - } + } + - if (req.fnName === 'sayHello') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.sayHello(req.args[0], callParams); - resp.result = {}; - } - next(); - }); -} + if (req.fnName === 'sayHello') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.sayHello(req.args[0], callParams); resp.result = {} + + } + + + next(); + }); + } + // Functions -export function callMeBack( - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function callMeBack( - peer: FluencePeer, - callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, - config?: { ttl?: number }, -): Promise; -export function callMeBack(...args) { - let peer: FluencePeer; - let callback; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - callback = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - callback = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function callMeBack(callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function callMeBack(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise; + export function callMeBack(...args: any) { + let peer: FluencePeer; + let callback: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + callback = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + callback = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -125,29 +130,31 @@ export function callMeBack(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0],arg1: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + callback(req.args[0], req.args[1], callParams); resp.result = {} - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - arg1: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - callback(req.args[0], req.args[1], callParams); - resp.result = {}; - } - next(); - }); - - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -157,12 +164,13 @@ export function callMeBack(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for callMeBack'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/on.ts b/src/compiled/examples/on.ts index 67e91fe..fd6cd80 100644 --- a/src/compiled/examples/on.ts +++ b/src/compiled/examples/on.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,36 +14,34 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function getPeerExternalAddresses(otherNodePeerId: string, config?: { ttl?: number }): Promise; -export function getPeerExternalAddresses( - peer: FluencePeer, - otherNodePeerId: string, - config?: { ttl?: number }, -): Promise; -export function getPeerExternalAddresses(...args) { - let peer: FluencePeer; - let otherNodePeerId; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - otherNodePeerId = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - otherNodePeerId = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function getPeerExternalAddresses(otherNodePeerId: string, config?: {ttl?: number}) : Promise; + export function getPeerExternalAddresses(peer: FluencePeer, otherNodePeerId: string, config?: {ttl?: number}) : Promise; + export function getPeerExternalAddresses(...args: any) { + let peer: FluencePeer; + let otherNodePeerId: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + otherNodePeerId = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + otherNodePeerId = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -74,18 +72,16 @@ export function getPeerExternalAddresses(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'otherNodePeerId', () => { - return otherNodePeerId; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -95,46 +91,43 @@ export function getPeerExternalAddresses(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for getPeerExternalAddresses'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function getDistantAddresses(target: string, viaNode: string, config?: { ttl?: number }): Promise; -export function getDistantAddresses( - peer: FluencePeer, - target: string, - viaNode: string, - config?: { ttl?: number }, -): Promise; -export function getDistantAddresses(...args) { - let peer: FluencePeer; - let target; - let viaNode; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - target = args[1]; - viaNode = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - target = args[0]; - viaNode = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function getDistantAddresses(target: string, viaNode: string, config?: {ttl?: number}) : Promise; + export function getDistantAddresses(peer: FluencePeer, target: string, viaNode: string, config?: {ttl?: number}) : Promise; + export function getDistantAddresses(...args: any) { + let peer: FluencePeer; + let target: any; +let viaNode: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + target = args[1]; +viaNode = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + target = args[0]; +viaNode = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -180,21 +173,17 @@ export function getDistantAddresses(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'target', () => { - return target; - }); - h.on('getDataSrv', 'viaNode', () => { - return viaNode; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'target', () => {return target;}); +h.on('getDataSrv', 'viaNode', () => {return viaNode;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -204,12 +193,13 @@ export function getDistantAddresses(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for getDistantAddresses'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/option.ts b/src/compiled/examples/option.ts index 7632532..bd17ffd 100644 --- a/src/compiled/examples/option.ts +++ b/src/compiled/examples/option.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,22 +14,23 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface SomeSDef { - getStr: (arg0: string | null, callParams: CallParams<'arg0'>) => string | null; - getStr1: (callParams: CallParams) => string | null; - getStr2: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface SomeSDef { + getStr: (arg0: string | null, callParams: CallParams<'arg0'>) => string | null; +getStr1: (callParams: CallParams) => string | null; +getStr2: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerSomeS(service: SomeSDef): void; + export function registerSomeS(service: SomeSDef): void; export function registerSomeS(serviceId: string, service: SomeSDef): void; export function registerSomeS(peer: FluencePeer, service: SomeSDef): void; export function registerSomeS(peer: FluencePeer, serviceId: string, service: SomeSDef): void; -export function registerSomeS(...args) { + export function registerSomeS(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -40,9 +41,10 @@ export function registerSomeS(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test2'; - } + } + else { + serviceId = "test2" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -52,71 +54,92 @@ export function registerSomeS(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'getStr') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + + var respResult = service.getStr(req.args[0].length === 0 ? null : req.args[0][0], callParams); + resp.result = respResult === null ? [] : [respResult] - if (req.fnName === 'getStr') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getStr(req.args[0], callParams); - } - if (req.fnName === 'getStr1') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getStr1(callParams); - } + } + - if (req.fnName === 'getStr2') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getStr2(req.args[0], callParams); - } - next(); - }); -} + if (req.fnName === 'getStr1') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + + var respResult = service.getStr1(callParams); + resp.result = respResult === null ? [] : [respResult] + + + } + + + + if (req.fnName === 'getStr2') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getStr2(req.args[0], callParams) + + } + + + next(); + }); + } + // Functions -export function useOptional(opt: string | null, config?: { ttl?: number }): Promise; -export function useOptional(peer: FluencePeer, opt: string | null, config?: { ttl?: number }): Promise; -export function useOptional(...args) { - let peer: FluencePeer; - let opt; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - opt = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - opt = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function useOptional(opt: string | null, config?: {ttl?: number}) : Promise; + export function useOptional(peer: FluencePeer, opt: string | null, config?: {ttl?: number}) : Promise; + export function useOptional(...args: any) { + let peer: FluencePeer; + let opt: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + opt = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + opt = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -143,18 +166,16 @@ export function useOptional(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'opt', () => { - return opt === null ? [] : [opt]; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'opt', () => {return opt === null ? [] : [opt];}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -164,36 +185,38 @@ export function useOptional(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for useOptional'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function returnOptional(config?: { ttl?: number }): Promise; -export function returnOptional(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function returnOptional(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function returnOptional(config?: {ttl?: number}) : Promise; + export function returnOptional(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function returnOptional(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -209,22 +232,20 @@ export function returnOptional(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); - } - opt = opt[0]; - } - return resolve(opt); - }); + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; + } + return resolve(opt); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -234,36 +255,38 @@ export function returnOptional(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for returnOptional'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function returnNone(config?: { ttl?: number }): Promise; -export function returnNone(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function returnNone(...args) { - let peer: FluencePeer; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function returnNone(config?: {ttl?: number}) : Promise; + export function returnNone(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function returnNone(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -279,22 +302,20 @@ export function returnNone(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); - } - opt = opt[0]; - } - return resolve(opt); - }); + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; + } + return resolve(opt); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -304,12 +325,13 @@ export function returnNone(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for returnNone'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/options/option_gen.ts b/src/compiled/examples/options/option_gen.ts index 93e3e70..ee3638d 100644 --- a/src/compiled/examples/options/option_gen.ts +++ b/src/compiled/examples/options/option_gen.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -25,10 +25,10 @@ import { export function registerOptionString(serviceId: string, service: OptionStringDef): void; export function registerOptionString(peer: FluencePeer, service: OptionStringDef): void; export function registerOptionString(peer: FluencePeer, serviceId: string, service: OptionStringDef): void; - export function registerOptionString(...args) { + export function registerOptionString(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -68,7 +68,7 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi }, }; resp.retCode = ResultCodes.success; - resp.result = service.checkOption(req.args[0], callParams) + resp.result = service.checkOption(req.args[0].length === 0 ? null : req.args[0][0], callParams) } @@ -80,12 +80,145 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi // Functions + export function emptyString(config?: {ttl?: number}) : Promise; + export function emptyString(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function emptyString(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$valueEmpty]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) + + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; + } + return resolve(opt); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for emptyString'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + + export function checkEmpty(config?: {ttl?: number}) : Promise; + export function checkEmpty(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function checkEmpty(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (call %init_peer_id% ("opt_str" "checkOption") [$valueEmpty] res) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [res]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) + + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + const [res] = args; + resolve(res); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for checkEmpty'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + export function stringAsOption(str: string, config?: {ttl?: number}) : Promise; export function stringAsOption(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise; - export function stringAsOption(...args) { + export function stringAsOption(...args: any) { let peer: FluencePeer; - let str; - let config; + let str: any; + let config: any; if (args[0] instanceof FluencePeer) { peer = args[0]; str = args[1]; @@ -155,145 +288,12 @@ config = args[1]; - export function emptyString(config?: {ttl?: number}) : Promise; - export function emptyString(peer: FluencePeer, config?: {ttl?: number}) : Promise; - export function emptyString(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (xor - (call %init_peer_id% ("callbackSrv" "response") [$valueEmpty]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay ; - }); - - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { resolve(null); } - opt = opt[0]; - } - return resolve(opt); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for emptyString'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) - } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; -} - - - - export function checkEmpty(config?: {ttl?: number}) : Promise; - export function checkEmpty(peer: FluencePeer, config?: {ttl?: number}) : Promise; - export function checkEmpty(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` - (xor - (seq - (seq - (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) - (call %init_peer_id% ("opt_str" "checkOption") [$valueEmpty] res) - ) - (xor - (call %init_peer_id% ("callbackSrv" "response") [res]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) - ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) -) - - `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay ; - }); - - h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); -}); - - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for checkEmpty'); - }) - if(config && config.ttl) { - r.withTTL(config.ttl) - } - request = r.build(); - }); - peer.internals.initiateFlow(request!); - return promise; -} - - - export function checkNoneEmpty(str: string, config?: {ttl?: number}) : Promise; export function checkNoneEmpty(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise; - export function checkNoneEmpty(...args) { + export function checkNoneEmpty(...args: any) { let peer: FluencePeer; - let str; - let config; + let str: any; + let config: any; if (args[0] instanceof FluencePeer) { peer = args[0]; str = args[1]; diff --git a/src/compiled/examples/par.ts b/src/compiled/examples/par.ts index f7914ee..7f3d732 100644 --- a/src/compiled/examples/par.ts +++ b/src/compiled/examples/par.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface ParServiceDef { - call: (callParams: CallParams) => string; -} + export interface ParServiceDef { + call: (callParams: CallParams) => string; + } -export function registerParService(service: ParServiceDef): void; + export function registerParService(service: ParServiceDef): void; export function registerParService(serviceId: string, service: ParServiceDef): void; export function registerParService(peer: FluencePeer, service: ParServiceDef): void; export function registerParService(peer: FluencePeer, serviceId: string, service: ParServiceDef): void; -export function registerParService(...args) { + export function registerParService(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerParService(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'parservice-id'; - } + } + else { + serviceId = "parservice-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,61 +52,59 @@ export function registerParService(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'call') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.call(callParams) - if (req.fnName === 'call') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.call(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function parFunc( - node: string, - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function parFunc( - peer: FluencePeer, - node: string, - c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void, - config?: { ttl?: number }, -): Promise; -export function parFunc(...args) { - let peer: FluencePeer; - let node; - let c; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node = args[1]; - c = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - node = args[0]; - c = args[1]; - config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function parFunc(node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function parFunc(peer: FluencePeer, node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise; + export function parFunc(...args: any) { + let peer: FluencePeer; + let node: any; +let c: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node = args[1]; +c = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + node = args[0]; +c = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -138,31 +138,32 @@ export function parFunc(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node', () => { - return node; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node', () => {return node;}); - h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'c') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - c(req.args[0], callParams); - resp.result = {}; - } - next(); - }); + h.use((req, resp, next) => { + if(req.serviceId === 'callbackSrv' && req.fnName === 'c') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + c(req.args[0], callParams); resp.result = {} - h.onEvent('callbackSrv', 'response', (args) => {}); + } + next(); + }); + + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -172,12 +173,13 @@ export function parFunc(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for parFunc'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/passArgs.ts b/src/compiled/examples/passArgs.ts index 579461e..a5d3c45 100644 --- a/src/compiled/examples/passArgs.ts +++ b/src/compiled/examples/passArgs.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,25 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface AquaDHTDef { - put_host_value: ( - key: string, - value: string, - service_id: string[], - callParams: CallParams<'key' | 'value' | 'service_id'>, - ) => string; -} + export interface AquaDHTDef { + put_host_value: (key: string, value: string, service_id: string[], callParams: CallParams<'key' | 'value' | 'service_id'>) => string; + } -export function registerAquaDHT(service: AquaDHTDef): void; + export function registerAquaDHT(service: AquaDHTDef): void; export function registerAquaDHT(serviceId: string, service: AquaDHTDef): void; export function registerAquaDHT(peer: FluencePeer, service: AquaDHTDef): void; export function registerAquaDHT(peer: FluencePeer, serviceId: string, service: AquaDHTDef): void; -export function registerAquaDHT(...args) { + export function registerAquaDHT(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -43,9 +39,10 @@ export function registerAquaDHT(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test-dht'; - } + } + else { + serviceId = "test-dht" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -55,70 +52,62 @@ export function registerAquaDHT(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'put_host_value') { + + const callParams = { + ...req.particleContext, + tetraplets: { + key: req.tetraplets[0],value: req.tetraplets[1],service_id: req.tetraplets[2] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.put_host_value(req.args[0], req.args[1], req.args[2], callParams) - if (req.fnName === 'put_host_value') { - const callParams = { - ...req.particleContext, - tetraplets: { - key: req.tetraplets[0], - value: req.tetraplets[1], - service_id: req.tetraplets[2], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.put_host_value(req.args[0], req.args[1], req.args[2], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function putHostValue( - key: string, - value: string, - service_id: string | null, - config?: { ttl?: number }, -): Promise; -export function putHostValue( - peer: FluencePeer, - key: string, - value: string, - service_id: string | null, - config?: { ttl?: number }, -): Promise; -export function putHostValue(...args) { - let peer: FluencePeer; - let key; - let value; - let service_id; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - key = args[1]; - value = args[2]; - service_id = args[3]; - config = args[4]; - } else { - peer = FluencePeer.default; - key = args[0]; - value = args[1]; - service_id = args[2]; - config = args[3]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function putHostValue(key: string, value: string, service_id: string | null, config?: {ttl?: number}) : Promise; + export function putHostValue(peer: FluencePeer, key: string, value: string, service_id: string | null, config?: {ttl?: number}) : Promise; + export function putHostValue(...args: any) { + let peer: FluencePeer; + let key: any; +let value: any; +let service_id: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + key = args[1]; +value = args[2]; +service_id = args[3]; +config = args[4]; + } else { + peer = FluencePeer.default; + key = args[0]; +value = args[1]; +service_id = args[2]; +config = args[3]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -143,24 +132,18 @@ export function putHostValue(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'key', () => { - return key; - }); - h.on('getDataSrv', 'value', () => { - return value; - }); - h.on('getDataSrv', 'service_id', () => { - return service_id === null ? [] : [service_id]; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'key', () => {return key;}); +h.on('getDataSrv', 'value', () => {return value;}); +h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [service_id];}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -170,38 +153,40 @@ export function putHostValue(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for putHostValue'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function create_client_util(service_id: string, config?: { ttl?: number }): Promise; -export function create_client_util(peer: FluencePeer, service_id: string, config?: { ttl?: number }): Promise; -export function create_client_util(...args) { - let peer: FluencePeer; - let service_id; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - service_id = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - service_id = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function create_client_util(service_id: string, config?: {ttl?: number}) : Promise; + export function create_client_util(peer: FluencePeer, service_id: string, config?: {ttl?: number}) : Promise; + export function create_client_util(...args: any) { + let peer: FluencePeer; + let service_id: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + service_id = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + service_id = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -220,18 +205,16 @@ export function create_client_util(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'service_id', () => { - return service_id; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'service_id', () => {return service_id;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -241,12 +224,13 @@ export function create_client_util(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for create_client_util'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/println.ts b/src/compiled/examples/println.ts index a9d4580..b05fa19 100644 --- a/src/compiled/examples/println.ts +++ b/src/compiled/examples/println.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface PrintlnDef { - print: (arg0: string, callParams: CallParams<'arg0'>) => void; -} + export interface PrintlnDef { + print: (arg0: string, callParams: CallParams<'arg0'>) => void; + } -export function registerPrintln(service: PrintlnDef): void; + export function registerPrintln(service: PrintlnDef): void; export function registerPrintln(serviceId: string, service: PrintlnDef): void; export function registerPrintln(peer: FluencePeer, service: PrintlnDef): void; export function registerPrintln(peer: FluencePeer, serviceId: string, service: PrintlnDef): void; -export function registerPrintln(...args) { + export function registerPrintln(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerPrintln(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'println-service-id'; - } + } + else { + serviceId = "println-service-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,52 +52,56 @@ export function registerPrintln(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'print') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.print(req.args[0], callParams); resp.result = {} - if (req.fnName === 'print') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.print(req.args[0], callParams); - resp.result = {}; - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function print(str: string, config?: { ttl?: number }): Promise; -export function print(peer: FluencePeer, str: string, config?: { ttl?: number }): Promise; -export function print(...args) { - let peer: FluencePeer; - let str; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - str = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - str = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function print(str: string, config?: {ttl?: number}) : Promise; + export function print(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise; + export function print(...args: any) { + let peer: FluencePeer; + let str: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + str = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + str = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -108,15 +114,15 @@ export function print(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'str', () => { - return str; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'str', () => {return str;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -126,12 +132,13 @@ export function print(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for print'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + diff --git a/src/compiled/examples/pushToStream.ts b/src/compiled/examples/pushToStream.ts index 617a4f4..0a14581 100644 --- a/src/compiled/examples/pushToStream.ts +++ b/src/compiled/examples/pushToStream.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface OpADef { - get_str: (callParams: CallParams) => string; -} + export interface OpADef { + get_str: (callParams: CallParams) => string; + } -export function registerOpA(service: OpADef): void; + export function registerOpA(service: OpADef): void; export function registerOpA(serviceId: string, service: OpADef): void; export function registerOpA(peer: FluencePeer, service: OpADef): void; export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void; -export function registerOpA(...args) { + export function registerOpA(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerOpA(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'pop'; - } + } + else { + serviceId = "pop" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,47 +52,54 @@ export function registerOpA(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'get_str') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.get_str(callParams) - if (req.fnName === 'get_str') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_str(callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function get_results(config?: { ttl?: number }): Promise; -export function get_results(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function get_results(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function get_results(config?: {ttl?: number}) : Promise; + export function get_results(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function get_results(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -112,16 +121,16 @@ export function get_results(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -131,12 +140,13 @@ export function get_results(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for get_results'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/returnLiteral.ts b/src/compiled/examples/returnLiteral.ts index b717d28..b9189af 100644 --- a/src/compiled/examples/returnLiteral.ts +++ b/src/compiled/examples/returnLiteral.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,30 +14,32 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services + // Functions -export function returnLiteral(config?: { ttl?: number }): Promise; -export function returnLiteral(peer: FluencePeer, config?: { ttl?: number }): Promise; -export function returnLiteral(...args) { - let peer: FluencePeer; - - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - config = args[1]; - } else { - peer = FluencePeer.default; - config = args[0]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function returnLiteral(config?: {ttl?: number}) : Promise; + export function returnLiteral(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function returnLiteral(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -50,16 +52,16 @@ export function returnLiteral(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - + h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -69,12 +71,13 @@ export function returnLiteral(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for returnLiteral'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/stream.ts b/src/compiled/examples/stream.ts index 6e04328..ba1a600 100644 --- a/src/compiled/examples/stream.ts +++ b/src/compiled/examples/stream.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface StringerDef { - returnString: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface StringerDef { + returnString: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerStringer(service: StringerDef): void; + export function registerStringer(service: StringerDef): void; export function registerStringer(serviceId: string, service: StringerDef): void; export function registerStringer(peer: FluencePeer, service: StringerDef): void; export function registerStringer(peer: FluencePeer, serviceId: string, service: StringerDef): void; -export function registerStringer(...args) { + export function registerStringer(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerStringer(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'stringer-id'; - } + } + else { + serviceId = "stringer-id" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,51 +52,319 @@ export function registerStringer(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'returnString') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.returnString(req.args[0], callParams) - if (req.fnName === 'returnString') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.returnString(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function checkStreams(ch: string[], config?: { ttl?: number }): Promise; -export function checkStreams(peer: FluencePeer, ch: string[], config?: { ttl?: number }): Promise; -export function checkStreams(...args) { - let peer: FluencePeer; - let ch; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - ch = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - ch = args[0]; - config = args[1]; - } + export function returnNone(config?: {ttl?: number}) : Promise; + export function returnNone(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function returnNone(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$valueNone]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; + } + return resolve(opt); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for returnNone'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + + export function stringNone(config?: {ttl?: number}) : Promise; + export function stringNone(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function stringNone(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$valueNone]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) + + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; + } + return resolve(opt); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for stringNone'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + + export function returnNil(config?: {ttl?: number}) : Promise; + export function returnNil(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function returnNil(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (ap $valueNil $relayNil) + ) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$relayNil]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) + + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + const [res] = args; + resolve(res); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for returnNil'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + + export function stringNil(config?: {ttl?: number}) : Promise; + export function stringNil(peer: FluencePeer, config?: {ttl?: number}) : Promise; + export function stringNil(...args: any) { + let peer: FluencePeer; + + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + config = args[1]; + } else { + peer = FluencePeer.default; + config = args[0]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` + (xor + (seq + (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) + (xor + (call %init_peer_id% ("callbackSrv" "response") [$valueNil]) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) + ) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) +) + + `, + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; + }); + + h.onEvent('callbackSrv', 'response', (args) => { + const [res] = args; + resolve(res); +}); + + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for stringNil'); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) + } + request = r.build(); + }); + peer.internals.initiateFlow(request!); + return promise; +} + + + + export function checkStreams(ch: string[], config?: {ttl?: number}) : Promise; + export function checkStreams(peer: FluencePeer, ch: string[], config?: {ttl?: number}) : Promise; + export function checkStreams(...args: any) { + let peer: FluencePeer; + let ch: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + ch = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + ch = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -124,18 +394,16 @@ export function checkStreams(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'ch', () => { - return ch; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'ch', () => {return ch;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -145,12 +413,13 @@ export function checkStreams(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for checkStreams'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/streamArgs.ts b/src/compiled/examples/streamArgs.ts index c0bb2b6..b4e56bd 100644 --- a/src/compiled/examples/streamArgs.ts +++ b/src/compiled/examples/streamArgs.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface TestServiceDef { - get_records: (key: string, callParams: CallParams<'key'>) => string[]; -} + export interface TestServiceDef { + get_records: (key: string, callParams: CallParams<'key'>) => string[]; + } -export function registerTestService(service: TestServiceDef): void; + export function registerTestService(service: TestServiceDef): void; export function registerTestService(serviceId: string, service: TestServiceDef): void; export function registerTestService(peer: FluencePeer, service: TestServiceDef): void; export function registerTestService(peer: FluencePeer, serviceId: string, service: TestServiceDef): void; -export function registerTestService(...args) { + export function registerTestService(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerTestService(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'test-service'; - } + } + else { + serviceId = "test-service" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,59 +52,59 @@ export function registerTestService(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'get_records') { + + const callParams = { + ...req.particleContext, + tetraplets: { + key: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.get_records(req.args[0], callParams) - if (req.fnName === 'get_records') { - const callParams = { - ...req.particleContext, - tetraplets: { - key: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_records(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function append_records(peer_: string, srum: string[][], config?: { ttl?: number }): Promise; -export function append_records( - peer: FluencePeer, - peer_: string, - srum: string[][], - config?: { ttl?: number }, -): Promise; -export function append_records(...args) { - let peer: FluencePeer; - let peer_; - let srum; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - peer_ = args[1]; - srum = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - peer_ = args[0]; - srum = args[1]; - config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function append_records(peer_: string, srum: string[][], config?: {ttl?: number}) : Promise; + export function append_records(peer: FluencePeer, peer_: string, srum: string[][], config?: {ttl?: number}) : Promise; + export function append_records(...args: any) { + let peer: FluencePeer; + let peer_: any; +let srum: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + peer_ = args[1]; +srum = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + peer_ = args[0]; +srum = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -126,18 +128,16 @@ export function append_records(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); - h.on('getDataSrv', 'peer', () => { - return peer_; - }); - h.on('getDataSrv', 'srum', () => { - return srum; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); + h.on('getDataSrv', 'peer', () => {return peer_;}); +h.on('getDataSrv', 'srum', () => {return srum;}); + h.onEvent('callbackSrv', 'response', (args) => { + +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -147,38 +147,40 @@ export function append_records(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for append_records'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return Promise.race([promise, Promise.resolve()]); } + -export function retrieve_records(peer_: string, config?: { ttl?: number }): Promise; -export function retrieve_records(peer: FluencePeer, peer_: string, config?: { ttl?: number }): Promise; -export function retrieve_records(...args) { - let peer: FluencePeer; - let peer_; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - peer_ = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - peer_ = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function retrieve_records(peer_: string, config?: {ttl?: number}) : Promise; + export function retrieve_records(peer: FluencePeer, peer_: string, config?: {ttl?: number}) : Promise; + export function retrieve_records(...args: any) { + let peer: FluencePeer; + let peer_: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + peer_ = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + peer_ = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -197,18 +199,16 @@ export function retrieve_records(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'peer', () => { - return peer_; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'peer', () => {return peer_;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -218,12 +218,13 @@ export function retrieve_records(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for retrieve_records'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/streamResults.ts b/src/compiled/examples/streamResults.ts index 7218b87..d94d4f6 100644 --- a/src/compiled/examples/streamResults.ts +++ b/src/compiled/examples/streamResults.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface DTGetterDef { - get_dt: (s: string, callParams: CallParams<'s'>) => { field: string }; -} + export interface DTGetterDef { + get_dt: (s: string, callParams: CallParams<'s'>) => {field:string}; + } -export function registerDTGetter(service: DTGetterDef): void; + export function registerDTGetter(service: DTGetterDef): void; export function registerDTGetter(serviceId: string, service: DTGetterDef): void; export function registerDTGetter(peer: FluencePeer, service: DTGetterDef): void; export function registerDTGetter(peer: FluencePeer, serviceId: string, service: DTGetterDef): void; -export function registerDTGetter(...args) { + export function registerDTGetter(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerDTGetter(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'get-dt'; - } + } + else { + serviceId = "get-dt" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,51 +52,56 @@ export function registerDTGetter(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'get_dt') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.get_dt(req.args[0], callParams) - if (req.fnName === 'get_dt') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_dt(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function use_name1(name: string, config?: { ttl?: number }): Promise; -export function use_name1(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise; -export function use_name1(...args) { - let peer: FluencePeer; - let name; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - name = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - name = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function use_name1(name: string, config?: {ttl?: number}) : Promise; + export function use_name1(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise; + export function use_name1(...args: any) { + let peer: FluencePeer; + let name: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + name = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + name = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -113,18 +120,16 @@ export function use_name1(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'name', () => { - return name; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'name', () => {return name;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -134,38 +139,40 @@ export function use_name1(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for use_name1'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function use_name2(name: string, config?: { ttl?: number }): Promise; -export function use_name2(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise; -export function use_name2(...args) { - let peer: FluencePeer; - let name; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - name = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - name = args[0]; - config = args[1]; - } - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function use_name2(name: string, config?: {ttl?: number}) : Promise; + export function use_name2(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise; + export function use_name2(...args: any) { + let peer: FluencePeer; + let name: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + name = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + name = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -199,18 +206,16 @@ export function use_name2(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'name', () => { - return name; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'name', () => {return name;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -220,12 +225,13 @@ export function use_name2(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for use_name2'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/subImportUsage.ts b/src/compiled/examples/subImportUsage.ts index 370c573..210929a 100644 --- a/src/compiled/examples/subImportUsage.ts +++ b/src/compiled/examples/subImportUsage.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,24 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface ConcatSubsDef { - get_some: ( - s: string, - sr: { one: string; two: number }, - callParams: CallParams<'s' | 'sr'>, - ) => { one: string; two: number }; -} + export interface ConcatSubsDef { + get_some: (s: string, sr: {one:string;two:number}, callParams: CallParams<'s' | 'sr'>) => {one:string;two:number}; + } -export function registerConcatSubs(service: ConcatSubsDef): void; + export function registerConcatSubs(service: ConcatSubsDef): void; export function registerConcatSubs(serviceId: string, service: ConcatSubsDef): void; export function registerConcatSubs(peer: FluencePeer, service: ConcatSubsDef): void; export function registerConcatSubs(peer: FluencePeer, serviceId: string, service: ConcatSubsDef): void; -export function registerConcatSubs(...args) { + export function registerConcatSubs(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -42,9 +39,10 @@ export function registerConcatSubs(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'concat_subs'; - } + } + else { + serviceId = "concat_subs" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -54,56 +52,56 @@ export function registerConcatSubs(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'get_some') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0],sr: req.tetraplets[1] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.get_some(req.args[0], req.args[1], callParams) - if (req.fnName === 'get_some') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - sr: req.tetraplets[1], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.get_some(req.args[0], req.args[1], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function subImportUsage(s: string, config?: { ttl?: number }): Promise<{ one: string; two: number }>; -export function subImportUsage( - peer: FluencePeer, - s: string, - config?: { ttl?: number }, -): Promise<{ one: string; two: number }>; -export function subImportUsage(...args) { - let peer: FluencePeer; - let s; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - s = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - s = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise<{ one: string; two: number }>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function subImportUsage(s: string, config?: {ttl?: number}) : Promise<{one:string;two:number}>; + export function subImportUsage(peer: FluencePeer, s: string, config?: {ttl?: number}) : Promise<{one:string;two:number}>; + export function subImportUsage(...args: any) { + let peer: FluencePeer; + let s: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + s = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + s = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise<{one:string;two:number}>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -128,18 +126,16 @@ export function subImportUsage(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 's', () => { - return s; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 's', () => {return s;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -149,12 +145,13 @@ export function subImportUsage(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for subImportUsage'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/topology.ts b/src/compiled/examples/topology.ts index 6cd7038..9482eb0 100644 --- a/src/compiled/examples/topology.ts +++ b/src/compiled/examples/topology.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface TestoDef { - getString: (arg0: string, callParams: CallParams<'arg0'>) => string; -} + export interface TestoDef { + getString: (arg0: string, callParams: CallParams<'arg0'>) => string; + } -export function registerTesto(service: TestoDef): void; + export function registerTesto(service: TestoDef): void; export function registerTesto(serviceId: string, service: TestoDef): void; export function registerTesto(peer: FluencePeer, service: TestoDef): void; export function registerTesto(peer: FluencePeer, serviceId: string, service: TestoDef): void; -export function registerTesto(...args) { + export function registerTesto(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerTesto(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'testo'; - } + } + else { + serviceId = "testo" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,39 +52,45 @@ export function registerTesto(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'getString') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getString(req.args[0], callParams) - if (req.fnName === 'getString') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getString(req.args[0], callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface LocalPrintDef { - print: (arg0: string, callParams: CallParams<'arg0'>) => void; -} + export interface LocalPrintDef { + print: (arg0: string, callParams: CallParams<'arg0'>) => void; + } -export function registerLocalPrint(service: LocalPrintDef): void; + export function registerLocalPrint(service: LocalPrintDef): void; export function registerLocalPrint(serviceId: string, service: LocalPrintDef): void; export function registerLocalPrint(peer: FluencePeer, service: LocalPrintDef): void; export function registerLocalPrint(peer: FluencePeer, serviceId: string, service: LocalPrintDef): void; -export function registerLocalPrint(...args) { + export function registerLocalPrint(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -93,9 +101,10 @@ export function registerLocalPrint(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'lp'; - } + } + else { + serviceId = "lp" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -105,74 +114,65 @@ export function registerLocalPrint(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'print') { + + const callParams = { + ...req.particleContext, + tetraplets: { + arg0: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + service.print(req.args[0], callParams); resp.result = {} - if (req.fnName === 'print') { - const callParams = { - ...req.particleContext, - tetraplets: { - arg0: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - service.print(req.args[0], callParams); - resp.result = {}; - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function topologyTest( - me: string, - myRelay: string, - friend: string, - friendRelay: string, - config?: { ttl?: number }, -): Promise; -export function topologyTest( - peer: FluencePeer, - me: string, - myRelay: string, - friend: string, - friendRelay: string, - config?: { ttl?: number }, -): Promise; -export function topologyTest(...args) { - let peer: FluencePeer; - let me; - let myRelay; - let friend; - let friendRelay; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - me = args[1]; - myRelay = args[2]; - friend = args[3]; - friendRelay = args[4]; - config = args[5]; - } else { - peer = FluencePeer.default; - me = args[0]; - myRelay = args[1]; - friend = args[2]; - friendRelay = args[3]; - config = args[4]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function topologyTest(me: string, myRelay: string, friend: string, friendRelay: string, config?: {ttl?: number}) : Promise; + export function topologyTest(peer: FluencePeer, me: string, myRelay: string, friend: string, friendRelay: string, config?: {ttl?: number}) : Promise; + export function topologyTest(...args: any) { + let peer: FluencePeer; + let me: any; +let myRelay: any; +let friend: any; +let friendRelay: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + me = args[1]; +myRelay = args[2]; +friend = args[3]; +friendRelay = args[4]; +config = args[5]; + } else { + peer = FluencePeer.default; + me = args[0]; +myRelay = args[1]; +friend = args[2]; +friendRelay = args[3]; +config = args[4]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -230,27 +230,19 @@ export function topologyTest(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'me', () => { - return me; - }); - h.on('getDataSrv', 'myRelay', () => { - return myRelay; - }); - h.on('getDataSrv', 'friend', () => { - return friend; - }); - h.on('getDataSrv', 'friendRelay', () => { - return friendRelay; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'me', () => {return me;}); +h.on('getDataSrv', 'myRelay', () => {return myRelay;}); +h.on('getDataSrv', 'friend', () => {return friend;}); +h.on('getDataSrv', 'friendRelay', () => {return friendRelay;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -260,12 +252,13 @@ export function topologyTest(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for topologyTest'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/tryCatch.ts b/src/compiled/examples/tryCatch.ts index 3f7143f..b6a279c 100644 --- a/src/compiled/examples/tryCatch.ts +++ b/src/compiled/examples/tryCatch.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface UnexistedDef { - getStr: (callParams: CallParams) => string; -} + export interface UnexistedDef { + getStr: (callParams: CallParams) => string; + } -export function registerUnexisted(service: UnexistedDef): void; + export function registerUnexisted(service: UnexistedDef): void; export function registerUnexisted(serviceId: string, service: UnexistedDef): void; export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): void; export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void; -export function registerUnexisted(...args) { + export function registerUnexisted(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerUnexisted(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'unex'; - } + } + else { + serviceId = "unex" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,37 +52,45 @@ export function registerUnexisted(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'getStr') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getStr(callParams) - if (req.fnName === 'getStr') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getStr(callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface OpADef { - identity: (s: string, callParams: CallParams<'s'>) => string; -} + export interface OpADef { + identity: (s: string, callParams: CallParams<'s'>) => string; + } -export function registerOpA(service: OpADef): void; + export function registerOpA(service: OpADef): void; export function registerOpA(serviceId: string, service: OpADef): void; export function registerOpA(peer: FluencePeer, service: OpADef): void; export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void; -export function registerOpA(...args) { + export function registerOpA(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -91,9 +101,10 @@ export function registerOpA(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -103,51 +114,56 @@ export function registerOpA(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.identity(req.args[0], callParams) - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function tryCatchTest(node_id: string, config?: { ttl?: number }): Promise; -export function tryCatchTest(peer: FluencePeer, node_id: string, config?: { ttl?: number }): Promise; -export function tryCatchTest(...args) { - let peer: FluencePeer; - let node_id; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node_id = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - node_id = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function tryCatchTest(node_id: string, config?: {ttl?: number}) : Promise; + export function tryCatchTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}) : Promise; + export function tryCatchTest(...args: any) { + let peer: FluencePeer; + let node_id: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node_id = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + node_id = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -187,18 +203,16 @@ export function tryCatchTest(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -208,12 +222,13 @@ export function tryCatchTest(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for tryCatchTest'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/tryOtherwise.ts b/src/compiled/examples/tryOtherwise.ts index 94c31e0..30bfc36 100644 --- a/src/compiled/examples/tryOtherwise.ts +++ b/src/compiled/examples/tryOtherwise.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface UnexistedDef { - getStr: (callParams: CallParams) => string; -} + export interface UnexistedDef { + getStr: (callParams: CallParams) => string; + } -export function registerUnexisted(service: UnexistedDef): void; + export function registerUnexisted(service: UnexistedDef): void; export function registerUnexisted(serviceId: string, service: UnexistedDef): void; export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): void; export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void; -export function registerUnexisted(...args) { + export function registerUnexisted(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerUnexisted(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'unex'; - } + } + else { + serviceId = "unex" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,37 +52,45 @@ export function registerUnexisted(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'getStr') { + + const callParams = { + ...req.particleContext, + tetraplets: { + + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.getStr(callParams) - if (req.fnName === 'getStr') { - const callParams = { - ...req.particleContext, - tetraplets: {}, - }; - resp.retCode = ResultCodes.success; - resp.result = service.getStr(callParams); - } + } + + + next(); + }); + } + - next(); - }); -} -export interface OpEDef { - identity: (s: string, callParams: CallParams<'s'>) => string; -} + export interface OpEDef { + identity: (s: string, callParams: CallParams<'s'>) => string; + } -export function registerOpE(service: OpEDef): void; + export function registerOpE(service: OpEDef): void; export function registerOpE(serviceId: string, service: OpEDef): void; export function registerOpE(peer: FluencePeer, service: OpEDef): void; export function registerOpE(peer: FluencePeer, serviceId: string, service: OpEDef): void; -export function registerOpE(...args) { + export function registerOpE(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -91,9 +101,10 @@ export function registerOpE(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'op'; - } + } + else { + serviceId = "op" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -103,51 +114,56 @@ export function registerOpE(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'identity') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.identity(req.args[0], callParams) - if (req.fnName === 'identity') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function tryOtherwiseTest(node_id: string, config?: { ttl?: number }): Promise; -export function tryOtherwiseTest(peer: FluencePeer, node_id: string, config?: { ttl?: number }): Promise; -export function tryOtherwiseTest(...args) { - let peer: FluencePeer; - let node_id; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node_id = args[1]; - config = args[2]; - } else { - peer = FluencePeer.default; - node_id = args[0]; - config = args[1]; - } - - let request: RequestFlow; - const promise = new Promise((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function tryOtherwiseTest(node_id: string, config?: {ttl?: number}) : Promise; + export function tryOtherwiseTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}) : Promise; + export function tryOtherwiseTest(...args: any) { + let peer: FluencePeer; + let node_id: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node_id = args[1]; +config = args[2]; + } else { + peer = FluencePeer.default; + node_id = args[0]; +config = args[1]; + } + + let request: RequestFlow; + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -181,18 +197,16 @@ export function tryOtherwiseTest(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -202,12 +216,13 @@ export function tryOtherwiseTest(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for tryOtherwiseTest'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/compiled/examples/via.ts b/src/compiled/examples/via.ts index 2f2420d..2f206cb 100644 --- a/src/compiled/examples/via.ts +++ b/src/compiled/examples/via.ts @@ -1,9 +1,9 @@ /** * * This file is auto-generated. Do not edit manually: changes may be erased. - * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. + * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.3.0-222 + * Aqua version: 0.3.0-SNAPSHOT * */ import { FluencePeer } from '@fluencelabs/fluence'; @@ -14,20 +14,21 @@ import { CallParams, } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + // Services -export interface CustomIdDef { - id: (s: string, callParams: CallParams<'s'>) => string; -} + export interface CustomIdDef { + id: (s: string, callParams: CallParams<'s'>) => string; + } -export function registerCustomId(service: CustomIdDef): void; + export function registerCustomId(service: CustomIdDef): void; export function registerCustomId(serviceId: string, service: CustomIdDef): void; export function registerCustomId(peer: FluencePeer, service: CustomIdDef): void; export function registerCustomId(peer: FluencePeer, serviceId: string, service: CustomIdDef): void; -export function registerCustomId(...args) { + export function registerCustomId(...args: any) { let peer: FluencePeer; - let serviceId; - let service; + let serviceId: any; + let service: any; if (args[0] instanceof FluencePeer) { peer = args[0]; } else { @@ -38,9 +39,10 @@ export function registerCustomId(...args) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } else { - serviceId = 'cid'; - } + } + else { + serviceId = "cid" +} if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') { service = args[0]; @@ -50,63 +52,59 @@ export function registerCustomId(...args) { service = args[2]; } - peer.internals.callServiceHandler.use((req, resp, next) => { - if (req.serviceId !== serviceId) { - next(); - return; - } + peer.internals.callServiceHandler.use((req, resp, next) => { + if (req.serviceId !== serviceId) { + next(); + return; + } + + + if (req.fnName === 'id') { + + const callParams = { + ...req.particleContext, + tetraplets: { + s: req.tetraplets[0] + }, + }; + resp.retCode = ResultCodes.success; + resp.result = service.id(req.args[0], callParams) - if (req.fnName === 'id') { - const callParams = { - ...req.particleContext, - tetraplets: { - s: req.tetraplets[0], - }, - }; - resp.retCode = ResultCodes.success; - resp.result = service.id(req.args[0], callParams); - } - - next(); - }); -} + } + + + next(); + }); + } + // Functions -export function viaArr( - node_id: string, - viaAr: string[], - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaArr( - peer: FluencePeer, - node_id: string, - viaAr: string[], - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaArr(...args) { - let peer: FluencePeer; - let node_id; - let viaAr; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node_id = args[1]; - viaAr = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - node_id = args[0]; - viaAr = args[1]; - config = args[2]; - } - - let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function viaArr(node_id: string, viaAr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaArr(peer: FluencePeer, node_id: string, viaAr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaArr(...args: any) { + let peer: FluencePeer; + let node_id: any; +let viaAr: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node_id = args[1]; +viaAr = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + node_id = args[0]; +viaAr = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -167,21 +165,17 @@ export function viaArr(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'viaAr', () => { - return viaAr; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); +h.on('getDataSrv', 'viaAr', () => {return viaAr;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -191,50 +185,43 @@ export function viaArr(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for viaArr'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function viaStream( - node_id: string, - viaStr: string[], - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaStream( - peer: FluencePeer, - node_id: string, - viaStr: string[], - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaStream(...args) { - let peer: FluencePeer; - let node_id; - let viaStr; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - node_id = args[1]; - viaStr = args[2]; - config = args[3]; - } else { - peer = FluencePeer.default; - node_id = args[0]; - viaStr = args[1]; - config = args[2]; - } - let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function viaStream(node_id: string, viaStr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaStream(peer: FluencePeer, node_id: string, viaStr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaStream(...args: any) { + let peer: FluencePeer; + let node_id: any; +let viaStr: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + node_id = args[1]; +viaStr = args[2]; +config = args[3]; + } else { + peer = FluencePeer.default; + node_id = args[0]; +viaStr = args[1]; +config = args[2]; + } + + let request: RequestFlow; + const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -303,21 +290,17 @@ export function viaStream(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'viaStr', () => { - return viaStr; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); +h.on('getDataSrv', 'viaStr', () => {return viaStr;}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -327,55 +310,46 @@ export function viaStream(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for viaStream'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + -export function viaOpt( - relay: string, - node_id: string, - viaOpt: string | null, - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaOpt( - peer: FluencePeer, - relay: string, - node_id: string, - viaOpt: string | null, - config?: { ttl?: number }, -): Promise<{ external_addresses: string[] }>; -export function viaOpt(...args) { - let peer: FluencePeer; - let relay; - let node_id; - let viaOpt; - let config; - if (args[0] instanceof FluencePeer) { - peer = args[0]; - relay = args[1]; - node_id = args[2]; - viaOpt = args[3]; - config = args[4]; - } else { - peer = FluencePeer.default; - relay = args[0]; - node_id = args[1]; - viaOpt = args[2]; - config = args[3]; - } - let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { - const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + export function viaOpt(relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaOpt(peer: FluencePeer, relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}) : Promise<{external_addresses:string[]}>; + export function viaOpt(...args: any) { + let peer: FluencePeer; + let relay: any; +let node_id: any; +let viaOpt: any; + let config: any; + if (args[0] instanceof FluencePeer) { + peer = args[0]; + relay = args[1]; +node_id = args[2]; +viaOpt = args[3]; +config = args[4]; + } else { + peer = FluencePeer.default; + relay = args[0]; +node_id = args[1]; +viaOpt = args[2]; +config = args[3]; + } + + let request: RequestFlow; + const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => { + const r = new RequestFlowBuilder() + .disableInjections() + .withRawScript( + ` (xor (seq (seq @@ -439,24 +413,18 @@ export function viaOpt(...args) { ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.connectionInfo.connectedRelay; - }); - h.on('getDataSrv', 'relay', () => { - return relay; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'viaOpt', () => { - return viaOpt === null ? [] : [viaOpt]; + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.connectionInfo.connectedRelay ; }); + h.on('getDataSrv', 'relay', () => {return relay;}); +h.on('getDataSrv', 'node_id', () => {return node_id;}); +h.on('getDataSrv', 'viaOpt', () => {return viaOpt === null ? [] : [viaOpt];}); h.onEvent('callbackSrv', 'response', (args) => { - const [res] = args; - resolve(res); - }); + const [res] = args; + resolve(res); +}); h.onEvent('errorHandlingSrv', 'error', (args) => { const [err] = args; @@ -466,12 +434,13 @@ export function viaOpt(...args) { .handleScriptError(reject) .handleTimeout(() => { reject('Request timed out for viaOpt'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); + }) + if(config && config.ttl) { + r.withTTL(config.ttl) } request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } + diff --git a/src/examples/streamCall.ts b/src/examples/streamCall.ts index 531d758..5cd2a33 100644 --- a/src/examples/streamCall.ts +++ b/src/examples/streamCall.ts @@ -1,5 +1,5 @@ import { FluencePeer } from '@fluencelabs/fluence'; -import { checkStreams, registerStringer } from '../compiled/examples/stream'; +import {checkStreams, registerStringer, stringNil, stringNone} from '../compiled/examples/stream'; export async function streamCall() { registerStringer({ @@ -10,3 +10,11 @@ export async function streamCall() { return checkStreams(['third', 'fourth']); } + +export async function returnNilCall() { + return stringNil() +} + +export async function returnNoneCall() { + return stringNone() +} diff --git a/src/run-examples.ts b/src/run-examples.ts index 0c3629f..321d4f4 100644 --- a/src/run-examples.ts +++ b/src/run-examples.ts @@ -13,7 +13,7 @@ import { ifCall } from './examples/if'; import { parCall } from './examples/parCall'; import { complexCall } from './examples/complex'; import { constantsCall } from './examples/constantsCall'; -import { streamCall } from './examples/streamCall'; +import {returnNilCall, returnNoneCall, streamCall} from './examples/streamCall'; import { topologyCall } from './examples/topologyCall'; import { foldJoinCall } from './examples/foldJoinCall'; import { registerHandlers, returnNull, returnOptionalCall, useOptionalCall } from './examples/useOptionalCall'; @@ -128,6 +128,10 @@ const main = async () => { // stream.aqua let streamResult = await streamCall(); checkCall('streamCall', streamResult, ['first updated', 'second updated', 'third updated', 'fourth updated'], cb); + let returnNilResult = await returnNilCall(); + checkCall('returnNilCall', returnNilResult, [], cb); + let returnNoneResult = await returnNoneCall(); + checkCall('returnNoneCall', returnNoneResult, null, cb); // topology.aqua let topologyResult = await topologyCall(peer2);