Update the compiler and JS SDK version to support udpate public JS API (#13)

This commit is contained in:
Pavel
2021-09-10 19:48:26 +03:00
committed by GitHub
parent 5c9a59f14d
commit 37cc0c8d37
58 changed files with 9677 additions and 4586 deletions

5030
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -34,7 +34,7 @@
},
"dependencies": {
"@fluencelabs/aqua-dht-ts": "0.1.36",
"@fluencelabs/fluence": "0.11.0",
"@fluencelabs/fluence": "0.12.0",
"@fluencelabs/fluence-network-environment": "^1.0.10",
"deep-equal": "^2.0.5"
},

View File

@ -3,10 +3,10 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.3.0-222
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -25,18 +25,18 @@ export function put_value(
value: string,
config?: { ttl?: number },
): Promise<string>;
export function put_value(...args) {
export function put_value(...args: any) {
let peer: FluencePeer;
let initial_peer;
let value;
let config;
if (args[0] instanceof FluencePeer) {
let initial_peer: any;
let value: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
initial_peer = args[1];
value = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
initial_peer = args[0];
value = args[1];
config = args[2];
@ -107,7 +107,7 @@ export function put_value(...args) {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'initial_peer', () => {
return initial_peer;
@ -155,15 +155,15 @@ export function registerKeyPutValue(
service_id: string | null,
config?: { ttl?: number },
): Promise<string[]>;
export function registerKeyPutValue(...args) {
export function registerKeyPutValue(...args: any) {
let peer: FluencePeer;
let node_id;
let key;
let value;
let relay_id;
let service_id;
let config;
if (args[0] instanceof FluencePeer) {
let node_id: any;
let key: any;
let value: any;
let relay_id: any;
let service_id: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
key = args[2];
@ -172,7 +172,7 @@ export function registerKeyPutValue(...args) {
service_id = args[5];
config = args[6];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
key = args[1];
value = args[2];
@ -252,7 +252,7 @@ export function registerKeyPutValue(...args) {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
@ -299,18 +299,18 @@ export function getNeighbours(
topic: string,
config?: { ttl?: number },
): Promise<string[]>;
export function getNeighbours(...args) {
export function getNeighbours(...args: any) {
let peer: FluencePeer;
let node_id;
let topic;
let config;
if (args[0] instanceof FluencePeer) {
let node_id: any;
let topic: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
topic = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
topic = args[1];
config = args[2];
@ -361,7 +361,7 @@ export function getNeighbours(...args) {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
@ -423,18 +423,18 @@ export function findSubscribers(
weight: number;
}[]
>;
export function findSubscribers(...args) {
export function findSubscribers(...args: any) {
let peer: FluencePeer;
let node_id;
let topic;
let config;
if (args[0] instanceof FluencePeer) {
let node_id: any;
let topic: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
topic = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
topic = args[1];
config = args[2];
@ -530,7 +530,7 @@ export function findSubscribers(...args) {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
@ -578,15 +578,15 @@ export function initTopicAndSubscribe(
service_id: string | null,
config?: { ttl?: number },
): Promise<void>;
export function initTopicAndSubscribe(...args) {
export function initTopicAndSubscribe(...args: any) {
let peer: FluencePeer;
let node_id;
let topic;
let value;
let relay_id;
let service_id;
let config;
if (args[0] instanceof FluencePeer) {
let node_id: any;
let topic: any;
let value: any;
let relay_id: any;
let service_id: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
topic = args[2];
@ -595,7 +595,7 @@ export function initTopicAndSubscribe(...args) {
service_id = args[5];
config = args[6];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
topic = args[1];
value = args[2];
@ -672,7 +672,7 @@ export function initTopicAndSubscribe(...args) {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,38 +14,41 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface OpHaDef {
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(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) {
export function registerOpHa(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -59,57 +62,49 @@ export function registerOpHa(peer: FluencePeer, serviceId: string, service: OpHa
return;
}
if (req.fnName === 'array') {
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') {
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 function doSmth(arg: {value:string}, config?: {ttl?: number}) : Promise<string[]>;
export function doSmth(peer: FluencePeer, arg: {value:string}, config?: {ttl?: number}) : Promise<string[]>;
export function doSmth(...args: any) {
export function doSmth(arg: { value: string }, config?: { ttl?: number }): Promise<string[]>;
export function doSmth(peer: FluencePeer, arg: { value: string }, config?: { ttl?: number }): Promise<string[]>;
export function doSmth(...args: any) {
let peer: FluencePeer;
let arg: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
arg = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
arg = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -142,13 +137,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'arg', () => {
return arg;
});
h.on('getDataSrv', 'arg', () => {return arg;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -158,13 +155,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for doSmth');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,32 +14,41 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function passFunctionAsArg(node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string, config?: {ttl?: number}) : Promise<void>;
export function passFunctionAsArg(peer: FluencePeer, node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string, config?: {ttl?: number}) : Promise<void>;
export function passFunctionAsArg(...args: any) {
export function passFunctionAsArg(
node: string,
str: string,
c: (arg0: string, callParams: CallParams<'arg0'>) => string,
config?: { ttl?: number },
): Promise<void>;
export function passFunctionAsArg(
peer: FluencePeer,
node: string,
str: string,
c: (arg0: string, callParams: CallParams<'arg0'>) => string,
config?: { ttl?: number },
): Promise<void>;
export function passFunctionAsArg(...args: any) {
let peer: FluencePeer;
let node: any;
let str: any;
let c: any;
let str: any;
let c: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node = args[1];
str = args[2];
c = args[3];
config = args[4];
str = args[2];
c = args[3];
config = args[4];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node = args[0];
str = args[1];
c = args[2];
config = args[3];
str = args[1];
c = args[2];
config = args[3];
}
let request: RequestFlow;
@ -96,30 +105,30 @@ config = args[3];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node', () => {
return node;
});
h.on('getDataSrv', 'str', () => {
return str;
});
h.on('getDataSrv', 'node', () => {return node;});
h.on('getDataSrv', 'str', () => {return str;});
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]
arg0: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
resp.result = c(req.args[0], callParams)
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;
@ -129,13 +138,12 @@ h.on('getDataSrv', 'str', () => {return str;});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for passFunctionAsArg');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface CoServiceDef {
export interface CoServiceDef {
call: (callParams: CallParams<null>) => string;
}
}
export function registerCoService(service: CoServiceDef): void;
export function registerCoService(service: CoServiceDef): void;
export function registerCoService(serviceId: string, service: CoServiceDef): void;
export function registerCoService(peer: FluencePeer, service: CoServiceDef): void;
export function registerCoService(peer: FluencePeer, serviceId: string, service: CoServiceDef): void;
export function registerCoService(...args: any) {
export function registerCoService(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'coservice-id';
}
else {
serviceId = "coservice-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,45 +61,47 @@ export function registerCoService(peer: FluencePeer, serviceId: string, service:
return;
}
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<void>;
export function coFunc(peer: FluencePeer, node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise<void>;
export function coFunc(...args: any) {
export function coFunc(
node: string,
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function coFunc(
peer: FluencePeer,
node: string,
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function coFunc(...args: any) {
let peer: FluencePeer;
let node: any;
let c: any;
let c: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node = args[1];
c = args[2];
config = args[3];
c = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node = args[0];
c = args[1];
config = args[2];
c = args[1];
config = args[2];
}
let request: RequestFlow;
@ -144,29 +149,28 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node', () => {
return node;
});
h.on('getDataSrv', 'node', () => {return node;});
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]
arg0: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
c(req.args[0], callParams); resp.result = {}
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;
@ -176,13 +180,12 @@ config = args[2];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for coFunc');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,38 +14,41 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface TestSDef {
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(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) {
export function registerTestS(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'some-id';
}
else {
serviceId = "some-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -59,75 +62,87 @@ export function registerTestS(peer: FluencePeer, serviceId: string, service: Tes
return;
}
if (req.fnName === 'multiline') {
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') {
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<string[]>;
export function doStuff(peer: FluencePeer, a: string, b: string, c: boolean, d: boolean, e: string[], g: string[], str: string, config?: {ttl?: number}) : Promise<string[]>;
export function doStuff(...args: any) {
export function doStuff(
a: string,
b: string,
c: boolean,
d: boolean,
e: string[],
g: string[],
str: string,
config?: { ttl?: number },
): Promise<string[]>;
export function doStuff(
peer: FluencePeer,
a: string,
b: string,
c: boolean,
d: boolean,
e: string[],
g: string[],
str: string,
config?: { ttl?: number },
): Promise<string[]>;
export function doStuff(...args: any) {
let peer: FluencePeer;
let a: any;
let b: any;
let c: any;
let d: any;
let e: any;
let g: any;
let str: any;
let b: any;
let c: any;
let d: any;
let e: any;
let g: any;
let str: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
a = args[1];
b = args[2];
c = args[3];
d = args[4];
e = args[5];
g = args[6];
str = args[7];
config = args[8];
b = args[2];
c = args[3];
d = args[4];
e = args[5];
g = args[6];
str = args[7];
config = args[8];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
a = args[0];
b = args[1];
c = args[2];
d = args[3];
e = args[4];
g = args[5];
str = args[6];
config = args[7];
b = args[1];
c = args[2];
d = args[3];
e = args[4];
g = args[5];
str = args[6];
config = args[7];
}
let request: RequestFlow;
@ -252,19 +267,33 @@ config = args[7];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
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.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;
@ -274,13 +303,12 @@ h.on('getDataSrv', 'str', () => {return str;});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for doStuff');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface GetterDef {
export interface GetterDef {
createStr: (arg0: number, callParams: CallParams<'arg0'>) => string;
}
}
export function registerGetter(service: GetterDef): void;
export function registerGetter(service: GetterDef): void;
export function registerGetter(serviceId: string, service: GetterDef): void;
export function registerGetter(peer: FluencePeer, service: GetterDef): void;
export function registerGetter(peer: FluencePeer, serviceId: string, service: GetterDef): void;
export function registerGetter(...args: any) {
export function registerGetter(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test';
}
else {
serviceId = "test"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,53 @@ export function registerGetter(peer: FluencePeer, serviceId: string, service: Ge
return;
}
if (req.fnName === 'createStr') {
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 {
export interface OpODef {
identity: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
}
export function registerOpO(service: OpODef): void;
export function registerOpO(service: OpODef): void;
export function registerOpO(serviceId: string, service: OpODef): void;
export function registerOpO(peer: FluencePeer, service: OpODef): void;
export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODef): void;
export function registerOpO(...args: any) {
export function registerOpO(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,39 +121,34 @@ export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODe
return;
}
if (req.fnName === 'identity') {
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<string[]>;
export function callConstant(peer: FluencePeer, config?: {ttl?: number}) : Promise<string[]>;
export function callConstant(...args: any) {
export function callConstant(config?: { ttl?: number }): Promise<string[]>;
export function callConstant(peer: FluencePeer, config?: { ttl?: number }): Promise<string[]>;
export function callConstant(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -183,13 +179,13 @@ export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODe
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -199,13 +195,12 @@ export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODe
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for callConstant');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface NodeIdGetterDef {
get: (callParams: CallParams<null>) => {name:string;peerId:string};
}
export interface NodeIdGetterDef {
get: (callParams: CallParams<null>) => { name: string; peerId: string };
}
export function registerNodeIdGetter(service: NodeIdGetterDef): void;
export function registerNodeIdGetter(service: NodeIdGetterDef): void;
export function registerNodeIdGetter(serviceId: string, service: NodeIdGetterDef): void;
export function registerNodeIdGetter(peer: FluencePeer, service: NodeIdGetterDef): void;
export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, service: NodeIdGetterDef): void;
export function registerNodeIdGetter(...args: any) {
export function registerNodeIdGetter(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'somesrv';
}
else {
serviceId = "somesrv"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,32 @@ export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, servi
return;
}
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<string>;
export function getAliasedData(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function getAliasedData(...args: any) {
export function getAliasedData(config?: { ttl?: number }): Promise<string>;
export function getAliasedData(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function getAliasedData(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -118,13 +114,13 @@ export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, servi
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -134,13 +130,12 @@ export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, servi
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for getAliasedData');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface PeerDef {
export interface PeerDef {
is_connected: (arg0: string, callParams: CallParams<'arg0'>) => boolean;
}
}
export function registerPeer(service: PeerDef): void;
export function registerPeer(service: PeerDef): void;
export function registerPeer(serviceId: string, service: PeerDef): void;
export function registerPeer(peer: FluencePeer, service: PeerDef): void;
export function registerPeer(peer: FluencePeer, serviceId: string, service: PeerDef): void;
export function registerPeer(...args: any) {
export function registerPeer(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'peer';
}
else {
serviceId = "peer"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,53 @@ export function registerPeer(peer: FluencePeer, serviceId: string, service: Peer
return;
}
if (req.fnName === 'is_connected') {
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 {
export interface OpDef {
identity: (callParams: CallParams<null>) => void;
}
}
export function registerOp(service: OpDef): void;
export function registerOp(service: OpDef): void;
export function registerOp(serviceId: string, service: OpDef): void;
export function registerOp(peer: FluencePeer, service: OpDef): void;
export function registerOp(peer: FluencePeer, serviceId: string, service: OpDef): void;
export function registerOp(...args: any) {
export function registerOp(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,56 +121,53 @@ export function registerOp(peer: FluencePeer, serviceId: string, service: OpDef)
return;
}
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 {
export interface TestDef {
doSomething: (callParams: CallParams<null>) => boolean;
getUserList: (callParams: CallParams<null>) => {name:string;peer_id:string;relay_id:string}[];
}
getUserList: (callParams: CallParams<null>) => { name: string; peer_id: string; relay_id: string }[];
}
export function registerTest(service: TestDef): void;
export function registerTest(service: TestDef): void;
export function registerTest(serviceId: string, service: TestDef): void;
export function registerTest(peer: FluencePeer, service: TestDef): void;
export function registerTest(peer: FluencePeer, serviceId: string, service: TestDef): void;
export function registerTest(...args: any) {
export function registerTest(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test';
}
else {
serviceId = "test"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -183,57 +181,44 @@ export function registerTest(peer: FluencePeer, serviceId: string, service: Test
return;
}
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') {
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<void>;
export function betterMessage(peer: FluencePeer, relay: string, config?: {ttl?: number}) : Promise<void>;
export function betterMessage(...args: any) {
export function betterMessage(relay: string, config?: { ttl?: number }): Promise<void>;
export function betterMessage(peer: FluencePeer, relay: string, config?: { ttl?: number }): Promise<void>;
export function betterMessage(...args: any) {
let peer: FluencePeer;
let relay: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
relay = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
relay = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -280,12 +265,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'relay', () => {return relay;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'relay', () => {
return relay;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -295,13 +280,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for betterMessage');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface ReturnDef {
run: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void;
}
export interface ReturnDef {
run: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void;
}
export function registerReturn(service: ReturnDef): void;
export function registerReturn(service: ReturnDef): void;
export function registerReturn(serviceId: string, service: ReturnDef): void;
export function registerReturn(peer: FluencePeer, service: ReturnDef): void;
export function registerReturn(peer: FluencePeer, serviceId: string, service: ReturnDef): void;
export function registerReturn(...args: any) {
export function registerReturn(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'returnService';
}
else {
serviceId = "returnService"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,38 @@ export function registerReturn(peer: FluencePeer, serviceId: string, service: Re
return;
}
if (req.fnName === 'run') {
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<void>;
export function test(peer: FluencePeer, node: string, config?: {ttl?: number}) : Promise<void>;
export function test(...args: any) {
export function test(node: string, config?: { ttl?: number }): Promise<void>;
export function test(peer: FluencePeer, node: string, config?: { ttl?: number }): Promise<void>;
export function test(...args: any) {
let peer: FluencePeer;
let node: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -132,12 +131,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node', () => {return node;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'node', () => {
return node;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -147,13 +146,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for test');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,26 +14,24 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function iterateAndPrint(strings: string[], config?: {ttl?: number}) : Promise<void>;
export function iterateAndPrint(peer: FluencePeer, strings: string[], config?: {ttl?: number}) : Promise<void>;
export function iterateAndPrint(...args: any) {
export function iterateAndPrint(strings: string[], config?: { ttl?: number }): Promise<void>;
export function iterateAndPrint(peer: FluencePeer, strings: string[], config?: { ttl?: number }): Promise<void>;
export function iterateAndPrint(...args: any) {
let peer: FluencePeer;
let strings: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
strings = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
strings = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -62,12 +60,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'strings', () => {return strings;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'strings', () => {
return strings;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -77,9 +75,9 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for iterateAndPrint');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
@ -87,25 +85,32 @@ config = args[1];
return Promise.race([promise, Promise.resolve()]);
}
export function iterateAndPrintParallel(nodes: string[], c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise<void>;
export function iterateAndPrintParallel(peer: FluencePeer, nodes: string[], c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise<void>;
export function iterateAndPrintParallel(...args: any) {
export function iterateAndPrintParallel(
nodes: string[],
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function iterateAndPrintParallel(
peer: FluencePeer,
nodes: string[],
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function iterateAndPrintParallel(...args: any) {
let peer: FluencePeer;
let nodes: any;
let c: any;
let c: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
nodes = args[1];
c = args[2];
config = args[3];
c = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
nodes = args[0];
c = args[1];
config = args[2];
c = args[1];
config = args[2];
}
let request: RequestFlow;
@ -149,29 +154,28 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'nodes', () => {
return nodes;
});
h.on('getDataSrv', 'nodes', () => {return nodes;});
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]
arg0: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
c(req.args[0], callParams); resp.result = {}
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;
@ -181,13 +185,12 @@ config = args[2];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for iterateAndPrintParallel');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface Op2Def {
export interface Op2Def {
identity: (s: number, callParams: CallParams<'s'>) => void;
}
}
export function registerOp2(service: Op2Def): void;
export function registerOp2(service: Op2Def): void;
export function registerOp2(serviceId: string, service: Op2Def): void;
export function registerOp2(peer: FluencePeer, service: Op2Def): void;
export function registerOp2(peer: FluencePeer, serviceId: string, service: Op2Def): void;
export function registerOp2(...args: any) {
export function registerOp2(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,38 @@ export function registerOp2(peer: FluencePeer, serviceId: string, service: Op2De
return;
}
if (req.fnName === 'identity') {
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<number[]>;
export function getTwoResults(peer: FluencePeer, relay: string, config?: {ttl?: number}) : Promise<number[]>;
export function getTwoResults(...args: any) {
export function getTwoResults(relay: string, config?: { ttl?: number }): Promise<number[]>;
export function getTwoResults(peer: FluencePeer, relay: string, config?: { ttl?: number }): Promise<number[]>;
export function getTwoResults(...args: any) {
let peer: FluencePeer;
let relay: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
relay = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
relay = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -161,13 +160,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'relay', () => {
return relay;
});
h.on('getDataSrv', 'relay', () => {return relay;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -177,13 +178,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for getTwoResults');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface TestSrvDef {
export interface TestSrvDef {
str: (callParams: CallParams<null>) => string;
}
}
export function registerTestSrv(service: TestSrvDef): void;
export function registerTestSrv(service: TestSrvDef): void;
export function registerTestSrv(serviceId: string, service: TestSrvDef): void;
export function registerTestSrv(peer: FluencePeer, service: TestSrvDef): void;
export function registerTestSrv(peer: FluencePeer, serviceId: string, service: TestSrvDef): void;
export function registerTestSrv(...args: any) {
export function registerTestSrv(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test-service-id';
}
else {
serviceId = "test-service-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,32 @@ export function registerTestSrv(peer: FluencePeer, serviceId: string, service: T
return;
}
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<string>;
export function testFunc(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function testFunc(...args: any) {
export function testFunc(config?: { ttl?: number }): Promise<string>;
export function testFunc(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function testFunc(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -118,13 +114,13 @@ export function registerTestSrv(peer: FluencePeer, serviceId: string, service: T
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -134,13 +130,12 @@ export function registerTestSrv(peer: FluencePeer, serviceId: string, service: T
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for testFunc');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface StringExtraDef {
export interface StringExtraDef {
addNameToHello: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
}
export function registerStringExtra(service: StringExtraDef): void;
export function registerStringExtra(service: StringExtraDef): void;
export function registerStringExtra(serviceId: string, service: StringExtraDef): void;
export function registerStringExtra(peer: FluencePeer, service: StringExtraDef): void;
export function registerStringExtra(peer: FluencePeer, serviceId: string, service: StringExtraDef): void;
export function registerStringExtra(...args: any) {
export function registerStringExtra(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'service-id';
}
else {
serviceId = "service-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,37 @@ export function registerStringExtra(peer: FluencePeer, serviceId: string, servic
return;
}
if (req.fnName === 'addNameToHello') {
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<string>;
export function helloWorld(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise<string>;
export function helloWorld(...args: any) {
export function helloWorld(name: string, config?: { ttl?: number }): Promise<string>;
export function helloWorld(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise<string>;
export function helloWorld(...args: any) {
let peer: FluencePeer;
let name: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
name = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
name = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -123,13 +121,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'name', () => {
return name;
});
h.on('getDataSrv', 'name', () => {return name;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -139,13 +139,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for helloWorld');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,26 +14,24 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function ifElseCall(condition: boolean, config?: {ttl?: number}) : Promise<void>;
export function ifElseCall(peer: FluencePeer, condition: boolean, config?: {ttl?: number}) : Promise<void>;
export function ifElseCall(...args: any) {
export function ifElseCall(condition: boolean, config?: { ttl?: number }): Promise<void>;
export function ifElseCall(peer: FluencePeer, condition: boolean, config?: { ttl?: number }): Promise<void>;
export function ifElseCall(...args: any) {
let peer: FluencePeer;
let condition: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
condition = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
condition = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -65,12 +63,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'condition', () => {return condition;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'condition', () => {
return condition;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -80,9 +78,9 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for ifElseCall');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
@ -90,22 +88,20 @@ config = args[1];
return Promise.race([promise, Promise.resolve()]);
}
export function ifElseNumCall(condition: number, config?: {ttl?: number}) : Promise<void>;
export function ifElseNumCall(peer: FluencePeer, condition: number, config?: {ttl?: number}) : Promise<void>;
export function ifElseNumCall(...args: any) {
export function ifElseNumCall(condition: number, config?: { ttl?: number }): Promise<void>;
export function ifElseNumCall(peer: FluencePeer, condition: number, config?: { ttl?: number }): Promise<void>;
export function ifElseNumCall(...args: any) {
let peer: FluencePeer;
let condition: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
condition = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
condition = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -137,12 +133,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'condition', () => {return condition;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'condition', () => {
return condition;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -152,13 +148,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for ifElseNumCall');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface SuperFooDef {
export interface SuperFooDef {
small_foo: (callParams: CallParams<null>) => string;
}
}
export function registerSuperFoo(service: SuperFooDef): void;
export function registerSuperFoo(service: SuperFooDef): void;
export function registerSuperFoo(serviceId: string, service: SuperFooDef): void;
export function registerSuperFoo(peer: FluencePeer, service: SuperFooDef): void;
export function registerSuperFoo(peer: FluencePeer, serviceId: string, service: SuperFooDef): void;
export function registerSuperFoo(...args: any) {
export function registerSuperFoo(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'super_foo';
}
else {
serviceId = "super_foo"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,25 +61,17 @@ export function registerSuperFoo(peer: FluencePeer, serviceId: string, service:
return;
}
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

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface MyExportSrvDef {
export interface MyExportSrvDef {
another_str: (callParams: CallParams<null>) => string;
}
}
export function registerMyExportSrv(service: MyExportSrvDef): void;
export function registerMyExportSrv(service: MyExportSrvDef): void;
export function registerMyExportSrv(serviceId: string, service: MyExportSrvDef): void;
export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): void;
export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void;
export function registerMyExportSrv(...args: any) {
export function registerMyExportSrv(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'my_export_srv';
}
else {
serviceId = "my_export_srv"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,32 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return;
}
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<string>;
export function string_from_lib(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function string_from_lib(...args: any) {
export function string_from_lib(config?: { ttl?: number }): Promise<string>;
export function string_from_lib(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function string_from_lib(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -115,13 +111,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -131,13 +127,12 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for string_from_lib');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,23 +14,22 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface OneMoreDef {
export interface OneMoreDef {
more_call: (callParams: CallParams<null>) => void;
}
}
export function registerOneMore(serviceId: string, service: OneMoreDef): void;
export function registerOneMore(serviceId: string, service: OneMoreDef): void;
export function registerOneMore(peer: FluencePeer, serviceId: string, service: OneMoreDef): void;
export function registerOneMore(...args: any) {
export function registerOneMore(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
@ -39,7 +38,12 @@ export function registerOneMore(peer: FluencePeer, serviceId: string, service: O
serviceId = args[1];
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -53,25 +57,18 @@ export function registerOneMore(peer: FluencePeer, serviceId: string, service: O
return;
}
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

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,23 +14,21 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function wrap(config?: {ttl?: number}) : Promise<string>;
export function wrap(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function wrap(...args: any) {
export function wrap(config?: { ttl?: number }): Promise<string>;
export function wrap(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function wrap(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -61,13 +59,13 @@ import {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -77,9 +75,9 @@ import {
.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();
});
@ -87,19 +85,17 @@ import {
return promise;
}
export function barfoo(config?: {ttl?: number}) : Promise<string[]>;
export function barfoo(peer: FluencePeer, config?: {ttl?: number}) : Promise<string[]>;
export function barfoo(...args: any) {
export function barfoo(config?: { ttl?: number }): Promise<string[]>;
export function barfoo(peer: FluencePeer, config?: { ttl?: number }): Promise<string[]>;
export function barfoo(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -130,13 +126,13 @@ import {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -146,13 +142,12 @@ import {
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for barfoo');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -0,0 +1,80 @@
/**
*
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
RequestFlowBuilder,
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function foo_wrapper(config?: { ttl?: number }): Promise<string>;
export function foo_wrapper(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function foo_wrapper(...args: any) {
let peer: FluencePeer;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = Fluence.getPeer();
config = args[0];
}
let request: RequestFlow;
const promise = new Promise<string>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(xor
(call %init_peer_id% ("callbackSrv" "response") ["I am MyFooBar foo"])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.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');
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,47 +14,62 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface NoopDef {
array: (a: string, b: string | null, c: string | null, d: string | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[];
array_length: (array: string[], callParams: CallParams<'array'>) => number;
bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[];
bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string;
concat: (a: string[], b: string[] | null, c: string[] | null, d: string[] | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[];
concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string;
identity: (s: string | null, callParams: CallParams<'s'>) => string | null;
noop: (callParams: CallParams<null>) => void;
sha256_string: (s: string, callParams: CallParams<'s'>) => string;
string_from_b58: (b: string, callParams: CallParams<'b'>) => string;
string_to_b58: (s: string, callParams: CallParams<'s'>) => string;
}
export interface NoopDef {
array: (
a: string,
b: string | null,
c: string | null,
d: string | null,
callParams: CallParams<'a' | 'b' | 'c' | 'd'>,
) => string[];
array_length: (array: string[], callParams: CallParams<'array'>) => number;
bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[];
bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string;
concat: (
a: string[],
b: string[] | null,
c: string[] | null,
d: string[] | null,
callParams: CallParams<'a' | 'b' | 'c' | 'd'>,
) => string[];
concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string;
identity: (s: string | null, callParams: CallParams<'s'>) => string | null;
noop: (callParams: CallParams<null>) => void;
sha256_string: (s: string, callParams: CallParams<'s'>) => string;
string_from_b58: (b: string, callParams: CallParams<'b'>) => string;
string_to_b58: (s: string, callParams: CallParams<'s'>) => string;
}
export function registerNoop(service: NoopDef): void;
export function registerNoop(service: NoopDef): void;
export function registerNoop(serviceId: string, service: NoopDef): void;
export function registerNoop(peer: FluencePeer, service: NoopDef): void;
export function registerNoop(peer: FluencePeer, serviceId: string, service: NoopDef): void;
export function registerNoop(...args: any) {
export function registerNoop(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -68,208 +83,183 @@ export function registerNoop(peer: FluencePeer, serviceId: string, service: Noop
return;
}
if (req.fnName === 'array') {
const callParams = {
...req.particleContext,
tetraplets: {
a: req.tetraplets[0],b: req.tetraplets[1],c: req.tetraplets[2],d: req.tetraplets[3]
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') {
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') {
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') {
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') {
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') {
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') {
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]
resp.result = respResult === null ? [] : [respResult];
}
if (req.fnName === 'noop') {
const callParams = {
...req.particleContext,
tetraplets: {
},
tetraplets: {},
};
resp.retCode = ResultCodes.success;
service.noop(callParams); resp.result = {}
service.noop(callParams);
resp.result = {};
}
if (req.fnName === 'sha256_string') {
const callParams = {
...req.particleContext,
tetraplets: {
s: req.tetraplets[0]
s: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
resp.result = service.sha256_string(req.args[0], callParams)
resp.result = service.sha256_string(req.args[0], callParams);
}
if (req.fnName === 'string_from_b58') {
const callParams = {
...req.particleContext,
tetraplets: {
b: req.tetraplets[0]
b: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
resp.result = service.string_from_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]
s: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
resp.result = service.string_to_b58(req.args[0], callParams)
resp.result = service.string_to_b58(req.args[0], callParams);
}
next();
});
}
}
export interface MyExportSrvDef {
export interface MyExportSrvDef {
another_str: (callParams: CallParams<null>) => string;
}
}
export function registerMyExportSrv(service: MyExportSrvDef): void;
export function registerMyExportSrv(service: MyExportSrvDef): void;
export function registerMyExportSrv(serviceId: string, service: MyExportSrvDef): void;
export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): void;
export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void;
export function registerMyExportSrv(...args: any) {
export function registerMyExportSrv(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'my_export_srv';
}
else {
serviceId = "my_export_srv"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -283,39 +273,32 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return;
}
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<string>;
export function some_str(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function some_str(...args: any) {
export function some_str(config?: { ttl?: number }): Promise<string>;
export function some_str(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function some_str(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -340,13 +323,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -356,9 +339,9 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.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();
});
@ -366,19 +349,17 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return promise;
}
export function some_string(config?: {ttl?: number}) : Promise<string>;
export function some_string(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function some_string(...args: any) {
export function some_string(config?: { ttl?: number }): Promise<string>;
export function some_string(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function some_string(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -403,13 +384,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -419,9 +400,9 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.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();
});
@ -429,19 +410,17 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return promise;
}
export function decl_foo(config?: {ttl?: number}) : Promise<string>;
export function decl_foo(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function decl_foo(...args: any) {
export function decl_foo(config?: { ttl?: number }): Promise<string>;
export function decl_foo(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function decl_foo(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -469,13 +448,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -485,9 +464,9 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.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();
});
@ -495,19 +474,17 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return promise;
}
export function decl_bar(config?: {ttl?: number}) : Promise<string>;
export function decl_bar(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function decl_bar(...args: any) {
export function decl_bar(config?: { ttl?: number }): Promise<string>;
export function decl_bar(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function decl_bar(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -532,13 +509,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -548,9 +525,9 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.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();
});
@ -558,19 +535,17 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
return promise;
}
export function some_random_func(config?: {ttl?: number}) : Promise<string>;
export function some_random_func(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function some_random_func(...args: any) {
export function some_random_func(config?: { ttl?: number }): Promise<string>;
export function some_random_func(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function some_random_func(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -595,13 +570,13 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -611,13 +586,12 @@ export function registerMyExportSrv(peer: FluencePeer, serviceId: string, servic
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for some_random_func');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface StringServiceDef {
export interface StringServiceDef {
concat: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string;
}
}
export function registerStringService(service: StringServiceDef): void;
export function registerStringService(service: StringServiceDef): void;
export function registerStringService(serviceId: string, service: StringServiceDef): void;
export function registerStringService(peer: FluencePeer, service: StringServiceDef): void;
export function registerStringService(peer: FluencePeer, serviceId: string, service: StringServiceDef): void;
export function registerStringService(...args: any) {
export function registerStringService(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'string_service';
}
else {
serviceId = "string_service"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,35 @@ export function registerStringService(peer: FluencePeer, serviceId: string, serv
return;
}
if (req.fnName === 'concat') {
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<string>;
export function concat_foobars(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function concat_foobars(...args: any) {
export function concat_foobars(config?: { ttl?: number }): Promise<string>;
export function concat_foobars(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function concat_foobars(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -136,13 +135,13 @@ export function registerStringService(peer: FluencePeer, serviceId: string, serv
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -152,13 +151,12 @@ export function registerStringService(peer: FluencePeer, serviceId: string, serv
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for concat_foobars');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface SubServiceDef {
sub: (s: string, callParams: CallParams<'s'>) => {one:string;two:number};
}
export interface SubServiceDef {
sub: (s: string, callParams: CallParams<'s'>) => { one: string; two: number };
}
export function registerSubService(service: SubServiceDef): void;
export function registerSubService(service: SubServiceDef): void;
export function registerSubService(serviceId: string, service: SubServiceDef): void;
export function registerSubService(peer: FluencePeer, service: SubServiceDef): void;
export function registerSubService(peer: FluencePeer, serviceId: string, service: SubServiceDef): void;
export function registerSubService(...args: any) {
export function registerSubService(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'sub_service';
}
else {
serviceId = "sub_service"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,44 +61,39 @@ export function registerSubService(peer: FluencePeer, serviceId: string, service
return;
}
if (req.fnName === 'sub') {
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 function subImport(...args: any) {
export function subImport(config?: { ttl?: number }): Promise<{ one: string; two: number }>;
export function subImport(peer: FluencePeer, config?: { ttl?: number }): Promise<{ one: string; two: number }>;
export function subImport(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
let request: RequestFlow;
const promise = new Promise<{one:string;two:number}>((resolve, reject) => {
const promise = new Promise<{ one: string; two: number }>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -118,13 +116,13 @@ export function registerSubService(peer: FluencePeer, serviceId: string, service
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -134,13 +132,12 @@ export function registerSubService(peer: FluencePeer, serviceId: string, service
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for subImport');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface GetStrDef {
export interface GetStrDef {
retStr: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
}
export function registerGetStr(service: GetStrDef): void;
export function registerGetStr(service: GetStrDef): void;
export function registerGetStr(serviceId: string, service: GetStrDef): void;
export function registerGetStr(peer: FluencePeer, service: GetStrDef): void;
export function registerGetStr(peer: FluencePeer, serviceId: string, service: GetStrDef): void;
export function registerGetStr(...args: any) {
export function registerGetStr(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'multiret-test';
}
else {
serviceId = "multiret-test"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,53 @@ export function registerGetStr(peer: FluencePeer, serviceId: string, service: Ge
return;
}
if (req.fnName === 'retStr') {
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 {
export interface GetNumDef {
retNum: (callParams: CallParams<null>) => number;
}
}
export function registerGetNum(service: GetNumDef): void;
export function registerGetNum(service: GetNumDef): void;
export function registerGetNum(serviceId: string, service: GetNumDef): void;
export function registerGetNum(peer: FluencePeer, service: GetNumDef): void;
export function registerGetNum(peer: FluencePeer, serviceId: string, service: GetNumDef): void;
export function registerGetNum(...args: any) {
export function registerGetNum(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'multiret-num';
}
else {
serviceId = "multiret-num"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,39 +121,32 @@ export function registerGetNum(peer: FluencePeer, serviceId: string, service: Ge
return;
}
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 function tupleFunc(...args: any) {
export function tupleFunc(config?: { ttl?: number }): Promise<[string, number]>;
export function tupleFunc(peer: FluencePeer, config?: { ttl?: number }): Promise<[string, number]>;
export function tupleFunc(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -183,14 +177,14 @@ export function registerGetNum(peer: FluencePeer, serviceId: string, service: Ge
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let opt: any = args;
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -200,9 +194,9 @@ export function registerGetNum(peer: FluencePeer, serviceId: string, service: Ge
.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();
});
@ -210,25 +204,32 @@ export function registerGetNum(peer: FluencePeer, serviceId: string, service: Ge
return promise;
}
export function multiReturnFunc(somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}) : Promise<[string[], number, string, number[], string | null, number]>;
export function multiReturnFunc(peer: FluencePeer, somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}) : Promise<[string[], number, string, number[], string | null, number]>;
export function multiReturnFunc(...args: any) {
export function multiReturnFunc(
somethingToReturn: number[],
smthOption: string | null,
config?: { ttl?: number },
): Promise<[string[], number, string, number[], string | null, number]>;
export function multiReturnFunc(
peer: FluencePeer,
somethingToReturn: number[],
smthOption: string | null,
config?: { ttl?: number },
): Promise<[string[], number, string, number[], string | null, number]>;
export function multiReturnFunc(...args: any) {
let peer: FluencePeer;
let somethingToReturn: any;
let smthOption: any;
let smthOption: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
somethingToReturn = args[1];
smthOption = args[2];
config = args[3];
smthOption = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
somethingToReturn = args[0];
smthOption = args[1];
config = args[2];
smthOption = args[1];
config = args[2];
}
let request: RequestFlow;
@ -273,19 +274,26 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'somethingToReturn', () => {
return somethingToReturn;
});
h.on('getDataSrv', 'smthOption', () => {
return smthOption === null ? [] : [smthOption];
});
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;
@ -295,13 +303,12 @@ h.on('getDataSrv', 'smthOption', () => {return smthOption === null ? [] : [smthO
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for multiReturnFunc');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface OpHDef {
export interface OpHDef {
identity: (s: string, callParams: CallParams<'s'>) => string;
}
}
export function registerOpH(service: OpHDef): void;
export function registerOpH(service: OpHDef): void;
export function registerOpH(serviceId: string, service: OpHDef): void;
export function registerOpH(peer: FluencePeer, service: OpHDef): void;
export function registerOpH(peer: FluencePeer, serviceId: string, service: OpHDef): void;
export function registerOpH(...args: any) {
export function registerOpH(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'opa';
}
else {
serviceId = "opa"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,37 @@ export function registerOpH(peer: FluencePeer, serviceId: string, service: OpHDe
return;
}
if (req.fnName === 'identity') {
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<string>;
export function a(peer: FluencePeer, b: string, config?: {ttl?: number}) : Promise<string>;
export function a(...args: any) {
export function a(b: string, config?: { ttl?: number }): Promise<string>;
export function a(peer: FluencePeer, b: string, config?: { ttl?: number }): Promise<string>;
export function a(...args: any) {
let peer: FluencePeer;
let b: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
b = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
b = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -123,13 +121,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'b', () => {
return b;
});
h.on('getDataSrv', 'b', () => {return b;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -139,9 +139,9 @@ config = args[1];
.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();
});
@ -149,22 +149,20 @@ config = args[1];
return promise;
}
export function d(e: string, config?: {ttl?: number}) : Promise<string>;
export function d(peer: FluencePeer, e: string, config?: {ttl?: number}) : Promise<string>;
export function d(...args: any) {
export function d(e: string, config?: { ttl?: number }): Promise<string>;
export function d(peer: FluencePeer, e: string, config?: { ttl?: number }): Promise<string>;
export function d(...args: any) {
let peer: FluencePeer;
let e: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
e = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
e = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -194,13 +192,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'e', () => {
return e;
});
h.on('getDataSrv', 'e', () => {return e;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -210,13 +210,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for d');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,44 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface ServiceWithDefaultIdDef {
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(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
peer = args[0];
} else {
peer = FluencePeer.default;
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
}
else {
serviceId = "defaultId"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
export function registerServiceWithDefaultId(service: ServiceWithDefaultIdDef): void;
export function registerServiceWithDefaultId(serviceId: string, service: ServiceWithDefaultIdDef): void;
export function registerServiceWithDefaultId(peer: FluencePeer, service: ServiceWithDefaultIdDef): void;
export function registerServiceWithDefaultId(
peer: FluencePeer,
serviceId: string,
service: ServiceWithDefaultIdDef,
): void;
export function registerServiceWithDefaultId(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'defaultId';
}
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,41 +65,40 @@ export function registerServiceWithDefaultId(peer: FluencePeer, serviceId: strin
return;
}
if (req.fnName === 'hello') {
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 {
export interface ServiceWithOUTDefaultIdDef {
hello: (s: string, callParams: CallParams<'s'>) => void;
}
}
export function registerServiceWithOUTDefaultId(serviceId: string, service: ServiceWithOUTDefaultIdDef): void;
export function registerServiceWithOUTDefaultId(peer: FluencePeer, serviceId: string, service: ServiceWithOUTDefaultIdDef): void;
export function registerServiceWithOUTDefaultId(...args: any) {
export function registerServiceWithOUTDefaultId(serviceId: string, service: ServiceWithOUTDefaultIdDef): void;
export function registerServiceWithOUTDefaultId(
peer: FluencePeer,
serviceId: string,
service: ServiceWithOUTDefaultIdDef,
): void;
export function registerServiceWithOUTDefaultId(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
@ -101,7 +107,12 @@ export function registerServiceWithOUTDefaultId(peer: FluencePeer, serviceId: st
serviceId = args[1];
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -115,45 +126,40 @@ export function registerServiceWithOUTDefaultId(peer: FluencePeer, serviceId: st
return;
}
if (req.fnName === 'hello') {
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 {
export interface MoreMembersDef {
member1: (callParams: CallParams<null>) => 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(serviceId: string, service: MoreMembersDef): void;
export function registerMoreMembers(peer: FluencePeer, serviceId: string, service: MoreMembersDef): void;
export function registerMoreMembers(...args: any) {
export function registerMoreMembers(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
@ -162,7 +168,12 @@ export function registerMoreMembers(peer: FluencePeer, serviceId: string, servic
serviceId = args[1];
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -176,102 +187,94 @@ export function registerMoreMembers(peer: FluencePeer, serviceId: string, servic
return;
}
if (req.fnName === 'member1') {
const callParams = {
...req.particleContext,
tetraplets: {
},
tetraplets: {},
};
resp.retCode = ResultCodes.success;
service.member1(callParams); resp.result = {}
service.member1(callParams);
resp.result = {};
}
if (req.fnName === 'member2') {
const callParams = {
...req.particleContext,
tetraplets: {
s1: req.tetraplets[0]
s1: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
service.member2(req.args[0], callParams); resp.result = {}
service.member2(req.args[0], callParams);
resp.result = {};
}
if (req.fnName === 'member3') {
const callParams = {
...req.particleContext,
tetraplets: {
s1: req.tetraplets[0],s2: req.tetraplets[1]
s1: req.tetraplets[0],
s2: req.tetraplets[1],
},
};
resp.retCode = ResultCodes.success;
service.member3(req.args[0], req.args[1], callParams); resp.result = {}
service.member3(req.args[0], req.args[1], callParams);
resp.result = {};
}
if (req.fnName === 'member4') {
const callParams = {
...req.particleContext,
tetraplets: {
s1: req.tetraplets[0],s2: req.tetraplets[1],i: req.tetraplets[2]
s1: req.tetraplets[0],
s2: req.tetraplets[1],
i: req.tetraplets[2],
},
};
resp.retCode = ResultCodes.success;
resp.result = service.member4(req.args[0], req.args[1], req.args[2], callParams)
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]
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.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<void>;
export function f1(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<void>;
export function f1(...args: any) {
export function f1(
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function f1(
peer: FluencePeer,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function f1(...args: any) {
let peer: FluencePeer;
let callback: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
callback = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
callback = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -295,28 +298,26 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.use((req, resp, next) => {
if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
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;
callback(req.args[0], req.args[1], callParams); resp.result = {}
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;
@ -326,9 +327,9 @@ config = args[1];
.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();
});
@ -336,25 +337,32 @@ config = args[1];
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<void>;
export function f2(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<void>;
export function f2(...args: any) {
export function f2(
num: number,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function f2(
peer: FluencePeer,
num: number,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function f2(...args: any) {
let peer: FluencePeer;
let num: any;
let callback: any;
let callback: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
num = args[1];
callback = args[2];
config = args[3];
callback = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
num = args[0];
callback = args[1];
config = args[2];
callback = args[1];
config = args[2];
}
let request: RequestFlow;
@ -381,29 +389,29 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'num', () => {
return num;
});
h.on('getDataSrv', 'num', () => {return num;});
h.use((req, resp, next) => {
if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
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;
callback(req.args[0], req.args[1], callParams); resp.result = {}
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;
@ -413,9 +421,9 @@ config = args[2];
.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();
});
@ -423,25 +431,32 @@ config = args[2];
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<string>;
export function f3(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<string>;
export function f3(...args: any) {
export function f3(
num: number,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<string>;
export function f3(
peer: FluencePeer,
num: number,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<string>;
export function f3(...args: any) {
let peer: FluencePeer;
let num: any;
let callback: any;
let callback: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
num = args[1];
callback = args[2];
config = args[3];
callback = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
num = args[0];
callback = args[1];
config = args[2];
callback = args[1];
config = args[2];
}
let request: RequestFlow;
@ -474,22 +489,24 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'num', () => {
return num;
});
h.on('getDataSrv', 'num', () => {return num;});
h.use((req, resp, next) => {
if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
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;
callback(req.args[0], req.args[1], callParams); resp.result = {}
callback(req.args[0], req.args[1], callParams);
resp.result = {};
}
next();
});
@ -497,7 +514,7 @@ config = args[2];
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -507,9 +524,9 @@ config = args[2];
.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();
});
@ -517,22 +534,27 @@ config = args[2];
return promise;
}
export function callBackZeroArgs(callback: (callParams: CallParams<null>) => void, config?: {ttl?: number}) : Promise<void>;
export function callBackZeroArgs(peer: FluencePeer, callback: (callParams: CallParams<null>) => void, config?: {ttl?: number}) : Promise<void>;
export function callBackZeroArgs(...args: any) {
export function callBackZeroArgs(
callback: (callParams: CallParams<null>) => void,
config?: { ttl?: number },
): Promise<void>;
export function callBackZeroArgs(
peer: FluencePeer,
callback: (callParams: CallParams<null>) => void,
config?: { ttl?: number },
): Promise<void>;
export function callBackZeroArgs(...args: any) {
let peer: FluencePeer;
let callback: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
callback = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
callback = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -556,28 +578,23 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.use((req, resp, next) => {
if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
const callParams = {
...req.particleContext,
tetraplets: {
},
tetraplets: {},
};
resp.retCode = ResultCodes.success;
callback(callParams); resp.result = {}
callback(callParams);
resp.result = {};
}
next();
});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -587,13 +604,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for callBackZeroArgs');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,38 +14,41 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface HelloWorldDef {
export interface HelloWorldDef {
getNumber: (callParams: CallParams<null>) => number;
sayHello: (s: string, callParams: CallParams<'s'>) => void;
}
sayHello: (s: string, callParams: CallParams<'s'>) => void;
}
export function registerHelloWorld(service: HelloWorldDef): void;
export function registerHelloWorld(service: HelloWorldDef): void;
export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): void;
export function registerHelloWorld(peer: FluencePeer, serviceId: string, service: HelloWorldDef): void;
export function registerHelloWorld(...args: any) {
export function registerHelloWorld(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'default';
}
else {
serviceId = "default"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -59,57 +62,54 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
return;
}
if (req.fnName === 'getNumber') {
const callParams = {
...req.particleContext,
tetraplets: {
},
tetraplets: {},
};
resp.retCode = ResultCodes.success;
resp.result = service.getNumber(callParams)
resp.result = service.getNumber(callParams);
}
if (req.fnName === 'sayHello') {
const callParams = {
...req.particleContext,
tetraplets: {
s: req.tetraplets[0]
s: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
service.sayHello(req.args[0], callParams); resp.result = {}
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<void>;
export function callMeBack(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void, config?: {ttl?: number}) : Promise<void>;
export function callMeBack(...args: any) {
export function callMeBack(
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function callMeBack(
peer: FluencePeer,
callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function callMeBack(...args: any) {
let peer: FluencePeer;
let callback: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
callback = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
callback = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -133,28 +133,26 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.use((req, resp, next) => {
if(req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
if (req.serviceId === 'callbackSrv' && req.fnName === 'callback') {
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;
callback(req.args[0], req.args[1], callParams); resp.result = {}
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;
@ -164,13 +162,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for callMeBack');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,26 +14,28 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function getPeerExternalAddresses(otherNodePeerId: string, config?: {ttl?: number}) : Promise<string[]>;
export function getPeerExternalAddresses(peer: FluencePeer, otherNodePeerId: string, config?: {ttl?: number}) : Promise<string[]>;
export function getPeerExternalAddresses(...args: any) {
export function getPeerExternalAddresses(otherNodePeerId: string, config?: { ttl?: number }): Promise<string[]>;
export function getPeerExternalAddresses(
peer: FluencePeer,
otherNodePeerId: string,
config?: { ttl?: number },
): Promise<string[]>;
export function getPeerExternalAddresses(...args: any) {
let peer: FluencePeer;
let otherNodePeerId: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
otherNodePeerId = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
otherNodePeerId = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -75,13 +77,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'otherNodePeerId', () => {
return otherNodePeerId;
});
h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -91,9 +95,9 @@ config = args[1];
.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();
});
@ -101,25 +105,28 @@ config = args[1];
return promise;
}
export function getDistantAddresses(target: string, viaNode: string, config?: {ttl?: number}) : Promise<string[]>;
export function getDistantAddresses(peer: FluencePeer, target: string, viaNode: string, config?: {ttl?: number}) : Promise<string[]>;
export function getDistantAddresses(...args: any) {
export function getDistantAddresses(target: string, viaNode: string, config?: { ttl?: number }): Promise<string[]>;
export function getDistantAddresses(
peer: FluencePeer,
target: string,
viaNode: string,
config?: { ttl?: number },
): Promise<string[]>;
export function getDistantAddresses(...args: any) {
let peer: FluencePeer;
let target: any;
let viaNode: any;
let viaNode: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
target = args[1];
viaNode = args[2];
config = args[3];
viaNode = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
target = args[0];
viaNode = args[1];
config = args[2];
viaNode = args[1];
config = args[2];
}
let request: RequestFlow;
@ -176,14 +183,18 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'target', () => {
return target;
});
h.on('getDataSrv', 'viaNode', () => {
return viaNode;
});
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;
@ -193,13 +204,12 @@ h.on('getDataSrv', 'viaNode', () => {return viaNode;});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for getDistantAddresses');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,39 +14,42 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface SomeSDef {
export interface SomeSDef {
getStr: (arg0: string | null, callParams: CallParams<'arg0'>) => string | null;
getStr1: (callParams: CallParams<null>) => string | null;
getStr2: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
getStr1: (callParams: CallParams<null>) => string | null;
getStr2: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
export function registerSomeS(service: SomeSDef): void;
export function registerSomeS(service: SomeSDef): void;
export function registerSomeS(serviceId: string, service: SomeSDef): void;
export function registerSomeS(peer: FluencePeer, service: SomeSDef): void;
export function registerSomeS(peer: FluencePeer, serviceId: string, service: SomeSDef): void;
export function registerSomeS(...args: any) {
export function registerSomeS(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test2';
}
else {
serviceId = "test2"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -60,78 +63,61 @@ export function registerSomeS(peer: FluencePeer, serviceId: string, service: Som
return;
}
if (req.fnName === 'getStr') {
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]
resp.result = respResult === null ? [] : [respResult];
}
if (req.fnName === 'getStr1') {
const callParams = {
...req.particleContext,
tetraplets: {
},
tetraplets: {},
};
resp.retCode = ResultCodes.success;
var respResult = service.getStr1(callParams);
resp.result = respResult === null ? [] : [respResult]
resp.result = respResult === null ? [] : [respResult];
}
if (req.fnName === 'getStr2') {
const callParams = {
...req.particleContext,
tetraplets: {
arg0: req.tetraplets[0]
arg0: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
resp.result = service.getStr2(req.args[0], callParams)
resp.result = service.getStr2(req.args[0], callParams);
}
next();
});
}
}
// Functions
export function useOptional(opt: string | null, config?: {ttl?: number}) : Promise<string>;
export function useOptional(peer: FluencePeer, opt: string | null, config?: {ttl?: number}) : Promise<string>;
export function useOptional(...args: any) {
export function useOptional(opt: string | null, config?: { ttl?: number }): Promise<string>;
export function useOptional(peer: FluencePeer, opt: string | null, config?: { ttl?: number }): Promise<string>;
export function useOptional(...args: any) {
let peer: FluencePeer;
let opt: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
opt = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
opt = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -169,13 +155,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'opt', () => {
return opt === null ? [] : [opt];
});
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;
@ -185,9 +173,9 @@ config = args[1];
.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();
});
@ -195,19 +183,17 @@ config = args[1];
return promise;
}
export function returnOptional(config?: {ttl?: number}) : Promise<string | null>;
export function returnOptional(peer: FluencePeer, config?: {ttl?: number}) : Promise<string | null>;
export function returnOptional(...args: any) {
export function returnOptional(config?: { ttl?: number }): Promise<string | null>;
export function returnOptional(peer: FluencePeer, config?: { ttl?: number }): Promise<string | null>;
export function returnOptional(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -235,17 +221,19 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -255,9 +243,9 @@ config = args[1];
.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();
});
@ -265,19 +253,17 @@ config = args[1];
return promise;
}
export function returnNone(config?: {ttl?: number}) : Promise<string | null>;
export function returnNone(peer: FluencePeer, config?: {ttl?: number}) : Promise<string | null>;
export function returnNone(...args: any) {
export function returnNone(config?: { ttl?: number }): Promise<string | null>;
export function returnNone(peer: FluencePeer, config?: { ttl?: number }): Promise<string | null>;
export function returnNone(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -305,17 +291,19 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -325,13 +313,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for returnNone');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface OptionStringDef {
export interface OptionStringDef {
checkOption: (str: string | null, callParams: CallParams<'str'>) => string;
}
}
export function registerOptionString(service: OptionStringDef): void;
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) {
export function registerOptionString(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'opt_str';
}
else {
serviceId = "opt_str"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,34 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
return;
}
if (req.fnName === 'checkOption') {
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<string | null>;
export function emptyString(peer: FluencePeer, config?: {ttl?: number}) : Promise<string | null>;
export function emptyString(...args: any) {
export function emptyString(config?: { ttl?: number }): Promise<string | null>;
export function emptyString(peer: FluencePeer, config?: { ttl?: number }): Promise<string | null>;
export function emptyString(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -115,17 +113,19 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -135,9 +135,9 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
.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();
});
@ -145,19 +145,17 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
return promise;
}
export function checkEmpty(config?: {ttl?: number}) : Promise<string>;
export function checkEmpty(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function checkEmpty(...args: any) {
export function checkEmpty(config?: { ttl?: number }): Promise<string>;
export function checkEmpty(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function checkEmpty(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -185,13 +183,13 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -201,9 +199,9 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
.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();
});
@ -211,22 +209,20 @@ export function registerOptionString(peer: FluencePeer, serviceId: string, servi
return promise;
}
export function stringAsOption(str: string, config?: {ttl?: number}) : Promise<string | null>;
export function stringAsOption(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise<string | null>;
export function stringAsOption(...args: any) {
export function stringAsOption(str: string, config?: { ttl?: number }): Promise<string | null>;
export function stringAsOption(peer: FluencePeer, str: string, config?: { ttl?: number }): Promise<string | null>;
export function stringAsOption(...args: any) {
let peer: FluencePeer;
let str: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
str = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
str = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -256,17 +252,21 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'str', () => {
return str;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -276,9 +276,9 @@ config = args[1];
.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();
});
@ -286,22 +286,20 @@ config = args[1];
return promise;
}
export function checkNoneEmpty(str: string, config?: {ttl?: number}) : Promise<string>;
export function checkNoneEmpty(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise<string>;
export function checkNoneEmpty(...args: any) {
export function checkNoneEmpty(str: string, config?: { ttl?: number }): Promise<string>;
export function checkNoneEmpty(peer: FluencePeer, str: string, config?: { ttl?: number }): Promise<string>;
export function checkNoneEmpty(...args: any) {
let peer: FluencePeer;
let str: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
str = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
str = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -334,13 +332,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'str', () => {
return str;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -350,13 +350,12 @@ config = args[1];
.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();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface ParServiceDef {
export interface ParServiceDef {
call: (callParams: CallParams<null>) => string;
}
}
export function registerParService(service: ParServiceDef): void;
export function registerParService(service: ParServiceDef): void;
export function registerParService(serviceId: string, service: ParServiceDef): void;
export function registerParService(peer: FluencePeer, service: ParServiceDef): void;
export function registerParService(peer: FluencePeer, serviceId: string, service: ParServiceDef): void;
export function registerParService(...args: any) {
export function registerParService(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'parservice-id';
}
else {
serviceId = "parservice-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,45 +61,47 @@ export function registerParService(peer: FluencePeer, serviceId: string, service
return;
}
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<void>;
export function parFunc(peer: FluencePeer, node: string, c: (arg0: {external_addresses:string[]}, callParams: CallParams<'arg0'>) => void, config?: {ttl?: number}) : Promise<void>;
export function parFunc(...args: any) {
export function parFunc(
node: string,
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function parFunc(
peer: FluencePeer,
node: string,
c: (arg0: { external_addresses: string[] }, callParams: CallParams<'arg0'>) => void,
config?: { ttl?: number },
): Promise<void>;
export function parFunc(...args: any) {
let peer: FluencePeer;
let node: any;
let c: any;
let c: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node = args[1];
c = args[2];
config = args[3];
c = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node = args[0];
c = args[1];
config = args[2];
c = args[1];
config = args[2];
}
let request: RequestFlow;
@ -141,29 +146,28 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node', () => {
return node;
});
h.on('getDataSrv', 'node', () => {return node;});
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]
arg0: req.tetraplets[0],
},
};
resp.retCode = ResultCodes.success;
c(req.args[0], callParams); resp.result = {}
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;
@ -173,13 +177,12 @@ config = args[2];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for parFunc');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,45 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface AquaDHTDef {
put_host_value: (key: string, value: string, service_id: string[], callParams: CallParams<'key' | 'value' | 'service_id'>) => string;
}
export interface AquaDHTDef {
put_host_value: (
key: string,
value: string,
service_id: string[],
callParams: CallParams<'key' | 'value' | 'service_id'>,
) => string;
}
export function registerAquaDHT(service: AquaDHTDef): void;
export function registerAquaDHT(service: AquaDHTDef): void;
export function registerAquaDHT(serviceId: string, service: AquaDHTDef): void;
export function registerAquaDHT(peer: FluencePeer, service: AquaDHTDef): void;
export function registerAquaDHT(peer: FluencePeer, serviceId: string, service: AquaDHTDef): void;
export function registerAquaDHT(...args: any) {
export function registerAquaDHT(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test-dht';
}
else {
serviceId = "test-dht"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,48 +66,56 @@ export function registerAquaDHT(peer: FluencePeer, serviceId: string, service: A
return;
}
if (req.fnName === 'put_host_value') {
const callParams = {
...req.particleContext,
tetraplets: {
key: req.tetraplets[0],value: req.tetraplets[1],service_id: req.tetraplets[2]
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<string>;
export function putHostValue(peer: FluencePeer, key: string, value: string, service_id: string | null, config?: {ttl?: number}) : Promise<string>;
export function putHostValue(...args: any) {
export function putHostValue(
key: string,
value: string,
service_id: string | null,
config?: { ttl?: number },
): Promise<string>;
export function putHostValue(
peer: FluencePeer,
key: string,
value: string,
service_id: string | null,
config?: { ttl?: number },
): Promise<string>;
export function putHostValue(...args: any) {
let peer: FluencePeer;
let key: any;
let value: any;
let service_id: any;
let value: any;
let service_id: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
key = args[1];
value = args[2];
service_id = args[3];
config = args[4];
value = args[2];
service_id = args[3];
config = args[4];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
key = args[0];
value = args[1];
service_id = args[2];
config = args[3];
value = args[1];
service_id = args[2];
config = args[3];
}
let request: RequestFlow;
@ -135,15 +151,21 @@ config = args[3];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
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.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;
@ -153,9 +175,9 @@ h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [servi
.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();
});
@ -163,22 +185,20 @@ h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [servi
return promise;
}
export function create_client_util(service_id: string, config?: {ttl?: number}) : Promise<string>;
export function create_client_util(peer: FluencePeer, service_id: string, config?: {ttl?: number}) : Promise<string>;
export function create_client_util(...args: any) {
export function create_client_util(service_id: string, config?: { ttl?: number }): Promise<string>;
export function create_client_util(peer: FluencePeer, service_id: string, config?: { ttl?: number }): Promise<string>;
export function create_client_util(...args: any) {
let peer: FluencePeer;
let service_id: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
service_id = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
service_id = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -208,13 +228,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'service_id', () => {
return service_id;
});
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;
@ -224,13 +246,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for create_client_util');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface PrintlnDef {
export interface PrintlnDef {
print: (arg0: string, callParams: CallParams<'arg0'>) => void;
}
}
export function registerPrintln(service: PrintlnDef): void;
export function registerPrintln(service: PrintlnDef): void;
export function registerPrintln(serviceId: string, service: PrintlnDef): void;
export function registerPrintln(peer: FluencePeer, service: PrintlnDef): void;
export function registerPrintln(peer: FluencePeer, serviceId: string, service: PrintlnDef): void;
export function registerPrintln(...args: any) {
export function registerPrintln(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'println-service-id';
}
else {
serviceId = "println-service-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,38 @@ export function registerPrintln(peer: FluencePeer, serviceId: string, service: P
return;
}
if (req.fnName === 'print') {
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<void>;
export function print(peer: FluencePeer, str: string, config?: {ttl?: number}) : Promise<void>;
export function print(...args: any) {
export function print(str: string, config?: { ttl?: number }): Promise<void>;
export function print(peer: FluencePeer, str: string, config?: { ttl?: number }): Promise<void>;
export function print(...args: any) {
let peer: FluencePeer;
let str: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
str = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
str = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -117,12 +116,12 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'str', () => {
return str;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -132,13 +131,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for print');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]);
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface OpADef {
export interface OpADef {
get_str: (callParams: CallParams<null>) => string;
}
}
export function registerOpA(service: OpADef): void;
export function registerOpA(service: OpADef): void;
export function registerOpA(serviceId: string, service: OpADef): void;
export function registerOpA(peer: FluencePeer, service: OpADef): void;
export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void;
export function registerOpA(...args: any) {
export function registerOpA(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'pop';
}
else {
serviceId = "pop"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,32 @@ export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADe
return;
}
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<string[]>;
export function get_results(peer: FluencePeer, config?: {ttl?: number}) : Promise<string[]>;
export function get_results(...args: any) {
export function get_results(config?: { ttl?: number }): Promise<string[]>;
export function get_results(peer: FluencePeer, config?: { ttl?: number }): Promise<string[]>;
export function get_results(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -124,13 +120,13 @@ export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADe
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -140,13 +136,12 @@ export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADe
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for get_results');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,23 +14,21 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
// Functions
export function returnLiteral(config?: {ttl?: number}) : Promise<string>;
export function returnLiteral(peer: FluencePeer, config?: {ttl?: number}) : Promise<string>;
export function returnLiteral(...args: any) {
export function returnLiteral(config?: { ttl?: number }): Promise<string>;
export function returnLiteral(peer: FluencePeer, config?: { ttl?: number }): Promise<string>;
export function returnLiteral(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -55,13 +53,13 @@ import {
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -71,13 +69,12 @@ import {
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for returnLiteral');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface StringerDef {
export interface StringerDef {
returnString: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
}
export function registerStringer(service: StringerDef): void;
export function registerStringer(service: StringerDef): void;
export function registerStringer(serviceId: string, service: StringerDef): void;
export function registerStringer(peer: FluencePeer, service: StringerDef): void;
export function registerStringer(peer: FluencePeer, serviceId: string, service: StringerDef): void;
export function registerStringer(...args: any) {
export function registerStringer(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'stringer-id';
}
else {
serviceId = "stringer-id"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,39 +61,34 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
return;
}
if (req.fnName === 'returnString') {
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<string | null>;
export function returnNone(peer: FluencePeer, config?: {ttl?: number}) : Promise<string | null>;
export function returnNone(...args: any) {
export function returnNone(config?: { ttl?: number }): Promise<string | null>;
export function returnNone(peer: FluencePeer, config?: { ttl?: number }): Promise<string | null>;
export function returnNone(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -115,17 +113,19 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -135,9 +135,9 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
.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();
});
@ -145,19 +145,17 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
return promise;
}
export function stringNone(config?: {ttl?: number}) : Promise<string | null>;
export function stringNone(peer: FluencePeer, config?: {ttl?: number}) : Promise<string | null>;
export function stringNone(...args: any) {
export function stringNone(config?: { ttl?: number }): Promise<string | null>;
export function stringNone(peer: FluencePeer, config?: { ttl?: number }): Promise<string | null>;
export function stringNone(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -182,17 +180,19 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
let [opt] = args;
if (Array.isArray(opt)) {
if (opt.length === 0) { resolve(null); }
if (opt.length === 0) {
resolve(null);
}
opt = opt[0];
}
return resolve(opt);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -202,9 +202,9 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
.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();
});
@ -212,85 +212,17 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
return promise;
}
export function returnNil(config?: {ttl?: number}) : Promise<string[]>;
export function returnNil(peer: FluencePeer, config?: {ttl?: number}) : Promise<string[]>;
export function returnNil(...args: any) {
export function returnNil(config?: { ttl?: number }): Promise<string[]>;
export function returnNil(peer: FluencePeer, config?: { ttl?: number }): Promise<string[]>;
export function returnNil(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
config = args[0];
}
let request: RequestFlow;
const promise = new Promise<string[]>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
`
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(ap $valueNil $relayNil)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [$relayNil])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
reject(err);
});
})
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for returnNil');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}
export function stringNil(config?: {ttl?: number}) : Promise<string[]>;
export function stringNil(peer: FluencePeer, config?: {ttl?: number}) : Promise<string[]>;
export function stringNil(...args: any) {
let peer: FluencePeer;
let config: any;
if (args[0] instanceof FluencePeer) {
peer = args[0];
config = args[1];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
config = args[0];
}
@ -315,13 +247,74 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
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');
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}
export function stringNil(config?: { ttl?: number }): Promise<string[]>;
export function stringNil(peer: FluencePeer, config?: { ttl?: number }): Promise<string[]>;
export function stringNil(...args: any) {
let peer: FluencePeer;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
config = args[1];
} else {
peer = Fluence.getPeer();
config = args[0];
}
let request: RequestFlow;
const promise = new Promise<string[]>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(xor
(call %init_peer_id% ("callbackSrv" "response") [$valueNil])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -331,9 +324,9 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
.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();
});
@ -341,22 +334,20 @@ export function registerStringer(peer: FluencePeer, serviceId: string, service:
return promise;
}
export function checkStreams(ch: string[], config?: {ttl?: number}) : Promise<string[]>;
export function checkStreams(peer: FluencePeer, ch: string[], config?: {ttl?: number}) : Promise<string[]>;
export function checkStreams(...args: any) {
export function checkStreams(ch: string[], config?: { ttl?: number }): Promise<string[]>;
export function checkStreams(peer: FluencePeer, ch: string[], config?: { ttl?: number }): Promise<string[]>;
export function checkStreams(...args: any) {
let peer: FluencePeer;
let ch: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
ch = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
ch = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -397,13 +388,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'ch', () => {
return ch;
});
h.on('getDataSrv', 'ch', () => {return ch;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -413,13 +406,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for checkStreams');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface TestServiceDef {
export interface TestServiceDef {
get_records: (key: string, callParams: CallParams<'key'>) => string[];
}
}
export function registerTestService(service: TestServiceDef): void;
export function registerTestService(service: TestServiceDef): void;
export function registerTestService(serviceId: string, service: TestServiceDef): void;
export function registerTestService(peer: FluencePeer, service: TestServiceDef): void;
export function registerTestService(peer: FluencePeer, serviceId: string, service: TestServiceDef): void;
export function registerTestService(...args: any) {
export function registerTestService(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'test-service';
}
else {
serviceId = "test-service"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,45 +61,45 @@ export function registerTestService(peer: FluencePeer, serviceId: string, servic
return;
}
if (req.fnName === 'get_records') {
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<void>;
export function append_records(peer: FluencePeer, peer_: string, srum: string[][], config?: {ttl?: number}) : Promise<void>;
export function append_records(...args: any) {
export function append_records(peer_: string, srum: string[][], config?: { ttl?: number }): Promise<void>;
export function append_records(
peer: FluencePeer,
peer_: string,
srum: string[][],
config?: { ttl?: number },
): Promise<void>;
export function append_records(...args: any) {
let peer: FluencePeer;
let peer_: any;
let srum: any;
let srum: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
peer_ = args[1];
srum = args[2];
config = args[3];
srum = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
peer_ = args[0];
srum = args[1];
config = args[2];
srum = args[1];
config = args[2];
}
let request: RequestFlow;
@ -131,13 +134,15 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'peer', () => {return peer_;});
h.on('getDataSrv', 'srum', () => {return srum;});
h.onEvent('callbackSrv', 'response', (args) => {
});
h.on('getDataSrv', 'peer', () => {
return peer_;
});
h.on('getDataSrv', 'srum', () => {
return srum;
});
h.onEvent('callbackSrv', 'response', (args) => {});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -147,9 +152,9 @@ h.on('getDataSrv', 'srum', () => {return srum;});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for append_records');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
@ -157,22 +162,20 @@ h.on('getDataSrv', 'srum', () => {return srum;});
return Promise.race([promise, Promise.resolve()]);
}
export function retrieve_records(peer_: string, config?: {ttl?: number}) : Promise<string[][]>;
export function retrieve_records(peer: FluencePeer, peer_: string, config?: {ttl?: number}) : Promise<string[][]>;
export function retrieve_records(...args: any) {
export function retrieve_records(peer_: string, config?: { ttl?: number }): Promise<string[][]>;
export function retrieve_records(peer: FluencePeer, peer_: string, config?: { ttl?: number }): Promise<string[][]>;
export function retrieve_records(...args: any) {
let peer: FluencePeer;
let peer_: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
peer_ = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
peer_ = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -202,13 +205,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'peer', () => {
return peer_;
});
h.on('getDataSrv', 'peer', () => {return peer_;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -218,13 +223,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for retrieve_records');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface DTGetterDef {
get_dt: (s: string, callParams: CallParams<'s'>) => {field:string};
}
export interface DTGetterDef {
get_dt: (s: string, callParams: CallParams<'s'>) => { field: string };
}
export function registerDTGetter(service: DTGetterDef): void;
export function registerDTGetter(service: DTGetterDef): void;
export function registerDTGetter(serviceId: string, service: DTGetterDef): void;
export function registerDTGetter(peer: FluencePeer, service: DTGetterDef): void;
export function registerDTGetter(peer: FluencePeer, serviceId: string, service: DTGetterDef): void;
export function registerDTGetter(...args: any) {
export function registerDTGetter(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'get-dt';
}
else {
serviceId = "get-dt"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,42 +61,37 @@ export function registerDTGetter(peer: FluencePeer, serviceId: string, service:
return;
}
if (req.fnName === 'get_dt') {
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<string>;
export function use_name1(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise<string>;
export function use_name1(...args: any) {
export function use_name1(name: string, config?: { ttl?: number }): Promise<string>;
export function use_name1(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise<string>;
export function use_name1(...args: any) {
let peer: FluencePeer;
let name: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
name = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
name = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -123,13 +121,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'name', () => {
return name;
});
h.on('getDataSrv', 'name', () => {return name;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -139,9 +139,9 @@ config = args[1];
.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();
});
@ -149,22 +149,20 @@ config = args[1];
return promise;
}
export function use_name2(name: string, config?: {ttl?: number}) : Promise<string[]>;
export function use_name2(peer: FluencePeer, name: string, config?: {ttl?: number}) : Promise<string[]>;
export function use_name2(...args: any) {
export function use_name2(name: string, config?: { ttl?: number }): Promise<string[]>;
export function use_name2(peer: FluencePeer, name: string, config?: { ttl?: number }): Promise<string[]>;
export function use_name2(...args: any) {
let peer: FluencePeer;
let name: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
name = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
name = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -209,13 +207,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'name', () => {
return name;
});
h.on('getDataSrv', 'name', () => {return name;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -225,13 +225,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for use_name2');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,44 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface ConcatSubsDef {
get_some: (s: string, sr: {one:string;two:number}, callParams: CallParams<'s' | 'sr'>) => {one:string;two:number};
}
export interface ConcatSubsDef {
get_some: (
s: string,
sr: { one: string; two: number },
callParams: CallParams<'s' | 'sr'>,
) => { one: string; two: number };
}
export function registerConcatSubs(service: ConcatSubsDef): void;
export function registerConcatSubs(service: ConcatSubsDef): void;
export function registerConcatSubs(serviceId: string, service: ConcatSubsDef): void;
export function registerConcatSubs(peer: FluencePeer, service: ConcatSubsDef): void;
export function registerConcatSubs(peer: FluencePeer, serviceId: string, service: ConcatSubsDef): void;
export function registerConcatSubs(...args: any) {
export function registerConcatSubs(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'concat_subs';
}
else {
serviceId = "concat_subs"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,46 +65,46 @@ export function registerConcatSubs(peer: FluencePeer, serviceId: string, service
return;
}
if (req.fnName === 'get_some') {
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 function subImportUsage(...args: any) {
export function subImportUsage(s: string, config?: { ttl?: number }): Promise<{ one: string; two: number }>;
export function subImportUsage(
peer: FluencePeer,
s: string,
config?: { ttl?: number },
): Promise<{ one: string; two: number }>;
export function subImportUsage(...args: any) {
let peer: FluencePeer;
let s: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
s = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
s = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
const promise = new Promise<{one:string;two:number}>((resolve, reject) => {
const promise = new Promise<{ one: string; two: number }>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -129,13 +136,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 's', () => {
return s;
});
h.on('getDataSrv', 's', () => {return s;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);
});
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
@ -145,13 +154,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for subImportUsage');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface TestoDef {
export interface TestoDef {
getString: (arg0: string, callParams: CallParams<'arg0'>) => string;
}
}
export function registerTesto(service: TestoDef): void;
export function registerTesto(service: TestoDef): void;
export function registerTesto(serviceId: string, service: TestoDef): void;
export function registerTesto(peer: FluencePeer, service: TestoDef): void;
export function registerTesto(peer: FluencePeer, serviceId: string, service: TestoDef): void;
export function registerTesto(...args: any) {
export function registerTesto(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'testo';
}
else {
serviceId = "testo"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,53 @@ export function registerTesto(peer: FluencePeer, serviceId: string, service: Tes
return;
}
if (req.fnName === 'getString') {
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 {
export interface LocalPrintDef {
print: (arg0: string, callParams: CallParams<'arg0'>) => void;
}
}
export function registerLocalPrint(service: LocalPrintDef): void;
export function registerLocalPrint(service: LocalPrintDef): void;
export function registerLocalPrint(serviceId: string, service: LocalPrintDef): void;
export function registerLocalPrint(peer: FluencePeer, service: LocalPrintDef): void;
export function registerLocalPrint(peer: FluencePeer, serviceId: string, service: LocalPrintDef): void;
export function registerLocalPrint(...args: any) {
export function registerLocalPrint(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'lp';
}
else {
serviceId = "lp"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,51 +121,60 @@ export function registerLocalPrint(peer: FluencePeer, serviceId: string, service
return;
}
if (req.fnName === 'print') {
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<string>;
export function topologyTest(peer: FluencePeer, me: string, myRelay: string, friend: string, friendRelay: string, config?: {ttl?: number}) : Promise<string>;
export function topologyTest(...args: any) {
export function topologyTest(
me: string,
myRelay: string,
friend: string,
friendRelay: string,
config?: { ttl?: number },
): Promise<string>;
export function topologyTest(
peer: FluencePeer,
me: string,
myRelay: string,
friend: string,
friendRelay: string,
config?: { ttl?: number },
): Promise<string>;
export function topologyTest(...args: any) {
let peer: FluencePeer;
let me: any;
let myRelay: any;
let friend: any;
let friendRelay: any;
let myRelay: any;
let friend: any;
let friendRelay: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
me = args[1];
myRelay = args[2];
friend = args[3];
friendRelay = args[4];
config = args[5];
myRelay = args[2];
friend = args[3];
friendRelay = args[4];
config = args[5];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
me = args[0];
myRelay = args[1];
friend = args[2];
friendRelay = args[3];
config = args[4];
myRelay = args[1];
friend = args[2];
friendRelay = args[3];
config = args[4];
}
let request: RequestFlow;
@ -233,16 +243,24 @@ config = args[4];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
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.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;
@ -252,13 +270,12 @@ h.on('getDataSrv', 'friendRelay', () => {return friendRelay;});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for topologyTest');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface UnexistedDef {
export interface UnexistedDef {
getStr: (callParams: CallParams<null>) => string;
}
}
export function registerUnexisted(service: UnexistedDef): void;
export function registerUnexisted(service: UnexistedDef): void;
export function registerUnexisted(serviceId: string, service: UnexistedDef): void;
export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): void;
export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void;
export function registerUnexisted(...args: any) {
export function registerUnexisted(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'unex';
}
else {
serviceId = "unex"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,51 @@ export function registerUnexisted(peer: FluencePeer, serviceId: string, service:
return;
}
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 {
export interface OpADef {
identity: (s: string, callParams: CallParams<'s'>) => string;
}
}
export function registerOpA(service: OpADef): void;
export function registerOpA(service: OpADef): void;
export function registerOpA(serviceId: string, service: OpADef): void;
export function registerOpA(peer: FluencePeer, service: OpADef): void;
export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void;
export function registerOpA(...args: any) {
export function registerOpA(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,42 +119,37 @@ export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADe
return;
}
if (req.fnName === 'identity') {
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<string[]>;
export function tryCatchTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}) : Promise<string[]>;
export function tryCatchTest(...args: any) {
export function tryCatchTest(node_id: string, config?: { ttl?: number }): Promise<string[]>;
export function tryCatchTest(peer: FluencePeer, node_id: string, config?: { ttl?: number }): Promise<string[]>;
export function tryCatchTest(...args: any) {
let peer: FluencePeer;
let node_id: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -206,13 +200,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
});
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;
@ -222,13 +218,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for tryCatchTest');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface UnexistedDef {
export interface UnexistedDef {
getStr: (callParams: CallParams<null>) => string;
}
}
export function registerUnexisted(service: UnexistedDef): void;
export function registerUnexisted(service: UnexistedDef): void;
export function registerUnexisted(serviceId: string, service: UnexistedDef): void;
export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): void;
export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void;
export function registerUnexisted(...args: any) {
export function registerUnexisted(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'unex';
}
else {
serviceId = "unex"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,55 +61,51 @@ export function registerUnexisted(peer: FluencePeer, serviceId: string, service:
return;
}
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 {
export interface OpEDef {
identity: (s: string, callParams: CallParams<'s'>) => string;
}
}
export function registerOpE(service: OpEDef): void;
export function registerOpE(service: OpEDef): void;
export function registerOpE(serviceId: string, service: OpEDef): void;
export function registerOpE(peer: FluencePeer, service: OpEDef): void;
export function registerOpE(peer: FluencePeer, serviceId: string, service: OpEDef): void;
export function registerOpE(...args: any) {
export function registerOpE(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'op';
}
else {
serviceId = "op"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -120,42 +119,37 @@ export function registerOpE(peer: FluencePeer, serviceId: string, service: OpEDe
return;
}
if (req.fnName === 'identity') {
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<string>;
export function tryOtherwiseTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}) : Promise<string>;
export function tryOtherwiseTest(...args: any) {
export function tryOtherwiseTest(node_id: string, config?: { ttl?: number }): Promise<string>;
export function tryOtherwiseTest(peer: FluencePeer, node_id: string, config?: { ttl?: number }): Promise<string>;
export function tryOtherwiseTest(...args: any) {
let peer: FluencePeer;
let node_id: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
config = args[2];
config = args[2];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
config = args[1];
config = args[1];
}
let request: RequestFlow;
@ -200,13 +194,15 @@ config = args[1];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
});
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;
@ -216,13 +212,12 @@ config = args[1];
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for tryOtherwiseTest');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -6,7 +6,7 @@
* Aqua version: 0.3.0-SNAPSHOT
*
*/
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
@ -14,37 +14,40 @@ import {
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
// Services
export interface CustomIdDef {
export interface CustomIdDef {
id: (s: string, callParams: CallParams<'s'>) => string;
}
}
export function registerCustomId(service: CustomIdDef): void;
export function registerCustomId(service: CustomIdDef): void;
export function registerCustomId(serviceId: string, service: CustomIdDef): void;
export function registerCustomId(peer: FluencePeer, service: CustomIdDef): void;
export function registerCustomId(peer: FluencePeer, serviceId: string, service: CustomIdDef): void;
export function registerCustomId(...args: any) {
export function registerCustomId(...args: any) {
let peer: FluencePeer;
let serviceId: any;
let service: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
}
if (typeof args[0] === 'string') {
serviceId = args[0];
} else if (typeof args[1] === 'string') {
serviceId = args[1];
} else {
serviceId = 'cid';
}
else {
serviceId = "cid"
}
if (!(args[0] instanceof FluencePeer) && typeof args[0] === 'object') {
// 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') {
service = args[0];
} else if (typeof args[1] === 'object') {
service = args[1];
@ -58,49 +61,53 @@ export function registerCustomId(peer: FluencePeer, serviceId: string, service:
return;
}
if (req.fnName === 'id') {
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 function viaArr(...args: any) {
export function viaArr(
node_id: string,
viaAr: string[],
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaArr(
peer: FluencePeer,
node_id: string,
viaAr: string[],
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaArr(...args: any) {
let peer: FluencePeer;
let node_id: any;
let viaAr: any;
let viaAr: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
viaAr = args[2];
config = args[3];
viaAr = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
viaAr = args[1];
config = args[2];
viaAr = args[1];
config = args[2];
}
let request: RequestFlow;
const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => {
const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -168,14 +175,18 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
});
h.on('getDataSrv', 'viaAr', () => {
return viaAr;
});
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;
@ -185,9 +196,9 @@ h.on('getDataSrv', 'viaAr', () => {return viaAr;});
.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();
});
@ -195,29 +206,36 @@ h.on('getDataSrv', 'viaAr', () => {return viaAr;});
return promise;
}
export function viaStream(node_id: string, viaStr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>;
export function viaStream(peer: FluencePeer, node_id: string, viaStr: string[], config?: {ttl?: number}) : Promise<{external_addresses:string[]}>;
export function viaStream(...args: any) {
export function viaStream(
node_id: string,
viaStr: string[],
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaStream(
peer: FluencePeer,
node_id: string,
viaStr: string[],
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaStream(...args: any) {
let peer: FluencePeer;
let node_id: any;
let viaStr: any;
let viaStr: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
node_id = args[1];
viaStr = args[2];
config = args[3];
viaStr = args[2];
config = args[3];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
node_id = args[0];
viaStr = args[1];
config = args[2];
viaStr = args[1];
config = args[2];
}
let request: RequestFlow;
const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => {
const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -293,14 +311,18 @@ config = args[2];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'node_id', () => {
return node_id;
});
h.on('getDataSrv', 'viaStr', () => {
return viaStr;
});
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;
@ -310,9 +332,9 @@ h.on('getDataSrv', 'viaStr', () => {return viaStr;});
.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();
});
@ -320,32 +342,41 @@ h.on('getDataSrv', 'viaStr', () => {return viaStr;});
return promise;
}
export function viaOpt(relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}) : Promise<{external_addresses:string[]}>;
export function viaOpt(peer: FluencePeer, relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}) : Promise<{external_addresses:string[]}>;
export function viaOpt(...args: any) {
export function viaOpt(
relay: string,
node_id: string,
viaOpt: string | null,
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaOpt(
peer: FluencePeer,
relay: string,
node_id: string,
viaOpt: string | null,
config?: { ttl?: number },
): Promise<{ external_addresses: string[] }>;
export function viaOpt(...args: any) {
let peer: FluencePeer;
let relay: any;
let node_id: any;
let viaOpt: any;
let node_id: any;
let viaOpt: any;
let config: any;
if (args[0] instanceof FluencePeer) {
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
relay = args[1];
node_id = args[2];
viaOpt = args[3];
config = args[4];
node_id = args[2];
viaOpt = args[3];
config = args[4];
} else {
peer = FluencePeer.default;
peer = Fluence.getPeer();
relay = args[0];
node_id = args[1];
viaOpt = args[2];
config = args[3];
node_id = args[1];
viaOpt = args[2];
config = args[3];
}
let request: RequestFlow;
const promise = new Promise<{external_addresses:string[]}>((resolve, reject) => {
const promise = new Promise<{ external_addresses: string[] }>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -416,15 +447,21 @@ config = args[3];
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.connectionInfo.connectedRelay ;
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.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;
@ -434,13 +471,12 @@ h.on('getDataSrv', 'viaOpt', () => {return viaOpt === null ? [] : [viaOpt];});
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for viaOpt');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
});
if (config && config.ttl) {
r.withTTL(config.ttl);
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -1,8 +1,8 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { passFunctionAsArg } from '../compiled/examples/callArrow';
export async function callArrowCall(): Promise<string> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
return new Promise<string>((resolve, reject) => {
passFunctionAsArg(relayPeerId, 'callArrow call', (a: string) => {
let result = 'Hello, ' + a + '!';

View File

@ -1,9 +1,9 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { parFunc } from '../compiled/examples/par';
import { registerCoService } from '../compiled/examples/co';
export async function coCall(): Promise<string[]> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
registerCoService({
call: () => {

View File

@ -1,9 +1,9 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { doStuff, registerTestS } from '../compiled/examples/complex';
export async function complexCall() {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const selfPeerId = FluencePeer.default.connectionInfo.selfPeerId;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
const selfPeerId = Fluence.getPeer().getStatus().peerId;
registerTestS({
t: (arg0) => {

View File

@ -1,8 +1,8 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { iterateAndPrint, iterateAndPrintParallel } from '../compiled/examples/fold';
export async function foldCall() {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
await iterateAndPrint([relayPeerId]);

View File

@ -1,7 +1,7 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { getTwoResults } from '../compiled/examples/foldJoin';
export async function foldJoinCall(): Promise<number[]> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
return await getTwoResults(relayPeerId);
}

View File

@ -1,7 +1,7 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { getPeerExternalAddresses } from '../compiled/examples/on';
export async function onCall(): Promise<string[]> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
return await getPeerExternalAddresses(relayPeerId);
}

View File

@ -1,8 +1,8 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { parFunc, registerParService } from '../compiled/examples/par';
export async function parCall() {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
let promise = new Promise<string>((resolve, reject) => {
registerParService({

View File

@ -1,12 +1,12 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import { topologyTest, registerTesto, registerLocalPrint } from '../compiled/examples/topology';
export async function topologyCall(peer2: FluencePeer): Promise<string> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const selfPeerId = FluencePeer.default.connectionInfo.selfPeerId;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
const selfPeerId = Fluence.getPeer().getStatus().peerId;
const relayPeerId2 = peer2.connectionInfo.connectedRelay;
const selfPeerId2 = peer2.connectionInfo.selfPeerId;
const relayPeerId2 = peer2.getStatus().relayPeerId;
const selfPeerId2 = peer2.getStatus().peerId;
registerTesto(peer2, {
getString: (args0) => {

View File

@ -1,7 +1,7 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { tryCatchTest } from '../compiled/examples/tryCatch';
export async function tryCatchCall(): Promise<string[]> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
return await tryCatchTest(relayPeerId);
}

View File

@ -1,7 +1,7 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { tryOtherwiseTest } from '../compiled/examples/tryOtherwise';
export async function tryOtherwiseCall(): Promise<string> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
return await tryOtherwiseTest(relayPeerId);
}

View File

@ -1,9 +1,9 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { krasnodar } from '@fluencelabs/fluence-network-environment';
import { viaArr, viaOpt, viaStream, registerCustomId } from '../compiled/examples/via';
export async function viaCall(): Promise<string[][]> {
const relayPeerId = FluencePeer.default.connectionInfo.connectedRelay;
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
registerCustomId({
id: (args0) => {

View File

@ -1,12 +1,12 @@
#!/usr/bin/env node
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import { krasnodar } from '@fluencelabs/fluence-network-environment';
import { helloWorld, registerStringExtra } from './compiled/examples/helloWorld';
const main = async () => {
// each compiled aqua function require a connected client
await FluencePeer.default.init({ connectTo: krasnodar[0] });
await Fluence.start({ connectTo: krasnodar[0] });
// example to how register a local service
// it could be used in aqua code as follows

View File

@ -1,9 +1,9 @@
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence } from '@fluencelabs/fluence';
import { krasnodar } from '@fluencelabs/fluence-network-environment';
import { getNeighbours, initTopicAndSubscribe, findSubscribers } from './compiled/dht/dht-example';
const main = async () => {
await FluencePeer.default.init({ connectTo: krasnodar[0] });
await Fluence.start({ connectTo: krasnodar[0] });
const relayPeerId = krasnodar[0].peerId;
const nodes = await getNeighbours(relayPeerId, 'random');

View File

@ -1,6 +1,6 @@
#!/usr/bin/env node
import { FluencePeer } from '@fluencelabs/fluence';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import { krasnodar, testNet } from '@fluencelabs/fluence-network-environment';
import { registerPrintln } from './compiled/examples/println';
import { callArrowCall } from './examples/callArrowCall';
@ -13,7 +13,7 @@ import { ifCall } from './examples/if';
import { parCall } from './examples/parCall';
import { complexCall } from './examples/complex';
import { constantsCall } from './examples/constantsCall';
import {returnNilCall, returnNoneCall, streamCall} from './examples/streamCall';
import { returnNilCall, returnNoneCall, streamCall } from './examples/streamCall';
import { topologyCall } from './examples/topologyCall';
import { foldJoinCall } from './examples/foldJoinCall';
import { registerHandlers, returnNull, returnOptionalCall, useOptionalCall } from './examples/useOptionalCall';
@ -30,7 +30,7 @@ import { pushToStreamCall } from './examples/pushToStreamCall';
import { literalCall } from './examples/returnLiteralCall';
import { multiReturnCall } from './examples/multiReturnCall';
import { declareCall } from './examples/declareCall';
import {genOptions} from "./examples/optionsCall";
import { genOptions } from './examples/optionsCall';
let deepEqual = require('deep-equal');
function checkCall(name: string, actual: any, expected: any, callBackOnError: () => void) {
@ -57,11 +57,11 @@ function checkCallBy(name: string, actual: any, by: (res: any) => boolean, callB
const main = async () => {
// setLogLevel("trace")
await FluencePeer.default.init({ connectTo: krasnodar[0] });
const selfPeerId = FluencePeer.default.connectionInfo.selfPeerId;
await Fluence.start({ connectTo: krasnodar[0] });
const selfPeerId = Fluence.getStatus().peerId;
const peer2 = new FluencePeer();
await peer2.init({ connectTo: krasnodar[1] });
await peer2.start({ connectTo: krasnodar[1] });
// this could be called from `println.aqua`
registerPrintln({
@ -226,8 +226,8 @@ const main = async () => {
let optionGenResult = await genOptions();
checkCall('optionGenResult', optionGenResult, ['none', 'some'], cb);
await FluencePeer.default.uninit();
await peer2.uninit();
await Fluence.stop();
await peer2.stop();
if (success) {
process.exit(0);