wao 0.6.0 → 0.6.1

package/cjs/helpers.js

@@ -10,6 +10,7 @@ var _assert = _interopRequireDefault(require("assert"));
 var _aoconnect3 = require("@permaweb/aoconnect");
 var _path = require("path");
 var _fs = require("fs");
+var _utils = require("./utils.js");
 var _yargs = _interopRequireDefault(require("yargs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -166,12 +167,7 @@ var Testnet = exports.Testnet = /*#__PURE__*/function () {
     this.arweave = arweave !== null && arweave !== void 0 ? arweave : {
       port: port
     };
-    this.aoconnect = aoconnect !== null && aoconnect !== void 0 ? aoconnect : {
-      MU_URL: "http://localhost:".concat(port + 2),
-      SU_URL: "http://localhost:".concat(port + 3),
-      CU_URL: "http://localhost:".concat(port + 4),
-      GATEWAY_URL: "http://localhost:".concat(port)
-    };
+    this.aoconnect = aoconnect !== null && aoconnect !== void 0 ? aoconnect : (0, _utils.optAO)(port);
     this.ar = new _index.AR(this.arweave);
   }
   return _createClass(Testnet, [{
@@ -198,7 +194,7 @@ var Testnet = exports.Testnet = /*#__PURE__*/function () {
               return this.ar.init(jwk);
             case 8:
               this.jwk = this.ar.jwk;
-              this.addr = this.ar.a;
+              this.addr = this.ar.addr;
               this.gql = this.ar.gql;
               _context4.next = 13;
               return this.src.upload("aos2_0_1", "wasm");
@@ -355,11 +351,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
           (_arweave = arweave) !== null && _arweave !== void 0 ? _arweave : arweave = {
             port: 4000
           };
-          (_aoconnect = aoconnect) !== null && _aoconnect !== void 0 ? _aoconnect : aoconnect = {
-            MU_URL: "http://localhost:4002",
-            CU_URL: "http://localhost:4004",
-            GATEWAY_URL: "http://localhost:4000"
-          };
+          (_aoconnect = aoconnect) !== null && _aoconnect !== void 0 ? _aoconnect : aoconnect = (0, _utils.optAO)(4000);
           ar = new _index.AR(arweave);
           _context5.next = 37;
           return ar.gen("10");

package/cjs/kv.js

@@ -0,0 +1,335 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _arweave = _interopRequireDefault(require("arweave"));
+var _utils = require("./utils.js");
+var _ramda = require("ramda");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+var KB = 1024;
+var MB = KB * 1024;
+var CACHE_SZ = 32 * KB;
+var CHUNK_SZ = 128 * MB;
+var NOTIFY_SZ = 512 * MB;
+var log = console.log;
+var KV = exports["default"] = /*#__PURE__*/_createClass(function KV(ar) {
+  _classCallCheck(this, KV);
+  this.kv = function WeaveDrive(mod, FS) {
+    return {
+      create: function create(id) {
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _yield$ar$data$length, _yield$ar$data;
+          var properties, node, bytesLength, stream;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                properties = {
+                  isDevice: false,
+                  contents: null
+                };
+                if (!FS.analyzePath("/data/").exists) FS.mkdir("/data/");
+                node = FS.createFile("/", "data/" + id, properties, true, false); // Set initial parameters
+                _context.next = 5;
+                return ar.data(id);
+              case 5:
+                _context.t2 = _yield$ar$data = _context.sent;
+                _context.t1 = _context.t2 === null;
+                if (_context.t1) {
+                  _context.next = 9;
+                  break;
+                }
+                _context.t1 = _yield$ar$data === void 0;
+              case 9:
+                if (!_context.t1) {
+                  _context.next = 13;
+                  break;
+                }
+                _context.t3 = void 0;
+                _context.next = 14;
+                break;
+              case 13:
+                _context.t3 = _yield$ar$data.length;
+              case 14:
+                _context.t4 = _yield$ar$data$length = _context.t3;
+                _context.t0 = _context.t4 !== null;
+                if (!_context.t0) {
+                  _context.next = 18;
+                  break;
+                }
+                _context.t0 = _yield$ar$data$length !== void 0;
+              case 18:
+                if (!_context.t0) {
+                  _context.next = 22;
+                  break;
+                }
+                _context.t5 = _yield$ar$data$length;
+                _context.next = 23;
+                break;
+              case 22:
+                _context.t5 = 0;
+              case 23:
+                bytesLength = _context.t5;
+                node.total_size = Number(bytesLength);
+                node.cache = new Uint8Array(0);
+                node.position = 0;
+
+                // Add a function that defers querying the file size until it is asked the first time.
+                Object.defineProperties(node, {
+                  usedBytes: {
+                    get: function get() {
+                      return bytesLength;
+                    }
+                  }
+                });
+
+                // Now we have created the file in the emscripten FS, we can open it as a stream
+                stream = FS.open("/data/" + id, "r"); //console.log("JS: Created file: ", id, " fd: ", stream.fd);
+                return _context.abrupt("return", stream);
+              case 30:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }))();
+      },
+      open: function open(filename) {
+        var _this = this;
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var pathCategory, id, stream, _stream;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                pathCategory = filename.split("/")[1];
+                id = filename.split("/")[2]; //log("JS: Opening ID: ", id)
+                if (!(pathCategory === "data")) {
+                  _context2.next = 17;
+                  break;
+                }
+                if (!FS.analyzePath(filename).exists) {
+                  _context2.next = 11;
+                  break;
+                }
+                stream = FS.open(filename, "r");
+                if (!stream.fd) {
+                  _context2.next = 7;
+                  break;
+                }
+                return _context2.abrupt("return", stream.fd);
+              case 7:
+                console.log("JS: File not found: ", filename);
+                return _context2.abrupt("return", 0);
+              case 11:
+                _context2.next = 13;
+                return _this.create(id);
+              case 13:
+                _stream = _context2.sent;
+                return _context2.abrupt("return", _stream.fd);
+              case 15:
+                _context2.next = 19;
+                break;
+              case 17:
+                console.log("JS: Invalid path category: ", pathCategory);
+                return _context2.abrupt("return", 0);
+              case 19:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }))();
+      },
+      read: function read(fd, raw_dst_ptr, raw_length) {
+        var _this2 = this;
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          var to_read, dst_ptr, stream, i, bytes_read, chunk_download_sz, to, data, start, end, chunk, response, reader, bytes_until_cache, bytes_until_notify, downloaded_bytes, cache_chunks, _yield$reader$read, done, chunk_bytes, write_length, chunk_to_cache;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                to_read = Number(raw_length);
+                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];
+                }
+
+                // Satisfy what we can with the cache first
+                bytes_read = _this2.readFromCache(stream, dst_ptr, to_read);
+                stream.position += bytes_read;
+                stream.lastReadPosition = stream.position;
+                dst_ptr += bytes_read;
+                to_read -= bytes_read;
+
+                // Return if we have satisfied the request
+                if (!(to_read === 0)) {
+                  _context3.next = 11;
+                  break;
+                }
+                return _context3.abrupt("return", bytes_read);
+              case 11:
+                //console.log("WeaveDrive: Read from cache: ", bytes_read, " Remaining to read: ", to_read)
+                chunk_download_sz = Math.max(to_read, CACHE_SZ);
+                to = Math.min(stream.node.total_size, stream.position + chunk_download_sz);
+                _context3.next = 15;
+                return ar.data(stream.node.name);
+              case 15:
+                data = _context3.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
+                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
+                  }
+                }), {
+                  headers: {
+                    "Content-Length": chunk.length.toString()
+                  }
+                });
+                reader = response.body.getReader();
+                bytes_until_cache = CHUNK_SZ;
+                bytes_until_notify = NOTIFY_SZ;
+                downloaded_bytes = 0;
+                cache_chunks = [];
+                _context3.prev = 25;
+              case 26:
+                if (!true) {
+                  _context3.next = 44;
+                  break;
+                }
+                _context3.next = 29;
+                return reader.read();
+              case 29:
+                _yield$reader$read = _context3.sent;
+                done = _yield$reader$read.done;
+                chunk_bytes = _yield$reader$read.value;
+                if (!done) {
+                  _context3.next = 34;
+                  break;
+                }
+                return _context3.abrupt("break", 44);
+              case 34:
+                // Update the number of downloaded bytes to be _all_, not just the write length
+                downloaded_bytes += chunk_bytes.length;
+                bytes_until_cache -= chunk_bytes.length;
+                bytes_until_notify -= chunk_bytes.length;
+
+                // Write bytes from the chunk and update the pointer if necessary
+                write_length = Math.min(chunk_bytes.length, to_read);
+                if (write_length > 0) {
+                  //console.log("WeaveDrive: Writing: ", write_length, " bytes to: ", dst_ptr)
+                  mod.HEAP8.set(chunk_bytes.subarray(0, write_length), dst_ptr);
+                  dst_ptr += write_length;
+                  bytes_read += write_length;
+                  stream.position += write_length;
+                  to_read -= write_length;
+                }
+                if (to_read == 0) {
+                  // Add excess bytes to our cache
+                  chunk_to_cache = chunk_bytes.subarray(write_length); //console.log("WeaveDrive: Cacheing excess: ", chunk_to_cache.length)
+                  cache_chunks.push(chunk_to_cache);
+                }
+                if (bytes_until_cache <= 0) {
+                  console.log("WeaveDrive: Chunk size reached. Compressing cache...");
+                  stream.node.cache = _this2.addChunksToCache(stream.node.cache, cache_chunks);
+                  cache_chunks = [];
+                  bytes_until_cache = CHUNK_SZ;
+                }
+                if (bytes_until_notify <= 0) {
+                  console.log("WeaveDrive: Downloaded: ", downloaded_bytes / stream.node.total_size * 100, "%");
+                  bytes_until_notify = NOTIFY_SZ;
+                }
+                _context3.next = 26;
+                break;
+              case 44:
+                _context3.next = 49;
+                break;
+              case 46:
+                _context3.prev = 46;
+                _context3.t0 = _context3["catch"](25);
+                console.error("WeaveDrive: Error reading the stream: ", _context3.t0);
+              case 49:
+                _context3.prev = 49;
+                reader.releaseLock();
+                return _context3.finish(49);
+              case 52:
+                // If we have no cache, or we have not satisfied the full request, we need to download the rest
+                // Rebuild the cache from the new cache chunks
+                stream.node.cache = _this2.addChunksToCache(stream.node.cache, cache_chunks);
+
+                // Update the last read position
+                stream.lastReadPosition = stream.position;
+                return _context3.abrupt("return", bytes_read);
+              case 55:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3, null, [[25, 46, 49, 52]]);
+        }))();
+      },
+      close: function close(fd) {
+        var stream = 0;
+        for (var i = 0; i < FS.streams.length; i++) {
+          if (FS.streams[i].fd === fd) stream = FS.streams[i];
+        }
+        FS.close(stream);
+      },
+      readFromCache: function readFromCache(stream, dst_ptr, length) {
+        // Check if the cache has been invalidated by a seek
+        if (stream.lastReadPosition !== stream.position) {
+          //console.log("WeaveDrive: Invalidating cache for fd: ", stream.fd, " Current pos: ", stream.position, " Last read pos: ", stream.lastReadPosition)
+          stream.node.cache = new Uint8Array(0);
+          return 0;
+        }
+        // Calculate the bytes of the request that can be satisfied with the cache
+        var cache_part_length = Math.min(length, stream.node.cache.length);
+        var cache_part = stream.node.cache.subarray(0, cache_part_length);
+        mod.HEAP8.set(cache_part, dst_ptr);
+        // Set the new cache to the remainder of the unused cache and update pointers
+        stream.node.cache = stream.node.cache.subarray(cache_part_length);
+        return cache_part_length;
+      },
+      addChunksToCache: function addChunksToCache(old_cache, chunks) {
+        // Make a new cache array of the old cache length + the sum of the chunk lengths, capped by the max cache size
+        var new_cache_length = Math.min(old_cache.length + chunks.reduce(function (acc, chunk) {
+          return acc + chunk.length;
+        }, 0), CACHE_SZ);
+        var new_cache = new Uint8Array(new_cache_length);
+        // Copy the old cache to the new cache
+        new_cache.set(old_cache, 0);
+        // Load the cache chunks into the new cache
+        var current_offset = old_cache.length;
+        var _iterator = _createForOfIteratorHelper(chunks),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var chunk = _step.value;
+            if (current_offset < new_cache_length) {
+              new_cache.set(chunk.subarray(0, new_cache_length - current_offset), current_offset);
+              current_offset += chunk.length;
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        return new_cache;
+      }
+    };
+  };
+});

package/cjs/utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isData = exports.isCheckComplete = exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = exports.action = void 0;
 exports.isJSON = isJSON;
-exports.wait = exports.validAddress = exports.udl = exports.toGraphObj = exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;
+exports.wait = exports.validAddress = exports.udl = exports.toGraphObj = exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = exports.optServer = exports.optAO = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;
 var _graphql = require("graphql");
 var _ramda = require("ramda");
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -595,4 +595,20 @@ var toGraphObj = exports.toGraphObj = function toGraphObj(_ref12) {
     tar: tar,
     args: args
   };
+};
+var optAO = exports.optAO = function optAO(port) {
+  return {
+    MU_URL: "http://localhost:".concat(port + 2),
+    SU_URL: "http://localhost:".concat(port + 3),
+    CU_URL: "http://localhost:".concat(port + 4),
+    GATEWAY_URL: "http://localhost:".concat(port)
+  };
+};
+var optServer = exports.optServer = function optServer(port) {
+  return {
+    ar: port,
+    mu: port + 2,
+    su: port + 3,
+    cu: port + 4
+  };
 };