fluencelabs/fluent-pad
1
0
Fork 0
mirror of https://github.com/fluencelabs/fluent-pad synced 2025-04-25 17:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Naming-related refactorings

Browse Source
This commit is contained in:
Pavel Murygin 2021-01-14 19:38:45 +03:00
parent 641e4da281
commit 1d83a95460
5 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -22,3 +22,6 @@ npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
.eslintcache .eslintcache
/services/history-inmemory/target/
/services/user-list-inmemory/target/

2
client/src/app/App1.tsx
View File

@ -26,7 +26,7 @@ const App = () => {
return; return;
} }
await calls.joinRoom(client, nickName); await calls.join(client, nickName);
setIsInRoom(true); setIsInRoom(true);
}; };

49
client/src/fluence/calls.ts
View File

@ -1,13 +1,15 @@
import { FluenceClient } from '@fluencelabs/fluence'; import { FluenceClient } from '@fluencelabs/fluence';
import { idText } from 'typescript';
import { fluenceClient } from '.'; import { fluenceClient } from '.';
import { import {
fluentPadServiceId, fluentPadServiceId,
historyNodePid,
historyServiceId, historyServiceId,
notifyOnlineFnName, notifyOnlineFnName,
notifyTextUpdateFnName, notifyTextUpdateFnName,
notifyUserAddedFnName, notifyUserAddedFnName,
notifyUserRemovedFnName, notifyUserRemovedFnName,
servicesNodePid, userListNodePid,
userListServiceId, userListServiceId,
} from './constants'; } from './constants';
import { Particle, sendParticle } from './exApi'; import { Particle, sendParticle } from './exApi';
@ -48,7 +50,7 @@ export const updateOnlineStatuses = async (client: FluenceClient) => {
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(seq (seq
(call node (userlist "get_users") [] allUsers) (call userlistNode (userlist "get_users") [] allUsers)
(fold allUsers.$.users! u (fold allUsers.$.users! u
(par (par
(seq (seq
@ -71,7 +73,7 @@ export const updateOnlineStatuses = async (client: FluenceClient) => {
) )
`, `,
{ {
node: servicesNodePid, userlistNode: userListNodePid,
userlist: userListServiceId, userlist: userListServiceId,
myRelay: client.relayPeerID.toB58String(), myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(), myPeerId: client.selfPeerId.toB58String(),
@ -90,7 +92,7 @@ export const notifySelfAdded = (client: FluenceClient, name: string) => {
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(seq (seq
(call node (userlist "get_users") [] allUsers) (call userlistNode (userlist "get_users") [] allUsers)
(fold allUsers.$.users! u (fold allUsers.$.users! u
(par (par
(seq (seq
@ -104,7 +106,7 @@ export const notifySelfAdded = (client: FluenceClient, name: string) => {
) )
`, `,
{ {
node: servicesNodePid, userlistNode: userListNodePid,
userlist: userListServiceId, userlist: userListServiceId,
myRelay: client.relayPeerID.toB58String(), myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(), myPeerId: client.selfPeerId.toB58String(),
@ -127,7 +129,7 @@ export const getUserList = async (client: FluenceClient) => {
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(seq (seq
(call node (userlist "get_users") [] allUsers) (call userlistNode (userlist "get_users") [] allUsers)
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(call myPeerId (fluentPadServiceId notifyUserAdded) [allUsers.$.users!]) (call myPeerId (fluentPadServiceId notifyUserAdded) [allUsers.$.users!])
@ -136,7 +138,7 @@ export const getUserList = async (client: FluenceClient) => {
) )
`, `,
{ {
node: servicesNodePid, userlistNode: userListNodePid,
userlist: userListServiceId, userlist: userListServiceId,
myRelay: client.relayPeerID.toB58String(), myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(), myPeerId: client.selfPeerId.toB58String(),
@ -149,9 +151,9 @@ export const getUserList = async (client: FluenceClient) => {
await sendParticle(client, particle); await sendParticle(client, particle);
}; };
export const joinRoom = async (client: FluenceClient, nickName: string) => { export const join = async (client: FluenceClient, nickName: string) => {
let joinRoomAir = ` let joinAir = `
(call node (userlist "join") [user] result) (call userlistNode (userlist "join") [user] result)
`; `;
const data = new Map(); const data = new Map();
@ -161,9 +163,9 @@ export const joinRoom = async (client: FluenceClient, nickName: string) => {
relay_id: client.relayPeerID.toB58String(), relay_id: client.relayPeerID.toB58String(),
}); });
data.set('userlist', userListServiceId); data.set('userlist', userListServiceId);
data.set('node', servicesNodePid); data.set('userlistNode', userListNodePid);
const [result] = await client.fetch<[GetUsersResult]>(joinRoomAir, ['result'], data); const [result] = await client.fetch<[GetUsersResult]>(joinAir, ['result'], data);
throwIfError(result); throwIfError(result);
return result.users; return result.users;
}; };
@ -174,9 +176,9 @@ export const leaveRoom = async (client: FluenceClient) => {
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(seq (seq
(call node (userlist "leave") [myPeerId]) (call userlistNode (userlist "leave") [myPeerId])
(seq (seq
(call node (userlist "get_users") [] allUsers) (call userlistNode (userlist "get_users") [] allUsers)
(fold allUsers.$.users! u (fold allUsers.$.users! u
(par (par
(seq (seq
@ -191,7 +193,7 @@ export const leaveRoom = async (client: FluenceClient) => {
) )
`, `,
{ {
node: servicesNodePid, userlistNode: userListNodePid,
userlist: userListServiceId, userlist: userListServiceId,
myRelay: client.relayPeerID.toB58String(), myRelay: client.relayPeerID.toB58String(),
myPeerId: client.selfPeerId.toB58String(), myPeerId: client.selfPeerId.toB58String(),
@ -206,15 +208,16 @@ export const leaveRoom = async (client: FluenceClient) => {
export const getHistory = async (client: FluenceClient) => { export const getHistory = async (client: FluenceClient) => {
let getHistoryAir = ` let getHistoryAir = `
(seq (seq
(call node (userlist "is_authenticated") [] token) (call userlistNode (userlist "is_authenticated") [] token)
(call node (history "get_all") [] messages) (call historyNode (history "get_all") [token.$.is_authenticated] messages)
) )
`; `;
const data = new Map(); const data = new Map();
data.set('userlist', userListServiceId); data.set('userlist', userListServiceId);
data.set('history', historyServiceId); data.set('history', historyServiceId);
data.set('node', servicesNodePid); data.set('userlistNode', userListNodePid);
data.set('historyNode', historyNodePid);
const [result] = await client.fetch<[GetMessagesResult]>(getHistoryAir, ['messages'], data); const [result] = await client.fetch<[GetMessagesResult]>(getHistoryAir, ['messages'], data);
throwIfError(result); throwIfError(result);
@ -227,11 +230,11 @@ export const addMessage = async (client: FluenceClient, messageBody: string) =>
(seq (seq
(call myRelay ("op" "identity") []) (call myRelay ("op" "identity") [])
(seq (seq
(call node (userlist "is_authenticated") [] token) (call userlistNode (userlist "is_authenticated") [] token)
(seq
(call userlistNode (userlist "get_users") [] allUsers)
(seq (seq
(call node (history "add") [message token.$.["is_authenticated"]]) (call node (history "add") [message token.$.["is_authenticated"]])
(seq
(call node (userlist "get_users") [] allUsers)
(fold allUsers.$.users! u (fold allUsers.$.users! u
(par (par
(seq (seq
@ -246,8 +249,10 @@ export const addMessage = async (client: FluenceClient, messageBody: string) =>
) )
) )
`, `,
{ {
node: servicesNodePid, userlistNode: userListNodePid,
historyNode: historyNodePid,
message: messageBody, message: messageBody,
userlist: userListServiceId, userlist: userListServiceId,
history: historyServiceId, history: historyServiceId,

3
client/src/fluence/constants.ts
View File

@ -10,4 +10,5 @@ export const notifyTextUpdateFnName = 'notifyTextUpdate';
export const userListServiceId = 'd4506f7d-be4a-4332-87b2-eb530f350861'; export const userListServiceId = 'd4506f7d-be4a-4332-87b2-eb530f350861';
export const historyServiceId = 'd9abbacf-6ee2-49e5-9683-536a5c931fa1'; export const historyServiceId = 'd9abbacf-6ee2-49e5-9683-536a5c931fa1';
export const servicesNodePid = dev[2].peerId; export const userListNodePid = dev[2].peerId;
export const historyNodePid = dev[2].peerId;

5
client/src/fluence/index.ts
View File

@ -30,6 +30,11 @@ export const connect = async (): Promise<FluenceClient> => {
return args; return args;
}); });
registerServiceFunction(c, 'op', 'alert', (args, _) => {
alert(args);
return args;
});
await c.connect(node.multiaddr); await c.connect(node.multiaddr);
fluenceClient = c; fluenceClient = c;
return fluenceClient; return fluenceClient;