wao 0.6.0 → 0.6.2

package/cjs/aoconnect.js

@@ -38,9 +38,12 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var pkg = (_WarpArBundles$defaul = WarpArBundles["default"]) !== null && _WarpArBundles$defaul !== void 0 ? _WarpArBundles$defaul : WarpArBundles;
 var DataItem = pkg.DataItem;
-var connect = exports.connect = function connect(mem) {
+var connect = exports.connect = function connect(mem, _ref) {
   var _mem;
-  var log = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var _ref$log = _ref.log,
+    log = _ref$log === void 0 ? false : _ref$log,
+    _ref$extensions = _ref.extensions,
+    extensions = _ref$extensions === void 0 ? {} : _ref$extensions;
   var isMem = ((_mem = mem) === null || _mem === void 0 ? void 0 : _mem.__type__) === "mem";
   if (!isMem) {
     var _mem2;
@@ -55,17 +58,18 @@ var connect = exports.connect = function connect(mem) {
     mem: mem,
     log: log
   });
-  var WeaveDrive = new _weavedrive["default"](ar).drive;
+  for (var k in extensions) extensions[k] = new extensions[k](ar).ext;
+  extensions.WeaveDrive = new _weavedrive["default"](ar).ext;
   var transform = function transform(input) {
     var _input$Tags;
     var output = {
       Tags: []
     };
     if (input.Data) output.Data = input.Data;
-    Object.entries(input).forEach(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-        key = _ref2[0],
-        value = _ref2[1];
+    Object.entries(input).forEach(function (_ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        key = _ref3[0],
+        value = _ref3[1];
       if (key !== "Data" && key !== "Tags" && typeof value === "string") {
         output.Tags.push({
           name: key,
@@ -101,14 +105,14 @@ var connect = exports.connect = function connect(mem) {
       Tags: Tags !== null && Tags !== void 0 && Tags.length ? Tags : []
     };
   };
-  var genEnv = function genEnv(_ref3) {
-    var pid = _ref3.pid,
-      _ref3$owner = _ref3.owner,
-      owner = _ref3$owner === void 0 ? "" : _ref3$owner,
-      _ref3$module = _ref3.module,
-      module = _ref3$module === void 0 ? "" : _ref3$module,
-      _ref3$auth = _ref3.auth,
-      auth = _ref3$auth === void 0 ? "" : _ref3$auth;
+  var genEnv = function genEnv(_ref4) {
+    var pid = _ref4.pid,
+      _ref4$owner = _ref4.owner,
+      owner = _ref4$owner === void 0 ? "" : _ref4$owner,
+      _ref4$module = _ref4.module,
+      module = _ref4$module === void 0 ? "" : _ref4$module,
+      _ref4$auth = _ref4.auth,
+      auth = _ref4$auth === void 0 ? "" : _ref4$auth;
     return {
       Process: {
         Id: pid,
@@ -143,7 +147,7 @@ var connect = exports.connect = function connect(mem) {
     };
   };
   var spawn = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _opt$module, _mem$wasms$mod, _format, _opt$tags, _opt$tags2;
       var opt,
         mod,
@@ -162,6 +166,7 @@ var connect = exports.connect = function connect(mem) {
         item,
         __tags,
         now,
+        t,
         handle,
         _tags,
         res,
@@ -180,7 +185,7 @@ var connect = exports.connect = function connect(mem) {
         unit,
         _int,
         cronTags,
-        k,
+        _k,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -269,15 +274,16 @@ var connect = exports.connect = function connect(mem) {
             return ar.postItems(item, _test.su.jwk);
           case 33:
             now = Date.now;
-            _context.next = 36;
+            t = (0, _utils.tags)(opt.tags);
+            _context.next = 37;
             return (0, _aoLoader["default"])(wasm, {
               format: format,
-              WeaveDrive: WeaveDrive,
+              WeaveDrive: extensions[t.Extension],
               spawn: item,
               module: mem.txs[mod],
               blockHeight: "100"
             });
-          case 36:
+          case 37:
             handle = _context.sent;
             _module = {
               handle: handle,
@@ -302,7 +308,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 57;
+              _context.next = 58;
               break;
             }
             data = "";
@@ -315,72 +321,72 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 51;
+            _context.next = 52;
             return _module.handle(null, msg, _env);
-          case 51:
+          case 52:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 58;
+            _context.next = 59;
             break;
-          case 57:
-            p.height += 1;
           case 58:
+            p.height += 1;
+          case 59:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 84;
+              _context.next = 85;
               break;
             }
             _tags$CronInterval$s = _tags["Cron-Interval"].split("-"), _tags$CronInterval$s2 = _slicedToArray(_tags$CronInterval$s, 2), num = _tags$CronInterval$s2[0], unit = _tags$CronInterval$s2[1];
             _int = 0;
             _context.t0 = unit.replace(/s$/, "");
-            _context.next = _context.t0 === "millisecond" ? 66 : _context.t0 === "second" ? 68 : _context.t0 === "minute" ? 70 : _context.t0 === "hour" ? 72 : _context.t0 === "day" ? 74 : _context.t0 === "month" ? 76 : _context.t0 === "year" ? 78 : 80;
+            _context.next = _context.t0 === "millisecond" ? 67 : _context.t0 === "second" ? 69 : _context.t0 === "minute" ? 71 : _context.t0 === "hour" ? 73 : _context.t0 === "day" ? 75 : _context.t0 === "month" ? 77 : _context.t0 === "year" ? 79 : 81;
             break;
-          case 66:
+          case 67:
             _int = num;
-            return _context.abrupt("break", 80);
-          case 68:
+            return _context.abrupt("break", 81);
+          case 69:
             _int = num * 1000;
-            return _context.abrupt("break", 80);
-          case 70:
+            return _context.abrupt("break", 81);
+          case 71:
             _int = num * 1000 * 60;
-            return _context.abrupt("break", 80);
-          case 72:
+            return _context.abrupt("break", 81);
+          case 73:
             _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 80);
-          case 74:
+            return _context.abrupt("break", 81);
+          case 75:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 80);
-          case 76:
+            return _context.abrupt("break", 81);
+          case 77:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 80);
-          case 78:
+            return _context.abrupt("break", 81);
+          case 79:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 80);
-          case 80:
+            return _context.abrupt("break", 81);
+          case 81:
             cronTags = [];
-            for (k in _tags) {
-              if (/^Cron-Tag-/.test(k)) {
+            for (_k in _tags) {
+              if (/^Cron-Tag-/.test(_k)) {
                 cronTags.push({
-                  name: k.replace(/Cron-Tag-/, ""),
-                  value: _tags[k]
+                  name: _k.replace(/Cron-Tag-/, ""),
+                  value: _tags[_k]
                 });
               }
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 84:
-            return _context.abrupt("return", id);
           case 85:
+            return _context.abrupt("return", id);
+          case 86:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function spawn() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   function genHashChain(previousHash) {
@@ -393,9 +399,9 @@ var connect = exports.connect = function connect(mem) {
     return (0, _base64url["default"])(hasher.digest());
   }
   var _assign = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(opt) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(opt) {
       var _opt$tags3;
-      var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data2, _ref6, _opt$from, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, raw_owner, hashBuffer, msg, _env, res, _iterator2, _step2, v, _iterator3, _step3, _v, __tags, _iterator4, _step4, _v2, _iterator5, _step5, v2;
+      var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data2, _ref7, _opt$from, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, raw_owner, hashBuffer, msg, _env, res, _iterator2, _step2, v, _iterator3, _step3, _v, __tags, _iterator4, _step4, _v2, _iterator5, _step5, v2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -451,7 +457,7 @@ var connect = exports.connect = function connect(mem) {
             _context2.prev = 21;
             data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
             _tags = _opt.tags;
-            from = (_ref6 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref6 !== void 0 ? _ref6 : owner;
+            from = (_ref7 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref7 !== void 0 ? _ref7 : owner;
             if (!_opt.item) {
               _context2.next = 42;
               break;
@@ -637,11 +643,11 @@ var connect = exports.connect = function connect(mem) {
       }, _callee2, null, [[21, 124], [26, 39], [54, 65, 68, 71], [72, 83, 86, 89], [90, 115, 118, 121], [95, 105, 108, 111]]);
     }));
     return function assign(_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var message = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(opt) {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(opt) {
       var _opt$item$id, _opt$item, _opt$owner;
       var p, ex, id, owner, item, _opt$tags4, _iterator6, _step6, v, _yield$ar$dataitem3;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -692,7 +698,6 @@ var connect = exports.connect = function connect(mem) {
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
           case 17:
-            //await ar.postItems(item, su.jwk)
             mem.msgs[id] = opt;
             _context3.next = 20;
             return _assign({
@@ -711,7 +716,7 @@ var connect = exports.connect = function connect(mem) {
       }, _callee3);
     }));
     return function message(_x2) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   return {
@@ -897,12 +902,11 @@ var connect = exports.connect = function connect(mem) {
             case 12:
               _context9.prev = 12;
               cloneMemory = function cloneMemory(memory) {
-                var buffer = memory.buffer.slice(0); // Clone the ArrayBuffer
+                var buffer = memory.buffer.slice(0);
                 return new WebAssembly.Memory({
                   initial: memory.buffer.byteLength / 65536,
-                  // Memory size in pages (64KB per page)
                   maximum: memory.maximum || undefined,
-                  shared: memory.shared || false // Retain sharing if applicable
+                  shared: memory.shared || false
                 });
               };
               msg = genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);

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/lua/weavedb_mock.lua

@@ -0,0 +1,43 @@
+local json = require("json")
+function rollup (id)
+  local file = io.open("/rollup/" .. id)
+  local data = nil
+  if file then data = file:read(file:seek('end')) end
+  file:close()
+  return data
+end
+
+function get (col, doc)
+  local file = io.open("/data/" .. col .. "/" .. doc)
+  local data = nil
+  if file then data = file:read(file:seek('end')) end
+  file:close()
+  return data
+end
+
+Handlers.add(
+  "Rollup",
+  "Rollup",
+  function (msg)
+    msg.reply({ Data = "committed!" })
+  end
+)
+
+Handlers.add(
+  "Finalize",
+  "Finalize",
+  function (msg)
+    local data = json.decode(rollup(msg.TXID))
+    msg.reply({ Data = "finalized!" })
+  end
+)
+
+
+Handlers.add(
+  "Get",
+  "Get",
+  function (msg)
+    msg.reply({ Data = get(msg.col, msg.doc) })
+  end
+)
+

package/cjs/server.js

@@ -44,7 +44,9 @@ var Server = /*#__PURE__*/function () {
       _ref$log = _ref.log,
       log = _ref$log === void 0 ? false : _ref$log;
     _classCallCheck(this, Server);
-    var _connect = (0, _aoconnect.connect)(aoconnect, log),
+    var _connect = (0, _aoconnect.connect)(aoconnect, {
+        log: log
+      }),
       _ar = _connect.ar,
       message = _connect.message,
       spawn = _connect.spawn,

package/cjs/tao.js

@@ -72,7 +72,9 @@ var AO = /*#__PURE__*/function (_MAO) {
       in_memory: true
     })]);
     _this.in_memory = true;
-    var _connect = (0, _aoconnect2.connect)(opt.mem),
+    var _connect = (0, _aoconnect2.connect)(opt.mem, {
+        extensions: opt.extensions
+      }),
       modules = _connect.modules,
       results = _connect.results,
       assign = _connect.assign,

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
+  };
 };