wao 0.7.0 → 0.7.1

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/aoconnect.js

@@ -193,7 +193,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

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.1",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",