wao 0.6.0 → 0.6.2

package/cjs/weavedrive.js

@@ -5,21 +5,17 @@ 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 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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-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; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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; }
-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 _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); } }
@@ -35,133 +31,47 @@ var NOTIFY_SZ = 512 * MB;
 var log = console.log;
 var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDrive(ar) {
   _classCallCheck(this, WeaveDrive);
-  this.drive = function WeaveDrive(mod, FS) {
+  this.ext = function (mod, FS) {
     return {
       reset: function reset(fd) {
         //console.log("WeaveDrive: Resetting fd: ", fd)
         FS.streams[fd].node.position = 0;
         FS.streams[fd].node.cache = new Uint8Array(0);
       },
-      joinUrl: function joinUrl(_ref) {
-        var url = _ref.url,
-          path = _ref.path;
-        if (!path) return url;
-        if (path.startsWith("/")) return this.joinUrl({
-          url: url,
-          path: path.slice(1)
-        });
-        url = new URL(url);
-        url.pathname += path;
-        return url.toString();
-      },
-      customFetch: function customFetch(path, options) {
+      create: function create(id) {
         var _this = this;
         return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var urlList, p, _iterator, _step, url, res;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                /**
-                 * mod.ARWEAVE may be a comma-delimited list of urls.
-                 * So we parse it into an array that we sequentially consume
-                 * using fetch, and return the first successful response.
-                 *
-                 * The first url is considered "primary". So if all urls fail
-                 * to produce a successful response, then we return the primary's
-                 * error response
-                 */
-                urlList = mod.ARWEAVE.includes(",") ? mod.ARWEAVE.split(",").map(function (url) {
-                  return url.trim();
-                }) : [mod.ARWEAVE];
-                _iterator = _createForOfIteratorHelper(urlList);
-                _context.prev = 2;
-                _iterator.s();
-              case 4:
-                if ((_step = _iterator.n()).done) {
-                  _context.next = 14;
-                  break;
-                }
-                url = _step.value;
-                res = fetch(_this.joinUrl({
-                  url: url,
-                  path: path
-                }), options);
-                _context.next = 9;
-                return res.then(function (r) {
-                  return r.ok;
-                })["catch"](function () {
-                  return false;
-                });
-              case 9:
-                if (!_context.sent) {
-                  _context.next = 11;
-                  break;
-                }
-                return _context.abrupt("return", res);
-              case 11:
-                if (!p) p = res;
-              case 12:
-                _context.next = 4;
-                break;
-              case 14:
-                _context.next = 19;
-                break;
-              case 16:
-                _context.prev = 16;
-                _context.t0 = _context["catch"](2);
-                _iterator.e(_context.t0);
-              case 19:
-                _context.prev = 19;
-                _iterator.f();
-                return _context.finish(19);
-              case 22:
-                return _context.abrupt("return", p);
-              case 23:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee, null, [[2, 16, 19, 22]]);
-        }))();
-      },
-      create: function create(id) {
-        var _this2 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var _data$length;
           var properties, node, data, bytesLength, stream;
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
               case 0:
                 properties = {
                   isDevice: false,
                   contents: null
-                };
-                _context2.next = 3;
-                return _this2.checkAdmissible(id);
+                }; //console.log("WeaveDrive: Arweave ID is not admissable! ", id)
+                _context.next = 3;
+                return _this.checkAdmissible(id);
               case 3:
-                if (_context2.sent) {
-                  _context2.next = 5;
+                if (_context.sent) {
+                  _context.next = 5;
                   break;
                 }
-                return _context2.abrupt("return", 0);
+                return _context.abrupt("return", 0);
               case 5:
                 // Create the file in the emscripten FS
 
-                // This check/mkdir was added for AOP 6 Boot loader because create is
-                // called first because were only loading Data, we needed to create
-                // the directory. See: https://github.com/permaweb/aos/issues/342
-                if (!FS.analyzePath("/data/").exists) {
-                  FS.mkdir("/data/");
-                }
+                if (!FS.analyzePath("/data/").exists) FS.mkdir("/data/");
                 node = FS.createFile("/", "data/" + id, properties, true, false); // Set initial parameters
                 /*
-                var bytesLength = await this.customFetch(`/${id}`, {
-                method: "HEAD",
-                }).then(res => res.headers.get("Content-Length"))
+                  var bytesLength = await this.customFetch(`/${id}`, {
+                  method: "HEAD",
+                  }).then(res => res.headers.get("Content-Length"))
                 */
-                _context2.next = 9;
+                _context.next = 9;
                 return ar.data(id);
               case 9:
-                data = _context2.sent;
+                data = _context.sent;
                 bytesLength = (_data$length = data === null || data === void 0 ? void 0 : data.length) !== null && _data$length !== void 0 ? _data$length : 0;
                 node.total_size = Number(bytesLength);
                 node.cache = new Uint8Array(0);
@@ -178,404 +88,229 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
 
                 // 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 _context2.abrupt("return", stream);
+                return _context.abrupt("return", stream);
               case 17:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
-          }, _callee2);
+          }, _callee);
         }))();
       },
       createBlockHeader: function createBlockHeader(id) {
-        var _this3 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-          var customFetch, retry, _retry, result, bytesLength, node, stream;
-          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var result, block, node, stream;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                _retry = function _retry3() {
-                  _retry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(x) {
-                    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                      while (1) switch (_context3.prev = _context3.next) {
-                        case 0:
-                          return _context3.abrupt("return", new Promise(function (r) {
-                            setTimeout(function () {
-                              r(customFetch("/block/height/".concat(id)));
-                            }, x * 10000);
-                          }));
-                        case 1:
-                        case "end":
-                          return _context3.stop();
-                      }
-                    }, _callee3);
-                  }));
-                  return _retry.apply(this, arguments);
-                };
-                retry = function _retry2(_x) {
-                  return _retry.apply(this, arguments);
-                };
-                customFetch = _this3.customFetch; // todo: add a bunch of retries
-                _context4.next = 5;
-                return _this3.customFetch("/block/height/".concat(id)).then(function (res) {
-                  return !res.ok ? retry(1) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(2) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(3) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(4) : res;
-                }).then(function (res) {
-                  return res.text();
-                });
-              case 5:
-                result = _context4.sent;
-                bytesLength = result.length;
+                result = "";
+                try {
+                  // todo: implement indep_hash
+                  // fetch(`/block/height/${id}`)
+                  block = ar.mem.blockmap[ar.mem.blocks[id]];
+                  if (block) {
+                    result = JSON.stringify({
+                      id: block.id,
+                      timestamp: block.timestamp,
+                      previous_block: block.previous,
+                      txs: block.txs,
+                      height: id
+                    });
+                  }
+                } catch (e) {}
                 node = FS.createDataFile("/", "block/" + id, Buffer.from(result, "utf-8"), true, false);
                 stream = FS.open("/block/" + id, "r");
-                return _context4.abrupt("return", stream);
-              case 10:
+                return _context2.abrupt("return", stream);
+              case 5:
               case "end":
-                return _context4.stop();
+                return _context2.stop();
             }
-          }, _callee4);
+          }, _callee2);
         }))();
       },
       createTxHeader: function createTxHeader(id) {
-        var _this4 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-          var customFetch, toAddress, _toAddress, retry, _retry4, result, node, stream;
-          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-            while (1) switch (_context8.prev = _context8.next) {
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          var result, tx, node, stream;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                _retry4 = function _retry6() {
-                  _retry4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(x) {
-                    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-                      while (1) switch (_context7.prev = _context7.next) {
-                        case 0:
-                          return _context7.abrupt("return", new Promise(function (r) {
-                            setTimeout(function () {
-                              r(customFetch("/tx/".concat(id)));
-                            }, x * 10000);
-                          }));
-                        case 1:
-                        case "end":
-                          return _context7.stop();
-                      }
-                    }, _callee7);
-                  }));
-                  return _retry4.apply(this, arguments);
-                };
-                retry = function _retry5(_x3) {
-                  return _retry4.apply(this, arguments);
-                };
-                _toAddress = function _toAddress3() {
-                  _toAddress = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(owner) {
-                    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                      while (1) switch (_context6.prev = _context6.next) {
-                        case 0:
-                          _context6.t0 = _arweave["default"].utils;
-                          _context6.next = 3;
-                          return _arweave["default"].crypto.hash(_arweave["default"].utils.b64UrlToBuffer(owner));
-                        case 3:
-                          _context6.t1 = _context6.sent;
-                          return _context6.abrupt("return", _context6.t0.bufferTob64Url.call(_context6.t0, _context6.t1));
-                        case 5:
-                        case "end":
-                          return _context6.stop();
-                      }
-                    }, _callee6);
-                  }));
-                  return _toAddress.apply(this, arguments);
-                };
-                toAddress = function _toAddress2(_x2) {
-                  return _toAddress.apply(this, arguments);
-                };
-                customFetch = _this4.customFetch; // todo: add a bunch of retries
-                _context8.next = 7;
-                return _this4.customFetch("/tx/".concat(id)).then(function (res) {
-                  return !res.ok ? retry(1) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(2) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(3) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(4) : res;
-                }).then(function (res) {
-                  return res.json();
-                }).then(/*#__PURE__*/function () {
-                  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(entry) {
-                    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-                      while (1) switch (_context5.prev = _context5.next) {
-                        case 0:
-                          _context5.t0 = _objectSpread;
-                          _context5.t1 = _objectSpread({}, entry);
-                          _context5.t2 = {};
-                          _context5.next = 5;
-                          return toAddress(entry.owner);
-                        case 5:
-                          _context5.t3 = _context5.sent;
-                          _context5.t4 = {
-                            ownerAddress: _context5.t3
-                          };
-                          return _context5.abrupt("return", (0, _context5.t0)(_context5.t1, _context5.t2, _context5.t4));
-                        case 8:
-                        case "end":
-                          return _context5.stop();
-                      }
-                    }, _callee5);
-                  }));
-                  return function (_x4) {
-                    return _ref2.apply(this, arguments);
-                  };
-                }())
-                //.then(x => (console.error(x), x))
-                .then(function (x) {
-                  return JSON.stringify(x);
-                });
-              case 7:
-                result = _context8.sent;
+                result = ""; // fetch(`/tx/${id}`)
+                try {
+                  tx = ar.mem.txs[id];
+                  if (tx) result = JSON.stringify(tx);
+                } catch (e) {}
                 node = FS.createDataFile("/", "tx/" + id, Buffer.from(result, "utf-8"), true, false);
                 stream = FS.open("/tx/" + id, "r");
-                return _context8.abrupt("return", stream);
-              case 11:
+                return _context3.abrupt("return", stream);
+              case 5:
               case "end":
-                return _context8.stop();
+                return _context3.stop();
             }
-          }, _callee8);
+          }, _callee3);
         }))();
       },
       createDataItemTxHeader: function createDataItemTxHeader(id) {
-        var _this5 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-          var gqlQuery, GET_TRANSACTION_QUERY, variables, retry, _retry7, gqlExists, result, stream;
-          return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-            while (1) switch (_context11.prev = _context11.next) {
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+          var result, stream;
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _retry7 = function _retry9() {
-                  _retry7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(x) {
-                    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                      while (1) switch (_context10.prev = _context10.next) {
-                        case 0:
-                          return _context10.abrupt("return", new Promise(function (r) {
-                            setTimeout(function () {
-                              r(gqlQuery(GET_TRANSACTION_QUERY, variables));
-                            }, x * 10000);
-                          }));
-                        case 1:
-                        case "end":
-                          return _context10.stop();
-                      }
-                    }, _callee10);
-                  }));
-                  return _retry7.apply(this, arguments);
-                };
-                retry = function _retry8(_x5) {
-                  return _retry7.apply(this, arguments);
-                };
-                gqlQuery = _this5.gqlQuery;
-                GET_TRANSACTION_QUERY = "\n      query GetTransactions ($transactionIds: [ID!]!) {\n        transactions(ids: $transactionIds) {\n          edges {\n            node {\n              id\n              anchor\n              data {\n                size\n              }\n              signature\n              recipient \n              owner {\n                address \n                key\n              }\n              fee {\n                ar \n                winston\n              }\n              quantity {\n                winston\n                ar\n              }\n              tags {\n                name \n                value \n              }\n              bundledIn {\n                id\n              }\n              block { \n                id\n                timestamp\n                height\n                previous\n              }\n            }\n          }\n        }\n      }";
-                variables = {
-                  transactionIds: [id]
-                };
-                _context11.next = 7;
-                return _this5.gqlExists();
-              case 7:
-                gqlExists = _context11.sent;
-                if (gqlExists) {
-                  _context11.next = 10;
-                  break;
-                }
-                return _context11.abrupt("return", "GQL Not Found!");
-              case 10:
-                _context11.next = 12;
-                return _this5.gqlQuery(GET_TRANSACTION_QUERY, variables).then(function (res) {
-                  return !res.ok ? retry(1) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(2) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(3) : res;
-                }).then(function (res) {
-                  return !res.ok ? retry(4) : res;
-                }).then(function (res) {
-                  return res.json();
-                }).then(function (res) {
-                  var _res$data;
-                  return res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.transactions) !== null && _res$data !== void 0 && (_res$data = _res$data.edges) !== null && _res$data !== void 0 && (_res$data = _res$data[0]) !== null && _res$data !== void 0 && _res$data.node ? res.data.transactions.edges[0].node : "No results";
-                }).then(/*#__PURE__*/function () {
-                  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(entry) {
-                    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-                      while (1) switch (_context9.prev = _context9.next) {
-                        case 0:
-                          return _context9.abrupt("return", typeof entry == "string" ? entry : _objectSpread({
-                            format: 3
-                          }, entry));
-                        case 1:
-                        case "end":
-                          return _context9.stop();
-                      }
-                    }, _callee9);
-                  }));
-                  return function (_x6) {
-                    return _ref3.apply(this, arguments);
-                  };
-                }()).then(function (x) {
-                  return typeof x == "string" ? x : JSON.stringify(x);
+                _context4.next = 2;
+                return ar.gql.txs({
+                  id: id,
+                  fields: ["id", "anchor", {
+                    data: ["size"]
+                  }, "signature", "recipient", "owner", "fee", "quantity", "tags", "bundledIn", "block"]
                 });
-              case 12:
-                result = _context11.sent;
-                if (!(result === "No results")) {
-                  _context11.next = 15;
-                  break;
-                }
-                return _context11.abrupt("return", result);
-              case 15:
+              case 2:
+                result = _context4.sent[0];
+                result = result ? JSON.stringify(result) : "No results";
                 FS.createDataFile("/", "tx2/" + id, Buffer.from(result, "utf-8"), true, false);
                 stream = FS.open("/tx2/" + id, "r");
-                return _context11.abrupt("return", stream);
-              case 18:
+                return _context4.abrupt("return", stream);
+              case 7:
               case "end":
-                return _context11.stop();
+                return _context4.stop();
             }
-          }, _callee11);
+          }, _callee4);
         }))();
       },
       open: function open(filename) {
-        var _this6 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _this2 = this;
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
           var pathCategory, id, stream, _stream, _stream2, _stream3, _stream4;
-          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-            while (1) switch (_context12.prev = _context12.next) {
+          return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
               case 0:
                 pathCategory = filename.split("/")[1];
                 id = filename.split("/")[2];
                 console.log("JS: Opening ID: ", id);
                 if (!(pathCategory === "tx")) {
-                  _context12.next = 16;
+                  _context5.next = 16;
                   break;
                 }
                 FS.createPath("/", "tx", true, false);
                 if (!FS.analyzePath(filename).exists) {
-                  _context12.next = 12;
+                  _context5.next = 12;
                   break;
                 }
                 stream = FS.open(filename, "r");
                 if (!stream.fd) {
-                  _context12.next = 9;
+                  _context5.next = 9;
                   break;
                 }
-                return _context12.abrupt("return", stream.fd);
+                return _context5.abrupt("return", stream.fd);
               case 9:
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 12:
-                _context12.next = 14;
-                return _this6.createTxHeader(id);
+                _context5.next = 14;
+                return _this2.createTxHeader(id);
               case 14:
-                _stream = _context12.sent;
-                return _context12.abrupt("return", _stream.fd);
+                _stream = _context5.sent;
+                return _context5.abrupt("return", _stream.fd);
               case 16:
                 if (!(pathCategory === "tx2")) {
-                  _context12.next = 31;
+                  _context5.next = 31;
                   break;
                 }
                 FS.createPath("/", "tx2", true, false);
                 if (!FS.analyzePath(filename).exists) {
-                  _context12.next = 25;
+                  _context5.next = 25;
                   break;
                 }
                 stream = FS.open(filename, "r");
                 if (!stream.fd) {
-                  _context12.next = 22;
+                  _context5.next = 22;
                   break;
                 }
-                return _context12.abrupt("return", stream.fd);
+                return _context5.abrupt("return", stream.fd);
               case 22:
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 25:
-                _context12.next = 27;
-                return _this6.createDataItemTxHeader(id);
+                _context5.next = 27;
+                return _this2.createDataItemTxHeader(id);
               case 27:
-                _stream2 = _context12.sent;
+                _stream2 = _context5.sent;
                 if (!_stream2.fd) {
-                  _context12.next = 30;
+                  _context5.next = 30;
                   break;
                 }
-                return _context12.abrupt("return", _stream2.fd);
+                return _context5.abrupt("return", _stream2.fd);
               case 30:
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 31:
                 if (!(pathCategory === "block")) {
-                  _context12.next = 44;
+                  _context5.next = 44;
                   break;
                 }
                 FS.createPath("/", "block", true, false);
                 if (!FS.analyzePath(filename).exists) {
-                  _context12.next = 40;
+                  _context5.next = 40;
                   break;
                 }
                 stream = FS.open(filename, "r");
                 if (!stream.fd) {
-                  _context12.next = 37;
+                  _context5.next = 37;
                   break;
                 }
-                return _context12.abrupt("return", stream.fd);
+                return _context5.abrupt("return", stream.fd);
               case 37:
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 40:
-                _context12.next = 42;
-                return _this6.createBlockHeader(id);
+                _context5.next = 42;
+                return _this2.createBlockHeader(id);
               case 42:
-                _stream3 = _context12.sent;
-                return _context12.abrupt("return", _stream3.fd);
+                _stream3 = _context5.sent;
+                return _context5.abrupt("return", _stream3.fd);
               case 44:
                 if (!(pathCategory === "data")) {
-                  _context12.next = 59;
+                  _context5.next = 59;
                   break;
                 }
                 if (!FS.analyzePath(filename).exists) {
-                  _context12.next = 53;
+                  _context5.next = 53;
                   break;
                 }
                 stream = FS.open(filename, "r");
                 if (!stream.fd) {
-                  _context12.next = 49;
+                  _context5.next = 49;
                   break;
                 }
-                return _context12.abrupt("return", stream.fd);
+                return _context5.abrupt("return", stream.fd);
               case 49:
                 console.log("JS: File not found: ", filename);
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 53:
-                _context12.next = 55;
-                return _this6.create(id);
+                _context5.next = 55;
+                return _this2.create(id);
               case 55:
-                _stream4 = _context12.sent;
-                return _context12.abrupt("return", _stream4.fd);
+                _stream4 = _context5.sent;
+                return _context5.abrupt("return", _stream4.fd);
               case 57:
-                _context12.next = 66;
+                _context5.next = 66;
                 break;
               case 59:
                 if (!(pathCategory === "headers")) {
-                  _context12.next = 64;
+                  _context5.next = 64;
                   break;
                 }
                 console.log("Header access not implemented yet.");
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 64:
                 console.log("JS: Invalid path category: ", pathCategory);
-                return _context12.abrupt("return", 0);
+                return _context5.abrupt("return", 0);
               case 66:
               case "end":
-                return _context12.stop();
+                return _context5.stop();
             }
-          }, _callee12);
+          }, _callee5);
         }))();
       },
       read: function read(fd, raw_dst_ptr, raw_length) {
-        var _this7 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        var _this3 = this;
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
           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 _callee13$(_context13) {
-            while (1) switch (_context13.prev = _context13.next) {
+          return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+            while (1) switch (_context6.prev = _context6.next) {
               case 0:
                 // Note: The length and dst_ptr are 53 bit integers in JS, so this _should_ be ok into a large memspace.
                 to_read = Number(raw_length);
@@ -588,49 +323,43 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 }
                 // read block headers
                 if (!stream.path.includes("/block")) {
-                  _context13.next = 7;
+                  _context6.next = 7;
                   break;
                 }
                 mod.HEAP8.set(stream.node.contents.subarray(0, to_read), dst_ptr);
-                return _context13.abrupt("return", to_read);
+                return _context6.abrupt("return", to_read);
               case 7:
                 if (!stream.path.includes("/tx")) {
-                  _context13.next = 10;
+                  _context6.next = 10;
                   break;
                 }
                 mod.HEAP8.set(stream.node.contents.subarray(0, to_read), dst_ptr);
-                return _context13.abrupt("return", to_read);
+                return _context6.abrupt("return", to_read);
               case 10:
                 // Satisfy what we can with the cache first
-                bytes_read = _this7.readFromCache(stream, dst_ptr, to_read);
+                bytes_read = _this3.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
+
+                //console.log("WeaveDrive: Satisfied request with cache. Returning...")
                 if (!(to_read === 0)) {
-                  _context13.next = 17;
+                  _context6.next = 17;
                   break;
                 }
-                return _context13.abrupt("return", bytes_read);
+                return _context6.abrupt("return", bytes_read);
               case 17:
                 //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); //console.log("WeaveDrive: fd: ", fd, " Read length: ", to_read, " Reading ahead:", to - to_read - stream.position)
-                // Fetch with streaming
-                /*
-                const response = await this.customFetch(`/${stream.node.name}`, {
-                method: "GET",
-                redirect: "follow",
-                headers: { Range: `bytes=${stream.position}-${to}` },
-                })
-                const reader = response.body.getReader()
-                */
-                _context13.next = 21;
+                // fetch(`/${stream.node.name}`)
+                _context6.next = 21;
                 return ar.data(stream.node.name);
               case 21:
-                data = _context13.sent;
+                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
@@ -650,23 +379,23 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 bytes_until_notify = NOTIFY_SZ;
                 downloaded_bytes = 0;
                 cache_chunks = [];
-                _context13.prev = 31;
+                _context6.prev = 31;
               case 32:
                 if (!true) {
-                  _context13.next = 50;
+                  _context6.next = 50;
                   break;
                 }
-                _context13.next = 35;
+                _context6.next = 35;
                 return reader.read();
               case 35:
-                _yield$reader$read = _context13.sent;
+                _yield$reader$read = _context6.sent;
                 done = _yield$reader$read.done;
                 chunk_bytes = _yield$reader$read.value;
                 if (!done) {
-                  _context13.next = 40;
+                  _context6.next = 40;
                   break;
                 }
-                return _context13.abrupt("break", 50);
+                return _context6.abrupt("break", 50);
               case 40:
                 // Update the number of downloaded bytes to be _all_, not just the write length
                 downloaded_bytes += chunk_bytes.length;
@@ -690,7 +419,7 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 }
                 if (bytes_until_cache <= 0) {
                   console.log("WeaveDrive: Chunk size reached. Compressing cache...");
-                  stream.node.cache = _this7.addChunksToCache(stream.node.cache, cache_chunks);
+                  stream.node.cache = _this3.addChunksToCache(stream.node.cache, cache_chunks);
                   cache_chunks = [];
                   bytes_until_cache = CHUNK_SZ;
                 }
@@ -698,40 +427,38 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                   console.log("WeaveDrive: Downloaded: ", downloaded_bytes / stream.node.total_size * 100, "%");
                   bytes_until_notify = NOTIFY_SZ;
                 }
-                _context13.next = 32;
+                _context6.next = 32;
                 break;
               case 50:
-                _context13.next = 55;
+                _context6.next = 55;
                 break;
               case 52:
-                _context13.prev = 52;
-                _context13.t0 = _context13["catch"](31);
-                console.error("WeaveDrive: Error reading the stream: ", _context13.t0);
+                _context6.prev = 52;
+                _context6.t0 = _context6["catch"](31);
+                console.error("WeaveDrive: Error reading the stream: ", _context6.t0);
               case 55:
-                _context13.prev = 55;
+                _context6.prev = 55;
                 reader.releaseLock();
-                return _context13.finish(55);
+                return _context6.finish(55);
               case 58:
                 // 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 = _this7.addChunksToCache(stream.node.cache, cache_chunks);
+                stream.node.cache = _this3.addChunksToCache(stream.node.cache, cache_chunks);
 
                 // Update the last read position
                 stream.lastReadPosition = stream.position;
-                return _context13.abrupt("return", bytes_read);
+                return _context6.abrupt("return", bytes_read);
               case 61:
               case "end":
-                return _context13.stop();
+                return _context6.stop();
             }
-          }, _callee13, null, [[31, 52, 55, 58]]);
+          }, _callee6, null, [[31, 52, 55, 58]]);
         }))();
       },
       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];
-          }
+          if (FS.streams[i].fd === fd) stream = FS.streams[i];
         }
         FS.close(stream);
       },
@@ -761,112 +488,148 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
         new_cache.set(old_cache, 0);
         // Load the cache chunks into the new cache
         var current_offset = old_cache.length;
-        var _iterator2 = _createForOfIteratorHelper(chunks),
-          _step2;
+        var _iterator = _createForOfIteratorHelper(chunks),
+          _step;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var chunk = _step2.value;
+          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) {
-          _iterator2.e(err);
+          _iterator.e(err);
         } finally {
-          _iterator2.f();
+          _iterator.f();
         }
         return new_cache;
       },
       // General helpder functions
       checkAdmissible: function checkAdmissible(ID) {
-        var _this8 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-          var bootTag, blockHeight, moduleExtensions, moduleHasWeaveDrive, processExtensions, processHasWeaveDrive, modes, moduleAvailabilityType, moduleMode, processAvailabilityType, processMode, attestors, assignmentsHaveID, individualsHaveID;
-          return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-            while (1) switch (_context14.prev = _context14.next) {
+        var _this4 = this;
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+          var bootTag, blockHeight, moduleExtensions, moduleHasWeaveDrive, processExtensions, processHasWeaveDrive, modes, moduleAvailabilityType, moduleMode, processAvailabilityType, processMode, attestors, exists, assignmentsHaveID, individualsHaveID;
+          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+            while (1) switch (_context8.prev = _context8.next) {
               case 0:
                 if (!(mod.mode && mod.mode == "test")) {
-                  _context14.next = 2;
+                  _context8.next = 2;
                   break;
                 }
-                return _context14.abrupt("return", true);
+                return _context8.abrupt("return", true);
               case 2:
                 // Check if we are attempting to load the On-Boot id, if so allow it
                 // this was added for AOP 6 Boot loader See: https://github.com/permaweb/aos/issues/342
-                bootTag = _this8.getTagValue("On-Boot", mod.spawn.tags);
+                bootTag = _this4.getTagValue("On-Boot", mod.spawn.tags);
                 if (!(bootTag && bootTag === ID)) {
-                  _context14.next = 5;
+                  _context8.next = 5;
                   break;
                 }
-                return _context14.abrupt("return", true);
+                return _context8.abrupt("return", true);
               case 5:
                 // Check that this module or process set the WeaveDrive tag on spawn
                 blockHeight = mod.blockHeight;
-                moduleExtensions = _this8.getTagValues("Extension", mod.module.tags);
+                moduleExtensions = _this4.getTagValues("Extension", mod.module.tags);
                 moduleHasWeaveDrive = moduleExtensions.includes("WeaveDrive");
-                processExtensions = _this8.getTagValues("Extension", mod.spawn.tags);
+                processExtensions = _this4.getTagValues("Extension", mod.spawn.tags);
                 processHasWeaveDrive = moduleHasWeaveDrive || processExtensions.includes("WeaveDrive");
                 if (processHasWeaveDrive) {
-                  _context14.next = 13;
+                  _context8.next = 13;
                   break;
                 }
                 console.log("WeaveDrive: Process tried to call WeaveDrive, but extension not set!");
-                return _context14.abrupt("return", false);
+                return _context8.abrupt("return", false);
               case 13:
                 modes = ["Assignments", "Individual", "Library"]; // Get the Availability-Type from the spawned process's Module or Process item
                 // First check the module for its defaults
-                moduleAvailabilityType = _this8.getTagValue("Availability-Type", mod.module.tags);
+                moduleAvailabilityType = _this4.getTagValue("Availability-Type", mod.module.tags);
                 moduleMode = moduleAvailabilityType ? moduleAvailabilityType : "Assignments"; // Default to assignments
                 // Now check the process's spawn item. These settings override Module item settings.
-                processAvailabilityType = _this8.getTagValue("Availability-Type", mod.spawn.tags);
+                processAvailabilityType = _this4.getTagValue("Availability-Type", mod.spawn.tags);
                 processMode = processAvailabilityType ? processAvailabilityType : moduleMode;
                 if (modes.includes(processMode)) {
-                  _context14.next = 20;
+                  _context8.next = 20;
                   break;
                 }
                 throw "Unsupported WeaveDrive mode: ".concat(processMode);
               case 20:
-                attestors = _this8.serializeStringArr([_this8.getTagValue("Scheduler", mod.spawn.tags)].concat(_toConsumableArray(_this8.getTagValues("Attestor", mod.spawn.tags))).filter(function (t) {
+                attestors = _this4.serializeStringArr([_this4.getTagValue("Scheduler", mod.spawn.tags)].concat(_toConsumableArray(_this4.getTagValues("Attestor", mod.spawn.tags))).filter(function (t) {
                   return !!t;
                 })); // Init a set of GraphQL queries to run in order to find a valid attestation
                 // Every WeaveDrive process has at least the "Assignments" availability check form.
-                _context14.next = 23;
-                return _this8.queryHasResult("query {\n          transactions(\n            owners: ".concat(attestors, ",\n            block: {min: 0, max: ").concat(blockHeight, "},\n            tags: [\n              { name: \"Type\", values: [\"Attestation\"] },\n              { name: \"Message\", values: [\"").concat(ID, "\"]}\n              { name: \"Data-Protocol\", values: [\"ao\"] },\n            ]\n          ) \n          {\n            edges {\n              node {\n                tags {\n                  name\n                  value\n                }\n              }\n            }\n          }\n        }"));
-              case 23:
-                assignmentsHaveID = _context14.sent;
+                exists = /*#__PURE__*/function () {
+                  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(tags) {
+                    var common;
+                    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                      while (1) switch (_context7.prev = _context7.next) {
+                        case 0:
+                          common = {
+                            owners: attestors,
+                            block: [0, blockHeight],
+                            fields: ["tags"]
+                          };
+                          _context7.next = 3;
+                          return ar.gql.txs(_objectSpread(_objectSpread({}, common), {}, {
+                            tags: tags
+                          }));
+                        case 3:
+                          _context7.t0 = _context7.sent.length;
+                          return _context7.abrupt("return", _context7.t0 > 0);
+                        case 5:
+                        case "end":
+                          return _context7.stop();
+                      }
+                    }, _callee7);
+                  }));
+                  return function exists(_x) {
+                    return _ref.apply(this, arguments);
+                  };
+                }();
+                _context8.next = 24;
+                return exists({
+                  Type: "Attestation",
+                  Message: ID,
+                  "Data-Protocol": "ao"
+                });
+              case 24:
+                assignmentsHaveID = _context8.sent;
                 if (!assignmentsHaveID) {
-                  _context14.next = 26;
+                  _context8.next = 27;
                   break;
                 }
-                return _context14.abrupt("return", true);
-              case 26:
+                return _context8.abrupt("return", true);
+              case 27:
                 if (!(processMode == "Individual")) {
-                  _context14.next = 32;
+                  _context8.next = 33;
                   break;
                 }
-                _context14.next = 29;
-                return _this8.queryHasResult("query {\n            transactions(\n              owners: ".concat(attestors, ",\n              block: {min: 0, max: ").concat(blockHeight, "},\n              tags: [\n                { name: \"Type\", values: [\"Available\"]},\n                { name: \"ID\", values: [\"").concat(ID, "\"]}\n                { name: \"Data-Protocol\", values: [\"WeaveDrive\"] },\n              ]\n            ) \n            {\n              edges {\n                node {\n                  tags {\n                    name\n                    value\n                  }\n                }\n              }\n            }\n          }"));
-              case 29:
-                individualsHaveID = _context14.sent;
+                _context8.next = 30;
+                return exists({
+                  Type: "Available",
+                  ID: ID,
+                  "Data-Protocol": "WeaveDrive"
+                });
+              case 30:
+                individualsHaveID = _context8.sent;
                 if (!individualsHaveID) {
-                  _context14.next = 32;
+                  _context8.next = 33;
                   break;
                 }
-                return _context14.abrupt("return", true);
-              case 32:
+                return _context8.abrupt("return", true);
+              case 33:
                 if (!(processMode == "Library")) {
-                  _context14.next = 34;
+                  _context8.next = 35;
                   break;
                 }
                 throw "This WeaveDrive implementation does not support Library attestations yet!";
-              case 34:
-                return _context14.abrupt("return", false);
               case 35:
+                return _context8.abrupt("return", false);
+              case 36:
               case "end":
-                return _context14.stop();
+                return _context8.stop();
             }
-          }, _callee14);
+          }, _callee8);
         }))();
       },
       serializeStringArr: function serializeStringArr() {
@@ -878,127 +641,13 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
       getTagValues: function getTagValues(key, tags) {
         var values = [];
         for (var i = 0; i < tags.length; i++) {
-          if (tags[i].name == key) {
-            values.push(tags[i].value);
-          }
+          if (tags[i].name == key) values.push(tags[i].value);
         }
         return values;
       },
       getTagValue: function getTagValue(key, tags) {
         var values = this.getTagValues(key, tags);
         return values.pop();
-      },
-      queryHasResult: function queryHasResult(query, variables) {
-        var _this9 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-          var _json$data;
-          var json;
-          return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-            while (1) switch (_context15.prev = _context15.next) {
-              case 0:
-                _context15.next = 2;
-                return _this9.gqlQuery(query, variables).then(function (res) {
-                  return res.json();
-                });
-              case 2:
-                json = _context15.sent;
-                return _context15.abrupt("return", !!(json !== null && json !== void 0 && (_json$data = json.data) !== null && _json$data !== void 0 && (_json$data = _json$data.transactions) !== null && _json$data !== void 0 && (_json$data = _json$data.edges) !== null && _json$data !== void 0 && _json$data.length));
-              case 4:
-              case "end":
-                return _context15.stop();
-            }
-          }, _callee15);
-        }))();
-      },
-      gqlExists: function gqlExists() {
-        var _this10 = this;
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-          var query, gqlExists;
-          return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-            while (1) switch (_context16.prev = _context16.next) {
-              case 0:
-                query = "query {\n        transactions(\n          first: 1\n        ) {\n          pageInfo {\n            hasNextPage\n          }\n        }\n      }\n      ";
-                _context16.next = 3;
-                return _this10.gqlQuery(query, {}).then(function (res) {
-                  return res.ok;
-                });
-              case 3:
-                gqlExists = _context16.sent;
-                return _context16.abrupt("return", gqlExists);
-              case 5:
-              case "end":
-                return _context16.stop();
-            }
-          }, _callee16);
-        }))();
-      },
-      gqlQuery: function gqlQuery(query, variables) {
-        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-          var _json, _toGraphObj, tar, args, res2, edges;
-          return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-            while (1) switch (_context17.prev = _context17.next) {
-              case 0:
-                _json = null;
-                _context17.prev = 1;
-                _toGraphObj = (0, _utils.toGraphObj)({
-                  query: query,
-                  variables: variables
-                }), tar = _toGraphObj.tar, args = _toGraphObj.args;
-                res2 = null;
-                if (!(tar === "transactions")) {
-                  _context17.next = 10;
-                  break;
-                }
-                _context17.next = 7;
-                return ar.gql.txs(_objectSpread({}, args));
-              case 7:
-                res2 = _context17.sent;
-                _context17.next = 14;
-                break;
-              case 10:
-                if (!(tar === "blocks")) {
-                  _context17.next = 14;
-                  break;
-                }
-                _context17.next = 13;
-                return ar.gql.blocks(_objectSpread({}, args));
-              case 13:
-                res2 = _context17.sent;
-              case 14:
-                edges = (0, _ramda.map)(function (v) {
-                  return {
-                    node: v,
-                    cursor: v.cursor
-                  };
-                }, res2);
-                _json = {
-                  data: {
-                    transactions: {
-                      pageInfo: {
-                        hasNextPage: true
-                      },
-                      edges: edges
-                    }
-                  }
-                };
-                _context17.next = 21;
-                break;
-              case 18:
-                _context17.prev = 18;
-                _context17.t0 = _context17["catch"](1);
-                log(_context17.t0);
-              case 21:
-                return _context17.abrupt("return", {
-                  json: function json() {
-                    return _json;
-                  }
-                });
-              case 22:
-              case "end":
-                return _context17.stop();
-            }
-          }, _callee17, null, [[1, 18]]);
-        }))();
       }
     };
   };