fluencelabs/fluent-pad
1
0
Fork 0
mirror of https://github.com/fluencelabs/fluent-pad synced 2025-05-16 18:41:22 +00:00
Code Issues Projects Releases Wiki Activity

Update aqua-cli version

Browse Source
This commit is contained in:
Pavel Murygin 2021-05-18 10:36:04 +03:00
parent 9db6302f77
commit 0d105e1caa
6 changed files with 111 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/aqua/common.aqua
View File

@ -1,3 +1,3 @@
data EmptyServiceResult: data EmptyServiceResult:
ret_code: s32 ret_code: i32
err_msg: string err_msg: string

4
client/aqua/history.aqua
View File

@ -1,7 +1,7 @@
import "common.aqua" import "common.aqua"
data AddServiceResult: data AddServiceResult:
ret_code: s32 ret_code: i32
err_msg: string err_msg: string
entry_id: u64 entry_id: u64
@ -10,7 +10,7 @@ data HistoryEntry:
body: string body: string
data GetEntriesServiceResult: data GetEntriesServiceResult:
ret_code: s32 ret_code: i32
err_msg: string err_msg: string
entries: []HistoryEntry entries: []HistoryEntry

4
client/aqua/user-list.aqua
View File

@ -8,11 +8,11 @@ data User:
data GetUsersServiceResult: data GetUsersServiceResult:
users: []User users: []User
ret_code: s32 ret_code: i32
err_msg: string err_msg: string
data AuthResult: data AuthResult:
ret_code: s32 ret_code: i32
err_msg: string err_msg: string
is_authenticated: bool is_authenticated: bool

6
client/package-lock.json generated
View File

@ -1216,9 +1216,9 @@
} }
}, },
"@fluencelabs/aqua-cli": { "@fluencelabs/aqua-cli": {
"version": "0.1.1-101", "version": "0.1.1-105",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.1-101.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-cli/-/aqua-cli-0.1.1-105.tgz",
"integrity": "sha512-H8ip2yGm1iUj7T5SveaCjXl5wEPsUhtN0iNRCPu2P7Af/+gDMgQoyeMk0FFidrfQLZD3KDRQwoUxelUv4pBQ/w==", "integrity": "sha512-G5TFGzp9AW7oE4jsYOt5685LIFcteSg3uvMH1e6jqMqyAElQZJ1NReZ5cuLHy89x9fp4/kljTxVwra3J31QtrQ==",
"dev": true "dev": true
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {

2
client/package.json
View File

@ -53,7 +53,7 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua-cli": "^0.1.1-101", "@fluencelabs/aqua-cli": "^0.1.1-105",
"@fluencelabs/aqua-lib": "0.1.1", "@fluencelabs/aqua-lib": "0.1.1",
"@types/lodash": "^4.14.168" "@types/lodash": "^4.14.168"
} }

187
client/src/aqua/app.ts
View File

@ -3,17 +3,19 @@
* 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.1.1-101 * Aqua version: 0.1.1-105
* *
*/ */
import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence'; import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable'; import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
export async function join(
client: FluenceClient,
export async function join(client: FluenceClient, user: {name:string;peer_id:string;relay_id:string}): Promise<{err_msg:string;ret_code:number}> { user: { name: string; peer_id: string; relay_id: string },
let request; ): Promise<{ err_msg: string; ret_code: number }> {
const promise = new Promise<{err_msg:string;ret_code:number}>((resolve, reject) => { let request: RequestFlow;
const promise = new Promise<{ err_msg: string; ret_code: number }>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(
@ -62,11 +64,13 @@ export async function join(client: FluenceClient, user: {name:string;peer_id:str
h.on('getDataSrv', '-relay-', () => { h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.on('getDataSrv', 'user', () => {return user;}); h.on('getDataSrv', 'user', () => {
return user;
});
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
@ -80,15 +84,15 @@ export async function join(client: FluenceClient, user: {name:string;peer_id:str
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return promise; return promise;
} }
export async function getUserList(
client: FluenceClient,
export async function getUserList(client: FluenceClient): Promise<{name:string;peer_id:string;relay_id:string}[]> { ): Promise<{ name: string; peer_id: string; relay_id: string }[]> {
let request; let request: RequestFlow;
const promise = new Promise<{name:string;peer_id:string;relay_id:string}[]>((resolve, reject) => { const promise = new Promise<{ name: string; peer_id: string; relay_id: string }[]>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(
@ -136,9 +140,9 @@ export async function getUserList(client: FluenceClient): Promise<{name:string;p
}); });
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
@ -152,15 +156,16 @@ export async function getUserList(client: FluenceClient): Promise<{name:string;p
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return promise; return promise;
} }
export async function initAfterJoin(
client: FluenceClient,
export async function initAfterJoin(client: FluenceClient, me: {name:string;peer_id:string;relay_id:string}): Promise<{name:string;peer_id:string;relay_id:string}[]> { me: { name: string; peer_id: string; relay_id: string },
let request; ): Promise<{ name: string; peer_id: string; relay_id: string }[]> {
const promise = new Promise<{name:string;peer_id:string;relay_id:string}[]>((resolve, reject) => { let request: RequestFlow;
const promise = new Promise<{ name: string; peer_id: string; relay_id: string }[]>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(
@ -258,11 +263,13 @@ export async function initAfterJoin(client: FluenceClient, me: {name:string;peer
h.on('getDataSrv', '-relay-', () => { h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.on('getDataSrv', 'me', () => {return me;}); h.on('getDataSrv', 'me', () => {
return me;
});
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
@ -276,14 +283,12 @@ export async function initAfterJoin(client: FluenceClient, me: {name:string;peer
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return promise; return promise;
} }
export async function updateOnlineStatuses(client: FluenceClient): Promise<void> { export async function updateOnlineStatuses(client: FluenceClient): Promise<void> {
let request; let request: RequestFlow;
const promise = new Promise<void>((resolve, reject) => { const promise = new Promise<void>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
@ -351,7 +356,6 @@ export async function updateOnlineStatuses(client: FluenceClient): Promise<void>
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
const [err] = args; const [err] = args;
@ -364,14 +368,12 @@ export async function updateOnlineStatuses(client: FluenceClient): Promise<void>
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]); return Promise.race([promise, Promise.resolve()]);
} }
export async function leave(client: FluenceClient): Promise<void> { export async function leave(client: FluenceClient): Promise<void> {
let request; let request: RequestFlow;
const promise = new Promise<void>((resolve, reject) => { const promise = new Promise<void>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
@ -457,7 +459,6 @@ export async function leave(client: FluenceClient): Promise<void> {
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
const [err] = args; const [err] = args;
@ -470,15 +471,15 @@ export async function leave(client: FluenceClient): Promise<void> {
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return Promise.race([promise, Promise.resolve()]); return Promise.race([promise, Promise.resolve()]);
} }
export async function auth(
client: FluenceClient,
export async function auth(client: FluenceClient): Promise<{err_msg:string;is_authenticated:boolean;ret_code:number}> { ): Promise<{ err_msg: string; is_authenticated: boolean; ret_code: number }> {
let request; let request: RequestFlow;
const promise = new Promise<{err_msg:string;is_authenticated:boolean;ret_code:number}>((resolve, reject) => { const promise = new Promise<{ err_msg: string; is_authenticated: boolean; ret_code: number }>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(
@ -526,9 +527,9 @@ export async function auth(client: FluenceClient): Promise<{err_msg:string;is_au
}); });
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
@ -542,19 +543,20 @@ export async function auth(client: FluenceClient): Promise<{err_msg:string;is_au
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return promise; return promise;
} }
export async function getHistory(
client: FluenceClient,
export async function getHistory(client: FluenceClient): Promise<{entries:{body:string;id:number}[];err_msg:string;ret_code:number}> { ): Promise<{ entries: { body: string; id: number }[]; err_msg: string; ret_code: number }> {
let request; let request: RequestFlow;
const promise = new Promise<{entries:{body:string;id:number}[];err_msg:string;ret_code:number}>((resolve, reject) => { const promise = new Promise<{ entries: { body: string; id: number }[]; err_msg: string; ret_code: number }>(
request = new RequestFlowBuilder() (resolve, reject) => {
.disableInjections() request = new RequestFlowBuilder()
.withRawScript( .disableInjections()
` .withRawScript(
`
(xor (xor
(seq (seq
(seq (seq
@ -609,38 +611,40 @@ export async function getHistory(client: FluenceClient): Promise<{entries:{body:
) )
`, `,
) )
.configHandler((h) => { .configHandler((h) => {
h.on('getDataSrv', '-relay-', () => { h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
const [err] = args; const [err] = args;
reject(err); reject(err);
}); });
}) })
.handleScriptError(reject) .handleScriptError(reject)
.handleTimeout(() => { .handleTimeout(() => {
reject('Request timed out for getHistory'); reject('Request timed out for getHistory');
}) })
.build(); .build();
}); },
await client.initiateFlow(request); );
await client.initiateFlow(request!);
return promise; return promise;
} }
export async function addEntry(
client: FluenceClient,
export async function addEntry(client: FluenceClient, entry: string): Promise<{entry_id:number;err_msg:string;ret_code:number}> { entry: string,
let request; ): Promise<{ entry_id: number; err_msg: string; ret_code: number }> {
const promise = new Promise<{entry_id:number;err_msg:string;ret_code:number}>((resolve, reject) => { let request: RequestFlow;
const promise = new Promise<{ entry_id: number; err_msg: string; ret_code: number }>((resolve, reject) => {
request = new RequestFlowBuilder() request = new RequestFlowBuilder()
.disableInjections() .disableInjections()
.withRawScript( .withRawScript(
@ -762,11 +766,13 @@ export async function addEntry(client: FluenceClient, entry: string): Promise<{e
h.on('getDataSrv', '-relay-', () => { h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!; return client.relayPeerId!;
}); });
h.on('getDataSrv', 'entry', () => {return entry;}); h.on('getDataSrv', 'entry', () => {
return entry;
});
h.onEvent('callbackSrv', 'response', (args) => { h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args; const [res] = args;
resolve(res); resolve(res);
}); });
h.onEvent('errorHandlingSrv', 'error', (args) => { h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument // assuming error is the single argument
@ -780,7 +786,6 @@ export async function addEntry(client: FluenceClient, entry: string): Promise<{e
}) })
.build(); .build();
}); });
await client.initiateFlow(request); await client.initiateFlow(request!);
return promise; return promise;
} }