wao 0.19.6 → 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/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/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/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.6",
+  "version": "0.19.7",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"