bump sdk version, update send as fetch calls

This commit is contained in:
Pavel Murygin 2021-01-14 23:16:56 +03:00
parent 8741e65850
commit 60be27d97a
3 changed files with 37 additions and 15 deletions

View File

@ -1206,9 +1206,9 @@
"integrity": "sha512-XIgRgyVgPJXvXB3NuYHpSdJ0EFcFZ+K4uduGFf8PfnFii/bFs4F1n3MBB+b4D0y59HR4F9ZQUC4fXxcf6UCYWA=="
},
"@fluencelabs/fluence": {
"version": "0.8.0-big-refactoring.13",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.8.0-big-refactoring.13.tgz",
"integrity": "sha512-xsQhoLN8K6sz4Mkoxlp9BWIAygQPOXtxIlVEDB2SRJD7QnAM0juvUx+f3sBWDndWwdl50ibv85StiGXBzw2A7A==",
"version": "0.8.0-big-refactoring.14",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.8.0-big-refactoring.14.tgz",
"integrity": "sha512-C2VLnmgdT8dMSkpXracg4TXXewu6YZuJFfoEZTLb0Xq5sXfVwiXE2YGNBYsbjy5CR73HxR/ehPfRca+qGskuEQ==",
"requires": {
"@fluencelabs/aquamarine-stepper": "0.0.30",
"async": "3.2.0",

View File

@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fluencelabs/fluence": "0.8.0-big-refactoring.13",
"@fluencelabs/fluence": "0.8.0-big-refactoring.14",
"@fluencelabs/fluence-network-environment": "^1.0.5",
"@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^11.2.2",

View File

@ -1,4 +1,5 @@
import { FluenceClient, Particle, sendParticle, sendParticleAsFetch } from '@fluencelabs/fluence';
import {
fluentPadServiceId,
historyNodePid,
@ -31,7 +32,7 @@ interface GetUsersResult extends ServiceResult {
users: Array<User>;
}
interface GetEntries extends ServiceResult {
interface GetEntriesResult extends ServiceResult {
entries: Entry[];
}
@ -151,9 +152,20 @@ export const getUserList = async (client: FluenceClient) => {
export const join = async (client: FluenceClient, nickName: string) => {
const particle = new Particle(
`
(call userlistNode (userlist "join") [user] result)
`,
(seq
(call myRelay ("op" "identity") [])
(seq
(call userlistNode (userlist "join") [user] result)
(seq
(call myRelay ("op" "identity") [])
(call myPeerId ("_callback" "join") [result])
)
)
)
`,
{
myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(),
user: {
name: nickName,
peer_id: client.selfPeerId.toB58String(),
@ -164,9 +176,8 @@ export const join = async (client: FluenceClient, nickName: string) => {
},
);
const [result] = await sendParticleAsFetch(client, particle, ['result']);
const [result] = await sendParticleAsFetch<[ServiceResult]>(client, particle, 'join');
throwIfError(result);
return result.users;
};
export const leave = async (client: FluenceClient) => {
@ -207,12 +218,23 @@ export const leave = async (client: FluenceClient) => {
export const getHistory = async (client: FluenceClient) => {
const particle = new Particle(
`
(seq
(call userlistNode (userlist "is_authenticated") [] token)
(call historyNode (history "get_all") [token.$.["is_authenticated"]] entries)
)
`,
(seq
(call myRelay ("op" "identity") [])
(seq
(call userlistNode (userlist "is_authenticated") [] token)
(seq
(call historyNode (history "get_all") [token.$.["is_authenticated"]] entries)
(seq
(call myRelay ("op" "identity") [])
(call myPeerId ("_callback" "get_history") [entries])
)
)
)
)
`,
{
myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(),
userlist: userListServiceId,
history: historyServiceId,
userlistNode: userListNodePid,
@ -220,7 +242,7 @@ export const getHistory = async (client: FluenceClient) => {
},
);
const [result] = await sendParticleAsFetch(client, particle, ['entries']);
const [result] = await sendParticleAsFetch<[GetEntriesResult]>(client, particle, 'get_history');
throwIfError(result);
return result.entries;
};