wao 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/cjs/aoconnect.js CHANGED
@@ -169,9 +169,12 @@ var connect = exports.connect = function connect(mem) {
169
169
  });
170
170
  case 12:
171
171
  handle = _context.sent;
172
+ // test me
172
173
  mem.modmap[id] = {
173
174
  handle: handle,
174
- id: id
175
+ id: id,
176
+ data: data,
177
+ format: t["Module-Format"]
175
178
  };
176
179
  return _context.abrupt("return", id);
177
180
  case 15:
@@ -189,10 +192,10 @@ var connect = exports.connect = function connect(mem) {
189
192
  var _opt$module, _opt$tags, _opt$tags2;
190
193
  var opt,
191
194
  mod,
195
+ _module,
192
196
  __dirname,
193
197
  wasm,
194
198
  handle,
195
- _module,
196
199
  ex,
197
200
  _iterator,
198
201
  _step,
@@ -237,10 +240,7 @@ var connect = exports.connect = function connect(mem) {
237
240
  throw Error("scheduler missing");
238
241
  case 5:
239
242
  mod = (_opt$module = opt.module) !== null && _opt$module !== void 0 ? _opt$module : mem.modules["aos2_0_1"];
240
- if (!(!mem.modmap[mod] && mem.wasms[mod])) {
241
- _context2.next = 15;
242
- break;
243
- }
243
+ _module = null;
244
244
  _context2.next = 9;
245
245
  return (0, _utils.dirname)();
246
246
  case 9:
@@ -254,11 +254,10 @@ var connect = exports.connect = function connect(mem) {
254
254
  });
255
255
  case 13:
256
256
  handle = _context2.sent;
257
- mem.modmap[mod] = {
257
+ _module = {
258
258
  handle: handle,
259
259
  id: mod
260
260
  };
261
- case 15:
262
261
  if (mod) {
263
262
  _context2.next = 17;
264
263
  break;
@@ -274,7 +273,6 @@ var connect = exports.connect = function connect(mem) {
274
273
  Scheduler: opt.scheduler,
275
274
  "Content-Type": "text/plain"
276
275
  }));
277
- _module = mem.modmap[mod];
278
276
  ex = false;
279
277
  (_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : opt.tags = [];
280
278
  _iterator = _createForOfIteratorHelper(opt.tags);
@@ -292,20 +290,20 @@ var connect = exports.connect = function connect(mem) {
292
290
  name: "Type",
293
291
  value: "Process"
294
292
  });
295
- _context2.next = 26;
293
+ _context2.next = 25;
296
294
  return ar.dataitem({
297
295
  data: opt.data,
298
296
  signer: opt.signer,
299
297
  tags: (0, _utils.tags)(opt.tags)
300
298
  });
301
- case 26:
299
+ case 25:
302
300
  _yield$ar$dataitem2 = _context2.sent;
303
301
  id = _yield$ar$dataitem2.id;
304
302
  owner = _yield$ar$dataitem2.owner;
305
303
  item = _yield$ar$dataitem2.item;
306
- _context2.next = 32;
304
+ _context2.next = 31;
307
305
  return ar.postItem(item, _test.su.jwk);
308
- case 32:
306
+ case 31:
309
307
  _tags = (0, _utils.tags)(opt.tags);
310
308
  res = null;
311
309
  memory = null;
@@ -324,7 +322,7 @@ var connect = exports.connect = function connect(mem) {
324
322
  opt: opt
325
323
  };
326
324
  if (!_tags["On-Boot"]) {
327
- _context2.next = 50;
325
+ _context2.next = 49;
328
326
  break;
329
327
  }
330
328
  data = "";
@@ -337,51 +335,51 @@ var connect = exports.connect = function connect(mem) {
337
335
  auth: _test.mu.addr
338
336
  });
339
337
  _t = (0, _utils.tags)(msg.Tags);
340
- _context2.next = 44;
338
+ _context2.next = 43;
341
339
  return _module.handle(null, msg, _env);
342
- case 44:
340
+ case 43:
343
341
  res = _context2.sent;
344
342
  p.memory = res.Memory;
345
343
  delete res.Memory;
346
344
  p.res[id] = res;
347
- _context2.next = 51;
345
+ _context2.next = 50;
348
346
  break;
349
- case 50:
347
+ case 49:
350
348
  p.height += 1;
351
- case 51:
349
+ case 50:
352
350
  mem.msgs[id] = opt;
353
351
  mem.env[id] = p;
354
352
  if (!_tags["Cron-Interval"]) {
355
- _context2.next = 77;
353
+ _context2.next = 76;
356
354
  break;
357
355
  }
358
356
  _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];
359
357
  _int = 0;
360
358
  _context2.t0 = unit.replace(/s$/, "");
361
- _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;
359
+ _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;
362
360
  break;
363
- case 59:
361
+ case 58:
364
362
  _int = num;
365
- return _context2.abrupt("break", 73);
366
- case 61:
363
+ return _context2.abrupt("break", 72);
364
+ case 60:
367
365
  _int = num * 1000;
368
- return _context2.abrupt("break", 73);
369
- case 63:
366
+ return _context2.abrupt("break", 72);
367
+ case 62:
370
368
  _int = num * 1000 * 60;
371
- return _context2.abrupt("break", 73);
372
- case 65:
369
+ return _context2.abrupt("break", 72);
370
+ case 64:
373
371
  _int = num * 1000 * 60 * 60;
374
- return _context2.abrupt("break", 73);
375
- case 67:
372
+ return _context2.abrupt("break", 72);
373
+ case 66:
376
374
  _int = num * 1000 * 60 * 60 * 24;
377
- return _context2.abrupt("break", 73);
378
- case 69:
375
+ return _context2.abrupt("break", 72);
376
+ case 68:
379
377
  _int = num * 1000 * 60 * 60 * 24 * 30;
380
- return _context2.abrupt("break", 73);
381
- case 71:
378
+ return _context2.abrupt("break", 72);
379
+ case 70:
382
380
  _int = num * 1000 * 60 * 60 * 24 * 365;
383
- return _context2.abrupt("break", 73);
384
- case 73:
381
+ return _context2.abrupt("break", 72);
382
+ case 72:
385
383
  cronTags = [];
386
384
  for (k in _tags) {
387
385
  if (/^Cron-Tag-/.test(k)) {
@@ -393,9 +391,9 @@ var connect = exports.connect = function connect(mem) {
393
391
  }
394
392
  mem.env[id].cronTags = cronTags;
395
393
  mem.env[id].span = _int;
396
- case 77:
394
+ case 76:
397
395
  return _context2.abrupt("return", id);
398
- case 78:
396
+ case 77:
399
397
  case "end":
400
398
  return _context2.stop();
401
399
  }
@@ -438,7 +436,7 @@ var connect = exports.connect = function connect(mem) {
438
436
  Message: opt.message,
439
437
  "Hash-Chain": hash
440
438
  }));
441
- p.epochs.push([opt.id]);
439
+ p.epochs.push([opt.message]);
442
440
  _context3.next = 8;
443
441
  return ar.dataitem({
444
442
  data: opt.data,
package/esm/aoconnect.js CHANGED
@@ -102,7 +102,9 @@ export const connect = mem => {
102
102
  mode: "test",
103
103
  WeaveDrive,
104
104
  })
105
- mem.modmap[id] = { handle, id }
105
+
106
+ // test me
107
+ mem.modmap[id] = { handle, id, data, format: t["Module-Format"] }
106
108
  return id
107
109
  }
108
110
 
@@ -110,18 +112,17 @@ export const connect = mem => {
110
112
  if (!opt.module) throw Error("module missing")
111
113
  if (!opt.scheduler) throw Error("scheduler missing")
112
114
  let mod = opt.module ?? mem.modules["aos2_0_1"]
113
- if (!mem.modmap[mod] && mem.wasms[mod]) {
114
- const __dirname = await dirname()
115
- const wasm = readFileSync(
116
- resolve(__dirname, `lua/${mem.wasms[mod].file}.wasm`),
117
- )
118
- const handle = await AoLoader(wasm, {
119
- format: mem.wasms[mod].format,
120
- mode: "test",
121
- WeaveDrive,
122
- })
123
- mem.modmap[mod] = { handle, id: mod }
124
- }
115
+ let _module = null
116
+ const __dirname = await dirname()
117
+ const wasm = readFileSync(
118
+ resolve(__dirname, `lua/${mem.wasms[mod].file}.wasm`),
119
+ )
120
+ const handle = await AoLoader(wasm, {
121
+ format: mem.wasms[mod].format,
122
+ mode: "test",
123
+ WeaveDrive,
124
+ })
125
+ _module = { handle, id: mod }
125
126
  if (!mod) throw Error("module not found")
126
127
  opt.tags = buildTags(
127
128
  null,
@@ -135,7 +136,6 @@ export const connect = mem => {
135
136
  "Content-Type": "text/plain",
136
137
  }),
137
138
  )
138
- const _module = mem.modmap[mod]
139
139
  let ex = false
140
140
  opt.tags ??= []
141
141
  for (let v of opt.tags) if (v.name === "Type") ex = true
@@ -253,7 +253,7 @@ export const connect = mem => {
253
253
  "Hash-Chain": hash,
254
254
  }),
255
255
  )
256
- p.epochs.push([opt.id])
256
+ p.epochs.push([opt.message])
257
257
  const { id, owner, item } = await ar.dataitem({
258
258
  data: opt.data,
259
259
  signer: opt.signer,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wao",
3
- "version": "0.4.5",
3
+ "version": "0.4.6",
4
4
  "description": "",
5
5
  "main": "cjs/index.js",
6
6
  "module": "esm/index.js",