fluencelabs/registry-demo-cli
1
0
Fork 0
mirror of https://github.com/fluencelabs/registry-demo-cli synced 2025-04-25 07:52:15 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Alexey Proshutinskiy 2022-03-24 20:59:25 +04:00
parent 848e91c0d7
commit adb39e31ae
6 changed files with 279 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -7,7 +7,8 @@
"compile-aqua": "aqua -i ./src/aqua -o ./src/generated", "compile-aqua": "aqua -i ./src/aqua -o ./src/generated",
"build": "npm run compile-aqua && tsc", "build": "npm run compile-aqua && tsc",
"prestart": "npm run build", "prestart": "npm run build",
"start": "node dist/index.js" "start": "node dist/index.js",
"start_client": "node dist/client.js"
}, },
"keywords": [], "keywords": [],
"author": "Fluence Labs", "author": "Fluence Labs",

22
src/aqua/export.aqua
View File

@ -1,9 +1,17 @@
module Export module Export
import createRouteAndRegister, resolveRoute from "@fluencelabs/registry/routing.aqua" import createRouteAndRegister from "@fluencelabs/registry/routing.aqua"
import Messaging from "./service.aqua" import resolveRoute from "@fluencelabs/registry/routing.aqua"
export createRouteAndRegister, resolveRoute, Messaging, send_message
func send_message(relay: string, peer_id: string, service_id: string, message: string): import GreetingService from "./service.aqua"
on peer_id via HOST_PEER_ID via relay: export createRouteAndRegister, GreetingService, greeting
Messaging service_id
Messaging.receive(message) const ACK = 5
func greeting(route_id: string, message: string) -> []string:
providers <- resolveRoute(route_id, ACK)
res: *string
for p <- providers:
on p.peer_id via p.relay_id:
GreetingService p.service_id!
res <- GreetingService.greeting(message)
<- res

6
src/aqua/service.aqua
View File

@ -1,4 +1,4 @@
module Service declares Messaging module Service declares GreetingService
service Messaging: service GreetingService:
receive(msg: string) greeting(name: string) -> string

15
src/client.ts
View File

@ -1,14 +1,13 @@
import { resolveRoute, send_message} from "./generated/export" import { greeting } from "./generated/export"
import { krasnodar } from "@fluencelabs/fluence-network-environment" import { krasnodar } from "@fluencelabs/fluence-network-environment"
import {Fluence} from "@fluencelabs/fluence" import { Fluence } from "@fluencelabs/fluence"
async function main(route_id: string) { async function main(route_id: string) {
await Fluence.start({connectTo: krasnodar[0]}); await Fluence.start({connectTo: krasnodar[4]});
console.log(route_id); console.log(Fluence.getStatus().relayPeerId);
let providers = await resolveRoute(route_id, 3); let results = await greeting(route_id, "Alexey");
console.log("Providers:", providers); console.log("Results:", results);
let provider = providers[0];
await send_message(provider.relay_id[0], provider.peer_id, provider.service_id[0], "hello world");
} }
let route_id = process.argv[2]; let route_id = process.argv[2];

339
src/generated/export.ts
View File

@ -16,33 +16,39 @@ import {
// Services // Services
export interface MessagingDef { export interface GreetingServiceDef {
receive: (msg: string, callParams: CallParams<'msg'>) => void | Promise<void>; greeting: (name: string, callParams: CallParams<'name'>) => string | Promise<string>;
} }
export function registerMessaging(serviceId: string, service: MessagingDef): void; export function registerGreetingService(serviceId: string, service: GreetingServiceDef): void;
export function registerMessaging(peer: FluencePeer, serviceId: string, service: MessagingDef): void; export function registerGreetingService(peer: FluencePeer, serviceId: string, service: GreetingServiceDef): void;
export function registerMessaging(...args: any) { export function registerGreetingService(...args: any) {
registerService( registerService(
args, args,
{ {
"functions" : { "functions" : {
"tag" : "labeledProduct", "tag" : "labeledProduct",
"fields" : { "fields" : {
"receive" : { "greeting" : {
"tag" : "arrow", "tag" : "arrow",
"domain" : { "domain" : {
"tag" : "labeledProduct", "tag" : "labeledProduct",
"fields" : { "fields" : {
"msg" : { "name" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "string" "name" : "string"
} }
} }
}, },
"codomain" : { "codomain" : {
"tag" : "nil" "tag" : "unlabeledProduct",
"items" : [
{
"tag" : "scalar",
"name" : "string"
}
]
} }
} }
} }
@ -54,165 +60,164 @@ export function registerMessaging(...args: any) {
// Functions // Functions
export function resolveRoute( export function registerForRouteNode(
route_id: string, subscriber_node_id: string,
ack: number, label: string,
value: string,
service_id: string | null,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<{ peer_id: string; relay_id: string[]; route_id: string; service_id: string[]; set_by: string; signature: number[]; solution: number[]; timestamp_created: number; value: string; }[]>; ): Promise<void>;
export function resolveRoute( export function registerForRouteNode(
peer: FluencePeer, peer: FluencePeer,
route_id: string, subscriber_node_id: string,
ack: number, label: string,
value: string,
service_id: string | null,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<{ peer_id: string; relay_id: string[]; route_id: string; service_id: string[]; set_by: string; signature: number[]; solution: number[]; timestamp_created: number; value: string; }[]>; ): Promise<void>;
export function resolveRoute(...args: any) { export function registerForRouteNode(...args: any) {
let script = ` let script = `
(xor (xor
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(seq (seq
(seq (seq
(seq (seq
(seq (seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "route_id") [] route_id) (call %init_peer_id% ("getDataSrv" "subscriber_node_id") [] subscriber_node_id)
) )
(call %init_peer_id% ("getDataSrv" "ack") [] ack) (call %init_peer_id% ("getDataSrv" "label") [] label)
)
(call %init_peer_id% ("getDataSrv" "value") [] value)
)
(call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
)
(call %init_peer_id% ("peer" "timestamp_sec") [] t)
)
(xor
(call -relay- ("registry" "get_route_bytes") [label [] t [] ""] bytes)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(call %init_peer_id% ("sig" "sign") [bytes] signature)
)
(xor
(call -relay- ("registry" "get_route_id") [label %init_peer_id%] route_id)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(xor
(call -relay- ("registry" "get_host_record_bytes") [route_id value [] service_id t []] bytes-0)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
)
(call %init_peer_id% ("sig" "sign") [bytes-0] signature-0)
)
(call -relay- ("op" "noop") [])
) )
(new $res
(xor (xor
(seq (seq
(seq (seq
(seq (seq
(seq (seq
(call -relay- ("op" "string_to_b58") [route_id] k) (seq
(call -relay- ("kad" "neighborhood") [k [] []] nodes) (seq
(call subscriber_node_id ("peer" "timestamp_sec") [] t-0)
(call subscriber_node_id ("trust-graph" "get_weight") [%init_peer_id% t-0] weight)
)
(call subscriber_node_id ("registry" "put_host_record") [route_id value [] service_id t [] signature-0.$.signature.[0]! weight t-0] result)
)
(call subscriber_node_id ("op" "string_to_b58") [route_id] k)
)
(call subscriber_node_id ("kad" "neighborhood") [k [] []] nodes)
) )
(par (par
(fold nodes n (fold nodes n
(par (par
(seq
(xor (xor
(xor (xor
(seq (seq
(seq (seq
(call n ("peer" "timestamp_sec") [] t) (seq
(call n ("registry" "get_records") [route_id t] get_result) (seq
(seq
(call n ("peer" "timestamp_sec") [] t-1)
(call n ("trust-graph" "get_weight") [%init_peer_id% t-1] weight-0)
) )
(ap get_result.$.result! $res) (call n ("registry" "register_route") [label [] t [] "" signature.$.signature.[0]! false weight-0 t-1] result-0)
)
(call n ("peer" "timestamp_sec") [] t-2)
)
(call n ("trust-graph" "get_weight") [%init_peer_id% t-2] weight-1)
)
(call n ("registry" "propagate_host_record") [result t-2 weight-1] result-1)
) )
(null) (null)
) )
(seq (seq
(call -relay- ("op" "noop") []) (call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
) )
) )
(call -relay- ("op" "noop") [])
)
(next n) (next n)
) )
) )
(null) (null)
) )
) )
(call -relay- ("op" "noop") [$res.$.[ack]!]) (call -relay- ("op" "noop") [])
) )
(call -relay- ("registry" "merge") [$res] result) (seq
) (call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5])
) )
) )
) )
(xor (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 6])
(call %init_peer_id% ("callbackSrv" "response") [result.$.result!])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
) )
` `
return callFunction( return callFunction(
args, args,
{ {
"functionName" : "resolveRoute", "functionName" : "registerForRouteNode",
"arrow" : { "arrow" : {
"tag" : "arrow", "tag" : "arrow",
"domain" : { "domain" : {
"tag" : "labeledProduct", "tag" : "labeledProduct",
"fields" : { "fields" : {
"route_id" : { "subscriber_node_id" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "string" "name" : "string"
}, },
"ack" : { "label" : {
"tag" : "scalar",
"name" : "i16"
}
}
},
"codomain" : {
"tag" : "unlabeledProduct",
"items" : [
{
"tag" : "array",
"type" : {
"tag" : "struct",
"name" : "Record",
"fields" : {
"relay_id" : {
"tag" : "array",
"type" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "string" "name" : "string"
}
},
"signature" : {
"tag" : "array",
"type" : {
"tag" : "scalar",
"name" : "u8"
}
},
"solution" : {
"tag" : "array",
"type" : {
"tag" : "scalar",
"name" : "u8"
}
},
"route_id" : {
"tag" : "scalar",
"name" : "string"
},
"set_by" : {
"tag" : "scalar",
"name" : "string"
},
"peer_id" : {
"tag" : "scalar",
"name" : "string"
},
"service_id" : {
"tag" : "array",
"type" : {
"tag" : "scalar",
"name" : "string"
}
}, },
"value" : { "value" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "string" "name" : "string"
}, },
"timestamp_created" : { "service_id" : {
"tag" : "option",
"type" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "u64" "name" : "string"
} }
} }
} }
} },
] "codomain" : {
"tag" : "nil"
} }
}, },
"names" : { "names" : {
@ -404,85 +409,144 @@ export function createRouteAndRegister(...args: any) {
export function send_message( export function greeting(
relay: string, route_id: string,
peer_id: string,
service_id: string,
message: string, message: string,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<void>; ): Promise<string[]>;
export function send_message( export function greeting(
peer: FluencePeer, peer: FluencePeer,
relay: string, route_id: string,
peer_id: string,
service_id: string,
message: string, message: string,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<void>; ): Promise<string[]>;
export function send_message(...args: any) { export function greeting(...args: any) {
let script = ` let script = `
(xor (xor
(seq
(seq
(seq
(seq (seq
(seq (seq
(seq (seq
(seq (seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "relay") [] relay) (call %init_peer_id% ("getDataSrv" "route_id") [] route_id)
)
(call %init_peer_id% ("getDataSrv" "peer_id") [] peer_id)
)
(call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
) )
(call %init_peer_id% ("getDataSrv" "message") [] message) (call %init_peer_id% ("getDataSrv" "message") [] message)
) )
(new $res
(seq
(seq
(new $res-0
(xor
(seq
(seq
(seq
(seq
(call -relay- ("op" "string_to_b58") [route_id] k)
(call -relay- ("kad" "neighborhood") [k [] []] nodes)
)
(par
(fold nodes n
(par
(seq
(xor
(xor
(seq
(seq
(call n ("peer" "timestamp_sec") [] t)
(call n ("registry" "get_records") [route_id t] get_result)
)
(ap get_result.$.result! $res-0)
)
(null)
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(call -relay- ("op" "noop") []) (call -relay- ("op" "noop") [])
) )
(call relay ("op" "noop") []) (next n)
)
)
(null)
)
)
(call -relay- ("op" "noop") [$res-0.$.[5]!])
)
(call -relay- ("registry" "merge") [$res-0] result)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(fold result.$.result! p
(seq
(seq
(seq
(call -relay- ("op" "noop") [])
(fold p.$.relay_id! -via-peer-
(seq
(call -via-peer- ("op" "noop") [])
(next -via-peer-)
)
)
) )
(xor (xor
(seq (seq
(seq (seq
(call peer_id (service_id "receive") [message]) (call p.$.peer_id! (p.$.service_id.[0]! "greeting") [message] $res)
(call relay ("op" "noop") []) (fold p.$.relay_id! -via-peer-
(seq
(next -via-peer-)
(call -via-peer- ("op" "noop") [])
)
)
) )
(call -relay- ("op" "noop") []) (call -relay- ("op" "noop") [])
) )
(seq (seq
(seq (seq
(call relay ("op" "noop") []) (fold p.$.relay_id! -via-peer-
(seq
(call -via-peer- ("op" "noop") [])
(next -via-peer-)
)
)
(call -relay- ("op" "noop") []) (call -relay- ("op" "noop") [])
) )
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
) )
) )
) )
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) (next p)
)
)
)
(call %init_peer_id% ("op" "identity") [$res] res-fix)
)
)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res-fix])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5])
) )
` `
return callFunction( return callFunction(
args, args,
{ {
"functionName" : "send_message", "functionName" : "greeting",
"arrow" : { "arrow" : {
"tag" : "arrow", "tag" : "arrow",
"domain" : { "domain" : {
"tag" : "labeledProduct", "tag" : "labeledProduct",
"fields" : { "fields" : {
"relay" : { "route_id" : {
"tag" : "scalar",
"name" : "string"
},
"peer_id" : {
"tag" : "scalar",
"name" : "string"
},
"service_id" : {
"tag" : "scalar", "tag" : "scalar",
"name" : "string" "name" : "string"
}, },
@ -493,7 +557,16 @@ export function send_message(...args: any) {
} }
}, },
"codomain" : { "codomain" : {
"tag" : "nil" "tag" : "unlabeledProduct",
"items" : [
{
"tag" : "array",
"type" : {
"tag" : "scalar",
"name" : "string"
}
}
]
} }
}, },
"names" : { "names" : {

20
src/index.ts
View File

@ -1,23 +1,25 @@
import {createRouteAndRegister, registerMessaging, resolveRoute, send_message} from "./generated/export" import {createRouteAndRegister, registerGreetingService} from "./generated/export"
import { krasnodar } from "@fluencelabs/fluence-network-environment" import { krasnodar } from "@fluencelabs/fluence-network-environment"
import {Fluence} from "@fluencelabs/fluence" import { Fluence } from "@fluencelabs/fluence"
async function main() { async function main() {
await Fluence.start({connectTo: krasnodar[0]}); await Fluence.start({connectTo: krasnodar[0]});
console.log('our peer id', Fluence.getStatus().peerId); console.log('our peer id', Fluence.getStatus().peerId);
let relay_id = Fluence.getStatus().relayPeerId;
console.log('connected to', Fluence.getStatus().relayPeerId); console.log('connected to', Fluence.getStatus().relayPeerId);
let label = "messaging_label"; let relay_id = Fluence.getStatus().relayPeerId;
let value = "so important"; let service_id = "my_greeting_service";
let service_id = "my_messaging"; await registerGreetingService(service_id, {
await registerMessaging(service_id, { greeting: (name) => {
receive: (msg) => { console.log("Message received:", name);
console.log("Message received:", msg); return "Hi, " + name;
} }
}) })
let label = "my_greeting_label";
let value = "so important";
let route_id = await createRouteAndRegister(label, value, relay_id, service_id); let route_id = await createRouteAndRegister(label, value, relay_id, service_id);
console.log("Route id:", route_id); console.log("Route id:", route_id);
process.stdin.setRawMode(true); process.stdin.setRawMode(true);