Update fluence-js to 14.2 and aqua to 0.4.0-235 (#33)

This commit is contained in:
Pavel
2021-10-22 09:41:48 +03:00
committed by GitHub
parent 12230c9ccc
commit ad8e18f01c
39 changed files with 4409 additions and 5184 deletions

View File

@ -1,187 +1,138 @@
/**
*
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.3.0-226
* Aqua version: 0.4.0-235
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import {
ResultCodes,
RequestFlow,
RequestFlowBuilder,
CallParams,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
callFunction,
registerService,
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
// Services
export interface HelloPeerDef {
hello: (from: string, callParams: CallParams<'from'>) => string;
}
export function registerHelloPeer(service: HelloPeerDef): void;
export interface HelloPeerDef {
hello: (from: string, callParams: CallParams<'from'>) => string | Promise<string>;
}
export function registerHelloPeer(service: HelloPeerDef): void;
export function registerHelloPeer(serviceId: string, service: HelloPeerDef): void;
export function registerHelloPeer(peer: FluencePeer, service: HelloPeerDef): void;
export function registerHelloPeer(peer: FluencePeer, serviceId: string, service: HelloPeerDef): void;
export function registerHelloPeer(...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 = "HelloPeer"
}
// 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];
} else {
service = args[2];
}
peer.internals.callServiceHandler.use((req, resp, next) => {
if (req.serviceId !== serviceId) {
next();
return;
}
if (req.fnName === 'hello') {
const callParams = {
...req.particleContext,
tetraplets: {
from: req.tetraplets[0]
},
};
resp.retCode = ResultCodes.success;
resp.result = service.hello(req.args[0], callParams)
}
next();
});
}
// Functions
export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}) : Promise<string>;
export function sayHello(...args: any) {
let peer: FluencePeer;
let targetPeerId: any;
let targetRelayPeerId: any;
let config: any;
if (FluencePeer.isInstance(args[0])) {
peer = args[0];
targetPeerId = args[1];
targetRelayPeerId = args[2];
config = args[3];
} else {
peer = Fluence.getPeer();
targetPeerId = args[0];
targetRelayPeerId = args[1];
config = args[2];
}
let request: RequestFlow;
const promise = new Promise<string>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
`
(xor
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId)
)
(call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId)
)
(call -relay- ("op" "noop") [])
)
(call targetRelayPeerId ("op" "noop") [])
)
(xor
(call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res)
(seq
(seq
(seq
(call targetRelayPeerId ("op" "noop") [])
(call -relay- ("op" "noop") [])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call -relay- ("op" "noop") [])
)
)
)
(call targetRelayPeerId ("op" "noop") [])
)
(call -relay- ("op" "noop") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.getStatus().relayPeerId;
});
h.on('getDataSrv', 'targetPeerId', () => {return targetPeerId;});
h.on('getDataSrv', 'targetRelayPeerId', () => {return targetRelayPeerId;});
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 sayHello');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
export function registerHelloPeer(...args: any) {
registerService(
args,
{
"defaultServiceId" : "HelloPeer",
"functions" : [
{
"functionName" : "hello",
"argDefs" : [
{
"name" : "from",
"argType" : {
"tag" : "primitive"
}
}
],
"returnType" : {
"tag" : "primitive"
}
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
]
}
);
}
// Functions
export function sayHello(targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise<string>;
export function sayHello(peer: FluencePeer, targetPeerId: string, targetRelayPeerId: string, config?: {ttl?: number}): Promise<string>;
export function sayHello(...args: any) {
let script = `
(xor
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "targetPeerId") [] targetPeerId)
)
(call %init_peer_id% ("getDataSrv" "targetRelayPeerId") [] targetRelayPeerId)
)
(call -relay- ("op" "noop") [])
)
(call targetRelayPeerId ("op" "noop") [])
)
(xor
(call targetPeerId ("HelloPeer" "hello") [%init_peer_id%] res)
(seq
(seq
(seq
(call targetRelayPeerId ("op" "noop") [])
(call -relay- ("op" "noop") [])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call -relay- ("op" "noop") [])
)
)
)
(call targetRelayPeerId ("op" "noop") [])
)
(call -relay- ("op" "noop") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`
return callFunction(
args,
{
"functionName" : "sayHello",
"returnType" : {
"tag" : "primitive"
},
"argDefs" : [
{
"name" : "targetPeerId",
"argType" : {
"tag" : "primitive"
}
},
{
"name" : "targetRelayPeerId",
"argType" : {
"tag" : "primitive"
}
}
],
"names" : {
"relay" : "-relay-",
"getDataSrv" : "getDataSrv",
"callbackSrv" : "callbackSrv",
"responseSrv" : "callbackSrv",
"responseFnName" : "response",
"errorHandlingSrv" : "errorHandlingSrv",
"errorFnName" : "error"
}
},
script
)
}