wao 0.19.4 → 0.19.7

package/cjs/hub/fs.js

@@ -3,13 +3,16 @@
 var _chokidar = _interopRequireDefault(require("chokidar"));
 var _utils = require("./utils.js");
 var _ws = _interopRequireDefault(require("ws"));
+var _yargs = _interopRequireDefault(require("yargs"));
 var _ramda = require("ramda");
 var _path = require("path");
 var _fs = require("fs");
 var _process$argv$;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+var _yargs$argv$port = (0, _yargs["default"])(process.argv.slice(2)).argv.port,
+  port = _yargs$argv$port === void 0 ? 4006 : _yargs$argv$port;
 var ws_server = new _ws["default"].Server({
-  port: 9090
+  port: port
 });
 var _dir = (_process$argv$ = process.argv[2]) !== null && _process$argv$ !== void 0 ? _process$argv$ : "./";
 var sus = {};
@@ -70,7 +73,7 @@ var sendContent = function sendContent(content, path) {
     }));
   }
 };
-console.log("WAO FS running on port 9090");
+console.log("WAO FS running on port ".concat(port));
 var wd = (0, _path.resolve)(cwd, _dir);
 console.log("Directory:", wd);
 _chokidar["default"].watch(wd, {

package/cjs/hub/index.js

@@ -7,10 +7,13 @@ var _ramda = require("ramda");
 var _utils = require("./utils.js");
 var _bundler = _interopRequireDefault(require("./bundler.js"));
 var _cu = _interopRequireDefault(require("./cu.js"));
+var _yargs = _interopRequireDefault(require("yargs"));
 var _ws = _interopRequireDefault(require("ws"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+var _yargs$argv$port = (0, _yargs["default"])(process.argv.slice(2)).argv.port,
+  port = _yargs$argv$port === void 0 ? 8080 : _yargs$argv$port;
 var ws_server = new _ws["default"].Server({
-  port: 8080
+  port: port
 });
 var sus = {};
 var cbs = {};

package/cjs/hub/ws-proxy.js

@@ -18,42 +18,14 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var _yargs$argv$port = (0, _yargs["default"])(process.argv.slice(2)).argv.port,
-  port = _yargs$argv$port === void 0 ? 7000 : _yargs$argv$port;
+  port = _yargs$argv$port === void 0 ? 4000 : _yargs$argv$port;
+var proxy_port = port + 5;
 var ws_server = new _ws["default"].Server({
-  port: 7070
+  port: proxy_port
 });
 var sus = {};
 var cbs = {};
-var _socket = null;
-ws_server.on("connection", function (socket) {
-  _socket = socket;
-  var clientId = (0, _utils.generateId)();
-  console.log("new ws:", clientId);
-  sus[clientId] = {
-    socket: socket,
-    su: false,
-    connections: {},
-    address: null
-  };
-  socket.send(JSON.stringify({
-    type: "registered",
-    id: clientId
-  }));
-  socket.on("message", function (message) {
-    var data = JSON.parse(message);
-    if (data.type === "msg") {
-      if (cbs[data.id]) {
-        cbs[data.id](data.res);
-        delete cbs[data.id];
-      }
-    }
-  });
-  socket.on("close", function () {
-    console.log("ws disconnected", clientId);
-    delete sus[clientId];
-  });
-});
-console.log("WAO FS running on port 7070");
+console.log("Starting WAO Proxy servers...");
 var Adaptor = /*#__PURE__*/function () {
   function Adaptor() {
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -135,4 +107,36 @@ var main = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-main();
+main();
+var _socket = null;
+ws_server.on("connection", function (socket) {
+  _socket = socket;
+  var clientId = (0, _utils.generateId)();
+  console.log("new ws:", clientId);
+  sus[clientId] = {
+    socket: socket,
+    su: false,
+    connections: {},
+    address: null
+  };
+  socket.send(JSON.stringify({
+    type: "registered",
+    id: clientId
+  }));
+  socket.on("message", function (message) {
+    var data = JSON.parse(message);
+    if (data.type === "msg") {
+      if (cbs[data.id]) {
+        cbs[data.id](data.res);
+        delete cbs[data.id];
+      }
+    }
+  });
+  socket.on("close", function () {
+    console.log("ws disconnected", clientId);
+    delete sus[clientId];
+  });
+});
+setTimeout(function () {
+  return console.log("WS on port ".concat(proxy_port));
+}, 10);

package/cjs/workspace/README.md

@@ -0,0 +1,27 @@
+#### 1. Create an APP
+
+```bash
+npx wao create waoapp && cd waoapp
+```
+
+#### 2. Run WAO Proxy
+
+```bash
+npx wao proxy
+```
+
+#### 3. Connect the Browser to the Proxy
+
+Go to [the web app](https://wao-localnet.vercel.app/) and open `Networks`, then click `Proxy`.
+
+#### 4. Run Test
+
+```bash
+yarn test test/test.js
+```
+
+#### 5. Deploy a Process to AO Testnet
+
+```bash
+yarn deploy src/counter.lua --wallet PATH_TO_WALLET_JSON
+```

package/cjs/workspace/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "wao-workspace",
+  "version": "0.0.1",
+  "type": "module",
+  "scripts": {
+    "test": "node --experimental-wasm-memory64",
+    "test-only": "node --experimental-wasm-memory64 --test-only",
+    "deploy": "node scripts/deploy.js"
+  },
+  "dependencies": {
+    "wao": "^0.19.6"
+  }
+}

package/cjs/workspace/scripts/deploy.js

@@ -1,61 +1,35 @@
-"use strict";
+import { AO } from "wao"
+const lua = process.argv[2]
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _wao = require("wao");
-var _fs = require("fs");
-var _path = require("path");
-var _yargs = _interopRequireDefault(require("yargs"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-var lua = process.argv[2];
-var _yargs$argv$wallet = (0, _yargs["default"])(process.argv.slice(2)).argv.wallet,
-  wallet = _yargs$argv$wallet === void 0 ? null : _yargs$argv$wallet;
-var src_data = null;
+import { readFileSync } from "fs"
+import { resolve } from "path"
+import yargs from "yargs"
+
+let { wallet = null } = yargs(process.argv.slice(2)).argv
+
+let src_data = null
 try {
-  src_data = (0, _fs.readFileSync)((0, _path.resolve)(process.cwd(), lua), "utf-8");
+  src_data = readFileSync(resolve(process.cwd(), lua), "utf-8")
 } catch (e) {
-  console.log("lua script not found");
-  process.exit();
+  console.log("lua script not found")
+  process.exit()
 }
-var jwk = null;
+
+let jwk = null
 try {
-  jwk = JSON.parse((0, _fs.readFileSync)((0, _path.resolve)(process.cwd(), wallet), "utf-8"));
+  jwk = JSON.parse(readFileSync(resolve(process.cwd(), wallet), "utf-8"))
 } catch (e) {
-  console.log("wallet not found");
-  process.exit();
+  console.log("wallet not found")
+  process.exit()
+}
+
+const deploy = async () => {
+  const ao = await new AO().init(jwk)
+  const { pid, p } = await ao.deploy({ src_data })
+  console.log("process deployed!", pid)
+
+  //console.log(await p.m("Inc", false))
+  //console.log(await p.d("Get", false))
 }
-var deploy = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var ao, _yield$ao$deploy, pid, p;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return new _wao.AO().init(jwk);
-        case 2:
-          ao = _context.sent;
-          _context.next = 5;
-          return ao.deploy({
-            src_data: src_data
-          });
-        case 5:
-          _yield$ao$deploy = _context.sent;
-          pid = _yield$ao$deploy.pid;
-          p = _yield$ao$deploy.p;
-          console.log("process deployed!", pid);
 
-          //console.log(await p.m("Inc", false))
-          //console.log(await p.d("Get", false))
-        case 9:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function deploy() {
-    return _ref.apply(this, arguments);
-  };
-}();
-deploy();
+deploy()

package/cjs/workspace/src/counter.lua

@@ -0,0 +1,10 @@
+local count = 0
+
+Handlers.add("Inc", "Inc", function (msg)
+  count = count + 1
+  msg.reply({ Data = "Incremented!" })
+end)
+
+Handlers.add("Get", "Get", function (msg)
+  msg.reply({ Data = tostring(count) })
+end)

package/cjs/workspace/test/test.js

@@ -1,103 +1,41 @@
-"use strict";
+import assert from "assert"
+import { describe, it } from "node:test"
+import { readFileSync } from "fs"
+import { resolve } from "path"
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _assert = _interopRequireDefault(require("assert"));
-var _nodeTest = require("node:test");
-var _fs = require("fs");
-var _path = require("path");
-var _test = require("wao/test");
-var _wao = require("wao");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; } // in-memory test
-// browser test
+import { AO, acc } from "wao/test" // in-memory test
+import { AO as WAO } from "wao" // browser test
 
-var src_data = (0, _fs.readFileSync)((0, _path.resolve)(import.meta.dirname, "../src/counter.lua"), "utf8");
-(0, _nodeTest.describe)("WAO", function () {
+const src_data = readFileSync(
+  resolve(import.meta.dirname, "../src/counter.lua"),
+  "utf8"
+)
+
+describe("WAO", function () {
   // lightning-fast testing in memory
-  (0, _nodeTest.it)("should spawn a process and send messages in memory", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var ao, _yield$ao$deploy, p, pid;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return new _test.AO().init(_test.acc[0]);
-        case 2:
-          ao = _context.sent;
-          _context.next = 5;
-          return ao.deploy({
-            src_data: src_data,
-            scheduler: _test.acc[0].addr
-          });
-        case 5:
-          _yield$ao$deploy = _context.sent;
-          p = _yield$ao$deploy.p;
-          pid = _yield$ao$deploy.pid;
-          _context.t0 = _assert["default"];
-          _context.next = 11;
-          return p.m("Inc", false);
-        case 11:
-          _context.t1 = _context.sent;
-          _context.t0.equal.call(_context.t0, _context.t1, "Incremented!");
-          _context.t2 = _assert["default"];
-          _context.next = 16;
-          return p.d("Get", false);
-        case 16:
-          _context.t3 = _context.sent;
-          _context.t2.equal.call(_context.t2, _context.t3, "1");
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })));
+  it("should spawn a process and send messages in memory", async () => {
+    const ao = await new AO().init(acc[0])
+    const { p, pid } = await ao.deploy({ src_data, scheduler: acc[0].addr })
+
+    assert.equal(await p.m("Inc", false), "Incremented!")
+    assert.equal(await p.d("Get", false), "1")
+  })
 
   // WAO Proxy must be running on your computer => "npx wao proxy"
-  (0, _nodeTest.it)("should spawn a process and send messages to the browser", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var ao, _yield$ao$postSchedul, res, id, _yield$ao$deploy2, p, pid;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return new _wao.AO(7000).init(_test.acc[0]);
-        case 2:
-          ao = _context2.sent;
-          _context2.next = 5;
-          return ao.postScheduler({
-            url: "http://localhost:7003"
-          });
-        case 5:
-          _yield$ao$postSchedul = _context2.sent;
-          res = _yield$ao$postSchedul.res;
-          id = _yield$ao$postSchedul.id;
-          _context2.next = 10;
-          return ao.deploy({
-            src_data: src_data,
-            scheduler: _test.acc[0].addr,
-            // specify the scheduler locaster address
-            module: "WASM32-D8q2OmZ4Mok00sD2Y_6SYEQ7Hjx-6VZ_jl3g" // use wasm32 module
-          });
-        case 10:
-          _yield$ao$deploy2 = _context2.sent;
-          p = _yield$ao$deploy2.p;
-          pid = _yield$ao$deploy2.pid;
-          _context2.t0 = _assert["default"];
-          _context2.next = 16;
-          return p.m("Inc", false);
-        case 16:
-          _context2.t1 = _context2.sent;
-          _context2.t0.equal.call(_context2.t0, _context2.t1, "Incremented!");
-          _context2.t2 = _assert["default"];
-          _context2.next = 21;
-          return p.d("Get", false);
-        case 21:
-          _context2.t3 = _context2.sent;
-          _context2.t2.equal.call(_context2.t2, _context2.t3, "1");
-        case 23:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  })));
-});
+  it("should spawn a process and send messages to the browser", async () => {
+    // connect with 4000 - 4004 ports
+    const ao = await new WAO(4000).init(acc[0])
+
+    // post Scheduler-Location (acc[0])
+    const { res, id } = await ao.postScheduler({ url: "http://localhost:4003" })
+
+    const { p, pid } = await ao.deploy({
+      src_data,
+      scheduler: acc[0].addr, // specify the scheduler locaster address
+      module: "WASM32-D8q2OmZ4Mok00sD2Y_6SYEQ7Hjx-6VZ_jl3g", // use wasm32 module
+    })
+
+    assert.equal(await p.m("Inc", false), "Incremented!")
+    assert.equal(await p.d("Get", false), "1")
+  })
+})

package/esm/hub/fs.js

@@ -1,7 +1,9 @@
 import chokidar from "chokidar"
 import { generateId } from "./utils.js"
 import WebSocket from "ws"
-const ws_server = new WebSocket.Server({ port: 9090 })
+import yargs from "yargs"
+let { port = 4006 } = yargs(process.argv.slice(2)).argv
+const ws_server = new WebSocket.Server({ port })
 import { keys, omit, isNil, mergeLeft } from "ramda"
 import { resolve } from "path"
 import { writeFileSync, readFileSync } from "fs"
@@ -70,7 +72,7 @@ const sendContent = (content, path) => {
   }
 }
 
-console.log("WAO FS running on port 9090")
+console.log(`WAO FS running on port ${port}`)
 const wd = resolve(cwd, _dir)
 console.log("Directory:", wd)
 chokidar

package/esm/hub/index.js

@@ -5,9 +5,10 @@ import { keys, omit, isNil, mergeLeft } from "ramda"
 import { generateId, toANS104Request, parseSignatureInput } from "./utils.js"
 import bundler from "./bundler.js"
 import cu from "./cu.js"
-
+import yargs from "yargs"
+let { port = 8080 } = yargs(process.argv.slice(2)).argv
 import WebSocket from "ws"
-const ws_server = new WebSocket.Server({ port: 8080 })
+const ws_server = new WebSocket.Server({ port })
 
 let sus = {}
 let cbs = {}

package/esm/hub/ws-proxy.js

@@ -1,44 +1,16 @@
 import yargs from "yargs"
-let { port = 7000 } = yargs(process.argv.slice(2)).argv
+let { port = 4000 } = yargs(process.argv.slice(2)).argv
 import { Server } from "../test.js"
 import { generateId } from "./utils.js"
 import WebSocket from "ws"
-const ws_server = new WebSocket.Server({ port: 7070 })
+const proxy_port = port + 5
+const ws_server = new WebSocket.Server({ port: proxy_port })
 import { keys, omit, isNil, mergeLeft } from "ramda"
 import { resolve } from "path"
 import { writeFileSync, readFileSync } from "fs"
 let sus = {}
 let cbs = {}
-let _socket = null
-
-ws_server.on("connection", socket => {
-  _socket = socket
-  const clientId = generateId()
-  console.log("new ws:", clientId)
-  sus[clientId] = {
-    socket,
-    su: false,
-    connections: {},
-    address: null,
-  }
-  socket.send(JSON.stringify({ type: "registered", id: clientId }))
-  socket.on("message", message => {
-    const data = JSON.parse(message)
-    if (data.type === "msg") {
-      if (cbs[data.id]) {
-        cbs[data.id](data.res)
-        delete cbs[data.id]
-      }
-    }
-  })
-
-  socket.on("close", () => {
-    console.log("ws disconnected", clientId)
-    delete sus[clientId]
-  })
-})
-
-console.log("WAO FS running on port 7070")
+console.log(`Starting WAO Proxy servers...`)
 class Adaptor {
   constructor({ hb_url, aoconnect, log = false, db } = {}) {}
   async get(req, res) {
@@ -65,3 +37,31 @@ class Adaptor {
 const main = async () => new Server({ log: true, port, adaptor: new Adaptor() })
 
 main()
+
+let _socket = null
+ws_server.on("connection", socket => {
+  _socket = socket
+  const clientId = generateId()
+  console.log("new ws:", clientId)
+  sus[clientId] = {
+    socket,
+    su: false,
+    connections: {},
+    address: null,
+  }
+  socket.send(JSON.stringify({ type: "registered", id: clientId }))
+  socket.on("message", message => {
+    const data = JSON.parse(message)
+    if (data.type === "msg") {
+      if (cbs[data.id]) {
+        cbs[data.id](data.res)
+        delete cbs[data.id]
+      }
+    }
+  })
+  socket.on("close", () => {
+    console.log("ws disconnected", clientId)
+    delete sus[clientId]
+  })
+})
+setTimeout(() => console.log(`WS on port ${proxy_port}`), 10)

package/esm/workspace/README.md

@@ -0,0 +1,27 @@
+#### 1. Create an APP
+
+```bash
+npx wao create waoapp && cd waoapp
+```
+
+#### 2. Run WAO Proxy
+
+```bash
+npx wao proxy
+```
+
+#### 3. Connect the Browser to the Proxy
+
+Go to [the web app](https://wao-localnet.vercel.app/) and open `Networks`, then click `Proxy`.
+
+#### 4. Run Test
+
+```bash
+yarn test test/test.js
+```
+
+#### 5. Deploy a Process to AO Testnet
+
+```bash
+yarn deploy src/counter.lua --wallet PATH_TO_WALLET_JSON
+```

package/esm/workspace/package.json

@@ -8,6 +8,6 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "wao": "^0.19.2"
+    "wao": "^0.19.6"
   }
 }

package/esm/workspace/test/test.js

@@ -23,11 +23,11 @@ describe("WAO", function () {
 
   // WAO Proxy must be running on your computer => "npx wao proxy"
   it("should spawn a process and send messages to the browser", async () => {
-    // connect with 7000 - 7004 ports
-    const ao = await new WAO(7000).init(acc[0])
+    // connect with 4000 - 4004 ports
+    const ao = await new WAO(4000).init(acc[0])
 
     // post Scheduler-Location (acc[0])
-    const { res, id } = await ao.postScheduler({ url: "http://localhost:7003" })
+    const { res, id } = await ao.postScheduler({ url: "http://localhost:4003" })
 
     const { p, pid } = await ao.deploy({
       src_data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.19.4",
+  "version": "0.19.7",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"