wao 0.10.7 → 0.11.0

package/cjs/ao.js

@@ -32,6 +32,14 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 var pkg = (_WarpArBundles$defaul = WarpArBundles["default"]) !== null && _WarpArBundles$defaul !== void 0 ? _WarpArBundles$defaul : WarpArBundles;
 var createData = pkg.createData,
   ArweaveSigner = pkg.ArweaveSigner;
+var getHash = function getHash(res) {
+  var _res$Messages, _res$Spawns, _res$Assignments;
+  return (0, _md["default"])(JSON.stringify({
+    Messages: (_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : [],
+    Spawns: (_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : [],
+    Assignments: (_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []
+  }));
+};
 function createDataItemSigner2(wallet) {
   var signer = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
@@ -700,7 +708,7 @@ var AO = /*#__PURE__*/function () {
                         try {
                           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                             _v = _step3.value;
-                            hash2 = (0, _md["default"])(JSON.stringify((0, _ramda.dissoc)("cursor", _v)));
+                            hash2 = getHash(_v);
                             if (!exists) {
                               if (hash2 === hash) exists = true;
                             } else {
@@ -828,7 +836,7 @@ var AO = /*#__PURE__*/function () {
               });
             case 30:
               res = _context11.sent;
-              hash = (0, _md["default"])(JSON.stringify(res));
+              hash = getHash(res);
               _txmap = _defineProperty({}, mid, {
                 checked: false,
                 res: res

package/cjs/bao.js

@@ -214,25 +214,26 @@ var AO = /*#__PURE__*/function (_MAO) {
                 "Memory-Limit": "1-gb",
                 "Compute-Limit": "9000000000000"
               });
+              console.log(tags, t);
               signer = (0, _aoconnect.createDataItemSigner)(jwk);
-              _context5.next = 13;
+              _context5.next = 14;
               return this.ar.dataitem({
                 tags: t,
                 data: data,
                 signer: signer
               });
-            case 13:
+            case 14:
               _yield$this$ar$datait = _context5.sent;
               id = _yield$this$ar$datait.id;
               owner = _yield$this$ar$datait.owner;
               item = _yield$this$ar$datait.item;
-              _context5.next = 19;
+              _context5.next = 20;
               return this.ar.postItems(item, jwk);
-            case 19:
+            case 20:
               return _context5.abrupt("return", {
                 id: id
               });
-            case 20:
+            case 21:
             case "end":
               return _context5.stop();
           }

package/cjs/weavedrive.js

@@ -359,17 +359,17 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
               case 21:
                 data = _context6.sent;
                 // Extract the Range header to determine the start and end of the requested chunk
-                start = 0;
-                end = data.length; // Create a ReadableStream for the requested chunk
+                start = stream.position;
+                end = to; // Create a ReadableStream for the requested chunk
                 chunk = data.subarray(start, end);
                 response = new Response(new ReadableStream({
                   start: function start(controller) {
-                    controller.enqueue(chunk); // Push the chunk to the stream
-                    controller.close(); // Close the stream when done
+                    controller.enqueue(chunk);
+                    controller.close();
                   }
                 }), {
                   headers: {
-                    "Content-Length": chunk.length.toString()
+                    "content-length": chunk.length.toString()
                   }
                 });
                 reader = response.body.getReader();

package/esm/ao.js

@@ -53,6 +53,15 @@ import {
   optAO,
 } from "./utils.js"
 
+const getHash = res =>
+  md5(
+    JSON.stringify({
+      Messages: res.Messages ?? [],
+      Spawns: res.Spawns ?? [],
+      Assignments: res.Assignments ?? [],
+    }),
+  )
+
 function createDataItemSigner2(wallet) {
   const signer = async ({ data, tags, target, anchor }) => {
     const signer = new ArweaveSigner(wallet)
@@ -415,7 +424,7 @@ class AO {
         }
       } else {
         for (let v of reverse(await this.res({ pid, limit }))) {
-          const hash2 = md5(JSON.stringify(dissoc("cursor", v)))
+          const hash2 = getHash(v)
           if (!exists) {
             if (hash2 === hash) exists = true
           } else {
@@ -456,7 +465,7 @@ class AO {
       if (!is(Array, check)) check = [check]
       let _txs = [{ id: mid, from: await this.ar.toAddr(jwk) }]
       res = await this.res({ pid, mid })
-      hash = md5(JSON.stringify(res))
+      hash = getHash(res)
       let _txmap = { [mid]: { checked: false, res } }
       results.push({ mid, res })
       let checked = false

package/esm/bao.js

@@ -111,6 +111,7 @@ class AO extends MAO {
       "Memory-Limit": "1-gb",
       "Compute-Limit": "9000000000000",
     })
+    console.log(tags, t)
     const signer = createDataItemSigner(jwk)
     const { id, owner, item } = await this.ar.dataitem({
       tags: t,

package/esm/weavedrive.js

@@ -182,6 +182,7 @@ export default class WeaveDrive {
             return 0
           }
         },
+
         async read(fd, raw_dst_ptr, raw_length) {
           // Note: The length and dst_ptr are 53 bit integers in JS, so this _should_ be ok into a large memspace.
           var to_read = Number(raw_length)
@@ -225,20 +226,20 @@ export default class WeaveDrive {
           // fetch(`/${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
+          const start = stream.position
+          const end = to
 
           // Create a ReadableStream for the requested chunk
           const chunk = data.subarray(start, end)
           const response = new Response(
             new ReadableStream({
               start(controller) {
-                controller.enqueue(chunk) // Push the chunk to the stream
-                controller.close() // Close the stream when done
+                controller.enqueue(chunk)
+                controller.close()
               },
             }),
             {
-              headers: { "Content-Length": chunk.length.toString() },
+              headers: { "content-length": chunk.length.toString() },
             },
           )
           const reader = response.body.getReader()

package/package.json

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