wao 0.6.1 → 0.6.3

package/cjs/ao.js

@@ -1246,7 +1246,7 @@ var AO = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              pid = _ref21.pid, _ref21$attempts = _ref21.attempts, attempts = _ref21$attempts === void 0 ? 5 : _ref21$attempts;
+              pid = _ref21.pid, _ref21$attempts = _ref21.attempts, attempts = _ref21$attempts === void 0 ? 10 : _ref21$attempts;
               exist = false;
               err = null;
             case 3:

package/cjs/aoconnect.js

@@ -11,7 +11,6 @@ var _base64url = _interopRequireDefault(require("base64url"));
 var _utils = require("./utils.js");
 var _armem = _interopRequireDefault(require("./armem.js"));
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
-var _kv = _interopRequireDefault(require("./kv.js"));
 var _aoLoader = _interopRequireDefault(require("@permaweb/ao-loader"));
 var _fs = require("fs");
 var _path = require("path");
@@ -39,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;
@@ -56,18 +58,18 @@ var connect = exports.connect = function connect(mem) {
     mem: mem,
     log: log
   });
-  var WeaveDrive = new _weavedrive["default"](ar).drive;
-  var KV = new _kv["default"](ar).kv;
+  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,
@@ -103,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,
@@ -145,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,
@@ -165,7 +167,6 @@ var connect = exports.connect = function connect(mem) {
         __tags,
         now,
         t,
-        wd,
         handle,
         _tags,
         res,
@@ -184,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) {
@@ -274,16 +275,15 @@ var connect = exports.connect = function connect(mem) {
           case 33:
             now = Date.now;
             t = (0, _utils.tags)(opt.tags);
-            wd = t.Extension === "KV" ? KV : WeaveDrive;
-            _context.next = 38;
+            _context.next = 37;
             return (0, _aoLoader["default"])(wasm, {
               format: format,
-              WeaveDrive: wd,
+              WeaveDrive: extensions[t.Extension],
               spawn: item,
               module: mem.txs[mod],
               blockHeight: "100"
             });
-          case 38:
+          case 37:
             handle = _context.sent;
             _module = {
               handle: handle,
@@ -308,7 +308,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 59;
+              _context.next = 58;
               break;
             }
             data = "";
@@ -321,72 +321,72 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 53;
+            _context.next = 52;
             return _module.handle(null, msg, _env);
-          case 53:
+          case 52:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 60;
+            _context.next = 59;
             break;
-          case 59:
+          case 58:
             p.height += 1;
-          case 60:
+          case 59:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 86;
+              _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" ? 68 : _context.t0 === "second" ? 70 : _context.t0 === "minute" ? 72 : _context.t0 === "hour" ? 74 : _context.t0 === "day" ? 76 : _context.t0 === "month" ? 78 : _context.t0 === "year" ? 80 : 82;
+            _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 68:
+          case 67:
             _int = num;
-            return _context.abrupt("break", 82);
-          case 70:
+            return _context.abrupt("break", 81);
+          case 69:
             _int = num * 1000;
-            return _context.abrupt("break", 82);
-          case 72:
+            return _context.abrupt("break", 81);
+          case 71:
             _int = num * 1000 * 60;
-            return _context.abrupt("break", 82);
-          case 74:
+            return _context.abrupt("break", 81);
+          case 73:
             _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 82);
-          case 76:
+            return _context.abrupt("break", 81);
+          case 75:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 82);
-          case 78:
+            return _context.abrupt("break", 81);
+          case 77:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 82);
-          case 80:
+            return _context.abrupt("break", 81);
+          case 79:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 82);
-          case 82:
+            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 86:
+          case 85:
             return _context.abrupt("return", id);
-          case 87:
+          case 86:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function spawn() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   function genHashChain(previousHash) {
@@ -399,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:
@@ -457,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;
@@ -643,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) {
@@ -716,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 {

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,