Add async example to hello-world

This commit is contained in:
Pavel Murygin 2021-10-20 22:14:29 +03:00
parent 59af5c4e0f
commit 8ff994da50
5 changed files with 312 additions and 165 deletions

View File

@ -2,10 +2,15 @@ import Peer from "@fluencelabs/aqua-lib/builtin.aqua"
service HelloWorld("hello-world"): service HelloWorld("hello-world"):
hello(str: string) hello(str: string)
getFortune() -> string
func sayHello(): func sayHello():
HelloWorld.hello("Hello, world!") HelloWorld.hello("Hello, world!")
func tellFortune() -> string:
res <- HelloWorld.getFortune()
<- res
func getRelayTime() -> u64: func getRelayTime() -> u64:
on HOST_PEER_ID: on HOST_PEER_ID:
ts <- Peer.timestamp_ms() ts <- Peer.timestamp_ms()

View File

@ -13,7 +13,7 @@
"@fluencelabs/fluence-network-environment": "1.0.10" "@fluencelabs/fluence-network-environment": "1.0.10"
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "^0.3.0-226", "@fluencelabs/aqua": "^0.3.2-233",
"@fluencelabs/aqua-lib": "^0.1.14", "@fluencelabs/aqua-lib": "^0.1.14",
"chokidar-cli": "^3.0.0", "chokidar-cli": "^3.0.0",
"ts-node": "^10.2.1", "ts-node": "^10.2.1",
@ -73,14 +73,16 @@
} }
}, },
"node_modules/@fluencelabs/aqua": { "node_modules/@fluencelabs/aqua": {
"version": "0.3.0-226", "version": "0.3.2-233",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
"integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
"dev": true, "dev": true,
"dependencies": {
"@fluencelabs/fluence": "0.12.1"
},
"bin": { "bin": {
"aqua": "index.js", "aqua": "index.js",
"aqua-cli": "error.js", "aqua-cli": "error.js"
"aqua-j": "index-java.js"
} }
}, },
"node_modules/@fluencelabs/aqua-lib": { "node_modules/@fluencelabs/aqua-lib": {
@ -89,6 +91,30 @@
"integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==", "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==",
"dev": true "dev": true
}, },
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz",
"integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==",
"dev": true,
"dependencies": {
"@chainsafe/libp2p-noise": "4.0.0",
"@fluencelabs/avm": "0.14.4",
"async": "3.2.0",
"base64-js": "1.5.1",
"bs58": "4.0.1",
"cids": "0.8.1",
"it-length-prefixed": "3.0.1",
"it-pipe": "1.1.0",
"libp2p": "0.32.3",
"libp2p-crypto": "0.19.7",
"libp2p-mplex": "0.10.4",
"libp2p-websockets": "0.16.1",
"loglevel": "1.7.0",
"multiaddr": "10.0.0",
"peer-id": "0.15.3",
"uuid": "8.3.0"
}
},
"node_modules/@fluencelabs/avm": { "node_modules/@fluencelabs/avm": {
"version": "0.14.4", "version": "0.14.4",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz",
@ -3243,10 +3269,39 @@
} }
}, },
"@fluencelabs/aqua": { "@fluencelabs/aqua": {
"version": "0.3.0-226", "version": "0.3.2-233",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-226.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.2-233.tgz",
"integrity": "sha512-9o0TdgsVNcBvifqo7VqIkN62P9EReE0LUxgWG1rGHi9yxJiGElvEBvrVUzqShffF66Ene7VGEe85lhFIGCfDgg==", "integrity": "sha512-LxwNt/O2ijHA2bG7+qdmnFT//kpIVj7mACBp28LxRpb2kJYMcVDNb9VfyWDiDdoX10PAT96OpkiYvVJPs0mpEw==",
"dev": true "dev": true,
"requires": {
"@fluencelabs/fluence": "0.12.1"
},
"dependencies": {
"@fluencelabs/fluence": {
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz",
"integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==",
"dev": true,
"requires": {
"@chainsafe/libp2p-noise": "4.0.0",
"@fluencelabs/avm": "0.14.4",
"async": "3.2.0",
"base64-js": "1.5.1",
"bs58": "4.0.1",
"cids": "0.8.1",
"it-length-prefixed": "3.0.1",
"it-pipe": "1.1.0",
"libp2p": "0.32.3",
"libp2p-crypto": "0.19.7",
"libp2p-mplex": "0.10.4",
"libp2p-websockets": "0.16.1",
"loglevel": "1.7.0",
"multiaddr": "10.0.0",
"peer-id": "0.15.3",
"uuid": "8.3.0"
}
}
}
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {
"version": "0.1.14", "version": "0.1.14",

View File

@ -11,7 +11,7 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "^0.3.0-226", "@fluencelabs/aqua": "^0.3.2-233",
"@fluencelabs/aqua-lib": "^0.1.14", "@fluencelabs/aqua-lib": "^0.1.14",
"chokidar-cli": "^3.0.0", "chokidar-cli": "^3.0.0",
"ts-node": "^10.2.1", "ts-node": "^10.2.1",

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased. * 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 * 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.3.2-233
* *
*/ */
import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -11,21 +11,27 @@ import {
ResultCodes, ResultCodes,
RequestFlow, RequestFlow,
RequestFlowBuilder, RequestFlowBuilder,
CallParams, CallParams
} from '@fluencelabs/fluence/dist/internal/compilerSupport/v1'; } from '@fluencelabs/fluence/dist/internal/compilerSupport/v1';
function missingFields(obj: any, fields: string[]): string[] {
return fields.filter(f => !(f in obj))
}
// Services // Services
export interface HelloWorldDef { export interface HelloWorldDef {
hello: (str: string, callParams: CallParams<'str'>) => void; getFortune: (callParams: CallParams<null>) => string;
} hello: (str: string, callParams: CallParams<'str'>) => void;
}
export function registerHelloWorld(service: HelloWorldDef): void; export function registerHelloWorld(service: HelloWorldDef): void;
export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void; export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): void; export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): void;
export function registerHelloWorld(peer: FluencePeer, serviceId: string, 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 peer: FluencePeer;
let serviceId: any; let serviceId: any;
let service: any; let service: any;
@ -39,10 +45,9 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
serviceId = args[0]; serviceId = args[0];
} else if (typeof args[1] === 'string') { } else if (typeof args[1] === 'string') {
serviceId = args[1]; serviceId = args[1];
} else {
serviceId = "hello-world"
} }
else {
serviceId = "hello-world"
}
// Figuring out which overload is the service. // 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 not Fluence Peer and it is an object, then it can only be the service def
@ -57,86 +62,97 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
service = args[2]; service = args[2];
} }
peer.internals.callServiceHandler.use((req, resp, next) => { const incorrectServiceDefinitions = missingFields(service, ['getFortune', 'hello']);
if (req.serviceId !== serviceId) { if (!!incorrectServiceDefinitions.length) {
next(); throw new Error("Error registering service HelloWorld: missing functions: " + incorrectServiceDefinitions.map((d) => "'" + d + "'").join(", "))
return; }
}
peer.internals.callServiceHandler.use((req, resp, next) => {
if (req.serviceId !== serviceId) {
next();
return;
}
if (req.fnName === 'hello') { if (req.fnName === 'getFortune') {
const callParams = {
...req.particleContext,
tetraplets: {
const callParams = { },
...req.particleContext, };
tetraplets: { resp.retCode = ResultCodes.success;
str: req.tetraplets[0] resp.result = service.getFortune(callParams)
}, }
};
resp.retCode = ResultCodes.success;
service.hello(req.args[0], callParams); resp.result = {}
} if (req.fnName === 'hello') {
const callParams = {
...req.particleContext,
next(); tetraplets: {
}); str: req.tetraplets[0]
} },
};
resp.retCode = ResultCodes.success;
service.hello(req.args[0], callParams); resp.result = {}
}
next();
});
}
// Functions // Functions
export function sayHello(config?: {ttl?: number}) : Promise<void>;
export function sayHello(peer: FluencePeer, config?: {ttl?: number}) : Promise<void>;
export function sayHello(...args: any) {
let peer: FluencePeer;
let config: any; export function sayHello(config?: {ttl?: number}): Promise<void>;
if (FluencePeer.isInstance(args[0])) { export function sayHello(peer: FluencePeer, config?: {ttl?: number}): Promise<void>;
peer = args[0]; export function sayHello(...args: any) {
config = args[1]; let peer: FluencePeer;
} else {
peer = Fluence.getPeer();
config = args[0];
}
let request: RequestFlow; let config: any;
const promise = new Promise<void>((resolve, reject) => { if (FluencePeer.isInstance(args[0])) {
const r = new RequestFlowBuilder() peer = args[0];
.disableInjections() config = args[1];
.withRawScript( } else {
` peer = Fluence.getPeer();
(xor config = args[0];
(seq }
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("hello-world" "hello") ["Hello, world!"])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`, let request: RequestFlow;
) const promise = new Promise<void>((resolve, reject) => {
.configHandler((h) => { const r = new RequestFlowBuilder()
h.on('getDataSrv', '-relay-', () => { .disableInjections()
return peer.getStatus().relayPeerId; .withRawScript(`
}); (xor
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("hello-world" "hello") ["Hello, world!"])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', '-relay-', () => {
return peer.getStatus().relayPeerId;
});
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => {
const [err] = args;
reject(err);
});
})
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for sayHello');
})
h.onEvent('errorHandlingSrv', 'error', (args) => { if (config && config.ttl) {
const [err] = args; r.withTTL(config.ttl)
reject(err); }
});
}) request = r.build();
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for sayHello');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
}
request = r.build();
}); });
peer.internals.initiateFlow(request!); peer.internals.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]); return Promise.race([promise, Promise.resolve()]);
@ -144,70 +160,133 @@ export function registerHelloWorld(peer: FluencePeer, serviceId: string, service
export function getRelayTime(config?: {ttl?: number}) : Promise<number>; export function tellFortune(config?: {ttl?: number}): Promise<string>;
export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}) : Promise<number>; export function tellFortune(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
export function getRelayTime(...args: any) { export function tellFortune(...args: any) {
let peer: FluencePeer; let peer: FluencePeer;
let config: any; let config: any;
if (FluencePeer.isInstance(args[0])) { if (FluencePeer.isInstance(args[0])) {
peer = args[0]; peer = args[0];
config = args[1]; config = args[1];
} else { } else {
peer = Fluence.getPeer(); peer = Fluence.getPeer();
config = args[0]; config = args[0];
} }
let request: RequestFlow; let request: RequestFlow;
const promise = new Promise<number>((resolve, reject) => { const promise = new Promise<string>((resolve, reject) => {
const r = new RequestFlowBuilder() const r = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(`
` (xor
(xor (seq
(seq (seq
(seq (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) (call %init_peer_id% ("hello-world" "getFortune") [] res)
(xor )
(call -relay- ("peer" "timestamp_ms") [] ts) (xor
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) (call %init_peer_id% ("callbackSrv" "response") [res])
) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
) )
(xor )
(call %init_peer_id% ("callbackSrv" "response") [ts]) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
(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.onEvent('callbackSrv', 'response', (args) => {
) const [res] = args;
.configHandler((h) => { resolve(res);
h.on('getDataSrv', '-relay-', () => { });
return peer.getStatus().relayPeerId; h.onEvent('errorHandlingSrv', 'error', (args) => {
}); const [err] = args;
reject(err);
});
})
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for tellFortune');
})
h.onEvent('callbackSrv', 'response', (args) => { if (config && config.ttl) {
const [res] = args; r.withTTL(config.ttl)
resolve(res); }
});
h.onEvent('errorHandlingSrv', 'error', (args) => { request = r.build();
const [err] = args;
reject(err);
});
})
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for getRelayTime');
})
if(config && config.ttl) {
r.withTTL(config.ttl)
}
request = r.build();
}); });
peer.internals.initiateFlow(request!); peer.internals.initiateFlow(request!);
return promise; return promise;
} }
export function getRelayTime(config?: {ttl?: number}): Promise<number>;
export function getRelayTime(peer: FluencePeer, config?: {ttl?: number}): Promise<number>;
export function getRelayTime(...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<number>((resolve, reject) => {
const r = new RequestFlowBuilder()
.disableInjections()
.withRawScript(`
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(xor
(call -relay- ("peer" "timestamp_ms") [] ts)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [ts])
(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.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 getRelayTime');
})
if (config && config.ttl) {
r.withTTL(config.ttl)
}
request = r.build();
});
peer.internals.initiateFlow(request!);
return promise;
}

View File

@ -4,19 +4,27 @@ import {
registerHelloWorld, registerHelloWorld,
sayHello, sayHello,
getRelayTime, getRelayTime,
tellFortune,
} from "./_aqua/hello-world"; } from "./_aqua/hello-world";
async function main() { async function main() {
await Fluence.start({ connectTo: krasnodar[0] }); await Fluence.start({ connectTo: krasnodar[0] });
registerHelloWorld({ registerHelloWorld({
hello: async (str) => { hello: (str) => {
console.log(str); console.log(str);
}, },
getFortune: async () => {
await new Promise(resolve => {
setTimeout(resolve, 1000)
})
return "Wealth awaits you very soon."
}); });
await sayHello(); await sayHello();
console.log(await tellFortune());
const relayTime = await getRelayTime(); const relayTime = await getRelayTime();
console.log("The relay time is: ", new Date(relayTime).toLocaleString()); console.log("The relay time is: ", new Date(relayTime).toLocaleString());