wao 0.16.4 → 0.16.5

package/cjs/adaptor-base.js

@@ -1007,7 +1007,7 @@ var Adaptor = /*#__PURE__*/function () {
               });
             case 11:
               slot = message;
-              if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
+              if (!/^[0-9a-zA-Z_-]{43,44}$/.test(message)) {
                 message = (_this$mem$env$process = this.mem.env[process]) === null || _this$mem$env$process === void 0 || (_this$mem$env$process = _this$mem$env$process.results) === null || _this$mem$env$process === void 0 ? void 0 : _this$mem$env$process[slot];
               }
               if (!(0, _ramda.isNil)(message)) {
@@ -1034,14 +1034,10 @@ var Adaptor = /*#__PURE__*/function () {
               });
             case 21:
               res2 = _context24.sent;
-              if (!(0, _ramda.isNil)(message)) {
-                _context24.next = 24;
-                break;
-              }
               return _context24.abrupt("return", {
                 json: res2
               });
-            case 24:
+            case 23:
             case "end":
               return _context24.stop();
           }
@@ -1219,65 +1215,77 @@ var Adaptor = /*#__PURE__*/function () {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
               query = _ref14.query, params = _ref14.params, body = _ref14.body, headers = _ref14.headers, method = _ref14.method;
-              _context30.next = 3;
+              if (body.type === "Buffer" && Array.isArray(body.data)) {
+                body = new Uint8Array(body.data);
+              }
+              valid = false; // todo: cannot verify node -> broser items
+              _context30.prev = 3;
+              _context30.next = 6;
               return _arbundles.DataItem.verify(body);
-            case 3:
+            case 6:
               valid = _context30.sent;
+              _context30.next = 12;
+              break;
+            case 9:
+              _context30.prev = 9;
+              _context30.t0 = _context30["catch"](3);
+              console.log(_context30.t0);
+            case 12:
               type = null;
               item = null;
-              if (valid) item = new _arbundles.DataItem(body);
+              if (valid || true) item = new _arbundles.DataItem(body);
               _tags = (0, _utils.tags)(item.tags);
               err = null;
               if (!(_tags.Type === "Process")) {
-                _context30.next = 16;
+                _context30.next = 24;
                 break;
               }
-              _context30.next = 12;
+              _context30.next = 20;
               return this.spawn({
                 item: item,
                 module: _tags.Module,
                 scheduler: _tags.Scheduler
               });
-            case 12:
+            case 20:
               res = _context30.sent;
               if (!res) err = "bad requrest";
-              _context30.next = 22;
+              _context30.next = 30;
               break;
-            case 16:
+            case 24:
               if (!(_tags.Type === "Message")) {
-                _context30.next = 21;
+                _context30.next = 29;
                 break;
               }
-              _context30.next = 19;
+              _context30.next = 27;
               return this.message({
                 item: item,
                 process: item.target
               });
-            case 19:
-              _context30.next = 22;
+            case 27:
+              _context30.next = 30;
               break;
-            case 21:
+            case 29:
               err = true;
-            case 22:
+            case 30:
               if (!err) {
-                _context30.next = 26;
+                _context30.next = 34;
                 break;
               }
               return _context30.abrupt("return", {
                 status: 400,
                 error: err
               });
-            case 26:
+            case 34:
               return _context30.abrupt("return", {
                 json: {
                   id: item.id
                 }
               });
-            case 27:
+            case 35:
             case "end":
               return _context30.stop();
           }
-        }, _callee30, this);
+        }, _callee30, this, [[3, 9]]);
       }));
       function mu_post_root(_x31) {
         return _mu_post_root.apply(this, arguments);

package/cjs/aoconnect-base.js

@@ -682,16 +682,21 @@ var _default = exports["default"] = function _default() {
               return mem.get("msgs", opt.message);
             case 7:
               _opt = _context4.sent;
-              hash = genHashChain(p.hash, opt.message);
+              hash = p.hash;
+              try {
+                hash = genHashChain(p.hash, opt.message);
+              } catch (e) {
+                console.log(e);
+              }
               p.hash = hash;
               _context4.t0 = _utils.buildTags;
               _context4.t1 = _ramda.mergeLeft;
               _context4.t2 = (0, _utils.tags)((_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : []);
               _context4.t3 = Date.now();
               _context4.t4 = p.epochs.length;
-              _context4.next = 17;
+              _context4.next = 18;
               return mem.get("height");
-            case 17:
+            case 18:
               _context4.t5 = _context4.sent;
               _context4.t6 = opt.process;
               _context4.t7 = opt.message;
@@ -712,81 +717,81 @@ var _default = exports["default"] = function _default() {
               _context4.t10 = (0, _context4.t1)(_context4.t2, _context4.t9);
               opt.tags = (0, _context4.t0)(null, _context4.t10);
               p.epochs.push([opt.message]);
-              _context4.next = 27;
+              _context4.next = 28;
               return ar.dataitem({
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags),
                 target: opt.process
               });
-            case 27:
+            case 28:
               _yield$ar$dataitem2 = _context4.sent;
               id = _yield$ar$dataitem2.id;
               owner = _yield$ar$dataitem2.owner;
               item = _yield$ar$dataitem2.item;
               if (!opt.message_item) {
-                _context4.next = 36;
+                _context4.next = 37;
                 break;
               }
-              _context4.next = 34;
+              _context4.next = 35;
               return ar.postItems([opt.message_item, item], su.jwk);
-            case 34:
-              _context4.next = 38;
+            case 35:
+              _context4.next = 39;
               break;
-            case 36:
-              _context4.next = 38;
+            case 37:
+              _context4.next = 39;
               return ar.postItems(item, su.jwk);
-            case 38:
-              _context4.prev = 38;
+            case 39:
+              _context4.prev = 39;
               data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
               _tags = _opt.tags;
               from = (_ref10 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref10 !== void 0 ? _ref10 : owner;
               if (!_opt.item) {
-                _context4.next = 59;
+                _context4.next = 60;
                 break;
               }
-              _context4.prev = 43;
+              _context4.prev = 44;
               data = _base64url["default"].decode(_opt.item.data);
               _tags = _opt.item.tags;
               if (from) {
-                _context4.next = 54;
+                _context4.next = 55;
                 break;
               }
               raw_owner = _opt.item.rawOwner;
               _context4.t11 = Buffer;
-              _context4.next = 51;
+              _context4.next = 52;
               return _crypto["default"].subtle.digest("SHA-256", raw_owner);
-            case 51:
+            case 52:
               _context4.t12 = _context4.sent;
               hashBuffer = _context4.t11.from.call(_context4.t11, _context4.t12);
               from = _base64url["default"].encode(hashBuffer);
-            case 54:
-              _context4.next = 59;
+            case 55:
+              _context4.next = 60;
               break;
-            case 56:
-              _context4.prev = 56;
-              _context4.t13 = _context4["catch"](43);
+            case 57:
+              _context4.prev = 57;
+              _context4.t13 = _context4["catch"](44);
               console.log(_context4.t13);
-            case 59:
-              _context4.next = 61;
+            case 60:
+              _context4.next = 62;
               return genMsg(opt.message, p, data, _tags, from, mu.addr);
-            case 61:
+            case 62:
               msg = _context4.sent;
-              _context4.next = 64;
+              _context4.next = 65;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 64:
+            case 65:
               _env = _context4.sent;
               if (p.handle) {
-                _context4.next = 97;
+                _context4.next = 98;
                 break;
               }
-              _context4.next = 68;
+              _context4.next = 69;
               return mem.getWasm(p.modulea);
-            case 68:
+            case 69:
               _yield$mem$getWasm2 = _context4.sent;
               format = _yield$mem$getWasm2.format;
               mod = _yield$mem$getWasm2.mod;
@@ -796,31 +801,31 @@ var _default = exports["default"] = function _default() {
               _context4.t15 = wasm;
               _context4.t16 = format;
               _context4.t17 = wdrive;
-              _context4.next = 79;
+              _context4.next = 80;
               return mem.getTx(p.id);
-            case 79:
+            case 80:
               _context4.t19 = _yield$mem$getTx3 = _context4.sent;
               _context4.t18 = _context4.t19 === null;
               if (_context4.t18) {
-                _context4.next = 83;
+                _context4.next = 84;
                 break;
               }
               _context4.t18 = _yield$mem$getTx3 === void 0;
-            case 83:
+            case 84:
               if (!_context4.t18) {
-                _context4.next = 87;
+                _context4.next = 88;
                 break;
               }
               _context4.t20 = void 0;
-              _context4.next = 88;
+              _context4.next = 89;
               break;
-            case 87:
-              _context4.t20 = _yield$mem$getTx3.item;
             case 88:
+              _context4.t20 = _yield$mem$getTx3.item;
+            case 89:
               _context4.t21 = _context4.t20;
-              _context4.next = 91;
+              _context4.next = 92;
               return mem.getTx(mod);
-            case 91:
+            case 92:
               _context4.t22 = _context4.sent;
               _context4.t23 = {
                 format: _context4.t16,
@@ -828,50 +833,50 @@ var _default = exports["default"] = function _default() {
                 spawn: _context4.t21,
                 module: _context4.t22
               };
-              _context4.next = 95;
+              _context4.next = 96;
               return (0, _context4.t14)(_context4.t15, _context4.t23);
-            case 95:
+            case 96:
               p.handle = _context4.sent;
               mem.env[opt.process].handle = p.handle;
-            case 97:
+            case 98:
               if (p.compressed) {
                 start = Date.now();
                 p.memory = mem.decompress(p.memory, p.original_size);
                 p.compressed = false;
               }
-              _context4.next = 100;
+              _context4.next = 101;
               return p.handle(p.memory, msg, _env);
-            case 100:
+            case 101:
               res = _context4.sent;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(opt.message);
-              _context4.next = 106;
+              _context4.next = 107;
               return mem.set(p, "env", opt.process);
-            case 106:
+            case 107:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res
               });
-              _context4.next = 109;
+              _context4.next = 110;
               return mem.set(_msg, "msgs", opt.message);
-            case 109:
+            case 110:
               _iterator3 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-              _context4.prev = 110;
+              _context4.prev = 111;
               _iterator3.s();
-            case 112:
+            case 113:
               if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 121;
+                _context4.next = 122;
                 break;
               }
               v = _step3.value;
-              _context4.next = 116;
+              _context4.next = 117;
               return mem.get("env", v.Target);
-            case 116:
+            case 117:
               if (!_context4.sent) {
-                _context4.next = 119;
+                _context4.next = 120;
                 break;
               }
-              _context4.next = 119;
+              _context4.next = 120;
               return message({
                 "for": opt.message,
                 process: v.Target,
@@ -880,32 +885,32 @@ var _default = exports["default"] = function _default() {
                 signer: mu.signer,
                 from: opt.process
               });
-            case 119:
-              _context4.next = 112;
+            case 120:
+              _context4.next = 113;
               break;
-            case 121:
-              _context4.next = 126;
+            case 122:
+              _context4.next = 127;
               break;
-            case 123:
-              _context4.prev = 123;
-              _context4.t24 = _context4["catch"](110);
+            case 124:
+              _context4.prev = 124;
+              _context4.t24 = _context4["catch"](111);
               _iterator3.e(_context4.t24);
-            case 126:
-              _context4.prev = 126;
+            case 127:
+              _context4.prev = 127;
               _iterator3.f();
-              return _context4.finish(126);
-            case 129:
+              return _context4.finish(127);
+            case 130:
               _iterator4 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-              _context4.prev = 130;
+              _context4.prev = 131;
               _iterator4.s();
-            case 132:
+            case 133:
               if ((_step4 = _iterator4.n()).done) {
-                _context4.next = 139;
+                _context4.next = 140;
                 break;
               }
               _v = _step4.value;
               __tags = (0, _utils.tags)(_v.Tags);
-              _context4.next = 137;
+              _context4.next = 138;
               return spawn({
                 "for": opt.message,
                 module: __tags.Module,
@@ -915,87 +920,87 @@ var _default = exports["default"] = function _default() {
                 from: __tags["From-Process"],
                 signer: mu.signer
               });
-            case 137:
-              _context4.next = 132;
+            case 138:
+              _context4.next = 133;
               break;
-            case 139:
-              _context4.next = 144;
+            case 140:
+              _context4.next = 145;
               break;
-            case 141:
-              _context4.prev = 141;
-              _context4.t25 = _context4["catch"](130);
+            case 142:
+              _context4.prev = 142;
+              _context4.t25 = _context4["catch"](131);
               _iterator4.e(_context4.t25);
-            case 144:
-              _context4.prev = 144;
+            case 145:
+              _context4.prev = 145;
               _iterator4.f();
-              return _context4.finish(144);
-            case 147:
+              return _context4.finish(145);
+            case 148:
               _iterator5 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-              _context4.prev = 148;
+              _context4.prev = 149;
               _iterator5.s();
-            case 150:
+            case 151:
               if ((_step5 = _iterator5.n()).done) {
-                _context4.next = 171;
+                _context4.next = 172;
                 break;
               }
               _v2 = _step5.value;
               _iterator6 = _createForOfIteratorHelper(_v2.Processes);
-              _context4.prev = 153;
+              _context4.prev = 154;
               _iterator6.s();
-            case 155:
+            case 156:
               if ((_step6 = _iterator6.n()).done) {
-                _context4.next = 161;
+                _context4.next = 162;
                 break;
               }
               v2 = _step6.value;
-              _context4.next = 159;
+              _context4.next = 160;
               return _assign({
                 message: _v2.Message,
                 process: v2,
                 from: opt.process,
                 signer: mu.signer
               });
-            case 159:
-              _context4.next = 155;
+            case 160:
+              _context4.next = 156;
               break;
-            case 161:
-              _context4.next = 166;
+            case 162:
+              _context4.next = 167;
               break;
-            case 163:
-              _context4.prev = 163;
-              _context4.t26 = _context4["catch"](153);
+            case 164:
+              _context4.prev = 164;
+              _context4.t26 = _context4["catch"](154);
               _iterator6.e(_context4.t26);
-            case 166:
-              _context4.prev = 166;
+            case 167:
+              _context4.prev = 167;
               _iterator6.f();
-              return _context4.finish(166);
-            case 169:
-              _context4.next = 150;
+              return _context4.finish(167);
+            case 170:
+              _context4.next = 151;
               break;
-            case 171:
-              _context4.next = 176;
+            case 172:
+              _context4.next = 177;
               break;
-            case 173:
-              _context4.prev = 173;
-              _context4.t27 = _context4["catch"](148);
+            case 174:
+              _context4.prev = 174;
+              _context4.t27 = _context4["catch"](149);
               _iterator5.e(_context4.t27);
-            case 176:
-              _context4.prev = 176;
+            case 177:
+              _context4.prev = 177;
               _iterator5.f();
-              return _context4.finish(176);
-            case 179:
+              return _context4.finish(177);
+            case 180:
               return _context4.abrupt("return", id);
-            case 182:
-              _context4.prev = 182;
-              _context4.t28 = _context4["catch"](38);
+            case 183:
+              _context4.prev = 183;
+              _context4.t28 = _context4["catch"](39);
               console.log(_context4.t28);
-            case 185:
-              return _context4.abrupt("return", null);
             case 186:
+              return _context4.abrupt("return", null);
+            case 187:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[38, 182], [43, 56], [110, 123, 126, 129], [130, 141, 144, 147], [148, 173, 176, 179], [153, 163, 166, 169]]);
+        }, _callee4, null, [[39, 183], [44, 57], [111, 124, 127, 130], [131, 142, 145, 148], [149, 174, 177, 180], [154, 164, 167, 170]]);
       }));
       return function assign(_x8) {
         return _ref9.apply(this, arguments);
@@ -1003,7 +1008,7 @@ var _default = exports["default"] = function _default() {
     }();
     var message = /*#__PURE__*/function () {
       var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(opt) {
-        var id, owner, item, _opt$id2, _key, i, _yield$ar$httpmsg2, _p, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, _id, _owner, _item, p, _opt$tags3, _yield$mem$getTx$tags3, _yield$mem$getTx4, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from2, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx5, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg2, key;
+        var id, owner, item, _opt$id2, _key, i, _yield$ar$httpmsg2, _p, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, p, _opt$tags3, _yield$mem$getTx$tags3, _yield$mem$getTx4, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from2, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx5, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg2, key;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -1064,9 +1069,9 @@ var _default = exports["default"] = function _default() {
               _context5.next = 38;
               break;
             case 35:
-              _id = (_opt$item$id = opt === null || opt === void 0 || (_opt$item = opt.item) === null || _opt$item === void 0 ? void 0 : _opt$item.id) !== null && _opt$item$id !== void 0 ? _opt$item$id : "";
-              _owner = (_opt$owner = opt.owner) !== null && _opt$owner !== void 0 ? _opt$owner : "";
-              _item = opt.item;
+              id = (_opt$item$id = opt === null || opt === void 0 || (_opt$item = opt.item) === null || _opt$item === void 0 ? void 0 : _opt$item.id) !== null && _opt$item$id !== void 0 ? _opt$item$id : "";
+              owner = (_opt$owner = opt.owner) !== null && _opt$owner !== void 0 ? _opt$owner : "";
+              item = opt.item;
             case 38:
               _context5.next = 40;
               return mem.get("env", opt.process);

package/esm/adaptor-base.js

@@ -324,7 +324,7 @@ class Adaptor {
       }
     }
     const slot = message
-    if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
+    if (!/^[0-9a-zA-Z_-]{43,44}$/.test(message)) {
       message = this.mem.env[process]?.results?.[slot]
     }
     if (isNil(message)) {
@@ -333,7 +333,7 @@ class Adaptor {
       if (isNil(message)) return { status: 404, error: "not Found" }
     }
     const res2 = await this.result({ message, process })
-    if (isNil(message)) return { json: res2 }
+    return { json: res2 }
   }
 
   async su_get_root({ query, params, body, headers, method }) {
@@ -388,10 +388,19 @@ class Adaptor {
   }
 
   async mu_post_root({ query, params, body, headers, method }) {
-    let valid = await DataItem.verify(body)
+    if (body.type === "Buffer" && Array.isArray(body.data)) {
+      body = new Uint8Array(body.data)
+    }
+    let valid = false
+    // todo: cannot verify node -> broser items
+    try {
+      valid = await DataItem.verify(body)
+    } catch (e) {
+      console.log(e)
+    }
     let type = null
     let item = null
-    if (valid) item = new DataItem(body)
+    if (valid || true) item = new DataItem(body)
     const _tags = tags(item.tags)
     let err = null
     if (_tags.Type === "Process") {

package/esm/aoconnect-base.js

@@ -269,7 +269,12 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       const p = await mem.get("env", opt.process)
       if (!p || !opt.process) return null
       let _opt = await mem.get("msgs", opt.message)
-      let hash = genHashChain(p.hash, opt.message)
+      let hash = p.hash
+      try {
+        hash = genHashChain(p.hash, opt.message)
+      } catch (e) {
+        console.log(e)
+      }
       p.hash = hash
       opt.tags = buildTags(
         null,
@@ -415,9 +420,9 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           }
         }
       } else {
-        let id = opt?.item?.id ?? ""
-        let owner = opt.owner ?? ""
-        let item = opt.item
+        id = opt?.item?.id ?? ""
+        owner = opt.owner ?? ""
+        item = opt.item
       }
 
       const p = await mem.get("env", opt.process)

package/package.json

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