wao 0.8.2 → 0.8.4

package/cjs/server.js

@@ -499,6 +499,7 @@ var Server = /*#__PURE__*/function () {
         });
       });
       app.get("/:pid", function (req, res) {
+        var _this3$mem$env$pid$tx, _this3$mem$env$pid;
         var pid = req.params.pid;
         var edges = (0, _ramda.map)(function (v) {
           var _mtx$anchor, _tx$anchor;
@@ -528,7 +529,7 @@ var Server = /*#__PURE__*/function () {
               }
             }
           };
-        })((0, _ramda.reverse)(_this3.mem.env[pid].txs));
+        })((0, _ramda.reverse)((_this3$mem$env$pid$tx = (_this3$mem$env$pid = _this3.mem.env[pid]) === null || _this3$mem$env$pid === void 0 ? void 0 : _this3$mem$env$pid.txs) !== null && _this3$mem$env$pid$tx !== void 0 ? _this3$mem$env$pid$tx : []));
         res.json({
           page_info: {
             has_next_page: false

package/cjs/tao.js

@@ -87,7 +87,6 @@ var AO = /*#__PURE__*/function (_MAO) {
       monitor = _connect.monitor,
       unmonitor = _connect.unmonitor,
       mem = _connect.mem;
-    _this.module = mem.modules.aos2_0_1;
     _this.assign = assign;
     _this.result = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res,

package/cjs/tar.js

@@ -643,7 +643,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               _data = (_tx$data = tx === null || tx === void 0 ? void 0 : tx.data) !== null && _tx$data !== void 0 ? _tx$data : null;
               if ((tx === null || tx === void 0 ? void 0 : tx.format) === 2 && _data) {
                 _data = Buffer.from(_data, "base64");
-              } else {
+              } else if (_data) {
                 _data = Buffer.from(_base64url["default"].decode(_data));
               }
               isBuf = (0, _ramda.is)(Uint8Array, _data) || (0, _ramda.is)(ArrayBuffer, _data);

package/cjs/utils.js

@@ -329,7 +329,10 @@ var srcs = exports.srcs = {
   module_sqlite: "ghSkge2sIUD_F00ym5sEimC63BDBuBrq4b5OcwxOjiw",
   module_aos2: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
   scheduler: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
-  authority: "fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY"
+  authority: "fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY",
+  module_wao: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
+  scheduler_wao: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
+  authority_wao: "eNaLJLsMiWCSWvQKNbk_YT-9ydeWl9lrWwXxLVp9kcg"
 };
 var buildTags = exports.buildTags = function buildTags(act, tags) {
   var _tags = [];

package/esm/ao.js

@@ -78,10 +78,11 @@ class AO {
       in_memory = false,
       port,
     } = opt
-
     if (!_port && port) _port = port
     if (!aoconnect && _port) aoconnect = optAO(_port)
     if (!ar && _port) ar = { port: _port }
+    this.wao = opt.wao
+    if (isNil(this.wao)) this.wao = in_memory || !isNil(ar?.port)
     if (!module) {
       switch (module_type) {
         case "sqlite":
@@ -130,9 +131,15 @@ class AO {
       this.monitor = monitor
       this.unmonitor = unmonitor
     }
-    this.module = module
-    this.scheduler = scheduler
-    this.authority = authority
+    if (this.wao) {
+      this.module = srcs.module_wao
+      this.scheduler = srcs.scheduler_wao
+      this.authority = srcs.authority_wao
+    } else {
+      this.module = module
+      this.scheduler = scheduler
+      this.authority = authority
+    }
   }
 
   async init(jwk) {

package/esm/aoconnect.js

@@ -72,25 +72,16 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
     }
   }
 
-  const genEnv = ({ pid, owner = "", module = "", auth = "" }) => {
+  const genEnv = async ({ pid, owner = "", module = "" }) => {
     return {
       Process: {
         Id: pid,
-        Tags: [
-          { name: "Data-Protocol", value: "ao" },
-          { name: "Variant", value: "ao.TN.1" },
-          { name: "Type", value: "Process" },
-          { name: "Authority", value: auth },
-        ],
+        Tags: (await mem.get("txs", pid))?.tags ?? [],
         Owner: owner,
       },
       Module: {
         Id: module,
-        Tags: [
-          { name: "Data-Protocol", value: "ao" },
-          { name: "Variant", value: "ao.TN.1" },
-          { name: "Type", value: "Module" },
-        ],
+        Tags: (await mem.get("txs", module))?.tags ?? [],
       },
     }
   }
@@ -108,6 +99,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
         Module: mod,
         Scheduler: opt.scheduler,
         "Content-Type": "text/plain",
+        Authority: mu.addr,
       }),
     )
     let ex = false
@@ -171,11 +163,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
       else data = (await mem.get("msgs", _tags["On-Boot"]))?.data ?? ""
       let msg = await genMsg(id, p, data, opt.tags, owner, mu.addr, true)
-      const _env = genEnv({
+      const _env = await genEnv({
         pid: p.id,
         owner: p.owner,
         module: p.module,
-        auth: mu.addr,
       })
       res = await _module.handle(null, msg, _env)
       p.memory = res.Memory
@@ -288,11 +279,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       }
       // check: is owner=mu.addr right?
       const msg = await genMsg(opt.message, p, data, _tags, from, mu.addr)
-      const _env = genEnv({
+      const _env = await genEnv({
         pid: p.id,
         owner: p.owner,
         module: p.module,
-        auth: mu.addr,
       })
       if (!p.handle) {
         const { format, mod, wasm } = await mem.getWasm(p.modulea)
@@ -450,11 +440,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
           mu.addr,
           true,
         )
-        const _env = genEnv({
+        const _env = await genEnv({
           pid: p.id,
           owner: p.owner,
           module: p.module,
-          auth: mu.addr,
         })
         function cloneMemory(memory) {
           const buffer = memory.buffer.slice(0)

package/esm/server.js

@@ -243,7 +243,7 @@ class Server {
             },
           },
         }
-      })(reverse(this.mem.env[pid].txs))
+      })(reverse(this.mem.env[pid]?.txs ?? []))
       res.json({ page_info: { has_next_page: false }, edges })
     })
     const server = app.listen(this.ports.su, () =>

package/esm/tao.js

@@ -3,7 +3,7 @@ import { createDataItemSigner } from "@permaweb/aoconnect"
 import { srcs, buildTags } from "./utils.js"
 import AR from "./tar.js"
 import { connect } from "./aoconnect.js"
-import { acc } from "./test.js"
+import { acc, mu } from "./test.js"
 import { mergeLeft, is, map } from "ramda"
 
 let log = `
@@ -69,7 +69,6 @@ class AO extends MAO {
       cache: opt.cache,
       reset: opt.reset,
     })
-    this.module = mem.modules.aos2_0_1
     this.assign = assign
     this.result = async (...opt) => {
       const res = await result(...opt)

package/esm/tar.js

@@ -194,7 +194,7 @@ class AR extends MAR {
     let _data = tx?.data ?? null
     if (tx?.format === 2 && _data) {
       _data = Buffer.from(_data, "base64")
-    } else {
+    } else if (_data) {
       _data = Buffer.from(base64url.decode(_data))
     }
     let isBuf = is(Uint8Array, _data) || is(ArrayBuffer, _data)

package/esm/utils.js

@@ -197,6 +197,9 @@ const srcs = {
   module_aos2: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
   scheduler: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
   authority: "fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY",
+  module_wao: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
+  scheduler_wao: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
+  authority_wao: "eNaLJLsMiWCSWvQKNbk_YT-9ydeWl9lrWwXxLVp9kcg",
 }
 
 const buildTags = (act, tags) => {

package/package.json

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