This commit is contained in:
DieMyst
2021-04-29 14:15:20 +03:00
parent 00b92812be
commit af1994fac3
8 changed files with 43 additions and 87 deletions

View File

@ -1,5 +1,3 @@
import "builtin.aqua"
service Testo("testo"):
getString: string -> string

33
package-lock.json generated
View File

@ -16,9 +16,9 @@
"integrity": "sha512-WYn3fO3dy/ZTS2DnjpEv59RAFTuPosO65jejb/2QRAbZId4KiaCxma0yvFC6P0j2qoAxCDTRdbKrNZGXzjddYQ=="
},
"@fluencelabs/fluence": {
"version": "0.9.43",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.9.43.tgz",
"integrity": "sha512-7n+BM1IOLqdF8xZBqybjwUC1jeyQfuzrrMeAVfXvaS5gNuB6sz9fJiknqOZNiOZkQG2KfG3YLO5V6kM9QNupeQ==",
"version": "0.9.45",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.9.45.tgz",
"integrity": "sha512-aTC86FFNkvMFNSjLcKkD5WzJ6o//FN/PNsuVY6C4AOsR3jm+jo+uoE9mhhpA1kNxsZq3aglCVzKW+SuM6rLXdg==",
"requires": {
"@fluencelabs/aquamarine-interpreter": "0.8.2",
"async": "3.2.0",
@ -39,9 +39,9 @@
}
},
"@fluencelabs/fluence-network-environment": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.8.tgz",
"integrity": "sha512-k1E48+r7tc5jWsnAeLrua7yRKN9lRISdJ1czkcOzUF6dZ9fI5+6ZfKKfUozJyC6n4hSjtCIcUV0G65vBvQfxBw=="
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.9.tgz",
"integrity": "sha512-TetSwl2PnLEoxkP/lr3MFpqSRKFO02PJMyjeN2TQbUUviQyfYLpL/IQFocaQZc0fRzOQWVg65aqSStHtA3rB6w=="
},
"@motrix/nat-api": {
"version": "0.3.1",
@ -160,9 +160,9 @@
"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
},
"@types/node": {
"version": "14.14.41",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
"integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
"version": "15.0.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz",
"integrity": "sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA=="
},
"@types/retry": {
"version": "0.12.0",
@ -2711,9 +2711,9 @@
}
},
"protobufjs": {
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
"integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.0.tgz",
"integrity": "sha512-i4usrGD86mtOLnoTwUsVXphDY7yHM2rDiV3JU4Ix43BOtHi0DHy5rSCciX8MRHSYHaxnoc0TcpwEBlrNUAxvQQ==",
"requires": {
"@protobufjs/aspromise": "^1.1.2",
"@protobufjs/base64": "^1.1.2",
@ -2726,15 +2726,8 @@
"@protobufjs/pool": "^1.1.0",
"@protobufjs/utf8": "^1.1.0",
"@types/long": "^4.0.1",
"@types/node": "^13.7.0",
"@types/node": ">=13.7.0",
"long": "^4.0.0"
},
"dependencies": {
"@types/node": {
"version": "13.13.50",
"resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.50.tgz",
"integrity": "sha512-y7kkh+hX/0jZNxMyBR/6asG0QMSaPSzgeVK63dhWHl4QAXCQB8lExXmzLL6SzmOgKHydtawpMnNhlDbv7DXPEA=="
}
}
},
"protocol-buffers-schema": {

View File

@ -27,8 +27,8 @@
"typescript": "^4.2.4"
},
"dependencies": {
"@fluencelabs/fluence": "^0.9.43",
"@fluencelabs/fluence-network-environment": "1.0.8",
"@fluencelabs/fluence": "^0.9.45",
"@fluencelabs/fluence-network-environment": "^1.0.9",
"deep-equal": "^2.0.5"
},
"description": "Minimal template for aquamarine project."

View File

@ -238,6 +238,7 @@ export async function doStuff(client: FluenceClient, a: string): Promise<string>
(call %init_peer_id% ("test-service-id" "str") [] str)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(seq
(seq
(call relay ("op" "identity") [])
@ -245,6 +246,8 @@ export async function doStuff(client: FluenceClient, a: string): Promise<string>
)
(call relay ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
)
)
(call %init_peer_id% ("callbackSrv" "response") [str])

View File

@ -180,6 +180,7 @@ export async function iterateAndPrintParallel(client: FluenceClient, nodes: stri
(par
(seq
(seq
(seq
(seq
(seq
(call relay ("op" "identity") [])
@ -191,6 +192,8 @@ export async function iterateAndPrintParallel(client: FluenceClient, nodes: stri
)
(call relay ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
(next s)
)
)

View File

@ -76,6 +76,7 @@ export async function parFunc(client: FluenceClient, node: string, c: (arg0: {ex
(call %init_peer_id% ("parservice-id" "call") [] y)
(seq
(seq
(seq
(seq
(seq
(call relay ("op" "identity") [])
@ -87,6 +88,8 @@ export async function parFunc(client: FluenceClient, node: string, c: (arg0: {ex
)
(call relay ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
)
(call %init_peer_id% ("parservice-id" "call") [] x)
)

View File

@ -11,53 +11,6 @@ import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
export async function id(client: FluenceClient): Promise<void> {
let request;
const promise = new Promise<void>((resolve, reject) => {
request = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
// assuming error is the single argument
const [err] = args;
reject(err);
});
})
.handleScriptError(reject)
.handleTimeout(() => {
reject('Request timed out for id');
})
.build();
});
await client.initiateFlow(request);
return Promise.race([promise, Promise.resolve()]);
}
export async function topologyTest(client: FluenceClient, me: string, myRelay: string, friend: string, friendRelay: string): Promise<string> {
let request;
const promise = new Promise<string>((resolve, reject) => {
@ -85,6 +38,7 @@ export async function topologyTest(client: FluenceClient, me: string, myRelay: s
(par
(seq
(seq
(seq
(seq
(seq
(call relay ("op" "identity") [])
@ -96,6 +50,8 @@ export async function topologyTest(client: FluenceClient, me: string, myRelay: s
)
(call relay ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
(call %init_peer_id% ("lp" "print") ["my string in par"])
)
)

View File

@ -4,7 +4,7 @@ import {topologyTest} from "./compiled/topology";
export async function topologyCall(client: FluenceClient, client2: FluenceClient): Promise<string> {
registerServiceFunction(client2, "testo", "getString", (args: any[], _) => {
console.log("hello from client2")
console.log("hello from client2: " + args[0])
return "hello from client2: " + args[0]
})