fluencelabs/fluence-js
1
0
Fork 0
mirror of https://github.com/fluencelabs/fluence-js.git synced 2025-06-27 06:41:32 +00:00
Code Issues Projects Releases Wiki Activity

feat: Simplify JS Client public API (#257)

Browse Source
This commit is contained in:
Pavel
2023-02-16 14:38:48 +03:00
committed by GitHub
parent 35dfb1bfbc
commit 9daaf41096
24 changed files with 774 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/@tests/aqua/_aqua/smoke_test.aqua
View File

@ -1,5 +1,9 @@
import "@fluencelabs/registry/resources-api.aqua"
func smokeTest(label: string) -> ?string, *string:
service HelloWorld("hello-world"):
hello(str: string) -> string
func smokeTest(label: string) -> ?string, *string, string:
res, errors <- createResource(label)
<- res, errors
hello <- HelloWorld.hello("Fluence user")
<- res, errors, hello

4
packages/@tests/aqua/package.json
View File

@ -17,8 +17,8 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-client.api": "workspace:*",
"@fluencelabs/fluence-network-environment": "1.0.13",
"@fluencelabs/js-client.api": "workspace:^",
"@fluencelabs/fluence-network-environment": "1.0.14",
"base64-js": "1.5.1"
},
"devDependencies": {

376
packages/@tests/aqua/src/_aqua/smoke_test.ts
View File

@ -1,3 +1,5 @@
/* eslint-disable */
// @ts-nocheck
/**
*
* This file is auto-generated. Do not edit manually: changes may be erased.
@ -6,17 +8,54 @@
* Aqua version: 0.9.4
*
*/
// eslint-disable
//ts-nocheck
import type { IFluenceClient as IFluenceClient$$, CallParams as CallParams$$ } from '@fluencelabs/js-client.api';
import { v5_callFunction as callFunction$$, v5_registerService as registerService$$ } from '@fluencelabs/js-client.api';
// Services
export interface HelloWorldDef {
hello: (str: string, callParams: CallParams$$<'str'>) => string | Promise<string>;
}
export function registerHelloWorld(service: HelloWorldDef): void;
export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
export function registerHelloWorld(peer: IFluenceClient$$, service: HelloWorldDef): void;
export function registerHelloWorld(peer: IFluenceClient$$, serviceId: string, service: HelloWorldDef): void;
export function registerHelloWorld(...args: any) {
registerService$$(args, {
defaultServiceId: 'hello-world',
functions: {
tag: 'labeledProduct',
fields: {
hello: {
tag: 'arrow',
domain: {
tag: 'labeledProduct',
fields: {
str: {
tag: 'scalar',
name: 'string',
},
},
},
codomain: {
tag: 'unlabeledProduct',
items: [
{
tag: 'scalar',
name: 'string',
},
],
},
},
},
},
});
}
// Functions
export type SmokeTestResult = [string | null, string[]];
export type SmokeTestResult = [string | null, string[], string];
export function smokeTest(label: string, config?: { ttl?: number }): Promise<SmokeTestResult>;
export function smokeTest(peer: IFluenceClient$$, label: string, config?: { ttl?: number }): Promise<SmokeTestResult>;
@ -27,208 +66,211 @@ export function smokeTest(...args: any) {
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "label") [] label)
)
(new $resource_id
(new $successful
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "label") [] label)
)
(new $resource_id
(new $successful
(seq
(seq
(call %init_peer_id% ("peer" "timestamp_sec") [] t)
(xor
(seq
(seq
(call %init_peer_id% ("peer" "timestamp_sec") [] t)
(xor
(seq
(call -relay- ("registry" "get_key_bytes") [label [] t [] ""] bytes)
(xor
(call %init_peer_id% ("sig" "sign") [bytes] result)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(xor
(match result.$.success! false
(ap result.$.error.[0]! $error)
)
(seq
(call -relay- ("registry" "get_key_bytes") [label [] t [] ""] bytes)
(xor
(call %init_peer_id% ("sig" "sign") [bytes] result)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(xor
(match result.$.success! false
(ap result.$.error.[0]! $error)
)
(seq
(seq
(seq
(seq
(seq
(ap result.$.signature! result_flat)
(call -relay- ("registry" "get_key_id") [label %init_peer_id%] id)
(seq
(ap result.$.signature! result_flat)
(call -relay- ("registry" "get_key_id") [label %init_peer_id%] id)
)
(call -relay- ("op" "string_to_b58") [id] k)
)
(call -relay- ("op" "string_to_b58") [id] k)
(call -relay- ("kad" "neighborhood") [k [] []] nodes)
)
(call -relay- ("kad" "neighborhood") [k [] []] nodes)
)
(par
(fold nodes n-0
(par
(seq
(xor
(xor
(seq
(seq
(seq
(call n-0 ("peer" "timestamp_sec") [] t-0)
(call n-0 ("trust-graph" "get_weight") [%init_peer_id% t-0] weight)
)
(call n-0 ("registry" "register_key") [label [] t [] "" result_flat.$.[0]! weight t-0] result-0)
)
(xor
(match result-0.$.success! true
(ap true $successful)
)
(ap result-0.$.error! $error)
)
)
(call n-0 ("op" "noop") [])
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(call -relay- ("op" "noop") [])
)
(next n-0)
)
(never)
)
(null)
)
)
(new $status
(new $result-1
(seq
(seq
(seq
(par
(seq
(seq
(seq
(call -relay- ("math" "sub") [1 1] sub)
(new $successful_test
(seq
(seq
(seq
(call -relay- ("math" "add") [sub 1] successful_incr)
(fold $successful s
(seq
(seq
(ap s $successful_test)
(canon -relay- $successful_test #successful_iter_canon)
)
(xor
(match #successful_iter_canon.length successful_incr
(null)
)
(next s)
)
)
(never)
)
)
(canon -relay- $successful_test #successful_result_canon)
)
(ap #successful_result_canon successful_gate)
)
)
)
(call -relay- ("math" "sub") [1 1] sub-0)
)
(ap "ok" $status)
)
(call -relay- ("peer" "timeout") [6000 "timeout"] $status)
)
(new $status_test
(seq
(seq
(seq
(call -relay- ("math" "add") [0 1] status_incr)
(fold $status s
(seq
(seq
(ap s $status_test)
(canon -relay- $status_test #status_iter_canon)
)
(xor
(match #status_iter_canon.length status_incr
(null)
)
(next s)
)
)
(never)
)
)
(canon -relay- $status_test #status_result_canon)
)
(ap #status_result_canon status_gate)
)
)
)
(xor
(match status_gate.$.[0]! "ok"
(ap true $result-1)
)
(ap false $result-1)
)
)
(new $result-1_test
(seq
(par
(fold nodes n-0
(par
(seq
(seq
(call -relay- ("math" "add") [0 1] result-1_incr)
(fold $result-1 s
(xor
(xor
(seq
(seq
(ap s $result-1_test)
(canon -relay- $result-1_test #result-1_iter_canon)
(seq
(call n-0 ("peer" "timestamp_sec") [] t-0)
(call n-0 ("trust-graph" "get_weight") [%init_peer_id% t-0] weight)
)
(call n-0 ("registry" "register_key") [label [] t [] "" result_flat.$.[0]! weight t-0] result-0)
)
(xor
(match #result-1_iter_canon.length result-1_incr
(null)
(match result-0.$.success! true
(ap true $successful)
)
(next s)
(ap result-0.$.error! $error)
)
)
(never)
(call n-0 ("op" "noop") [])
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(canon -relay- $result-1_test #result-1_result_canon)
(call -relay- ("op" "noop") [])
)
(next n-0)
)
(never)
)
(null)
)
)
(new $status
(new $result-1
(seq
(seq
(seq
(par
(seq
(seq
(seq
(call -relay- ("math" "sub") [1 1] sub)
(new $successful_test
(seq
(seq
(seq
(call -relay- ("math" "add") [sub 1] successful_incr)
(fold $successful s
(seq
(seq
(ap s $successful_test)
(canon -relay- $successful_test #successful_iter_canon)
)
(xor
(match #successful_iter_canon.length successful_incr
(null)
)
(next s)
)
)
(never)
)
)
(canon -relay- $successful_test #successful_result_canon)
)
(ap #successful_result_canon successful_gate)
)
)
)
(call -relay- ("math" "sub") [1 1] sub-0)
)
(ap "ok" $status)
)
(call -relay- ("peer" "timeout") [6000 "timeout"] $status)
)
(new $status_test
(seq
(seq
(seq
(call -relay- ("math" "add") [0 1] status_incr)
(fold $status s
(seq
(seq
(ap s $status_test)
(canon -relay- $status_test #status_iter_canon)
)
(xor
(match #status_iter_canon.length status_incr
(null)
)
(next s)
)
)
(never)
)
)
(canon -relay- $status_test #status_result_canon)
)
(ap #status_result_canon status_gate)
)
)
)
(xor
(match status_gate.$.[0]! "ok"
(ap true $result-1)
)
(ap false $result-1)
)
)
(new $result-1_test
(seq
(seq
(seq
(call -relay- ("math" "add") [0 1] result-1_incr)
(fold $result-1 s
(seq
(seq
(ap s $result-1_test)
(canon -relay- $result-1_test #result-1_iter_canon)
)
(xor
(match #result-1_iter_canon.length result-1_incr
(null)
)
(next s)
)
)
(never)
)
)
(canon -relay- $result-1_test #result-1_result_canon)
)
(ap #result-1_result_canon result-1_gate)
)
(ap #result-1_result_canon result-1_gate)
)
)
)
)
)
)
(xor
(match result-1_gate.$.[0]! false
(ap "resource wasn't created: timeout exceeded" $error)
(xor
(match result-1_gate.$.[0]! false
(ap "resource wasn't created: timeout exceeded" $error)
)
(ap id $resource_id)
)
(ap id $resource_id)
)
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
(canon %init_peer_id% $resource_id #-resource_id-fix-0)
)
(canon %init_peer_id% $resource_id #-resource_id-fix-0)
(ap #-resource_id-fix-0 -resource_id-flat-0)
)
(ap #-resource_id-fix-0 -resource_id-flat-0)
)
)
)
(call %init_peer_id% ("hello-world" "hello") ["Fluence user"] hello)
)
(xor
(seq
(canon %init_peer_id% $error #error_canon)
(call %init_peer_id% ("callbackSrv" "response") [-resource_id-flat-0 #error_canon])
(call %init_peer_id% ("callbackSrv" "response") [-resource_id-flat-0 #error_canon hello])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
)
@ -268,6 +310,10 @@ export function smokeTest(...args: any) {
name: 'string',
},
},
{
tag: 'scalar',
name: 'string',
},
],
},
},
@ -284,3 +330,5 @@ export function smokeTest(...args: any) {
script,
);
}
/* eslint-enable */

77
packages/@tests/aqua/src/index.ts
View File

@ -1,50 +1,65 @@
import { fromByteArray } from 'base64-js';
import { Fluence } from '@fluencelabs/js-client.api';
import { krasnodar } from '@fluencelabs/fluence-network-environment';
import { smokeTest } from './_aqua/smoke_test.js';
import { kras, randomKras } from '@fluencelabs/fluence-network-environment';
import { registerHelloWorld, smokeTest } from './_aqua/smoke_test.js';
// const relay = {
// multiaddr: '/ip4/127.0.0.1/tcp/4310/ws/p2p/12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3',
// peerId: '12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3',
// };
const relay = krasnodar[4];
const relay = randomKras();
const rndSk = () => {
// if (getRandomValues) {
// return getRandomValues(new Uint8Array(32));
// }
// @ts-ignore
// return globalThis.crypto.webcrypto.getRandomValues(new Uint8Array(32));
function generateRandomUint8Array() {
const uint8Array = new Uint8Array(32);
for (let i = 0; i < uint8Array.length; i++) {
uint8Array[i] = Math.floor(Math.random() * 256);
}
return uint8Array;
}
const optsWithRandomKeyPair = () => {
return {
keyPair: {
type: 'Ed25519',
source: generateRandomUint8Array(),
},
} as const;
};
export const main = async () => {
console.log('starting fluence...');
await Fluence.start({
relay: relay,
// keyPair: {
// type: 'Ed25519',
// source: rndSk(),
// },
});
try {
Fluence.onConnectionStateChange((state) => console.info('connection state changed: ', state));
console.log('started fluence');
const p = await Fluence.getPeer();
console.log('connecting to Fluence Network...');
await Fluence.connect(relay, optsWithRandomKeyPair());
console.log('my peer id: ', p.getStatus().peerId);
console.log('my sk id: ', fromByteArray(p.getSk()));
console.log('connected');
console.log('running some aqua...');
const [res, errors] = await smokeTest('my_resource');
if (res === null) {
console.log('aqua failed, errors', errors);
} else {
console.log('aqua finished, result', res);
await registerHelloWorld({
hello(str) {
return 'Hello, ' + str + '!';
},
});
const client = await Fluence.getClient();
console.log('my peer id: ', client.getPeerId());
console.log('my sk id: ', fromByteArray(client.getPeerSecretKey()));
console.log('running some aqua...');
const [res, errors, hello] = await smokeTest('my_resource');
console.log(hello);
if (res === null) {
console.log('aqua failed, errors', errors);
} else {
console.log('aqua finished, result', res);
}
} finally {
console.log('disconnecting from Fluence Network...');
await Fluence.disconnect();
console.log('disconnected');
}
console.log('stopping fluence...');
await Fluence.stop();
console.log('stopped fluence...');
};
export const runMain = () => {

4
packages/@tests/frameworks/cra-ts/package.json
View File

@ -3,8 +3,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fluencelabs/js-client.api": "workspace:*",
"@test/aqua_for_test": "workspace:*",
"@fluencelabs/js-client.api": "workspace:^",
"@test/aqua_for_test": "workspace:^",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "13.4.0",
"@testing-library/user-event": "13.5.0",

6
packages/@tests/smoke_node/package.json
View File

@ -17,9 +17,9 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-client.api": "workspace:*",
"@fluencelabs/js-client.node": "workspace:*",
"@test/aqua_for_test": "workspace:*"
"@fluencelabs/js-client.api": "workspace:^",
"@fluencelabs/js-client.node": "workspace:^",
"@test/aqua_for_test": "workspace:^"
},
"devDependencies": {}
}

2
packages/@tests/smoke_web/package.json
View File

@ -18,7 +18,7 @@
"license": "Apache-2.0",
"dependencies": {},
"devDependencies": {
"@fluencelabs/js-client.web.standalone": "workspace:*",
"@fluencelabs/js-client.web.standalone": "workspace:^",
"http-server": "14.1.1"
}
}