wao 0.7.0 → 0.7.2

package/cjs/ao.js

@@ -525,6 +525,7 @@ var AO = /*#__PURE__*/function () {
           module,
           _ref11$scheduler,
           scheduler,
+          memory,
           jwk,
           _ref11$tags,
           tags,
@@ -534,11 +535,12 @@ var AO = /*#__PURE__*/function () {
           _yield$this$ar$checkW,
           pid,
           _tags,
+          p,
           _args8 = arguments;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _ref11 = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {}, boot = _ref11.boot, _ref11$module = _ref11.module, module = _ref11$module === void 0 ? this.module : _ref11$module, _ref11$scheduler = _ref11.scheduler, scheduler = _ref11$scheduler === void 0 ? this.scheduler : _ref11$scheduler, jwk = _ref11.jwk, _ref11$tags = _ref11.tags, tags = _ref11$tags === void 0 ? {} : _ref11$tags, data = _ref11.data, auth = _ref11.auth;
+              _ref11 = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {}, boot = _ref11.boot, _ref11$module = _ref11.module, module = _ref11$module === void 0 ? this.module : _ref11$module, _ref11$scheduler = _ref11.scheduler, scheduler = _ref11$scheduler === void 0 ? this.scheduler : _ref11$scheduler, memory = _ref11.memory, jwk = _ref11.jwk, _ref11$tags = _ref11.tags, tags = _ref11$tags === void 0 ? {} : _ref11$tags, data = _ref11.data, auth = _ref11.auth;
               err = null;
               _context8.next = 4;
               return this.ar.checkWallet({
@@ -564,6 +566,7 @@ var AO = /*#__PURE__*/function () {
               _tags = (0, _utils.buildTags)(null, tags);
               _context8.next = 17;
               return this.spawn({
+                memory: memory,
                 module: module,
                 scheduler: scheduler,
                 signer: this.toSigner(jwk),
@@ -580,11 +583,13 @@ var AO = /*#__PURE__*/function () {
               console.log(_context8.t0);
               err = _context8.t0;
             case 24:
+              p = pid ? this.p(pid) : null;
               return _context8.abrupt("return", {
                 err: err,
-                pid: pid
+                pid: pid,
+                p: p
               });
-            case 25:
+            case 26:
             case "end":
               return _context8.stop();
           }

package/cjs/aoconnect.js

@@ -149,7 +149,7 @@ var connect = exports.connect = function connect(mem) {
   };
   var spawn = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _opt$module, _mem$wasms$mod, _format, _opt$tags, _opt$tags2;
+      var _opt$module, _mem$wasms$mod, _format, _opt$tags, _opt$tags2, _opt$memory;
       var opt,
         mod,
         _module,
@@ -180,7 +180,6 @@ var connect = exports.connect = function connect(mem) {
         data,
         msg,
         _env,
-        _t,
         _tags$CronInterval$s,
         _tags$CronInterval$s2,
         num,
@@ -308,7 +307,7 @@ var connect = exports.connect = function connect(mem) {
             Date.now = now;
             _tags = (0, _utils.tags)(opt.tags);
             res = null;
-            memory = null;
+            memory = (_opt$memory = opt.memory) !== null && _opt$memory !== void 0 ? _opt$memory : null;
             p = {
               id: id,
               epochs: [],
@@ -323,8 +322,15 @@ var connect = exports.connect = function connect(mem) {
               txs: [],
               opt: opt
             };
+            if (!memory) {
+              _context.next = 56;
+              break;
+            }
+            _context.next = 70;
+            break;
+          case 56:
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 67;
+              _context.next = 69;
               break;
             }
             data = "";
@@ -336,52 +342,51 @@ var connect = exports.connect = function connect(mem) {
               module: p.module,
               auth: _test.mu.addr
             });
-            _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 61;
+            _context.next = 63;
             return _module.handle(null, msg, _env);
-          case 61:
+          case 63:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 68;
+            _context.next = 70;
             break;
-          case 67:
+          case 69:
             p.height += 1;
-          case 68:
+          case 70:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 94;
+              _context.next = 96;
               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.t1 = unit.replace(/s$/, "");
-            _context.next = _context.t1 === "millisecond" ? 76 : _context.t1 === "second" ? 78 : _context.t1 === "minute" ? 80 : _context.t1 === "hour" ? 82 : _context.t1 === "day" ? 84 : _context.t1 === "month" ? 86 : _context.t1 === "year" ? 88 : 90;
+            _context.next = _context.t1 === "millisecond" ? 78 : _context.t1 === "second" ? 80 : _context.t1 === "minute" ? 82 : _context.t1 === "hour" ? 84 : _context.t1 === "day" ? 86 : _context.t1 === "month" ? 88 : _context.t1 === "year" ? 90 : 92;
             break;
-          case 76:
-            _int = num;
-            return _context.abrupt("break", 90);
           case 78:
-            _int = num * 1000;
-            return _context.abrupt("break", 90);
+            _int = num;
+            return _context.abrupt("break", 92);
           case 80:
-            _int = num * 1000 * 60;
-            return _context.abrupt("break", 90);
+            _int = num * 1000;
+            return _context.abrupt("break", 92);
           case 82:
-            _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 90);
+            _int = num * 1000 * 60;
+            return _context.abrupt("break", 92);
           case 84:
-            _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 90);
+            _int = num * 1000 * 60 * 60;
+            return _context.abrupt("break", 92);
           case 86:
-            _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 90);
+            _int = num * 1000 * 60 * 60 * 24;
+            return _context.abrupt("break", 92);
           case 88:
-            _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 90);
+            _int = num * 1000 * 60 * 60 * 24 * 30;
+            return _context.abrupt("break", 92);
           case 90:
+            _int = num * 1000 * 60 * 60 * 24 * 365;
+            return _context.abrupt("break", 92);
+          case 92:
             cronTags = [];
             for (_k in _tags) {
               if (/^Cron-Tag-/.test(_k)) {
@@ -393,9 +398,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 94:
+          case 96:
             return _context.abrupt("return", id);
-          case 95:
+          case 97:
           case "end":
             return _context.stop();
         }

package/cjs/tar.js

@@ -265,7 +265,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               };
               data = di.data;
               try {
-                data = _base64url["default"].decode(di.data);
+                //data = base64url.decode(di.data)
               } catch (e) {}
               _context4.t0 = {
                 size: data_size,
@@ -545,7 +545,7 @@ var AR = /*#__PURE__*/function (_MAR) {
   }, {
     key: "data",
     value: function () {
-      var _data2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id, _string) {
+      var _data2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id, _string, log) {
         var _tx$data;
         var decode, string, tx, _data, isBuf, isStr;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -559,7 +559,11 @@ var AR = /*#__PURE__*/function (_MAR) {
               }
               tx = this.mem.txs[id];
               _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");
+              if ((tx === null || tx === void 0 ? void 0 : tx.format) === 2 && _data) {
+                _data = Buffer.from(_data, "base64");
+              } else {
+                _data = Buffer.from(_base64url["default"].decode(_data));
+              }
               isBuf = (0, _ramda.is)(Uint8Array, _data) || (0, _ramda.is)(ArrayBuffer, _data);
               isStr = (0, _ramda.is)(String, _data);
               if (!(decode === false)) {
@@ -573,7 +577,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 _context7.next = 17;
                 break;
               }
-              return _context7.abrupt("return", Buffer.from(_data).toString());
+              return _context7.abrupt("return", _data.toString());
             case 17:
               if (!(isStr && string !== true)) {
                 _context7.next = 19;
@@ -588,7 +592,7 @@ var AR = /*#__PURE__*/function (_MAR) {
           }
         }, _callee7, this);
       }));
-      function data(_x9, _x10) {
+      function data(_x9, _x10, _x11) {
         return _data2.apply(this, arguments);
       }
       return data;

package/cjs/weavedrive.js

@@ -317,9 +317,7 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 dst_ptr = Number(raw_dst_ptr);
                 stream = 0;
                 for (i = 0; i < FS.streams.length; i++) {
-                  if (FS.streams[i].fd === fd) {
-                    stream = FS.streams[i];
-                  }
+                  if (FS.streams[i].fd === fd) stream = FS.streams[i];
                 }
                 // read block headers
                 if (!stream.path.includes("/block")) {
@@ -357,7 +355,7 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 to = Math.min(stream.node.total_size, stream.position + chunk_download_sz); //console.log("WeaveDrive: fd: ", fd, " Read length: ", to_read, " Reading ahead:", to - to_read - stream.position)
                 // fetch(`/${stream.node.name}`)
                 _context6.next = 21;
-                return ar.data(stream.node.name);
+                return ar.data(stream.node.name, null, log);
               case 21:
                 data = _context6.sent;
                 // Extract the Range header to determine the start and end of the requested chunk

package/esm/.db/929039/data/ppl/bob.json

@@ -0,0 +1 @@
+{"name":"Bob","age":40}

package/esm/ao.js

@@ -333,6 +333,7 @@ class AO {
     boot,
     module = this.module,
     scheduler = this.scheduler,
+    memory,
     jwk,
     tags = {},
     data,
@@ -348,6 +349,7 @@ class AO {
       if (!tags.Authority && this.authority) tags.Authority = this.authority
       let _tags = buildTags(null, tags)
       pid = await this.spawn({
+        memory,
         module,
         scheduler,
         signer: this.toSigner(jwk),
@@ -358,7 +360,8 @@ class AO {
       console.log(e)
       err = e
     }
-    return { err, pid }
+    const p = pid ? this.p(pid) : null
+    return { err, pid, p }
   }
 
   async msg({

package/esm/aoconnect.js

@@ -167,7 +167,7 @@ export const connect = (mem, { log = false, extensions = {} } = {}) => {
 
     const _tags = tags(opt.tags)
     let res = null
-    let memory = null
+    let memory = opt.memory ?? null
     let p = {
       id: id,
       epochs: [],
@@ -182,7 +182,9 @@ export const connect = (mem, { log = false, extensions = {} } = {}) => {
       txs: [],
       opt,
     }
-    if (_tags["On-Boot"] || true) {
+    if (memory) {
+      // forking...
+    } else if (_tags["On-Boot"] || true) {
       let data = ""
       if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
       else data = mem.msgs[_tags["On-Boot"]]?.data ?? ""
@@ -193,8 +195,6 @@ export const connect = (mem, { log = false, extensions = {} } = {}) => {
         module: p.module,
         auth: mu.addr,
       })
-
-      const _t = tags(msg.Tags)
       res = await _module.handle(null, msg, _env)
       p.memory = res.Memory
       delete res.Memory

package/esm/tar.js

@@ -63,7 +63,7 @@ class AR extends MAR {
       this.mem.addrmap[owner] = { key: di.owner, address: owner }
       let data = di.data
       try {
-        data = base64url.decode(di.data)
+        //data = base64url.decode(di.data)
       } catch (e) {}
       let _item = {
         _data: { size: data_size, type: data_type },
@@ -177,7 +177,7 @@ class AR extends MAR {
     return this.mem.txs[id]
   }
 
-  async data(id, _string) {
+  async data(id, _string, log) {
     let decode = true
     let string = _string
     if (is(Object, _string)) {
@@ -186,7 +186,11 @@ class AR extends MAR {
     }
     let tx = this.mem.txs[id]
     let _data = tx?.data ?? null
-    if (tx?.format === 2 && _data) _data = Buffer.from(_data, "base64")
+    if (tx?.format === 2 && _data) {
+      _data = Buffer.from(_data, "base64")
+    } else {
+      _data = Buffer.from(base64url.decode(_data))
+    }
     let isBuf = is(Uint8Array, _data) || is(ArrayBuffer, _data)
     let isStr = is(String, _data)
     if (decode === false) {
@@ -194,7 +198,7 @@ class AR extends MAR {
       return base64url.encode(_data)
     } else {
       if (isBuf && string) {
-        return Buffer.from(_data).toString()
+        return _data.toString()
       } else if (isStr && string !== true) {
         return new TextEncoder().encode(_data)
       }

package/esm/weavedrive.js

@@ -122,7 +122,6 @@ export default class WeaveDrive {
             false,
           )
           var stream = FS.open("/tx2/" + id, "r")
-
           return stream
         },
         async open(filename) {
@@ -190,9 +189,7 @@ export default class WeaveDrive {
 
           var stream = 0
           for (var i = 0; i < FS.streams.length; i++) {
-            if (FS.streams[i].fd === fd) {
-              stream = FS.streams[i]
-            }
+            if (FS.streams[i].fd === fd) stream = FS.streams[i]
           }
           // read block headers
           if (stream.path.includes("/block")) {
@@ -226,8 +223,7 @@ export default class WeaveDrive {
           //console.log("WeaveDrive: fd: ", fd, " Read length: ", to_read, " Reading ahead:", to - to_read - stream.position)
 
           // fetch(`/${stream.node.name}`)
-          const data = await ar.data(stream.node.name)
-
+          const data = await ar.data(stream.node.name, null, log)
           // Extract the Range header to determine the start and end of the requested chunk
           const start = 0
           const end = data.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",