wao 0.4.4 → 0.4.6

package/cjs/aoconnect.js

@@ -69,13 +69,13 @@ var connect = exports.connect = function connect(mem) {
     });
     return output;
   };
-  var genMsg = function genMsg(p, data, Tags, from, owner) {
-    var dry = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var genMsg = function genMsg(Id, p, data, Tags, from, Owner) {
+    var dry = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     if (!dry) p.height += 1;
     return {
-      Id: p.height,
+      Id: Id,
       Target: p.id,
-      Owner: owner,
+      Owner: Owner,
       Data: data !== null && data !== void 0 && data.length ? data : "",
       "Block-Height": p.height.toString(),
       Timestamp: Date.now().toString(),
@@ -169,9 +169,12 @@ var connect = exports.connect = function connect(mem) {
             });
           case 12:
             handle = _context.sent;
+            // test me
             mem.modmap[id] = {
               handle: handle,
-              id: id
+              id: id,
+              data: data,
+              format: t["Module-Format"]
             };
             return _context.abrupt("return", id);
           case 15:
@@ -189,10 +192,10 @@ var connect = exports.connect = function connect(mem) {
       var _opt$module, _opt$tags, _opt$tags2;
       var opt,
         mod,
+        _module,
         __dirname,
         wasm,
         handle,
-        _module,
         ex,
         _iterator,
         _step,
@@ -237,10 +240,7 @@ var connect = exports.connect = function connect(mem) {
             throw Error("scheduler missing");
           case 5:
             mod = (_opt$module = opt.module) !== null && _opt$module !== void 0 ? _opt$module : mem.modules["aos2_0_1"];
-            if (!(!mem.modmap[mod] && mem.wasms[mod])) {
-              _context2.next = 15;
-              break;
-            }
+            _module = null;
             _context2.next = 9;
             return (0, _utils.dirname)();
           case 9:
@@ -254,11 +254,10 @@ var connect = exports.connect = function connect(mem) {
             });
           case 13:
             handle = _context2.sent;
-            mem.modmap[mod] = {
+            _module = {
               handle: handle,
               id: mod
             };
-          case 15:
             if (mod) {
               _context2.next = 17;
               break;
@@ -274,7 +273,6 @@ var connect = exports.connect = function connect(mem) {
               Scheduler: opt.scheduler,
               "Content-Type": "text/plain"
             }));
-            _module = mem.modmap[mod];
             ex = false;
             (_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : opt.tags = [];
             _iterator = _createForOfIteratorHelper(opt.tags);
@@ -292,20 +290,20 @@ var connect = exports.connect = function connect(mem) {
               name: "Type",
               value: "Process"
             });
-            _context2.next = 26;
+            _context2.next = 25;
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags)
             });
-          case 26:
+          case 25:
             _yield$ar$dataitem2 = _context2.sent;
             id = _yield$ar$dataitem2.id;
             owner = _yield$ar$dataitem2.owner;
             item = _yield$ar$dataitem2.item;
-            _context2.next = 32;
+            _context2.next = 31;
             return ar.postItem(item, _test.su.jwk);
-          case 32:
+          case 31:
             _tags = (0, _utils.tags)(opt.tags);
             res = null;
             memory = null;
@@ -324,12 +322,12 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!_tags["On-Boot"]) {
-              _context2.next = 50;
+              _context2.next = 49;
               break;
             }
             data = "";
             if (_tags["On-Boot"] === "Data") data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";else data = (_mem$msgs$_tags$OnBo = (_mem$msgs$_tags$OnBo2 = mem.msgs[_tags["On-Boot"]]) === null || _mem$msgs$_tags$OnBo2 === void 0 ? void 0 : _mem$msgs$_tags$OnBo2.data) !== null && _mem$msgs$_tags$OnBo !== void 0 ? _mem$msgs$_tags$OnBo : "";
-            msg = genMsg(p, data, opt.tags, owner, _test.mu.addr, true);
+            msg = genMsg(id, p, data, opt.tags, owner, _test.mu.addr, true);
             _env = genEnv({
               pid: p.id,
               owner: p.owner,
@@ -337,51 +335,51 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context2.next = 44;
+            _context2.next = 43;
             return _module.handle(null, msg, _env);
-          case 44:
+          case 43:
             res = _context2.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context2.next = 51;
+            _context2.next = 50;
             break;
-          case 50:
+          case 49:
             p.height += 1;
-          case 51:
+          case 50:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context2.next = 77;
+              _context2.next = 76;
               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;
             _context2.t0 = unit.replace(/s$/, "");
-            _context2.next = _context2.t0 === "millisecond" ? 59 : _context2.t0 === "second" ? 61 : _context2.t0 === "minute" ? 63 : _context2.t0 === "hour" ? 65 : _context2.t0 === "day" ? 67 : _context2.t0 === "month" ? 69 : _context2.t0 === "year" ? 71 : 73;
+            _context2.next = _context2.t0 === "millisecond" ? 58 : _context2.t0 === "second" ? 60 : _context2.t0 === "minute" ? 62 : _context2.t0 === "hour" ? 64 : _context2.t0 === "day" ? 66 : _context2.t0 === "month" ? 68 : _context2.t0 === "year" ? 70 : 72;
             break;
-          case 59:
+          case 58:
             _int = num;
-            return _context2.abrupt("break", 73);
-          case 61:
+            return _context2.abrupt("break", 72);
+          case 60:
             _int = num * 1000;
-            return _context2.abrupt("break", 73);
-          case 63:
+            return _context2.abrupt("break", 72);
+          case 62:
             _int = num * 1000 * 60;
-            return _context2.abrupt("break", 73);
-          case 65:
+            return _context2.abrupt("break", 72);
+          case 64:
             _int = num * 1000 * 60 * 60;
-            return _context2.abrupt("break", 73);
-          case 67:
+            return _context2.abrupt("break", 72);
+          case 66:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context2.abrupt("break", 73);
-          case 69:
+            return _context2.abrupt("break", 72);
+          case 68:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context2.abrupt("break", 73);
-          case 71:
+            return _context2.abrupt("break", 72);
+          case 70:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context2.abrupt("break", 73);
-          case 73:
+            return _context2.abrupt("break", 72);
+          case 72:
             cronTags = [];
             for (k in _tags) {
               if (/^Cron-Tag-/.test(k)) {
@@ -393,9 +391,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 77:
+          case 76:
             return _context2.abrupt("return", id);
-          case 78:
+          case 77:
           case "end":
             return _context2.stop();
         }
@@ -438,7 +436,7 @@ var connect = exports.connect = function connect(mem) {
               Message: opt.message,
               "Hash-Chain": hash
             }));
-            p.epochs.push([opt.id]);
+            p.epochs.push([opt.message]);
             _context3.next = 8;
             return ar.dataitem({
               data: opt.data,
@@ -455,7 +453,7 @@ var connect = exports.connect = function connect(mem) {
             return ar.postItem(item, _test.su.jwk);
           case 14:
             _context3.prev = 14;
-            msg = genMsg(p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_ref8 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref8 !== void 0 ? _ref8 : owner, _test.mu.addr);
+            msg = genMsg(opt.message, p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_ref8 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref8 !== void 0 ? _ref8 : owner, _test.mu.addr);
             _env = genEnv({
               pid: p.id,
               owner: p.owner,
@@ -842,7 +840,7 @@ var connect = exports.connect = function connect(mem) {
               id = _yield$ar$dataitem5.id;
               owner = _yield$ar$dataitem5.owner;
               _context10.prev = 6;
-              msg = genMsg(p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);
+              msg = genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);
               _env = genEnv({
                 pid: p.id,
                 owner: p.owner,

package/esm/aoconnect.js

@@ -44,12 +44,12 @@ export const connect = mem => {
     return output
   }
 
-  const genMsg = (p, data, Tags, from, owner, dry = false) => {
+  const genMsg = (Id, p, data, Tags, from, Owner, dry = false) => {
     if (!dry) p.height += 1
     return {
-      Id: p.height,
+      Id,
       Target: p.id,
-      Owner: owner,
+      Owner,
       Data: data?.length ? data : "",
       "Block-Height": p.height.toString(),
       Timestamp: Date.now().toString(),
@@ -102,7 +102,9 @@ export const connect = mem => {
       mode: "test",
       WeaveDrive,
     })
-    mem.modmap[id] = { handle, id }
+
+    // test me
+    mem.modmap[id] = { handle, id, data, format: t["Module-Format"] }
     return id
   }
 
@@ -110,18 +112,17 @@ export const connect = mem => {
     if (!opt.module) throw Error("module missing")
     if (!opt.scheduler) throw Error("scheduler missing")
     let mod = opt.module ?? mem.modules["aos2_0_1"]
-    if (!mem.modmap[mod] && mem.wasms[mod]) {
-      const __dirname = await dirname()
-      const wasm = readFileSync(
-        resolve(__dirname, `lua/${mem.wasms[mod].file}.wasm`),
-      )
-      const handle = await AoLoader(wasm, {
-        format: mem.wasms[mod].format,
-        mode: "test",
-        WeaveDrive,
-      })
-      mem.modmap[mod] = { handle, id: mod }
-    }
+    let _module = null
+    const __dirname = await dirname()
+    const wasm = readFileSync(
+      resolve(__dirname, `lua/${mem.wasms[mod].file}.wasm`),
+    )
+    const handle = await AoLoader(wasm, {
+      format: mem.wasms[mod].format,
+      mode: "test",
+      WeaveDrive,
+    })
+    _module = { handle, id: mod }
     if (!mod) throw Error("module not found")
     opt.tags = buildTags(
       null,
@@ -135,7 +136,6 @@ export const connect = mem => {
         "Content-Type": "text/plain",
       }),
     )
-    const _module = mem.modmap[mod]
     let ex = false
     opt.tags ??= []
     for (let v of opt.tags) if (v.name === "Type") ex = true
@@ -167,7 +167,7 @@ export const connect = mem => {
       let data = ""
       if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
       else data = mem.msgs[_tags["On-Boot"]]?.data ?? ""
-      let msg = genMsg(p, data, opt.tags, owner, mu.addr, true)
+      let msg = genMsg(id, p, data, opt.tags, owner, mu.addr, true)
       const _env = genEnv({
         pid: p.id,
         owner: p.owner,
@@ -253,7 +253,7 @@ export const connect = mem => {
         "Hash-Chain": hash,
       }),
     )
-    p.epochs.push([opt.id])
+    p.epochs.push([opt.message])
     const { id, owner, item } = await ar.dataitem({
       data: opt.data,
       signer: opt.signer,
@@ -263,6 +263,7 @@ export const connect = mem => {
     await ar.postItem(item, su.jwk)
     try {
       const msg = genMsg(
+        opt.message,
         p,
         _opt.data ?? "",
         _opt.tags,
@@ -398,7 +399,15 @@ export const connect = mem => {
       const p = mem.env[opt.process]
       const { id, owner } = await ar.dataitem({ ...opt, target: opt.process })
       try {
-        const msg = genMsg(p, opt.data ?? "", opt.tags, owner, mu.addr, true)
+        const msg = genMsg(
+          id,
+          p,
+          opt.data ?? "",
+          opt.tags,
+          owner,
+          mu.addr,
+          true,
+        )
         const _env = genEnv({
           pid: p.id,
           owner: p.owner,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",