diff --git a/aqua-examples/echo-greeter/client-peer/.gitignore b/aqua-examples/echo-greeter/client-peer/.gitignore new file mode 100644 index 0000000..3b8255f --- /dev/null +++ b/aqua-examples/echo-greeter/client-peer/.gitignore @@ -0,0 +1,2 @@ +dist/ +src/echo_greeter.ts \ No newline at end of file diff --git a/aqua-examples/echo-greeter/client-peer/dist/aqua-compiled/echo_greeter.js b/aqua-examples/echo-greeter/client-peer/dist/aqua-compiled/echo_greeter.js deleted file mode 100644 index 3611616..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/aqua-compiled/echo_greeter.js +++ /dev/null @@ -1,178 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0; -var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable"); -function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (echo_service_id \"echo\") [names] echo_names)\n )\n (fold echo_names result\n (seq\n (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; }); - h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq = echo_greeting_seq; -function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\n )\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (fold echo_names result\n (seq\n (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_topo', function () { return echo_topo; }); - h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq_2'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq_2 = echo_greeting_seq_2; -function echo_greeting_par(client, greet, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (fold greeting_services greeting_service\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[2]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par = echo_greeting_par; diff --git a/aqua-examples/echo-greeter/client-peer/dist/aqua/echo_greeter.js b/aqua-examples/echo-greeter/client-peer/dist/aqua/echo_greeter.js deleted file mode 100644 index 3611616..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/aqua/echo_greeter.js +++ /dev/null @@ -1,178 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0; -var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable"); -function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (echo_service_id \"echo\") [names] echo_names)\n )\n (fold echo_names result\n (seq\n (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; }); - h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq = echo_greeting_seq; -function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\n )\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (fold echo_names result\n (seq\n (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_topo', function () { return echo_topo; }); - h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq_2'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq_2 = echo_greeting_seq_2; -function echo_greeting_par(client, greet, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (fold greeting_services greeting_service\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[2]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par = echo_greeting_par; diff --git a/aqua-examples/echo-greeter/client-peer/dist/client-peer/src/index.js b/aqua-examples/echo-greeter/client-peer/dist/client-peer/src/index.js deleted file mode 100644 index 6c425e0..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/client-peer/src/index.js +++ /dev/null @@ -1,84 +0,0 @@ -"use strict"; -/* - * Copyright 2021 Fluence Labs Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var fluence_1 = require("@fluencelabs/fluence"); -var fluence_network_environment_1 = require("@fluencelabs/fluence-network-environment"); -var greeting_services = [{ "node": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", "service_id": "fb5f7126-e1ee-4ecf-81e7-20804cb7203b" }, { "node": "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", "service_id": "893a6fb8-43b9-4b11-8786-93300bd68bc8" }]; -var echo_services = [{ "node": "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", "service_id": "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede" }, { "node": "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", "service_id": "5a03906b-3217-40a2-93fb-7e83be735408" }]; -var names = ["Jim", "John", "Jake"]; -// let greeting_service = -function main() { - return __awaiter(this, void 0, void 0, function () { - var fluence; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, fluence_1.createClient(fluence_network_environment_1.krasnodar[2])]; - case 1: - fluence = _a.sent(); - console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId); - //func echo_greeting_seq(names: []string, greet: bool, node: string, echo_service_id: string, greeting_service_id: string) -> []string: - // const network_result = await echo_greeting_seq(fluence, names, true, echo_services[0].node, echo_services[0].service_id, greeting_services[0].service_id); - // console.log("seq result: ", network_result); - // const network_result_par = await get_price_par(fluence, "ethereum", "usd", getter_topo, mean_topo); - // console.log("par result: ", network_result_par); - return [2 /*return*/]; - } - }); - }); -} -main() - .then(function () { return process.exit(0); }) - .catch(function (error) { - console.error(error); - process.exit(1); -}); diff --git a/aqua-examples/echo-greeter/client-peer/dist/echo_greeter.js b/aqua-examples/echo-greeter/client-peer/dist/echo_greeter.js deleted file mode 100644 index 3611616..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/echo_greeter.js +++ /dev/null @@ -1,178 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.echo_greeting_par = exports.echo_greeting_seq_2 = exports.echo_greeting_seq = void 0; -var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable"); -function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (echo_service_id \"echo\") [names] echo_names)\n )\n (fold echo_names result\n (seq\n (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; }); - h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq = echo_greeting_seq; -function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\n )\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (fold echo_names result\n (seq\n (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_topo', function () { return echo_topo; }); - h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq_2'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq_2 = echo_greeting_seq_2; -function echo_greeting_par(client, greet, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (fold greeting_services greeting_service\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[2]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par'); - }); - if (config === null || config === void 0 ? void 0 : config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par = echo_greeting_par; diff --git a/aqua-examples/echo-greeter/client-peer/dist/src/echo_greeter.js b/aqua-examples/echo-greeter/client-peer/dist/src/echo_greeter.js deleted file mode 100644 index f00a9dd..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/src/echo_greeter.js +++ /dev/null @@ -1,372 +0,0 @@ -"use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.echo_greeting_par_alternative = exports.echo_greeting_seq = exports.greeting = exports.echo = exports.echo_greeting_par = exports.echo_greeting_par_improved = exports.echo_greeting_seq_2 = void 0; -var api_unstable_1 = require("@fluencelabs/fluence/dist/api.unstable"); -// Services -//OpString -//defaultId = "op" -//identity: (s: string) => void -//END OpString -//EchoService -//defaultId = undefined -//echo: (arg0: string[]) => {echo:string}[] -//END EchoService -//GreetingService -//defaultId = "service-id" -//greeting: (arg0: string, arg1: boolean) => string -//END GreetingService -// Functions -function echo_greeting_seq_2(client, names, greet, echo_topo, greeting_topo, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_topo\") [] echo_topo)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_topo\") [] greeting_topo)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_topo.$.node! (echo_topo.$.service_id! \"echo\") [names] echo_names)\n )\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n )\n )\n (xor\n (fold echo_names result\n (seq\n (call greeting_topo.$.node! (greeting_topo.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_topo', function () { return echo_topo; }); - h.on('getDataSrv', 'greeting_topo', function () { return greeting_topo; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq_2'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq_2 = echo_greeting_seq_2; -function echo_greeting_par_improved(client, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (seq\n (par\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (fold greeting_services greeting_service\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greeting_service.$.greet!] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"noop\") [])\n )\n (null)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par_improved'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par_improved = echo_greeting_par_improved; -function echo_greeting_par(client, greet, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (seq\n (par\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (fold greeting_services greeting_service\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"noop\") [])\n )\n (null)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par = echo_greeting_par; -function echo(client, names, node, echo_service, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (echo_service \"echo\") [names] res)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo = echo; -function greeting(client, name, greet, node, greeting_service_id, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"name\") [] name)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (greeting_service_id \"greeting\") [name greet] res)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'name', function () { return name; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for greeting'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.greeting = greeting; -function echo_greeting_seq(client, names, greet, node, echo_service_id, greeting_service_id, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"names\") [] names)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"node\") [] node)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service_id\") [] echo_service_id)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_service_id\") [] greeting_service_id)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call node (echo_service_id \"echo\") [names] echo_names)\n )\n (fold echo_names result\n (seq\n (call node (greeting_service_id \"greeting\") [result.$.echo! greet] $res)\n (next result)\n )\n )\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'names', function () { return names; }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'node', function () { return node; }); - h.on('getDataSrv', 'echo_service_id', function () { return echo_service_id; }); - h.on('getDataSrv', 'greeting_service_id', function () { return greeting_service_id; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_seq'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_seq = echo_greeting_seq; -function echo_greeting_par_alternative(client, greet, echo_service, greeting_services, config) { - return __awaiter(this, void 0, void 0, function () { - var request, promise; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - promise = new Promise(function (resolve, reject) { - var r = new api_unstable_1.RequestFlowBuilder() - .disableInjections() - .withRawScript("\n(xor\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (seq\n (call %init_peer_id% (\"getDataSrv\" \"-relay-\") [] -relay-)\n (call %init_peer_id% (\"getDataSrv\" \"greet\") [] greet)\n )\n (call %init_peer_id% (\"getDataSrv\" \"echo_service\") [] echo_service)\n )\n (call %init_peer_id% (\"getDataSrv\" \"greeting_services\") [] greeting_services)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (xor\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call echo_service.$.node! (echo_service.$.service_id! \"echo\") [echo_service.$.names!] echo_results)\n )\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 1])\n )\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (fold echo_results result\n (seq\n (fold greeting_services greeting_service\n (seq\n (seq\n (par\n (seq\n (seq\n (xor\n (call greeting_service.$.node! (greeting_service.$.service_id! \"greeting\") [result.$.echo! greet] $res)\n (seq\n (call -relay- (\"op\" \"noop\") [])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 2])\n )\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (call %init_peer_id% (\"op\" \"noop\") [])\n )\n (null)\n )\n (call -relay- (\"op\" \"noop\") [])\n )\n (next greeting_service)\n )\n )\n (next result)\n )\n )\n )\n (call %init_peer_id% (\"op\" \"identity\") [$res.$.[5]!])\n )\n (xor\n (call %init_peer_id% (\"callbackSrv\" \"response\") [$res])\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 3])\n )\n )\n (call %init_peer_id% (\"errorHandlingSrv\" \"error\") [%last_error% 4])\n)\n\n ") - .configHandler(function (h) { - h.on('getDataSrv', '-relay-', function () { - return client.relayPeerId; - }); - h.on('getDataSrv', 'greet', function () { return greet; }); - h.on('getDataSrv', 'echo_service', function () { return echo_service; }); - h.on('getDataSrv', 'greeting_services', function () { return greeting_services; }); - h.onEvent('callbackSrv', 'response', function (args) { - var res = args[0]; - resolve(res); - }); - h.onEvent('errorHandlingSrv', 'error', function (args) { - // assuming error is the single argument - var err = args[0]; - reject(err); - }); - }) - .handleScriptError(reject) - .handleTimeout(function () { - reject('Request timed out for echo_greeting_par_alternative'); - }); - if (config && config.ttl) { - r.withTTL(config.ttl); - } - request = r.build(); - }); - return [4 /*yield*/, client.initiateFlow(request)]; - case 1: - _a.sent(); - return [2 /*return*/, promise]; - } - }); - }); -} -exports.echo_greeting_par_alternative = echo_greeting_par_alternative; diff --git a/aqua-examples/echo-greeter/client-peer/dist/src/index.js b/aqua-examples/echo-greeter/client-peer/dist/src/index.js deleted file mode 100644 index dee893a..0000000 --- a/aqua-examples/echo-greeter/client-peer/dist/src/index.js +++ /dev/null @@ -1,144 +0,0 @@ -"use strict"; -/* - * Copyright 2021 Fluence Labs Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; -var __generator = (this && this.__generator) || function (thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [op[0] & 2, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -var fluence_1 = require("@fluencelabs/fluence"); -var fluence_network_environment_1 = require("@fluencelabs/fluence-network-environment"); -var echo_greeter_1 = require("./echo_greeter"); -var greeting_topos = [ - { - node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede", - }, - { - node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - service_id: "5a03906b-3217-40a2-93fb-7e83be735408", - }, -]; -var echo_topos = [ - { - node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b", - }, - { - node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8", - }, -]; -var echo_service = { - node: echo_topos[0].node, - service_id: echo_topos[0].service_id, - names: ["Jim", "John", "Jake"], -}; -var greeting_services = [ - { - node: greeting_topos[0].node, - service_id: greeting_topos[0].service_id, - greet: true, - }, - { - node: greeting_topos[1].node, - service_id: greeting_topos[1].service_id, - greet: false, - }, -]; -var names = ["Jim", "John", "Jake"]; -// let greeting_service = -function main() { - return __awaiter(this, void 0, void 0, function () { - var fluence, echo_result, result, _i, echo_result_1, item, greeting_result, seq_result, par_result; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, fluence_1.createClient(fluence_network_environment_1.krasnodar[2])]; - case 1: - fluence = _a.sent(); - console.log("created a fluence client %s with relay %s", fluence.selfPeerId, fluence.relayPeerId); - return [4 /*yield*/, echo_greeter_1.echo(fluence, names, echo_topos[0].node, echo_topos[0].service_id)]; - case 2: - echo_result = _a.sent(); - result = ""; - for (_i = 0, echo_result_1 = echo_result; _i < echo_result_1.length; _i++) { - item = echo_result_1[_i]; - result += item.echo + ","; - } - console.log("echo result : ", result); - return [4 /*yield*/, echo_greeter_1.greeting(fluence, names[0], true, greeting_topos[0].node, greeting_topos[0].service_id)]; - case 3: - greeting_result = _a.sent(); - console.log("greeting result : ", greeting_result); - return [4 /*yield*/, echo_greeter_1.echo_greeting_seq(fluence, names, true, echo_topos[0].node, echo_topos[0].service_id, greeting_topos[0].service_id)]; - case 4: - seq_result = _a.sent(); - console.log("seq result : ", seq_result); - return [4 /*yield*/, echo_greeter_1.echo_greeting_par(fluence, true, echo_service, greeting_services)]; - case 5: - par_result = _a.sent(); - console.log("par result : ", par_result); - return [4 /*yield*/, echo_greeter_1.echo_greeting_par_alternative(fluence, true, echo_service, greeting_services)]; - case 6: - par_result = _a.sent(); - console.log("par alternative result : ", par_result); - return [4 /*yield*/, echo_greeter_1.echo_greeting_par_improved(fluence, echo_service, greeting_services)]; - case 7: - par_result = _a.sent(); - console.log("par improved signature result : ", par_result); - return [2 /*return*/]; - } - }); - }); -} -main() - .then(function () { return process.exit(0); }) - .catch(function (error) { - console.error(error); - process.exit(1); -}); diff --git a/aqua-examples/echo-greeter/client-peer/package-lock.json b/aqua-examples/echo-greeter/client-peer/package-lock.json index 03a93a0..49173b0 100644 --- a/aqua-examples/echo-greeter/client-peer/package-lock.json +++ b/aqua-examples/echo-greeter/client-peer/package-lock.json @@ -38,9 +38,9 @@ } }, "@fluencelabs/aqua": { - "version": "0.2.2-221", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.2.2-221.tgz", - "integrity": "sha512-npFPyIs95uEDfkxKytvjj88NFS2z147+WebnRMp9aHbnGrzmKqLBG6eyoxPuTh9qTQbPL9DfX5rbl/iPfr4Sxw==", + "version": "0.3.0-224", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.3.0-224.tgz", + "integrity": "sha512-6rcs79Rub2LLOBHYiZu7AVeHH9aLG4qnhYiefneuLtn1G7npPUVFYbkuO1TSJ4zilq7cvP/IqJEhc6CLDx4f8g==", "dev": true }, "@fluencelabs/aqua-lib": { @@ -49,29 +49,22 @@ "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" }, "@fluencelabs/avm": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.3.tgz", - "integrity": "sha512-HCRIn8WHshHDkZmoW9ITnEzdr+XcZBo9SjlcbKHd8+ls1LkX4SiGe2tKh3QQwtmJ6xFh9TypTwjWeDYCGIw7JA==", + "version": "0.14.4", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", + "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", "requires": { "base64-js": "1.5.1" - }, - "dependencies": { - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - } } }, "@fluencelabs/fluence": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.1.tgz", - "integrity": "sha512-xAtZh6B9IIQiDflwNhf4dIvjNX6vFddDvU27fGiDuhiXs92k/dQ6ks3yWL0tqsceSbkz4w7r2vQMfDq6gWkdgg==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.11.0.tgz", + "integrity": "sha512-HfUS8eLwfviiJhqsrHnOnRxO20TbdahPreP6AkBXQaEpWeRew6vxAd0Dn+xdzy6KCJ4W9GOKLcgtPfqquIO2Pg==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.3", + "@fluencelabs/avm": "0.14.4", "async": "3.2.0", - "base64-js": "1.3.1", + "base64-js": "1.5.1", "bs58": "4.0.1", "cids": "0.8.1", "it-length-prefixed": "3.0.1", @@ -82,6 +75,7 @@ "libp2p-websockets": "0.16.1", "loglevel": "1.7.0", "multiaddr": "10.0.0", + "noble-ed25519": "^1.2.5", "peer-id": "0.15.3", "uuid": "8.3.0" } @@ -295,9 +289,9 @@ "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" }, "@types/node": { - "version": "16.7.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.10.tgz", - "integrity": "sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==" + "version": "16.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz", + "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag==" }, "@types/retry": { "version": "0.12.1", @@ -412,9 +406,9 @@ } }, "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "bcrypt-pbkdf": { "version": "1.0.2", @@ -974,9 +968,9 @@ "integrity": "sha512-wiI02c+G1BVuu0jz30Nsr1/et0cpSRulKUusN8HDZXxuX4MdUzfMp2P4JUk+a49Wr1kHitRLrnnh3+UzJ6neaQ==" }, "it-glob": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.13.tgz", - "integrity": "sha512-0Hcd5BraJUPzL28NWiFbdNrcdyNxNTKKdU3sjdFiYynNTQpwlG2UKW31X7bp+XhJwux/oPzIquo5ioztVmc2RQ==", + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.14.tgz", + "integrity": "sha512-TKKzs9CglbsihSpcwJPXN5DBUssu4akRzPlp8QJRCoLrKoaOpyY2V1qDlxx+UMivn0i114YyTd4AawWl7eqIdw==", "requires": { "@types/minimatch": "^3.0.4", "minimatch": "^3.0.4" @@ -1034,9 +1028,9 @@ "integrity": "sha512-EElupuWhHVStUgUY+OfTJIS2MZed96lDrAXzJUuqiiqLnIKoBRqtX1ZG2oR0bGDsSppmz83MtzCeKLZ9TVAUxQ==" }, "it-merge": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/it-merge/-/it-merge-1.0.2.tgz", - "integrity": "sha512-bp+h4X3tQ83/a2MvaeP4nRi+52z2AO2y8tf2OzDdaSXKMC0n0gVtHrJUDaE+kiIkBiUtTt1hp7vJHMM0VtCfGA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/it-merge/-/it-merge-1.0.3.tgz", + "integrity": "sha512-FTIcv8VGOkSnq5WGoepN+ag/DVdSVZk7pALuduxyGlErH7uzcvZD3IXHXY47ViptHQFbga2rU9SPlFmC7ttRBA==", "requires": { "it-pushable": "^1.4.0" } @@ -1583,6 +1577,11 @@ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==" }, + "noble-ed25519": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/noble-ed25519/-/noble-ed25519-1.2.5.tgz", + "integrity": "sha512-7vst+4UhM5QU3jJ3pUqPMKBCOePrxBojmoQa59qcSnYvjFF/T4jqb4WISlfslcWyBw7G5H9V/acpcAxMd8DzUQ==" + }, "node-addon-api": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", @@ -2088,9 +2087,9 @@ } }, "ws": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.4.tgz", - "integrity": "sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==" + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==" }, "xml2js": { "version": "0.4.23", diff --git a/aqua-examples/echo-greeter/client-peer/package.json b/aqua-examples/echo-greeter/client-peer/package.json index 47f3c77..61bf543 100644 --- a/aqua-examples/echo-greeter/client-peer/package.json +++ b/aqua-examples/echo-greeter/client-peer/package.json @@ -14,7 +14,7 @@ ], "dependencies": { "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.10.1", + "@fluencelabs/fluence": "^0.11.0", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, @@ -43,7 +43,7 @@ }, "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/echo-greeter#readme", "devDependencies": { - "@fluencelabs/aqua": "0.2.2-221", + "@fluencelabs/aqua": "^0.3.0-224", "typescript": "^3.9.5" } } diff --git a/aqua-examples/echo-greeter/client-peer/src/index.ts b/aqua-examples/echo-greeter/client-peer/src/index.ts index 53c0213..5613e22 100644 --- a/aqua-examples/echo-greeter/client-peer/src/index.ts +++ b/aqua-examples/echo-greeter/client-peer/src/index.ts @@ -14,74 +14,73 @@ * limitations under the License. */ -import { createClient, setLogLevel, FluenceClient } from "@fluencelabs/fluence"; +import { setLogLevel, FluencePeer } from "@fluencelabs/fluence"; import { krasnodar, Node } from "@fluencelabs/fluence-network-environment"; import { - echo, - greeting, - echo_greeting_seq, - echo_greeting_par, - echo_greeting_par_alternative, - echo_greeting_par_improved + echo, + greeting, + echo_greeting_seq, + echo_greeting_par, + echo_greeting_par_alternative, + echo_greeting_par_improved, } from "./echo_greeter"; - interface EchoResult { - echo: string; + echo: string; } interface NodeServicePair { - node: string; - service_id: string; + node: string; + service_id: string; } interface EchoService { - node: string; - service_id: string; - names: Array; + node: string; + service_id: string; + names: Array; } interface GreetingService { - node: string; - service_id: string; - greet: boolean; + node: string; + service_id: string; + greet: boolean; } let greeting_topos: Array = [ - { - node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede", - }, - { - node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - service_id: "5a03906b-3217-40a2-93fb-7e83be735408", - }, + { + node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", + service_id: "5cf520ff-dd65-47d7-a51a-2bf08dfe2ede", + }, + { + node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", + service_id: "5a03906b-3217-40a2-93fb-7e83be735408", + }, ]; let echo_topos: Array = [ - { - node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b", - }, - { - node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8", - }, + { + node: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", + service_id: "fb5f7126-e1ee-4ecf-81e7-20804cb7203b", + }, + { + node: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", + service_id: "893a6fb8-43b9-4b11-8786-93300bd68bc8", + }, ]; let echo_service: EchoService = { - node: echo_topos[0].node, - service_id: echo_topos[0].service_id, - names: ["Jim", "John", "Jake"], + node: echo_topos[0].node, + service_id: echo_topos[0].service_id, + names: ["Jim", "John", "Jake"], }; let greeting_services: Array = [ - { - node: greeting_topos[0].node, - service_id: greeting_topos[0].service_id, - greet: true, - }, - { - node: greeting_topos[1].node, - service_id: greeting_topos[1].service_id, - greet: false, - }, + { + node: greeting_topos[0].node, + service_id: greeting_topos[0].service_id, + greet: true, + }, + { + node: greeting_topos[1].node, + service_id: greeting_topos[1].service_id, + greet: false, + }, ]; let names: Array = ["Jim", "John", "Jake"]; @@ -89,82 +88,73 @@ let names: Array = ["Jim", "John", "Jake"]; // let greeting_service = async function main() { - // console.log("hello"); - // setLogLevel('DEBUG'); + // console.log("hello"); + // setLogLevel('DEBUG'); - const fluence = await createClient(krasnodar[2]); - console.log( - "created a fluence client %s with relay %s", - fluence.selfPeerId, - fluence.relayPeerId - ); + await FluencePeer.default.init({ connectTo: krasnodar[2] }); + console.log( + "created a fluence client %s with relay %s", + FluencePeer.default.connectionInfo.selfPeerId, + FluencePeer.default.connectionInfo.connectedRelay + ); - let echo_result = await echo( - fluence, - names, - echo_topos[0].node, - echo_topos[0].service_id - ); + let echo_result = await echo( + names, + echo_topos[0].node, + echo_topos[0].service_id + ); - let result = ""; + let result = ""; - for (let item of echo_result) { - result += item.echo + "," - } - console.log("echo result : ", result); + for (let item of echo_result) { + result += item.echo + ","; + } + console.log("echo result : ", result); - let greeting_result = await greeting( - fluence, - names[0], - true, - greeting_topos[0].node, - greeting_topos[0].service_id - ); - console.log("greeting result : ", greeting_result); + let greeting_result = await greeting( + names[0], + true, + greeting_topos[0].node, + greeting_topos[0].service_id + ); + console.log("greeting result : ", greeting_result); - // echo_greeting_par(greet: bool, echo_service: EchoServiceInput, greeting_services: []NodeServicePair) -> []string: - let seq_result = await echo_greeting_seq( - fluence, - names, - true, - echo_topos[0].node, - echo_topos[0].service_id, - greeting_topos[0].service_id - ); - console.log("seq result : ", seq_result); + // echo_greeting_par(greet: bool, echo_service: EchoServiceInput, greeting_services: []NodeServicePair) -> []string: + let seq_result = await echo_greeting_seq( + names, + true, + echo_topos[0].node, + echo_topos[0].service_id, + greeting_topos[0].service_id + ); + console.log("seq result : ", seq_result); + let par_result = await echo_greeting_par( + true, + echo_service, + greeting_services + ); + console.log("par result : ", par_result); - let par_result = await echo_greeting_par( - fluence, - true, - echo_service, - greeting_services - ); - console.log("par result : ", par_result); + par_result = await echo_greeting_par_alternative( + true, + echo_service, + greeting_services + ); + console.log("par alternative result : ", par_result); + par_result = await echo_greeting_par_improved( + echo_service, + greeting_services + ); + console.log("par improved signature result : ", par_result); - par_result = await echo_greeting_par_alternative( - fluence, - true, - echo_service, - greeting_services - ); - console.log("par alternative result : ", par_result); - - par_result = await echo_greeting_par_improved( - fluence, - echo_service, - greeting_services - ); - console.log("par improved signature result : ", par_result); - - - return; + return; } main() - .then(() => process.exit(0)) - .catch((error) => { - console.error(error); - process.exit(1); - }); \ No newline at end of file + .then(() => process.exit(0)) + .catch((error) => { + console.error(error); + process.exit(1); + });