wao 0.5.6 → 0.6.1

package/cjs/aoconnect.js

@@ -11,6 +11,7 @@ var _base64url = _interopRequireDefault(require("base64url"));
 var _utils = require("./utils.js");
 var _armem = _interopRequireDefault(require("./armem.js"));
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
+var _kv = _interopRequireDefault(require("./kv.js"));
 var _aoLoader = _interopRequireDefault(require("@permaweb/ao-loader"));
 var _fs = require("fs");
 var _path = require("path");
@@ -40,6 +41,7 @@ var pkg = (_WarpArBundles$defaul = WarpArBundles["default"]) !== null && _WarpAr
 var DataItem = pkg.DataItem;
 var connect = exports.connect = function connect(mem) {
   var _mem;
+  var log = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isMem = ((_mem = mem) === null || _mem === void 0 ? void 0 : _mem.__type__) === "mem";
   if (!isMem) {
     var _mem2;
@@ -51,9 +53,11 @@ var connect = exports.connect = function connect(mem) {
     mem = new _armem["default"](args);
   }
   var ar = new _tar["default"]({
-    mem: mem
+    mem: mem,
+    log: log
   });
   var WeaveDrive = new _weavedrive["default"](ar).drive;
+  var KV = new _kv["default"](ar).kv;
   var transform = function transform(input) {
     var _input$Tags;
     var output = {
@@ -91,7 +95,7 @@ var connect = exports.connect = function connect(mem) {
       Target: p.id,
       Owner: Owner,
       Data: data !== null && data !== void 0 && data.length ? data : "",
-      "Block-Height": p.height.toString(),
+      "Block-Height": mem.height.toString(),
       Timestamp: Date.now().toString(),
       Module: p.module,
       From: from,
@@ -150,8 +154,6 @@ var connect = exports.connect = function connect(mem) {
         format,
         wasm,
         _mem$wasms$mod2,
-        now,
-        handle,
         ex,
         _iterator,
         _step,
@@ -161,6 +163,10 @@ var connect = exports.connect = function connect(mem) {
         owner,
         item,
         __tags,
+        now,
+        t,
+        wd,
+        handle,
         _tags,
         res,
         memory,
@@ -216,32 +222,18 @@ var connect = exports.connect = function connect(mem) {
               format = mem.wasms[mod].format;
             }
             (_format = format) !== null && _format !== void 0 ? _format : format = "wasm64-unknown-emscripten-draft_2024_02_15";
-            now = Date.now;
-            _context.next = 17;
-            return (0, _aoLoader["default"])(wasm, {
-              format: format,
-              mode: "test",
-              WeaveDrive: WeaveDrive
-            });
-          case 17:
-            handle = _context.sent;
-            Date.now = now;
-            _module = {
-              handle: handle,
-              id: mod
-            };
             if (mod) {
-              _context.next = 22;
+              _context.next = 16;
               break;
             }
             throw Error("module not found");
-          case 22:
+          case 16:
             opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags = opt.tags) !== null && _opt$tags !== void 0 ? _opt$tags : []), {
               "Data-Protocol": "ao",
               Variant: "ao.TN.1",
               Type: "Process",
               SDK: "aoconnect",
-              Module: opt.module,
+              Module: mod,
               Scheduler: opt.scheduler,
               "Content-Type": "text/plain"
             }));
@@ -262,14 +254,14 @@ var connect = exports.connect = function connect(mem) {
               name: "Type",
               value: "Process"
             });
-            _context.next = 30;
+            _context.next = 24;
             return ar.dataitem({
               item: opt.item,
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags)
             });
-          case 30:
+          case 24:
             _yield$ar$dataitem = _context.sent;
             id = _yield$ar$dataitem.id;
             owner = _yield$ar$dataitem.owner;
@@ -277,9 +269,27 @@ var connect = exports.connect = function connect(mem) {
             __tags = _yield$ar$dataitem.tags;
             opt.tags = (0, _utils.buildTags)(null, __tags);
             if (opt.item) opt.data = _base64url["default"].decode(item.data);
-            _context.next = 39;
-            return ar.postItem(item, _test.su.jwk);
-          case 39:
+            _context.next = 33;
+            return ar.postItems(item, _test.su.jwk);
+          case 33:
+            now = Date.now;
+            t = (0, _utils.tags)(opt.tags);
+            wd = t.Extension === "KV" ? KV : WeaveDrive;
+            _context.next = 38;
+            return (0, _aoLoader["default"])(wasm, {
+              format: format,
+              WeaveDrive: wd,
+              spawn: item,
+              module: mem.txs[mod],
+              blockHeight: "100"
+            });
+          case 38:
+            handle = _context.sent;
+            _module = {
+              handle: handle,
+              id: mod
+            };
+            Date.now = now;
             _tags = (0, _utils.tags)(opt.tags);
             res = null;
             memory = null;
@@ -298,7 +308,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 57;
+              _context.next = 59;
               break;
             }
             data = "";
@@ -311,51 +321,51 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 51;
+            _context.next = 53;
             return _module.handle(null, msg, _env);
-          case 51:
+          case 53:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 58;
+            _context.next = 60;
             break;
-          case 57:
+          case 59:
             p.height += 1;
-          case 58:
+          case 60:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 84;
+              _context.next = 86;
               break;
             }
             _tags$CronInterval$s = _tags["Cron-Interval"].split("-"), _tags$CronInterval$s2 = _slicedToArray(_tags$CronInterval$s, 2), num = _tags$CronInterval$s2[0], unit = _tags$CronInterval$s2[1];
             _int = 0;
             _context.t0 = unit.replace(/s$/, "");
-            _context.next = _context.t0 === "millisecond" ? 66 : _context.t0 === "second" ? 68 : _context.t0 === "minute" ? 70 : _context.t0 === "hour" ? 72 : _context.t0 === "day" ? 74 : _context.t0 === "month" ? 76 : _context.t0 === "year" ? 78 : 80;
+            _context.next = _context.t0 === "millisecond" ? 68 : _context.t0 === "second" ? 70 : _context.t0 === "minute" ? 72 : _context.t0 === "hour" ? 74 : _context.t0 === "day" ? 76 : _context.t0 === "month" ? 78 : _context.t0 === "year" ? 80 : 82;
             break;
-          case 66:
-            _int = num;
-            return _context.abrupt("break", 80);
           case 68:
-            _int = num * 1000;
-            return _context.abrupt("break", 80);
+            _int = num;
+            return _context.abrupt("break", 82);
           case 70:
-            _int = num * 1000 * 60;
-            return _context.abrupt("break", 80);
+            _int = num * 1000;
+            return _context.abrupt("break", 82);
           case 72:
-            _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60;
+            return _context.abrupt("break", 82);
           case 74:
-            _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60;
+            return _context.abrupt("break", 82);
           case 76:
-            _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60 * 24;
+            return _context.abrupt("break", 82);
           case 78:
-            _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60 * 24 * 30;
+            return _context.abrupt("break", 82);
           case 80:
+            _int = num * 1000 * 60 * 60 * 24 * 365;
+            return _context.abrupt("break", 82);
+          case 82:
             cronTags = [];
             for (k in _tags) {
               if (/^Cron-Tag-/.test(k)) {
@@ -367,9 +377,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 84:
+          case 86:
             return _context.abrupt("return", id);
-          case 85:
+          case 87:
           case "end":
             return _context.stop();
         }
@@ -431,40 +441,50 @@ var connect = exports.connect = function connect(mem) {
             id = _yield$ar$dataitem2.id;
             owner = _yield$ar$dataitem2.owner;
             item = _yield$ar$dataitem2.item;
-            _context2.next = 16;
-            return ar.postItem(item, _test.su.jwk);
-          case 16:
-            _context2.prev = 16;
+            if (!opt.message_item) {
+              _context2.next = 19;
+              break;
+            }
+            _context2.next = 17;
+            return ar.postItems([opt.message_item, item], _test.su.jwk);
+          case 17:
+            _context2.next = 21;
+            break;
+          case 19:
+            _context2.next = 21;
+            return ar.postItems(item, _test.su.jwk);
+          case 21:
+            _context2.prev = 21;
             data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
             _tags = _opt.tags;
             from = (_ref6 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref6 !== void 0 ? _ref6 : owner;
             if (!_opt.item) {
-              _context2.next = 37;
+              _context2.next = 42;
               break;
             }
-            _context2.prev = 21;
+            _context2.prev = 26;
             data = _base64url["default"].decode(_opt.item.data);
             _tags = _opt.item.tags;
             if (from) {
-              _context2.next = 32;
+              _context2.next = 37;
               break;
             }
             raw_owner = _opt.item.rawOwner;
             _context2.t0 = Buffer;
-            _context2.next = 29;
+            _context2.next = 34;
             return _crypto["default"].subtle.digest("SHA-256", raw_owner);
-          case 29:
+          case 34:
             _context2.t1 = _context2.sent;
             hashBuffer = _context2.t0.from.call(_context2.t0, _context2.t1);
             from = _base64url["default"].encode(hashBuffer);
-          case 32:
-            _context2.next = 37;
+          case 37:
+            _context2.next = 42;
             break;
-          case 34:
-            _context2.prev = 34;
-            _context2.t2 = _context2["catch"](21);
+          case 39:
+            _context2.prev = 39;
+            _context2.t2 = _context2["catch"](26);
             console.log(_context2.t2);
-          case 37:
+          case 42:
             // check: is owner=mu.addr right?
             msg = genMsg(opt.message, p, data, _tags, from, _test.mu.addr);
             _env = genEnv({
@@ -473,9 +493,9 @@ var connect = exports.connect = function connect(mem) {
               module: p.module,
               auth: _test.mu.addr
             });
-            _context2.next = 41;
+            _context2.next = 46;
             return p.handle(p.memory, msg, _env);
-          case 41:
+          case 46:
             res = _context2.sent;
             p.memory = res.Memory;
             delete res.Memory;
@@ -486,19 +506,19 @@ var connect = exports.connect = function connect(mem) {
             }, opt));
             mem.msgs[opt.message] = _opt;
             _iterator2 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-            _context2.prev = 49;
+            _context2.prev = 54;
             _iterator2.s();
-          case 51:
+          case 56:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 58;
+              _context2.next = 63;
               break;
             }
             v = _step2.value;
             if (!mem.env[v.Target]) {
-              _context2.next = 56;
+              _context2.next = 61;
               break;
             }
-            _context2.next = 56;
+            _context2.next = 61;
             return message({
               process: v.Target,
               tags: v.Tags,
@@ -506,32 +526,32 @@ var connect = exports.connect = function connect(mem) {
               signer: _test.mu.signer,
               from: opt.process
             });
-          case 56:
-            _context2.next = 51;
+          case 61:
+            _context2.next = 56;
             break;
-          case 58:
-            _context2.next = 63;
+          case 63:
+            _context2.next = 68;
             break;
-          case 60:
-            _context2.prev = 60;
-            _context2.t3 = _context2["catch"](49);
+          case 65:
+            _context2.prev = 65;
+            _context2.t3 = _context2["catch"](54);
             _iterator2.e(_context2.t3);
-          case 63:
-            _context2.prev = 63;
+          case 68:
+            _context2.prev = 68;
             _iterator2.f();
-            return _context2.finish(63);
-          case 66:
+            return _context2.finish(68);
+          case 71:
             _iterator3 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-            _context2.prev = 67;
+            _context2.prev = 72;
             _iterator3.s();
-          case 69:
+          case 74:
             if ((_step3 = _iterator3.n()).done) {
-              _context2.next = 76;
+              _context2.next = 81;
               break;
             }
             _v = _step3.value;
             __tags = (0, _utils.tags)(_v.Tags);
-            _context2.next = 74;
+            _context2.next = 79;
             return spawn({
               module: __tags.Module,
               scheduler: _test.scheduler,
@@ -540,87 +560,87 @@ var connect = exports.connect = function connect(mem) {
               from: __tags["From-Process"],
               signer: _test.mu.signer
             });
-          case 74:
-            _context2.next = 69;
+          case 79:
+            _context2.next = 74;
             break;
-          case 76:
-            _context2.next = 81;
+          case 81:
+            _context2.next = 86;
             break;
-          case 78:
-            _context2.prev = 78;
-            _context2.t4 = _context2["catch"](67);
+          case 83:
+            _context2.prev = 83;
+            _context2.t4 = _context2["catch"](72);
             _iterator3.e(_context2.t4);
-          case 81:
-            _context2.prev = 81;
+          case 86:
+            _context2.prev = 86;
             _iterator3.f();
-            return _context2.finish(81);
-          case 84:
+            return _context2.finish(86);
+          case 89:
             _iterator4 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-            _context2.prev = 85;
+            _context2.prev = 90;
             _iterator4.s();
-          case 87:
+          case 92:
             if ((_step4 = _iterator4.n()).done) {
-              _context2.next = 108;
+              _context2.next = 113;
               break;
             }
             _v2 = _step4.value;
             _iterator5 = _createForOfIteratorHelper(_v2.Processes);
-            _context2.prev = 90;
+            _context2.prev = 95;
             _iterator5.s();
-          case 92:
+          case 97:
             if ((_step5 = _iterator5.n()).done) {
-              _context2.next = 98;
+              _context2.next = 103;
               break;
             }
             v2 = _step5.value;
-            _context2.next = 96;
+            _context2.next = 101;
             return _assign({
               message: _v2.Message,
               process: v2,
               from: opt.process,
               signer: _test.mu.signer
             });
-          case 96:
-            _context2.next = 92;
+          case 101:
+            _context2.next = 97;
             break;
-          case 98:
-            _context2.next = 103;
+          case 103:
+            _context2.next = 108;
             break;
-          case 100:
-            _context2.prev = 100;
-            _context2.t5 = _context2["catch"](90);
+          case 105:
+            _context2.prev = 105;
+            _context2.t5 = _context2["catch"](95);
             _iterator5.e(_context2.t5);
-          case 103:
-            _context2.prev = 103;
+          case 108:
+            _context2.prev = 108;
             _iterator5.f();
-            return _context2.finish(103);
-          case 106:
-            _context2.next = 87;
+            return _context2.finish(108);
+          case 111:
+            _context2.next = 92;
             break;
-          case 108:
-            _context2.next = 113;
+          case 113:
+            _context2.next = 118;
             break;
-          case 110:
-            _context2.prev = 110;
-            _context2.t6 = _context2["catch"](85);
+          case 115:
+            _context2.prev = 115;
+            _context2.t6 = _context2["catch"](90);
             _iterator4.e(_context2.t6);
-          case 113:
-            _context2.prev = 113;
+          case 118:
+            _context2.prev = 118;
             _iterator4.f();
-            return _context2.finish(113);
-          case 116:
+            return _context2.finish(118);
+          case 121:
             return _context2.abrupt("return", id);
-          case 119:
-            _context2.prev = 119;
-            _context2.t7 = _context2["catch"](16);
+          case 124:
+            _context2.prev = 124;
+            _context2.t7 = _context2["catch"](21);
             console.log(_context2.t7);
-          case 122:
+          case 127:
             return _context2.abrupt("return", null);
-          case 123:
+          case 128:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[16, 119], [21, 34], [49, 60, 63, 66], [67, 78, 81, 84], [85, 110, 113, 116], [90, 100, 103, 106]]);
+      }, _callee2, null, [[21, 124], [26, 39], [54, 65, 68, 71], [72, 83, 86, 89], [90, 115, 118, 121], [95, 105, 108, 111]]);
     }));
     return function assign(_x) {
       return _ref5.apply(this, arguments);
@@ -678,20 +698,18 @@ var connect = exports.connect = function connect(mem) {
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
           case 17:
-            _context3.next = 19;
-            return ar.postItem(item, _test.su.jwk);
-          case 19:
             mem.msgs[id] = opt;
-            _context3.next = 22;
+            _context3.next = 20;
             return _assign({
+              message_item: item,
               message: id,
               process: opt.process,
               from: owner,
               signer: _test.mu.signer
             });
-          case 22:
+          case 20:
             return _context3.abrupt("return", id);
-          case 23:
+          case 21:
           case "end":
             return _context3.stop();
         }
@@ -884,12 +902,11 @@ var connect = exports.connect = function connect(mem) {
             case 12:
               _context9.prev = 12;
               cloneMemory = function cloneMemory(memory) {
-                var buffer = memory.buffer.slice(0); // Clone the ArrayBuffer
+                var buffer = memory.buffer.slice(0);
                 return new WebAssembly.Memory({
                   initial: memory.buffer.byteLength / 65536,
-                  // Memory size in pages (64KB per page)
                   maximum: memory.maximum || undefined,
-                  shared: memory.shared || false // Retain sharing if applicable
+                  shared: memory.shared || false
                 });
               };
               msg = genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);

package/cjs/ar.js

@@ -830,22 +830,30 @@ var AR = /*#__PURE__*/function () {
     key: "data",
     value: function () {
       var _data2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(txid) {
-        var string,
+        var _string,
+          decode,
+          string,
           _data,
           _args14 = arguments;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              string = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : false;
-              _context14.next = 3;
+              _string = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : false;
+              decode = true;
+              string = _string;
+              if ((0, _ramda.is)(Object, _string)) {
+                if (!(0, _ramda.isNil)(_string.decode)) decode = _string.decode;
+                if (!(0, _ramda.isNil)(_string.string)) string = _string.string;
+              }
+              _context14.next = 6;
               return this.arweave.transactions.getData(txid, {
-                decode: true,
+                decode: decode,
                 string: string
               });
-            case 3:
+            case 6:
               _data = _context14.sent;
               return _context14.abrupt("return", _data);
-            case 5:
+            case 8:
             case "end":
               return _context14.stop();
           }

package/cjs/armem.js

@@ -74,7 +74,8 @@ var ArMem = exports["default"] = /*#__PURE__*/function () {
           "Input-Encoding": "JSON-V1",
           "Output-Encoding": "JSON-V1",
           "Memory-Limit": "1-gb",
-          "Compute-Limit": "9000000000000"
+          "Compute-Limit": "9000000000000",
+          Extension: "WeaveDrive"
         })
       };
     }