Update aqua-cli version

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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