diff --git a/src/compiled/dht/dht-example.ts b/src/compiled/dht/dht-example.ts index 8cb38ff..b6a44f6 100644 --- a/src/compiled/dht/dht-example.ts +++ b/src/compiled/dht/dht-example.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,24 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services // Functions + -export function put_value(initial_peer: string, value: string, config?: { ttl?: number }): Promise; -export function put_value( - peer: FluencePeer, - initial_peer: string, - value: string, - config?: { ttl?: number }, -): Promise; +export function put_value(initial_peer: string, value: string, config?: {ttl?: number}): Promise; +export function put_value(peer: FluencePeer, initial_peer: string, value: string, config?: {ttl?: number}): Promise; export function put_value(...args: any) { let peer: FluencePeer; let initial_peer: any; @@ -49,9 +46,8 @@ export function put_value(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -107,58 +103,41 @@ export function put_value(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'initial_peer', () => { - return initial_peer; - }); - h.on('getDataSrv', 'value', () => { - return value; - }); - 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 put_value'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'initial_peer', () => {return initial_peer;}); + h.on('getDataSrv', 'value', () => {return value;}); + 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 put_value'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } -export function registerKeyPutValue( - node_id: string, - key: string, - value: string, - relay_id: string | null, - service_id: string | null, - config?: { ttl?: number }, -): Promise; -export function registerKeyPutValue( - peer: FluencePeer, - node_id: string, - key: string, - value: string, - relay_id: string | null, - service_id: string | null, - config?: { ttl?: number }, -): Promise; + + +export function registerKeyPutValue(node_id: string, key: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise; +export function registerKeyPutValue(peer: FluencePeer, node_id: string, key: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise; export function registerKeyPutValue(...args: any) { let peer: FluencePeer; let node_id: any; @@ -188,9 +167,8 @@ export function registerKeyPutValue(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -252,57 +230,44 @@ export function registerKeyPutValue(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'key', () => { - return key; - }); - h.on('getDataSrv', 'value', () => { - return value; - }); - h.on('getDataSrv', 'relay_id', () => { - return relay_id === null ? [] : [relay_id]; - }); - h.on('getDataSrv', 'service_id', () => { - return service_id === null ? [] : [service_id]; - }); - 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 registerKeyPutValue'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'key', () => {return key;}); + h.on('getDataSrv', 'value', () => {return value;}); + h.on('getDataSrv', 'relay_id', () => {return relay_id === null ? [] : [relay_id];}); + h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [service_id];}); + 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 registerKeyPutValue'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } -export function getNeighbours(node_id: string, topic: string, config?: { ttl?: number }): Promise; -export function getNeighbours( - peer: FluencePeer, - node_id: string, - topic: string, - config?: { ttl?: number }, -): Promise; + + +export function getNeighbours(node_id: string, topic: string, config?: {ttl?: number}): Promise; +export function getNeighbours(peer: FluencePeer, node_id: string, topic: string, config?: {ttl?: number}): Promise; export function getNeighbours(...args: any) { let peer: FluencePeer; let node_id: any; @@ -323,9 +288,8 @@ export function getNeighbours(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -361,72 +325,41 @@ export function getNeighbours(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'topic', () => { - return topic; - }); - 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 getNeighbours'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'topic', () => {return topic;}); + 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 getNeighbours'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } -export function findSubscribers( - node_id: string, - topic: string, - config?: { ttl?: number }, -): Promise< - { - peer_id: string; - relay_id: string[]; - service_id: string[]; - set_by: string; - timestamp_created: number; - value: string; - weight: number; - }[] ->; -export function findSubscribers( - peer: FluencePeer, - node_id: string, - topic: string, - config?: { ttl?: number }, -): Promise< - { - peer_id: string; - relay_id: string[]; - service_id: string[]; - set_by: string; - timestamp_created: number; - value: string; - weight: number; - }[] ->; + + +export function findSubscribers(node_id: string, topic: string, config?: {ttl?: number}): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>; +export function findSubscribers(peer: FluencePeer, node_id: string, topic: string, config?: {ttl?: number}): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>; export function findSubscribers(...args: any) { let peer: FluencePeer; let node_id: any; @@ -445,21 +378,10 @@ export function findSubscribers(...args: any) { } let request: RequestFlow; - const promise = new Promise< - { - peer_id: string; - relay_id: string[]; - service_id: string[]; - set_by: string; - timestamp_created: number; - value: string; - weight: number; - }[] - >((resolve, reject) => { + const promise = new Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -530,58 +452,41 @@ export function findSubscribers(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'topic', () => { - return topic; - }); - 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 findSubscribers'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'topic', () => {return topic;}); + 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 findSubscribers'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; } -export function initTopicAndSubscribe( - node_id: string, - topic: string, - value: string, - relay_id: string | null, - service_id: string | null, - config?: { ttl?: number }, -): Promise; -export function initTopicAndSubscribe( - peer: FluencePeer, - node_id: string, - topic: string, - value: string, - relay_id: string | null, - service_id: string | null, - config?: { ttl?: number }, -): Promise; + + +export function initTopicAndSubscribe(node_id: string, topic: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise; +export function initTopicAndSubscribe(peer: FluencePeer, node_id: string, topic: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise; export function initTopicAndSubscribe(...args: any) { let peer: FluencePeer; let node_id: any; @@ -611,9 +516,8 @@ export function initTopicAndSubscribe(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -672,42 +576,34 @@ export function initTopicAndSubscribe(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'topic', () => { - return topic; - }); - h.on('getDataSrv', 'value', () => { - return value; - }); - h.on('getDataSrv', 'relay_id', () => { - return relay_id === null ? [] : [relay_id]; - }); - h.on('getDataSrv', 'service_id', () => { - return service_id === null ? [] : [service_id]; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for initTopicAndSubscribe'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'topic', () => {return topic;}); + h.on('getDataSrv', 'value', () => {return value;}); + h.on('getDataSrv', 'relay_id', () => {return relay_id === null ? [] : [relay_id];}); + h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [service_id];}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for initTopicAndSubscribe'); + }) - request = r.build(); + 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/aliases.ts b/src/compiled/examples/aliases.ts index e50d1b6..696a137 100644 --- a/src/compiled/examples/aliases.ts +++ b/src/compiled/examples/aliases.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,28 +11,26 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface ComplexServiceDef { - call: ( - d: { otherValue: number; value: string }, - sd: { complex: { someNum: number; someStr: string }; value: string }, - callParams: CallParams<'d' | 'sd'>, - ) => { someNum: number; someStr: string }; - identity: (callParams: CallParams) => { complex: { someNum: number; someStr: string }; value: string }; + call: (d: { otherValue: number; value: string; }, sd: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'d' | 'sd'>) => { someNum: number; someStr: string; }; +identity: (callParams: CallParams) => { complex: { someNum: number; someStr: string; }; value: string; }; } - export function registerComplexService(service: ComplexServiceDef): void; export function registerComplexService(serviceId: string, service: ComplexServiceDef): void; export function registerComplexService(peer: FluencePeer, service: ComplexServiceDef): void; export function registerComplexService(peer: FluencePeer, serviceId: string, service: ComplexServiceDef): void; + + export function registerComplexService(...args: any) { let peer: FluencePeer; let serviceId: any; @@ -48,7 +46,7 @@ export function registerComplexService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op-ha'; + serviceId = "op-ha" } // Figuring out which overload is the service. @@ -56,7 +54,7 @@ export function registerComplexService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -66,10 +64,7 @@ export function registerComplexService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['call', 'identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service ComplexService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service ComplexService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -82,52 +77,35 @@ export function registerComplexService(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - d: req.tetraplets[0], - sd: req.tetraplets[1], + d: req.tetraplets[0],sd: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.call(req.args[0], req.args[1], callParams); + resp.result = service.call(req.args[0], req.args[1], callParams) } - if (req.fnName === 'identity') { +if (req.fnName === 'identity') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(callParams); + resp.result = service.identity(callParams) } next(); }); } - + // Functions - -export function doSmth( - d: { otherValue: number; value: string }, - d2: { otherValue: number; value: string }, - sd: { complex: { someNum: number; someStr: string }; value: string }, - c: ( - arg0: { someNum: number; someStr: string }, - arg1: { complex: { someNum: number; someStr: string }; value: string }, - callParams: CallParams<'arg0' | 'arg1'>, - ) => { complex: { otherValue: number; value: string }; value: string }, - config?: { ttl?: number }, -): Promise<{ complex: { otherValue: number; value: string }; value: string }>; -export function doSmth( - peer: FluencePeer, - d: { otherValue: number; value: string }, - d2: { otherValue: number; value: string }, - sd: { complex: { someNum: number; someStr: string }; value: string }, - c: ( - arg0: { someNum: number; someStr: string }, - arg1: { complex: { someNum: number; someStr: string }; value: string }, - callParams: CallParams<'arg0' | 'arg1'>, - ) => { complex: { otherValue: number; value: string }; value: string }, - config?: { ttl?: number }, -): Promise<{ complex: { otherValue: number; value: string }; value: string }>; +export type DoSmthArgD = { otherValue: number; value: string; } +export type DoSmthArgD2 = { otherValue: number; value: string; } +export type DoSmthArgSd = { complex: { someNum: number; someStr: string; }; value: string; } +export type DoSmthResult = { complex: { otherValue: number; value: string; }; value: string; } +export function doSmth(d: DoSmthArgD, d2: DoSmthArgD2, sd: DoSmthArgSd, c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; }, config?: {ttl?: number}): Promise; +export function doSmth(peer: FluencePeer, d: DoSmthArgD, d2: DoSmthArgD2, sd: DoSmthArgSd, c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; }, config?: {ttl?: number}): Promise; export function doSmth(...args: any) { let peer: FluencePeer; let d: any; @@ -152,12 +130,10 @@ export function doSmth(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ complex: { otherValue: number; value: string }; value: string }>( - (resolve, reject) => { - const r = new RequestFlowBuilder() + const promise = new Promise((resolve, reject) => { + const r = new RequestFlowBuilder() .disableInjections() - .withRawScript( - ` + .withRawScript(` (xor (seq (seq @@ -192,30 +168,23 @@ export function doSmth(...args: any) { h.on('getDataSrv', '-relay-', () => { return peer.getStatus().relayPeerId; }); - h.on('getDataSrv', 'd', () => { - return d; - }); - h.on('getDataSrv', 'd2', () => { - return d2; - }); - h.on('getDataSrv', 'sd', () => { - return sd; - }); + h.on('getDataSrv', 'd', () => {return d;}); + h.on('getDataSrv', 'd2', () => {return d2;}); + h.on('getDataSrv', 'sd', () => {return sd;}); h.use((req, resp, next) => { - if (req.serviceId === 'callbackSrv' && req.fnName === 'c') { + if(req.serviceId === 'callbackSrv' && req.fnName === 'c') { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], - arg1: req.tetraplets[1], + arg0: req.tetraplets[0],arg1: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = c(req.args[0], req.args[1], callParams); + resp.result = c(req.args[0], req.args[1], callParams) } next(); }); - + h.onEvent('callbackSrv', 'response', (args) => { const [res] = args; resolve(res); @@ -228,15 +197,14 @@ export function doSmth(...args: any) { .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(); - }, - ); + request = r.build(); + }); peer.internals.initiateFlow(request!); return promise; } diff --git a/src/compiled/examples/assignment.ts b/src/compiled/examples/assignment.ts index 46f5cee..63a55ab 100644 --- a/src/compiled/examples/assignment.ts +++ b/src/compiled/examples/assignment.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,24 +11,26 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface OpHaDef { array: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string[]; - identity: (a: string, callParams: CallParams<'a'>) => string; +identity: (a: string, callParams: CallParams<'a'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -44,7 +46,7 @@ export function registerOpHa(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -52,7 +54,7 @@ export function registerOpHa(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -62,10 +64,7 @@ export function registerOpHa(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['array', 'identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpHa: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpHa: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -78,33 +77,33 @@ export function registerOpHa(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], + a: req.tetraplets[0],b: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.array(req.args[0], req.args[1], callParams); + resp.result = service.array(req.args[0], req.args[1], callParams) } - if (req.fnName === 'identity') { +if (req.fnName === 'identity') { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], + a: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); + resp.result = service.identity(req.args[0], callParams) } next(); }); } - + // Functions +export type DoSmthArgArg = { value: string; } -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(arg: DoSmthArgArg, config?: {ttl?: number}): Promise; +export function doSmth(peer: FluencePeer, arg: DoSmthArgArg, config?: {ttl?: number}): Promise; export function doSmth(...args: any) { let peer: FluencePeer; let arg: any; @@ -122,9 +121,8 @@ export function doSmth(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -145,33 +143,31 @@ export function doSmth(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'arg', () => { - return arg; - }); - 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 doSmth'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'arg', () => {return arg;}); + 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 doSmth'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/callArrow.ts b/src/compiled/examples/callArrow.ts index dcaf404..b812527 100644 --- a/src/compiled/examples/callArrow.ts +++ b/src/compiled/examples/callArrow.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,30 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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(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; @@ -58,9 +49,8 @@ export function passFunctionAsArg(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -105,47 +95,45 @@ export function passFunctionAsArg(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.onEvent('callbackSrv', 'response', (args) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for passFunctionAsArg'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 21b0d23..489ccbe 100644 --- a/src/compiled/examples/co.ts +++ b/src/compiled/examples/co.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface CoServiceDef { call: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerCoService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'coservice-id'; + serviceId = "coservice-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerCoService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerCoService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['call']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service CoService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service CoService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,29 +75,23 @@ export function registerCoService(...args: any) { if (req.fnName === 'call') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.call(callParams); + resp.result = service.call(callParams) } 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(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; @@ -119,9 +112,8 @@ export function coFunc(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -157,45 +149,44 @@ export function coFunc(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.onEvent('callbackSrv', 'response', (args) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for coFunc'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 483fbb4..9195e14 100644 --- a/src/compiled/examples/complex.ts +++ b/src/compiled/examples/complex.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,24 +11,26 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface TestSDef { multiline: (a: string, b: string, c: boolean, callParams: CallParams<'a' | 'b' | 'c'>) => string; - t: (arg0: string, callParams: CallParams<'arg0'>) => string; +t: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -44,7 +46,7 @@ export function registerTestS(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'some-id'; + serviceId = "some-id" } // Figuring out which overload is the service. @@ -52,7 +54,7 @@ export function registerTestS(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -62,10 +64,7 @@ export function registerTestS(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['multiline', 't']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service TestS: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service TestS: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -78,53 +77,33 @@ export function registerTestS(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - c: req.tetraplets[2], + 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); + resp.result = service.multiline(req.args[0], req.args[1], req.args[2], callParams) } - if (req.fnName === 't') { +if (req.fnName === 't') { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.t(req.args[0], callParams); + 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(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; @@ -160,9 +139,8 @@ export function doStuff(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -275,51 +253,37 @@ export function doStuff(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for doStuff'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/constants.ts b/src/compiled/examples/constants.ts index f8f7ba5..238c196 100644 --- a/src/compiled/examples/constants.ts +++ b/src/compiled/examples/constants.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface GetterDef { createStr: (arg0: number, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerGetter(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test'; + serviceId = "test" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerGetter(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerGetter(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['createStr']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Getter: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Getter: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,25 +76,28 @@ export function registerGetter(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.createStr(req.args[0], callParams); + resp.result = service.createStr(req.args[0], callParams) } next(); }); } + + export interface OpODef { identity: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -111,7 +113,7 @@ export function registerOpO(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -119,7 +121,7 @@ export function registerOpO(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -129,10 +131,7 @@ export function registerOpO(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpO: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpO: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -145,21 +144,22 @@ export function registerOpO(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); + resp.result = service.identity(req.args[0], callParams) } next(); }); } - + // Functions + -export function callConstant(config?: { ttl?: number }): Promise; -export function callConstant(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function callConstant(config?: {ttl?: number}): Promise; +export function callConstant(peer: FluencePeer, config?: {ttl?: number}): Promise; export function callConstant(...args: any) { let peer: FluencePeer; @@ -175,9 +175,8 @@ export function callConstant(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -195,31 +194,31 @@ export function callConstant(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 callConstant'); - }); + 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 callConstant'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/dataAlias.ts b/src/compiled/examples/dataAlias.ts index 6ae9649..f148bec 100644 --- a/src/compiled/examples/dataAlias.ts +++ b/src/compiled/examples/dataAlias.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,23 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface NodeIdGetterDef { - get: (callParams: CallParams) => { name: string; peerId: string }; + get: (callParams: CallParams) => { name: string; peerId: string; }; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerNodeIdGetter(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'somesrv'; + serviceId = "somesrv" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerNodeIdGetter(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerNodeIdGetter(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['get']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service NodeIdGetter: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service NodeIdGetter: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,20 +75,23 @@ export function registerNodeIdGetter(...args: any) { if (req.fnName === 'get') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.get(callParams); + resp.result = service.get(callParams) } next(); }); } - + // Functions + -export function getAliasedData(config?: { ttl?: number }): Promise; -export function getAliasedData(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function getAliasedData(config?: {ttl?: number}): Promise; +export function getAliasedData(peer: FluencePeer, config?: {ttl?: number}): Promise; export function getAliasedData(...args: any) { let peer: FluencePeer; @@ -105,9 +107,8 @@ export function getAliasedData(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -122,31 +123,31 @@ export function getAliasedData(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 getAliasedData'); - }); + 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 getAliasedData'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/example.ts b/src/compiled/examples/example.ts index 518bd3a..459323c 100644 --- a/src/compiled/examples/example.ts +++ b/src/compiled/examples/example.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface PeerDef { is_connected: (arg0: string, callParams: CallParams<'arg0'>) => boolean; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerPeer(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'peer'; + serviceId = "peer" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerPeer(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerPeer(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['is_connected']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Peer: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Peer: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,25 +76,28 @@ export function registerPeer(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.is_connected(req.args[0], callParams); + resp.result = service.is_connected(req.args[0], callParams) } next(); }); } + + export interface OpDef { identity: (callParams: CallParams) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -111,7 +113,7 @@ export function registerOp(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -119,7 +121,7 @@ export function registerOp(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -129,10 +131,7 @@ export function registerOp(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Op: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Op: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -144,26 +143,30 @@ export function registerOp(...args: any) { if (req.fnName === 'identity') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - service.identity(callParams); - resp.result = {}; + service.identity(callParams); resp.result = {} } next(); }); } + + export interface TestDef { doSomething: (callParams: CallParams) => boolean; - getUserList: (callParams: CallParams) => { name: string; peer_id: string; relay_id: string }[]; +getUserList: (callParams: CallParams) => { name: string; peer_id: string; relay_id: string; }[]; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -179,7 +182,7 @@ export function registerTest(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test'; + serviceId = "test" } // Figuring out which overload is the service. @@ -187,7 +190,7 @@ export function registerTest(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -197,10 +200,7 @@ export function registerTest(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['doSomething', 'getUserList']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Test: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Test: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -212,29 +212,34 @@ export function registerTest(...args: any) { if (req.fnName === 'doSomething') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.doSomething(callParams); + resp.result = service.doSomething(callParams) } - if (req.fnName === 'getUserList') { +if (req.fnName === 'getUserList') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.getUserList(callParams); + 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(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; @@ -252,9 +257,8 @@ export function betterMessage(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -289,30 +293,30 @@ export function betterMessage(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relay', () => { - return relay; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for betterMessage'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'relay', () => {return relay;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for betterMessage'); + }) - request = r.build(); + 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 7a71af5..f368158 100644 --- a/src/compiled/examples/fldist-sample.ts +++ b/src/compiled/examples/fldist-sample.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,23 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface ReturnDef { - run: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void; + run: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerReturn(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'returnService'; + serviceId = "returnService" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerReturn(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerReturn(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['run']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Return: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Return: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,22 +76,22 @@ export function registerReturn(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.run(req.args[0], callParams); - resp.result = {}; + service.run(req.args[0], callParams); resp.result = {} } 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(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; @@ -110,9 +109,8 @@ export function test(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -139,30 +137,30 @@ export function test(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node', () => { - return node; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for test'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node', () => {return node;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for test'); + }) - request = r.build(); + 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 d158622..94f0088 100644 --- a/src/compiled/examples/fold.ts +++ b/src/compiled/examples/fold.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,19 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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(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; @@ -41,9 +43,8 @@ export function iterateAndPrint(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -60,46 +61,39 @@ export function iterateAndPrint(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'strings', () => { - return strings; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for iterateAndPrint'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'strings', () => {return strings;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for iterateAndPrint'); + }) - request = r.build(); + 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(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; @@ -120,9 +114,8 @@ export function iterateAndPrintParallel(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -154,45 +147,44 @@ export function iterateAndPrintParallel(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.onEvent('callbackSrv', 'response', (args) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for iterateAndPrintParallel'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 7b62622..c6cf712 100644 --- a/src/compiled/examples/foldJoin.ts +++ b/src/compiled/examples/foldJoin.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface Op2Def { identity: (s: number, callParams: CallParams<'s'>) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerOp2(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerOp2(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerOp2(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Op2: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Op2: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,22 +76,22 @@ export function registerOp2(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.identity(req.args[0], callParams); - resp.result = {}; + service.identity(req.args[0], callParams); resp.result = {} } 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(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; @@ -110,9 +109,8 @@ export function getTwoResults(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -168,33 +166,31 @@ export function getTwoResults(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'relay', () => { - return relay; - }); - 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 getTwoResults'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'relay', () => {return relay;}); + 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 getTwoResults'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/func.ts b/src/compiled/examples/func.ts index 1904ea3..b538a6a 100644 --- a/src/compiled/examples/func.ts +++ b/src/compiled/examples/func.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface TestSrvDef { str: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerTestSrv(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test-service-id'; + serviceId = "test-service-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerTestSrv(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerTestSrv(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['str']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service TestSrv: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service TestSrv: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,20 +75,23 @@ export function registerTestSrv(...args: any) { if (req.fnName === 'str') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.str(callParams); + resp.result = service.str(callParams) } next(); }); } - + // Functions + -export function testFunc(config?: { ttl?: number }): Promise; -export function testFunc(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function testFunc(config?: {ttl?: number}): Promise; +export function testFunc(peer: FluencePeer, config?: {ttl?: number}): Promise; export function testFunc(...args: any) { let peer: FluencePeer; @@ -105,9 +107,8 @@ export function testFunc(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -122,31 +123,31 @@ export function testFunc(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 testFunc'); - }); + 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 testFunc'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/helloWorld.ts b/src/compiled/examples/helloWorld.ts index 6eab21b..dcbbcfa 100644 --- a/src/compiled/examples/helloWorld.ts +++ b/src/compiled/examples/helloWorld.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface StringExtraDef { addNameToHello: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerStringExtra(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'service-id'; + serviceId = "service-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerStringExtra(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerStringExtra(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['addNameToHello']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service StringExtra: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service StringExtra: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerStringExtra(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.addNameToHello(req.args[0], callParams); + resp.result = service.addNameToHello(req.args[0], callParams) } 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(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; @@ -109,9 +109,8 @@ export function helloWorld(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -129,33 +128,31 @@ export function helloWorld(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'name', () => { - return name; - }); - 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 helloWorld'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'name', () => {return name;}); + 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 helloWorld'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/if.ts b/src/compiled/examples/if.ts index 39496c5..5cd91b2 100644 --- a/src/compiled/examples/if.ts +++ b/src/compiled/examples/if.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,19 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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(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; @@ -41,9 +43,8 @@ export function ifElseCall(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -63,37 +64,39 @@ export function ifElseCall(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'condition', () => { - return condition; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for ifElseCall'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'condition', () => {return condition;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for ifElseCall'); + }) - request = r.build(); + 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(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; @@ -111,9 +114,8 @@ export function ifElseNumCall(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -133,30 +135,30 @@ export function ifElseNumCall(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'condition', () => { - return condition; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for ifElseNumCall'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'condition', () => {return condition;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for ifElseNumCall'); + }) - request = r.build(); + 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 f7065c1..ec9d710 100644 --- a/src/compiled/examples/imports_exports/declare.ts +++ b/src/compiled/examples/imports_exports/declare.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface SuperFooDef { small_foo: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerSuperFoo(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'super_foo'; + serviceId = "super_foo" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerSuperFoo(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerSuperFoo(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['small_foo']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service SuperFoo: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service SuperFoo: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,14 +75,17 @@ export function registerSuperFoo(...args: any) { if (req.fnName === 'small_foo') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.small_foo(callParams); + resp.result = service.small_foo(callParams) } next(); }); } - + // Functions + diff --git a/src/compiled/examples/imports_exports/exports.ts b/src/compiled/examples/imports_exports/exports.ts index c786dca..3917243 100644 --- a/src/compiled/examples/imports_exports/exports.ts +++ b/src/compiled/examples/imports_exports/exports.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerMyExportSrv(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'my_export_srv'; + serviceId = "my_export_srv" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerMyExportSrv(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerMyExportSrv(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['another_str']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service MyExportSrv: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service MyExportSrv: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,20 +75,23 @@ export function registerMyExportSrv(...args: any) { if (req.fnName === 'another_str') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.another_str(callParams); + resp.result = service.another_str(callParams) } 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(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; @@ -105,9 +107,8 @@ export function string_from_lib(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -119,31 +120,31 @@ export function string_from_lib(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 string_from_lib'); - }); + 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 string_from_lib'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 f7786c2..71c296b 100644 --- a/src/compiled/examples/imports_exports/gen/OneMore.ts +++ b/src/compiled/examples/imports_exports/gen/OneMore.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,9 +24,10 @@ function missingFields(obj: any, fields: string[]): string[] { export interface OneMoreDef { more_call: (callParams: CallParams) => void; } - export function registerOneMore(serviceId: string, service: OneMoreDef): void; export function registerOneMore(peer: FluencePeer, serviceId: string, service: OneMoreDef): void; + + export function registerOneMore(...args: any) { let peer: FluencePeer; let serviceId: any; @@ -40,14 +42,14 @@ export function registerOneMore(...args: any) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } // Figuring out which overload is the service. // If the first argument is not Fluence Peer and it is an object, then it can only be the service def // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -57,10 +59,7 @@ export function registerOneMore(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['more_call']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OneMore: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OneMore: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -72,15 +71,17 @@ export function registerOneMore(...args: any) { if (req.fnName === 'more_call') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - service.more_call(callParams); - resp.result = {}; + service.more_call(callParams); resp.result = {} } next(); }); } - + // Functions + diff --git a/src/compiled/examples/imports_exports/import2.ts b/src/compiled/examples/imports_exports/import2.ts index 9cc7d72..38c892a 100644 --- a/src/compiled/examples/imports_exports/import2.ts +++ b/src/compiled/examples/imports_exports/import2.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,19 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services // Functions + -export function wrap(config?: { ttl?: number }): Promise; -export function wrap(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function wrap(config?: {ttl?: number}): Promise; +export function wrap(peer: FluencePeer, config?: {ttl?: number}): Promise; export function wrap(...args: any) { let peer: FluencePeer; @@ -39,9 +41,8 @@ export function wrap(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -59,38 +60,40 @@ export function wrap(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 wrap'); - }); + 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 wrap'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function barfoo(peer: FluencePeer, config?: {ttl?: number}): Promise; export function barfoo(...args: any) { let peer: FluencePeer; @@ -106,9 +109,8 @@ export function barfoo(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -126,31 +128,31 @@ export function barfoo(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 barfoo'); - }); + 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 barfoo'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/imports_exports/import3.ts b/src/compiled/examples/imports_exports/import3.ts index fc5ad60..695c226 100644 --- a/src/compiled/examples/imports_exports/import3.ts +++ b/src/compiled/examples/imports_exports/import3.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,19 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services // Functions + -export function foo_wrapper(config?: { ttl?: number }): Promise; -export function foo_wrapper(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function foo_wrapper(config?: {ttl?: number}): Promise; +export function foo_wrapper(peer: FluencePeer, config?: {ttl?: number}): Promise; export function foo_wrapper(...args: any) { let peer: FluencePeer; @@ -39,9 +41,8 @@ export function foo_wrapper(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -53,31 +54,31 @@ export function foo_wrapper(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 foo_wrapper'); - }); + 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 foo_wrapper'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 d5fff90..1cf4830 100644 --- a/src/compiled/examples/imports_exports/imports-empty.ts +++ b/src/compiled/examples/imports_exports/imports-empty.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,45 +11,35 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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; + 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(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: any) { let peer: FluencePeer; let serviceId: any; @@ -65,7 +55,7 @@ export function registerNoop(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -73,7 +63,7 @@ export function registerNoop(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -81,24 +71,9 @@ export function registerNoop(...args: any) { service = args[2]; } - const incorrectServiceDefinitions = missingFields(service, [ - 'array', - 'array_length', - 'bytes_from_b58', - 'bytes_to_b58', - 'concat', - 'concat_strings', - 'identity', - 'noop', - 'sha256_string', - 'string_from_b58', - 'string_to_b58', - ]); + const incorrectServiceDefinitions = missingFields(service, ['array', 'array_length', 'bytes_from_b58', 'bytes_to_b58', 'concat', 'concat_strings', 'identity', 'noop', 'sha256_string', 'string_from_b58', 'string_to_b58']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Noop: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Noop: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -111,155 +86,141 @@ export function registerNoop(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], - c: req.tetraplets[2], - d: req.tetraplets[3], + 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, - ); + 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_length') { +if (req.fnName === 'array_length') { const callParams = { ...req.particleContext, tetraplets: { - array: req.tetraplets[0], + array: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.array_length(req.args[0], callParams); + resp.result = service.array_length(req.args[0], callParams) } - if (req.fnName === 'bytes_from_b58') { +if (req.fnName === 'bytes_from_b58') { const callParams = { ...req.particleContext, tetraplets: { - b: req.tetraplets[0], + b: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.bytes_from_b58(req.args[0], callParams); + resp.result = service.bytes_from_b58(req.args[0], callParams) } - if (req.fnName === 'bytes_to_b58') { +if (req.fnName === 'bytes_to_b58') { const callParams = { ...req.particleContext, tetraplets: { - bs: req.tetraplets[0], + bs: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.bytes_to_b58(req.args[0], callParams); + resp.result = service.bytes_to_b58(req.args[0], callParams) } - if (req.fnName === 'concat') { +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], + 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, - ); + 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) } - if (req.fnName === 'concat_strings') { +if (req.fnName === 'concat_strings') { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], + a: req.tetraplets[0],b: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.concat_strings(req.args[0], req.args[1], callParams); + resp.result = service.concat_strings(req.args[0], req.args[1], callParams) } - if (req.fnName === 'identity') { +if (req.fnName === 'identity') { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + 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] - 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') { +if (req.fnName === 'noop') { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + }, }; resp.retCode = ResultCodes.success; - resp.result = service.sha256_string(req.args[0], callParams); + service.noop(callParams); resp.result = {} } - if (req.fnName === 'string_from_b58') { +if (req.fnName === 'sha256_string') { const callParams = { ...req.particleContext, tetraplets: { - b: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.string_from_b58(req.args[0], callParams); + resp.result = service.sha256_string(req.args[0], callParams) } - if (req.fnName === 'string_to_b58') { +if (req.fnName === 'string_from_b58') { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + b: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.string_to_b58(req.args[0], callParams); + 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: any) { let peer: FluencePeer; let serviceId: any; @@ -275,7 +236,7 @@ export function registerMyExportSrv(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'my_export_srv'; + serviceId = "my_export_srv" } // Figuring out which overload is the service. @@ -283,7 +244,7 @@ export function registerMyExportSrv(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -293,10 +254,7 @@ export function registerMyExportSrv(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['another_str']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service MyExportSrv: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service MyExportSrv: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -308,20 +266,23 @@ export function registerMyExportSrv(...args: any) { if (req.fnName === 'another_str') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.another_str(callParams); + resp.result = service.another_str(callParams) } next(); }); } - + // Functions + -export function some_str(config?: { ttl?: number }): Promise; -export function some_str(peer: FluencePeer, config?: { ttl?: number }): Promise; +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; @@ -337,9 +298,8 @@ export function some_str(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -351,38 +311,40 @@ export function some_str(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 some_str'); - }); + 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 some_str'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function some_string(peer: FluencePeer, config?: {ttl?: number}): Promise; export function some_string(...args: any) { let peer: FluencePeer; @@ -398,9 +360,8 @@ export function some_string(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -412,38 +373,40 @@ export function some_string(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 some_string'); - }); + 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 some_string'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function decl_foo(peer: FluencePeer, config?: {ttl?: number}): Promise; export function decl_foo(...args: any) { let peer: FluencePeer; @@ -459,9 +422,8 @@ export function decl_foo(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -476,38 +438,40 @@ export function decl_foo(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 decl_foo'); - }); + 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 decl_foo'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function decl_bar(peer: FluencePeer, config?: {ttl?: number}): Promise; export function decl_bar(...args: any) { let peer: FluencePeer; @@ -523,9 +487,8 @@ export function decl_bar(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -537,38 +500,40 @@ export function decl_bar(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 decl_bar'); - }); + 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 decl_bar'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(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; @@ -584,9 +549,8 @@ export function some_random_func(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -598,31 +562,31 @@ export function some_random_func(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 some_random_func'); - }); + 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 some_random_func'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 e6971cd..aa2b265 100644 --- a/src/compiled/examples/imports_exports/imports.ts +++ b/src/compiled/examples/imports_exports/imports.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface StringServiceDef { concat: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerStringService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'string_service'; + serviceId = "string_service" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerStringService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerStringService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['concat']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service StringService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service StringService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,22 +76,22 @@ export function registerStringService(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - a: req.tetraplets[0], - b: req.tetraplets[1], + a: req.tetraplets[0],b: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.concat(req.args[0], req.args[1], callParams); + resp.result = service.concat(req.args[0], req.args[1], callParams) } next(); }); } - + // Functions + -export function concat_foobars(config?: { ttl?: number }): Promise; -export function concat_foobars(peer: FluencePeer, config?: { ttl?: number }): Promise; +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; @@ -108,9 +107,8 @@ export function concat_foobars(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -143,31 +141,31 @@ export function concat_foobars(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 concat_foobars'); - }); + 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 concat_foobars'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 eecc78f..0e90324 100644 --- a/src/compiled/examples/imports_exports/subImport.ts +++ b/src/compiled/examples/imports_exports/subImport.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,23 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface SubServiceDef { - sub: (s: string, callParams: CallParams<'s'>) => { one: string; two: number }; + sub: (s: string, callParams: CallParams<'s'>) => { one: string; two: number; }; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerSubService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'sub_service'; + serviceId = "sub_service" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerSubService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerSubService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['sub']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service SubService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service SubService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerSubService(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.sub(req.args[0], callParams); + resp.result = service.sub(req.args[0], callParams) } 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 type SubImportResult = { one: string; two: number; } +export function subImport(config?: {ttl?: number}): Promise; +export function subImport(peer: FluencePeer, config?: {ttl?: number}): Promise; export function subImport(...args: any) { let peer: FluencePeer; @@ -105,11 +105,10 @@ export function subImport(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ one: string; two: number }>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -124,31 +123,31 @@ export function subImport(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 subImport'); - }); + 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 subImport'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/multiReturn.ts b/src/compiled/examples/multiReturn.ts index 24efead..f7a39d2 100644 --- a/src/compiled/examples/multiReturn.ts +++ b/src/compiled/examples/multiReturn.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface GetStrDef { retStr: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerGetStr(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'multiret-test'; + serviceId = "multiret-test" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerGetStr(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerGetStr(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['retStr']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service GetStr: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service GetStr: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,25 +76,28 @@ export function registerGetStr(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.retStr(req.args[0], callParams); + resp.result = service.retStr(req.args[0], callParams) } next(); }); } + + export interface GetNumDef { retNum: (callParams: CallParams) => number; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -111,7 +113,7 @@ export function registerGetNum(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'multiret-num'; + serviceId = "multiret-num" } // Figuring out which overload is the service. @@ -119,7 +121,7 @@ export function registerGetNum(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -129,10 +131,7 @@ export function registerGetNum(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['retNum']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service GetNum: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service GetNum: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -144,20 +143,23 @@ export function registerGetNum(...args: any) { if (req.fnName === 'retNum') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.retNum(callParams); + resp.result = service.retNum(callParams) } next(); }); } - + // Functions - -export function tupleFunc(config?: { ttl?: number }): Promise<[string, number]>; -export function tupleFunc(peer: FluencePeer, config?: { ttl?: number }): Promise<[string, number]>; + +export type TupleFuncResult = [string, number] +export function tupleFunc(config?: {ttl?: number}): Promise; +export function tupleFunc(peer: FluencePeer, config?: {ttl?: number}): Promise; export function tupleFunc(...args: any) { let peer: FluencePeer; @@ -171,11 +173,10 @@ export function tupleFunc(...args: any) { } let request: RequestFlow; - const promise = new Promise<[string, number]>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -193,48 +194,41 @@ export function tupleFunc(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { + h.onEvent('callbackSrv', 'response', (args) => { let opt: any = args; return resolve(opt); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for tupleFunc'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 type MultiReturnFuncResult = [string[], number, string, number[], string | null, number] +export function multiReturnFunc(somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}): Promise; +export function multiReturnFunc(peer: FluencePeer, somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}): Promise; export function multiReturnFunc(...args: any) { let peer: FluencePeer; let somethingToReturn: any; @@ -253,11 +247,10 @@ export function multiReturnFunc(...args: any) { } let request: RequestFlow; - const promise = new Promise<[string[], number, string, number[], string | null, number]>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -290,43 +283,36 @@ export function multiReturnFunc(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'somethingToReturn', () => { - return somethingToReturn; - }); - h.on('getDataSrv', 'smthOption', () => { - return smthOption === null ? [] : [smthOption]; - }); - h.onEvent('callbackSrv', 'response', (args) => { + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'somethingToReturn', () => {return somethingToReturn;}); + h.on('getDataSrv', 'smthOption', () => {return smthOption === null ? [] : [smthOption];}); + h.onEvent('callbackSrv', 'response', (args) => { let opt: any = args; - if (Array.isArray(opt[4])) { - if (opt[4].length === 0) { - opt[4] = null; - } else { - opt[4] = opt[4][0]; + 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; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for multiReturnFunc'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/nestedFuncs.ts b/src/compiled/examples/nestedFuncs.ts index 6325593..ef43f18 100644 --- a/src/compiled/examples/nestedFuncs.ts +++ b/src/compiled/examples/nestedFuncs.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface OpHDef { identity: (s: string, callParams: CallParams<'s'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerOpH(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'opa'; + serviceId = "opa" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerOpH(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerOpH(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpH: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpH: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerOpH(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); + resp.result = service.identity(req.args[0], callParams) } 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(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; @@ -109,9 +109,8 @@ export function a(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -129,40 +128,40 @@ export function a(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'b', () => { - return b; - }); - 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 a'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'b', () => {return b;}); + 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 a'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(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; @@ -180,9 +179,8 @@ export function d(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -200,33 +198,31 @@ export function d(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'e', () => { - return e; - }); - 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 d'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'e', () => {return e;}); + 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 d'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 03735f8..c162779 100644 --- a/src/compiled/examples/new-api-full.ts +++ b/src/compiled/examples/new-api-full.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,15 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface ServiceWithDefaultIdDef { hello: (s: string, callParams: CallParams<'s'>) => 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(peer: FluencePeer, serviceId: string, service: ServiceWithDefaultIdDef): void; + + export function registerServiceWithDefaultId(...args: any) { let peer: FluencePeer; let serviceId: any; @@ -47,7 +45,7 @@ export function registerServiceWithDefaultId(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'defaultId'; + serviceId = "defaultId" } // Figuring out which overload is the service. @@ -55,7 +53,7 @@ export function registerServiceWithDefaultId(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -65,10 +63,7 @@ export function registerServiceWithDefaultId(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['hello']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service ServiceWithDefaultId: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service ServiceWithDefaultId: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -81,28 +76,26 @@ export function registerServiceWithDefaultId(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.hello(req.args[0], callParams); - resp.result = {}; + service.hello(req.args[0], callParams); resp.result = {} } next(); }); } + + 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(peer: FluencePeer, serviceId: string, service: ServiceWithOUTDefaultIdDef): void; + + export function registerServiceWithOUTDefaultId(...args: any) { let peer: FluencePeer; let serviceId: any; @@ -117,14 +110,14 @@ export function registerServiceWithOUTDefaultId(...args: any) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } // Figuring out which overload is the service. // If the first argument is not Fluence Peer and it is an object, then it can only be the service def // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -134,10 +127,7 @@ export function registerServiceWithOUTDefaultId(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['hello']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service ServiceWithOUTDefaultId: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service ServiceWithOUTDefaultId: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -150,28 +140,30 @@ export function registerServiceWithOUTDefaultId(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.hello(req.args[0], callParams); - resp.result = {}; + service.hello(req.args[0], callParams); resp.result = {} } 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; +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(peer: FluencePeer, serviceId: string, service: MoreMembersDef): void; + + export function registerMoreMembers(...args: any) { let peer: FluencePeer; let serviceId: any; @@ -186,14 +178,14 @@ export function registerMoreMembers(...args: any) { serviceId = args[0]; } else if (typeof args[1] === 'string') { serviceId = args[1]; - } + } // Figuring out which overload is the service. // If the first argument is not Fluence Peer and it is an object, then it can only be the service def // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -203,10 +195,7 @@ export function registerMoreMembers(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['member1', 'member2', 'member3', 'member4', 'member5']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service MoreMembers: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service MoreMembers: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -216,81 +205,69 @@ export function registerMoreMembers(...args: any) { } 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 = {}; + service.member1(callParams); resp.result = {} } - if (req.fnName === 'member3') { +if (req.fnName === 'member2') { const callParams = { ...req.particleContext, tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], + s1: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.member3(req.args[0], req.args[1], callParams); - resp.result = {}; + service.member2(req.args[0], callParams); resp.result = {} } - if (req.fnName === 'member4') { +if (req.fnName === 'member3') { const callParams = { ...req.particleContext, tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], - i: req.tetraplets[2], + s1: req.tetraplets[0],s2: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.member4(req.args[0], req.args[1], req.args[2], callParams); + service.member3(req.args[0], req.args[1], callParams); resp.result = {} } - if (req.fnName === 'member5') { +if (req.fnName === 'member4') { const callParams = { ...req.particleContext, tetraplets: { - s1: req.tetraplets[0], - s2: req.tetraplets[1], - i: req.tetraplets[2], + 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); + 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(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; @@ -308,9 +285,8 @@ export function f1(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -322,59 +298,52 @@ export function f1(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for f1'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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(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; @@ -395,9 +364,8 @@ export function f2(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -412,62 +380,53 @@ export function f2(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.onEvent('callbackSrv', 'response', (args) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for f2'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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(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; @@ -488,9 +447,8 @@ export function f3(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -511,63 +469,54 @@ export function f3(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.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 f3'); + }) - 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 f3'); - }); + if (config && config.ttl) { + r.withTTL(config.ttl) + } - if (config && config.ttl) { - r.withTTL(config.ttl); - } - - request = r.build(); + 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(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; @@ -585,9 +534,8 @@ export function callBackZeroArgs(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -599,40 +547,43 @@ export function callBackZeroArgs(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for callBackZeroArgs'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 d2b9785..1848d24 100644 --- a/src/compiled/examples/new-api.ts +++ b/src/compiled/examples/new-api.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,24 +11,26 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface HelloWorldDef { getNumber: (callParams: CallParams) => number; - sayHello: (s: string, callParams: CallParams<'s'>) => void; +sayHello: (s: string, callParams: CallParams<'s'>) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -44,7 +46,7 @@ export function registerHelloWorld(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'default'; + serviceId = "default" } // Figuring out which overload is the service. @@ -52,7 +54,7 @@ export function registerHelloWorld(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -62,10 +64,7 @@ export function registerHelloWorld(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['getNumber', 'sayHello']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service HelloWorld: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service HelloWorld: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -75,41 +74,36 @@ export function registerHelloWorld(...args: any) { } 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 = {}; + 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(); }); } - + // 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(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; @@ -127,9 +121,8 @@ export function callMeBack(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -141,43 +134,43 @@ export function callMeBack(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for callMeBack'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 acf7b31..81d91bc 100644 --- a/src/compiled/examples/on.ts +++ b/src/compiled/examples/on.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,23 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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(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; @@ -45,9 +43,8 @@ export function getPeerExternalAddresses(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -77,45 +74,40 @@ export function getPeerExternalAddresses(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'otherNodePeerId', () => { - return otherNodePeerId; - }); - 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 getPeerExternalAddresses'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;}); + 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 getPeerExternalAddresses'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(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; @@ -136,9 +128,8 @@ export function getDistantAddresses(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -183,36 +174,32 @@ export function getDistantAddresses(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'target', () => { - return target; - }); - h.on('getDataSrv', 'viaNode', () => { - return viaNode; - }); - 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 getDistantAddresses'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'target', () => {return target;}); + h.on('getDataSrv', 'viaNode', () => {return viaNode;}); + 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 getDistantAddresses'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/option.ts b/src/compiled/examples/option.ts index 4c90d16..3309bbd 100644 --- a/src/compiled/examples/option.ts +++ b/src/compiled/examples/option.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,25 +11,27 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // 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; +getStr1: (callParams: CallParams) => string | null; +getStr2: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -45,7 +47,7 @@ export function registerSomeS(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test2'; + serviceId = "test2" } // Figuring out which overload is the service. @@ -53,7 +55,7 @@ export function registerSomeS(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -63,10 +65,7 @@ export function registerSomeS(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['getStr', 'getStr1', 'getStr2']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service SomeS: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service SomeS: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -79,45 +78,50 @@ export function registerSomeS(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + 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] - var respResult = service.getStr(req.args[0].length === 0 ? null : req.args[0][0], callParams); - resp.result = respResult === null ? [] : [respResult]; } - 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') { +if (req.fnName === 'getStr1') { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + }, }; resp.retCode = ResultCodes.success; - resp.result = service.getStr2(req.args[0], callParams); + + 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(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; @@ -135,9 +139,8 @@ export function useOptional(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -163,40 +166,40 @@ export function useOptional(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'opt', () => { - return opt === null ? [] : [opt]; - }); - 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 useOptional'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'opt', () => {return opt === null ? [] : [opt];}); + 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 useOptional'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function returnOptional(peer: FluencePeer, config?: {ttl?: number}): Promise; export function returnOptional(...args: any) { let peer: FluencePeer; @@ -212,9 +215,8 @@ export function returnOptional(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -229,44 +231,44 @@ export function returnOptional(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - opt = opt[0]; - } - return resolve(opt); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for returnOptional'); - }); + return resolve(opt); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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(config?: {ttl?: number}): Promise; +export function returnNone(peer: FluencePeer, config?: {ttl?: number}): Promise; export function returnNone(...args: any) { let peer: FluencePeer; @@ -282,9 +284,8 @@ export function returnNone(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -299,37 +300,35 @@ export function returnNone(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 14b762c..9002203 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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface OptionStringDef { checkOption: (str: string | null, callParams: CallParams<'str'>) => string; } - export function registerOptionString(service: OptionStringDef): void; 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerOptionString(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'opt_str'; + serviceId = "opt_str" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerOptionString(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerOptionString(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['checkOption']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OptionString: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OptionString: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerOptionString(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - str: req.tetraplets[0], + str: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.checkOption(req.args[0].length === 0 ? null : req.args[0][0], callParams); + resp.result = service.checkOption(req.args[0].length === 0 ? null : req.args[0][0], callParams) } next(); }); } - + // Functions + -export function emptyString(config?: { ttl?: number }): Promise; -export function emptyString(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function emptyString(config?: {ttl?: number}): Promise; +export function emptyString(peer: FluencePeer, config?: {ttl?: number}): Promise; export function emptyString(...args: any) { let peer: FluencePeer; @@ -107,9 +107,8 @@ export function emptyString(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -121,44 +120,44 @@ export function emptyString(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function checkEmpty(peer: FluencePeer, config?: {ttl?: number}): Promise; export function checkEmpty(...args: any) { let peer: FluencePeer; @@ -174,9 +173,8 @@ export function checkEmpty(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -191,38 +189,40 @@ export function checkEmpty(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(str: string, config?: {ttl?: number}): Promise; +export function stringAsOption(peer: FluencePeer, str: string, config?: {ttl?: number}): Promise; export function stringAsOption(...args: any) { let peer: FluencePeer; let str: any; @@ -240,9 +240,8 @@ export function stringAsOption(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -260,46 +259,44 @@ export function stringAsOption(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'str', () => { - return str; - }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'str', () => {return str;}); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - opt = opt[0]; - } - return resolve(opt); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for stringAsOption'); - }); + return resolve(opt); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for stringAsOption'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(str: string, config?: {ttl?: number}): Promise; +export function checkNoneEmpty(peer: FluencePeer, str: string, config?: {ttl?: number}): Promise; export function checkNoneEmpty(...args: any) { let peer: FluencePeer; let str: any; @@ -317,9 +314,8 @@ export function checkNoneEmpty(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -340,33 +336,31 @@ export function checkNoneEmpty(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'str', () => { - return str; - }); - 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 checkNoneEmpty'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'str', () => {return str;}); + 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 checkNoneEmpty'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/par.ts b/src/compiled/examples/par.ts index 00a35c1..9717d21 100644 --- a/src/compiled/examples/par.ts +++ b/src/compiled/examples/par.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface ParServiceDef { call: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerParService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'parservice-id'; + serviceId = "parservice-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerParService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerParService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['call']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service ParService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service ParService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,29 +75,23 @@ export function registerParService(...args: any) { if (req.fnName === 'call') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.call(callParams); + resp.result = service.call(callParams) } 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(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; @@ -119,9 +112,8 @@ export function parFunc(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -154,45 +146,44 @@ export function parFunc(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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(); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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.onEvent('callbackSrv', 'response', (args) => { - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for parFunc'); - }); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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 837ffcf..86cdf42 100644 --- a/src/compiled/examples/passArgs.ts +++ b/src/compiled/examples/passArgs.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,28 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface AquaDHTDef { - put_host_value: ( - key: string, - value: string, - service_id: string[], - callParams: CallParams<'key' | 'value' | 'service_id'>, - ) => string; + 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(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: any) { let peer: FluencePeer; let serviceId: any; @@ -48,7 +45,7 @@ export function registerAquaDHT(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test-dht'; + serviceId = "test-dht" } // Figuring out which overload is the service. @@ -56,7 +53,7 @@ export function registerAquaDHT(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -66,10 +63,7 @@ export function registerAquaDHT(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['put_host_value']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service AquaDHT: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service AquaDHT: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -82,34 +76,22 @@ export function registerAquaDHT(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - key: req.tetraplets[0], - value: req.tetraplets[1], - service_id: req.tetraplets[2], + 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); + resp.result = service.put_host_value(req.args[0], req.args[1], req.args[2], callParams) } 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(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; @@ -133,9 +115,8 @@ export function putHostValue(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -159,46 +140,42 @@ export function putHostValue(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for putHostValue'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + 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(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; @@ -216,9 +193,8 @@ export function create_client_util(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -236,33 +212,31 @@ export function create_client_util(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'service_id', () => { - return service_id; - }); - 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 create_client_util'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'service_id', () => {return service_id;}); + 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 create_client_util'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/println.ts b/src/compiled/examples/println.ts index 9ca9941..0d69d1b 100644 --- a/src/compiled/examples/println.ts +++ b/src/compiled/examples/println.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface PrintlnDef { print: (arg0: string, callParams: CallParams<'arg0'>) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerPrintln(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'println-service-id'; + serviceId = "println-service-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerPrintln(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerPrintln(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['print']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Println: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Println: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,22 +76,22 @@ export function registerPrintln(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.print(req.args[0], callParams); - resp.result = {}; + service.print(req.args[0], callParams); resp.result = {} } 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(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; @@ -110,9 +109,8 @@ export function print(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -124,30 +122,30 @@ export function print(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'str', () => { - return str; - }); - h.onEvent('callbackSrv', 'response', (args) => {}); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for print'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'str', () => {return str;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for print'); + }) - request = r.build(); + 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 4b49c84..290fe10 100644 --- a/src/compiled/examples/pushToStream.ts +++ b/src/compiled/examples/pushToStream.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface OpADef { get_str: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerOpA(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'pop'; + serviceId = "pop" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerOpA(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerOpA(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['get_str']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpA: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpA: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,20 +75,23 @@ export function registerOpA(...args: any) { if (req.fnName === 'get_str') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.get_str(callParams); + resp.result = service.get_str(callParams) } next(); }); } - + // Functions + -export function get_results(config?: { ttl?: number }): Promise; -export function get_results(peer: FluencePeer, config?: { ttl?: number }): Promise; +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; @@ -105,9 +107,8 @@ export function get_results(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -128,31 +129,31 @@ export function get_results(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 get_results'); - }); + 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 get_results'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/returnLiteral.ts b/src/compiled/examples/returnLiteral.ts index 073827b..d594cb2 100644 --- a/src/compiled/examples/returnLiteral.ts +++ b/src/compiled/examples/returnLiteral.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,19 +11,21 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services // Functions + -export function returnLiteral(config?: { ttl?: number }): Promise; -export function returnLiteral(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function returnLiteral(config?: {ttl?: number}): Promise; +export function returnLiteral(peer: FluencePeer, config?: {ttl?: number}): Promise; export function returnLiteral(...args: any) { let peer: FluencePeer; @@ -39,9 +41,8 @@ export function returnLiteral(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -53,31 +54,31 @@ export function returnLiteral(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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 returnLiteral'); - }); + 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 returnLiteral'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/stream.ts b/src/compiled/examples/stream.ts index 7a258b9..8566915 100644 --- a/src/compiled/examples/stream.ts +++ b/src/compiled/examples/stream.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface StringerDef { returnString: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerStringer(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'stringer-id'; + serviceId = "stringer-id" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerStringer(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerStringer(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['returnString']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Stringer: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Stringer: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerStringer(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.returnString(req.args[0], callParams); + resp.result = service.returnString(req.args[0], callParams) } next(); }); } - + // Functions + -export function returnNone(config?: { ttl?: number }): Promise; -export function returnNone(peer: FluencePeer, config?: { ttl?: number }): Promise; +export function returnNone(config?: {ttl?: number}): Promise; +export function returnNone(peer: FluencePeer, config?: {ttl?: number}): Promise; export function returnNone(...args: any) { let peer: FluencePeer; @@ -107,9 +107,8 @@ export function returnNone(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -121,44 +120,44 @@ export function returnNone(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function stringNone(peer: FluencePeer, config?: {ttl?: number}): Promise; export function stringNone(...args: any) { let peer: FluencePeer; @@ -174,9 +173,8 @@ export function stringNone(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -188,44 +186,44 @@ export function stringNone(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - h.onEvent('callbackSrv', 'response', (args) => { - let [opt] = args; - if (Array.isArray(opt)) { - if (opt.length === 0) { - resolve(null); + h.onEvent('callbackSrv', 'response', (args) => { + let [opt] = args; + if (Array.isArray(opt)) { + if (opt.length === 0) { resolve(null); } + opt = opt[0]; } - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function returnNil(peer: FluencePeer, config?: {ttl?: number}): Promise; export function returnNil(...args: any) { let peer: FluencePeer; @@ -241,9 +239,8 @@ export function returnNil(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -255,38 +252,40 @@ export function returnNil(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(config?: {ttl?: number}): Promise; +export function stringNil(peer: FluencePeer, config?: {ttl?: number}): Promise; export function stringNil(...args: any) { let peer: FluencePeer; @@ -302,9 +301,8 @@ export function stringNil(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) @@ -316,38 +314,40 @@ export function stringNil(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); - 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'); - }); + 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); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(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; @@ -365,9 +365,8 @@ export function checkStreams(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -396,33 +395,31 @@ export function checkStreams(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'ch', () => { - return ch; - }); - 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 checkStreams'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'ch', () => {return ch;}); + 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 checkStreams'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/streamArgs.ts b/src/compiled/examples/streamArgs.ts index 7e8cdb4..54b913c 100644 --- a/src/compiled/examples/streamArgs.ts +++ b/src/compiled/examples/streamArgs.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface TestServiceDef { get_records: (key: string, callParams: CallParams<'key'>) => string[]; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerTestService(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'test-service'; + serviceId = "test-service" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerTestService(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerTestService(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['get_records']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service TestService: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service TestService: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,26 +76,22 @@ export function registerTestService(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - key: req.tetraplets[0], + key: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.get_records(req.args[0], callParams); + resp.result = service.get_records(req.args[0], callParams) } 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(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; @@ -117,9 +112,8 @@ export function append_records(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -142,40 +136,40 @@ export function append_records(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for append_records'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'peer', () => {return peer_;}); + h.on('getDataSrv', 'srum', () => {return srum;}); + h.onEvent('callbackSrv', 'response', (args) => { - if (config && config.ttl) { - r.withTTL(config.ttl); - } + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .handleScriptError(reject) + .handleTimeout(() => { + reject('Request timed out for append_records'); + }) - request = r.build(); + 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(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; @@ -193,9 +187,8 @@ export function retrieve_records(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -213,33 +206,31 @@ export function retrieve_records(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'peer', () => { - return peer_; - }); - 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 retrieve_records'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'peer', () => {return peer_;}); + 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 retrieve_records'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/streamResults.ts b/src/compiled/examples/streamResults.ts index 628206a..9014aaf 100644 --- a/src/compiled/examples/streamResults.ts +++ b/src/compiled/examples/streamResults.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,23 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface DTGetterDef { - get_dt: (s: string, callParams: CallParams<'s'>) => { field: string }; + get_dt: (s: string, callParams: CallParams<'s'>) => { field: string; }; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerDTGetter(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'get-dt'; + serviceId = "get-dt" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerDTGetter(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerDTGetter(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['get_dt']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service DTGetter: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service DTGetter: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,21 +76,22 @@ export function registerDTGetter(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.get_dt(req.args[0], callParams); + resp.result = service.get_dt(req.args[0], callParams) } 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(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; @@ -109,9 +109,8 @@ export function use_name1(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -129,40 +128,40 @@ export function use_name1(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'name', () => { - return name; - }); - 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 use_name1'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'name', () => {return name;}); + 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 use_name1'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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(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; @@ -180,9 +179,8 @@ export function use_name2(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -215,33 +213,31 @@ export function use_name2(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'name', () => { - return name; - }); - 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 use_name2'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'name', () => {return name;}); + 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 use_name2'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/subImportUsage.ts b/src/compiled/examples/subImportUsage.ts index 37716aa..e82d173 100644 --- a/src/compiled/examples/subImportUsage.ts +++ b/src/compiled/examples/subImportUsage.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,27 +11,25 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services export interface ConcatSubsDef { - get_some: ( - s: string, - sr: { one: string; two: number }, - callParams: CallParams<'s' | 'sr'>, - ) => { one: string; two: number }; + 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(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: any) { let peer: FluencePeer; let serviceId: any; @@ -47,7 +45,7 @@ export function registerConcatSubs(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'concat_subs'; + serviceId = "concat_subs" } // Figuring out which overload is the service. @@ -55,7 +53,7 @@ export function registerConcatSubs(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -65,10 +63,7 @@ export function registerConcatSubs(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['get_some']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service ConcatSubs: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service ConcatSubs: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -81,26 +76,22 @@ export function registerConcatSubs(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], - sr: req.tetraplets[1], + s: req.tetraplets[0],sr: req.tetraplets[1] }, }; resp.retCode = ResultCodes.success; - resp.result = service.get_some(req.args[0], req.args[1], callParams); + resp.result = service.get_some(req.args[0], req.args[1], callParams) } 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 type SubImportUsageResult = { one: string; two: number; } +export function subImportUsage(s: string, config?: {ttl?: number}): Promise; +export function subImportUsage(peer: FluencePeer, s: string, config?: {ttl?: number}): Promise; export function subImportUsage(...args: any) { let peer: FluencePeer; let s: any; @@ -116,11 +107,10 @@ export function subImportUsage(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ one: string; two: number }>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -144,33 +134,31 @@ export function subImportUsage(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 's', () => { - return s; - }); - 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 subImportUsage'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 's', () => {return s;}); + 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 subImportUsage'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/topology.ts b/src/compiled/examples/topology.ts index 1edc56a..2db766b 100644 --- a/src/compiled/examples/topology.ts +++ b/src/compiled/examples/topology.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface TestoDef { getString: (arg0: string, callParams: CallParams<'arg0'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerTesto(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'testo'; + serviceId = "testo" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerTesto(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerTesto(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['getString']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Testo: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Testo: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,25 +76,28 @@ export function registerTesto(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.getString(req.args[0], callParams); + resp.result = service.getString(req.args[0], callParams) } next(); }); } + + export interface LocalPrintDef { print: (arg0: string, callParams: CallParams<'arg0'>) => 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: any) { let peer: FluencePeer; let serviceId: any; @@ -111,7 +113,7 @@ export function registerLocalPrint(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'lp'; + serviceId = "lp" } // Figuring out which overload is the service. @@ -119,7 +121,7 @@ export function registerLocalPrint(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -129,10 +131,7 @@ export function registerLocalPrint(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['print']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service LocalPrint: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service LocalPrint: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -145,35 +144,22 @@ export function registerLocalPrint(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - arg0: req.tetraplets[0], + arg0: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - service.print(req.args[0], callParams); - resp.result = {}; + service.print(req.args[0], callParams); resp.result = {} } 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(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; @@ -200,9 +186,8 @@ export function topologyTest(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -259,42 +244,34 @@ export function topologyTest(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for topologyTest'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/tryCatch.ts b/src/compiled/examples/tryCatch.ts index f0d5de4..446f19f 100644 --- a/src/compiled/examples/tryCatch.ts +++ b/src/compiled/examples/tryCatch.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface UnexistedDef { getStr: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerUnexisted(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'unex'; + serviceId = "unex" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerUnexisted(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerUnexisted(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['getStr']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Unexisted: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Unexisted: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,24 +75,29 @@ export function registerUnexisted(...args: any) { if (req.fnName === 'getStr') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.getStr(callParams); + resp.result = service.getStr(callParams) } next(); }); } + + export interface OpADef { identity: (s: string, callParams: CallParams<'s'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -109,7 +113,7 @@ export function registerOpA(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -117,7 +121,7 @@ export function registerOpA(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -127,10 +131,7 @@ export function registerOpA(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpA: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpA: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -143,21 +144,22 @@ export function registerOpA(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); + resp.result = service.identity(req.args[0], callParams) } 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(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; @@ -175,9 +177,8 @@ export function tryCatchTest(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -216,33 +217,31 @@ export function tryCatchTest(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - 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 tryCatchTest'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + 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 tryCatchTest'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/tryOtherwise.ts b/src/compiled/examples/tryOtherwise.ts index bfcf349..b0cc2f1 100644 --- a/src/compiled/examples/tryOtherwise.ts +++ b/src/compiled/examples/tryOtherwise.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface UnexistedDef { getStr: (callParams: CallParams) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerUnexisted(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'unex'; + serviceId = "unex" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerUnexisted(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerUnexisted(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['getStr']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service Unexisted: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service Unexisted: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -76,24 +75,29 @@ export function registerUnexisted(...args: any) { if (req.fnName === 'getStr') { const callParams = { ...req.particleContext, - tetraplets: {}, + tetraplets: { + + }, }; resp.retCode = ResultCodes.success; - resp.result = service.getStr(callParams); + resp.result = service.getStr(callParams) } next(); }); } + + export interface OpEDef { identity: (s: string, callParams: CallParams<'s'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -109,7 +113,7 @@ export function registerOpE(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'op'; + serviceId = "op" } // Figuring out which overload is the service. @@ -117,7 +121,7 @@ export function registerOpE(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -127,10 +131,7 @@ export function registerOpE(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['identity']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service OpE: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service OpE: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -143,21 +144,22 @@ export function registerOpE(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.identity(req.args[0], callParams); + resp.result = service.identity(req.args[0], callParams) } 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(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; @@ -175,9 +177,8 @@ export function tryOtherwiseTest(...args: any) { let request: RequestFlow; const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -210,33 +211,31 @@ export function tryOtherwiseTest(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - 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 tryOtherwiseTest'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + 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 tryOtherwiseTest'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise; diff --git a/src/compiled/examples/via.ts b/src/compiled/examples/via.ts index a979d1a..fefb712 100644 --- a/src/compiled/examples/via.ts +++ b/src/compiled/examples/via.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.1-231 + * Aqua version: 0.3.2-SNAPSHOT * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -11,11 +11,12 @@ import { ResultCodes, RequestFlow, RequestFlowBuilder, - CallParams, + CallParams } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; + function missingFields(obj: any, fields: string[]): string[] { - return fields.filter((f) => !(f in obj)); + return fields.filter(f => !(f in obj)) } // Services @@ -23,11 +24,12 @@ function missingFields(obj: any, fields: string[]): string[] { export interface CustomIdDef { id: (s: string, callParams: CallParams<'s'>) => string; } - 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: any) { let peer: FluencePeer; let serviceId: any; @@ -43,7 +45,7 @@ export function registerCustomId(...args: any) { } else if (typeof args[1] === 'string') { serviceId = args[1]; } else { - serviceId = 'cid'; + serviceId = "cid" } // Figuring out which overload is the service. @@ -51,7 +53,7 @@ export function registerCustomId(...args: any) { // If the first argument is peer, we are checking further. The second argument might either be // an object, that it must be the service object // or a string, which is the service id. In that case the service is the third argument - if (!FluencePeer.isInstance(args[0]) && typeof args[0] === 'object') { + if (!(FluencePeer.isInstance(args[0])) && typeof args[0] === 'object') { service = args[0]; } else if (typeof args[1] === 'object') { service = args[1]; @@ -61,10 +63,7 @@ export function registerCustomId(...args: any) { const incorrectServiceDefinitions = missingFields(service, ['id']); if (!!incorrectServiceDefinitions.length) { - throw new Error( - 'Error registering service CustomId: missing functions: ' + - incorrectServiceDefinitions.map((d) => "'" + d + "'").join(', '), - ); + throw new Error("Error registering service CustomId: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", ")) } peer.internals.callServiceHandler.use((req, resp, next) => { @@ -77,30 +76,22 @@ export function registerCustomId(...args: any) { const callParams = { ...req.particleContext, tetraplets: { - s: req.tetraplets[0], + s: req.tetraplets[0] }, }; resp.retCode = ResultCodes.success; - resp.result = service.id(req.args[0], callParams); + resp.result = service.id(req.args[0], callParams) } 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 type ViaArrResult = { external_addresses: string[]; } +export function viaArr(node_id: string, viaAr: string[], config?: {ttl?: number}): Promise; +export function viaArr(peer: FluencePeer, node_id: string, viaAr: string[], config?: {ttl?: number}): Promise; export function viaArr(...args: any) { let peer: FluencePeer; let node_id: any; @@ -119,11 +110,10 @@ export function viaArr(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -183,52 +173,41 @@ export function viaArr(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'viaAr', () => { - return viaAr; - }); - 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 viaArr'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'viaAr', () => {return viaAr;}); + 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 viaArr'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 type ViaStreamResult = { external_addresses: string[]; } +export function viaStream(node_id: string, viaStr: string[], config?: {ttl?: number}): Promise; +export function viaStream(peer: FluencePeer, node_id: string, viaStr: string[], config?: {ttl?: number}): Promise; export function viaStream(...args: any) { let peer: FluencePeer; let node_id: any; @@ -247,11 +226,10 @@ export function viaStream(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -319,54 +297,41 @@ export function viaStream(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - h.on('getDataSrv', 'node_id', () => { - return node_id; - }); - h.on('getDataSrv', 'viaStr', () => { - return viaStr; - }); - 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 viaStream'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + h.on('getDataSrv', 'node_id', () => {return node_id;}); + h.on('getDataSrv', 'viaStr', () => {return viaStr;}); + 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 viaStream'); + }) - if (config && config.ttl) { - r.withTTL(config.ttl); - } + if (config && config.ttl) { + r.withTTL(config.ttl) + } - request = r.build(); + 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 type ViaOptResult = { external_addresses: string[]; } +export function viaOpt(relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}): Promise; +export function viaOpt(peer: FluencePeer, relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}): Promise; export function viaOpt(...args: any) { let peer: FluencePeer; let relay: any; @@ -388,11 +353,10 @@ export function viaOpt(...args: any) { } let request: RequestFlow; - const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => { + const promise = new Promise((resolve, reject) => { const r = new RequestFlowBuilder() - .disableInjections() - .withRawScript( - ` + .disableInjections() + .withRawScript(` (xor (seq (seq @@ -455,39 +419,33 @@ export function viaOpt(...args: any) { (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3]) ) `, - ) - .configHandler((h) => { - h.on('getDataSrv', '-relay-', () => { - return peer.getStatus().relayPeerId; - }); - 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); - }); - h.onEvent('errorHandlingSrv', 'error', (args) => { - const [err] = args; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(() => { - reject('Request timed out for viaOpt'); - }); + ) + .configHandler((h) => { + h.on('getDataSrv', '-relay-', () => { + return peer.getStatus().relayPeerId; + }); + 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); + }); + h.onEvent('errorHandlingSrv', 'error', (args) => { + const [err] = args; + reject(err); + }); + }) + .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(); + request = r.build(); }); peer.internals.initiateFlow(request!); return promise;