wao 0.16.3 → 0.16.4

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.
Files changed (5) hide show
  1. package/cjs/aoconnect-base.js +3 -3
  2. package/cjs/armem-base.js +65 -61
  3. package/esm/aoconnect-base.js +3 -3
  4. package/esm/armem-base.js +11 -10
  5. package/package.json +1 -1
package/cjs/aoconnect-base.js CHANGED
@@ -836,7 +836,7 @@ var _default = exports["default"] = function _default() {
836
836
  case 97:
837
837
  if (p.compressed) {
838
838
  start = Date.now();
839
- p.memory = mem.waosm.decompress(p.memory, p.original_size);
839
+ p.memory = mem.decompress(p.memory, p.original_size);
840
840
  p.compressed = false;
841
841
  }
842
842
  _context4.next = 100;
@@ -1243,7 +1243,7 @@ var _default = exports["default"] = function _default() {
1243
1243
  case 126:
1244
1244
  if (p.compressed) {
1245
1245
  start = Date.now();
1246
- p.memory = mem.waosm.decompress(p.memory, p.original_size);
1246
+ p.memory = mem.decompress(p.memory, p.original_size);
1247
1247
  p.compressed = false;
1248
1248
  }
1249
1249
  _context5.next = 129;
@@ -1772,7 +1772,7 @@ var _default = exports["default"] = function _default() {
1772
1772
  case 45:
1773
1773
  if (p.compressed) {
1774
1774
  start = Date.now();
1775
- p.memory = mem.waosm.decompress(p.memory, p.original_size);
1775
+ p.memory = mem.decompress(p.memory, p.original_size);
1776
1776
  p.compressed = false;
1777
1777
  }
1778
1778
  _context12.next = 48;
package/cjs/armem-base.js CHANGED
@@ -76,6 +76,18 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
76
76
  this.SU_URL = SU_URL;
77
77
  }
78
78
  return _createClass(ArMemBase, [{
79
+ key: "compress",
80
+ value: function compress(memory) {
81
+ var waosm = new this.Waosm();
82
+ return waosm.compress(memory);
83
+ }
84
+ }, {
85
+ key: "decompress",
86
+ value: function decompress(memory, size) {
87
+ var waosm = new this.Waosm();
88
+ return waosm.decompress(memory, size);
89
+ }
90
+ }, {
79
91
  key: "owner",
80
92
  value: function () {
81
93
  var _owner = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(di) {
@@ -173,10 +185,9 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
173
185
  }
174
186
  memory = val.memory;
175
187
  try {
176
- memory = this.waosm.compress(val.memory);
188
+ memory = this.compress(val.memory);
177
189
  } catch (e) {
178
190
  console.log(e);
179
- memory = (0, _compress.compress)(val.memory);
180
191
  }
181
192
  this[key][field].original_size = val.memory.length;
182
193
  _context3.next = 18;
@@ -328,136 +339,129 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
328
339
  _context5.next = 6;
329
340
  return this._init();
330
341
  case 6:
331
- this.waosm = new this.Waosm();
332
342
  if (!this.db) {
333
- _context5.next = 58;
343
+ _context5.next = 57;
334
344
  break;
335
345
  }
336
346
  _i = 0, _arr = ["height", "blocks"];
337
- case 9:
347
+ case 8:
338
348
  if (!(_i < _arr.length)) {
339
- _context5.next = 17;
349
+ _context5.next = 16;
340
350
  break;
341
351
  }
342
352
  v = _arr[_i];
343
- _context5.next = 13;
353
+ _context5.next = 12;
344
354
  return this.get(v);
345
- case 13:
355
+ case 12:
346
356
  this[v] = _context5.sent;
347
- case 14:
357
+ case 13:
348
358
  _i++;
349
- _context5.next = 9;
359
+ _context5.next = 8;
350
360
  break;
351
- case 17:
361
+ case 16:
352
362
  _i2 = 0, _arr2 = ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
353
- case 18:
363
+ case 17:
354
364
  if (!(_i2 < _arr2.length)) {
355
- _context5.next = 56;
365
+ _context5.next = 55;
356
366
  break;
357
367
  }
358
368
  _v = _arr2[_i2];
359
369
  (_this$_v = this[_v]) !== null && _this$_v !== void 0 ? _this$_v : this[_v] = {};
360
- _context5.next = 23;
370
+ _context5.next = 22;
361
371
  return this.db.getKeys({
362
372
  start: _v,
363
373
  end: _v + "a"
364
374
  });
365
- case 23:
375
+ case 22:
366
376
  items = _context5.sent;
367
377
  _iterator = _createForOfIteratorHelper(items || []);
368
- _context5.prev = 25;
378
+ _context5.prev = 24;
369
379
  _iterator.s();
370
- case 27:
380
+ case 26:
371
381
  if ((_step = _iterator.n()).done) {
372
- _context5.next = 45;
382
+ _context5.next = 44;
373
383
  break;
374
384
  }
375
385
  v2 = _step.value;
376
386
  key = v2.split(".")[0];
377
387
  field = v2.split(".")[1];
378
388
  if (!(key === _v)) {
379
- _context5.next = 43;
389
+ _context5.next = 42;
380
390
  break;
381
391
  }
382
392
  if (!key.match(/^env/)) {
383
- _context5.next = 40;
393
+ _context5.next = 39;
384
394
  break;
385
395
  }
386
- _context5.next = 35;
396
+ _context5.next = 34;
387
397
  return this.db.get(v2);
388
- case 35:
398
+ case 34:
389
399
  v3 = _context5.sent;
390
400
  if ((0, _ramda.is)(Uint8Array, v3.memory)) {
391
- try {
392
- v3.compressed = true;
393
- //v3.memory = this.waosm.decompress(v3.memory, v3.original_size)
394
- } catch (e) {
395
- console.log(e);
396
- v3.memory = (0, _compress.decompress)(v3.memory);
397
- }
401
+ v3.compressed = true;
398
402
  }
399
403
  this[_v][field] = v3;
400
- _context5.next = 43;
401
- break;
402
- case 40:
403
404
  _context5.next = 42;
405
+ break;
406
+ case 39:
407
+ _context5.next = 41;
404
408
  return this.db.get(v2);
405
- case 42:
409
+ case 41:
406
410
  this[_v][field] = _context5.sent;
407
- case 43:
408
- _context5.next = 27;
411
+ case 42:
412
+ _context5.next = 26;
409
413
  break;
410
- case 45:
411
- _context5.next = 50;
414
+ case 44:
415
+ _context5.next = 49;
412
416
  break;
413
- case 47:
414
- _context5.prev = 47;
415
- _context5.t0 = _context5["catch"](25);
417
+ case 46:
418
+ _context5.prev = 46;
419
+ _context5.t0 = _context5["catch"](24);
416
420
  _iterator.e(_context5.t0);
417
- case 50:
418
- _context5.prev = 50;
421
+ case 49:
422
+ _context5.prev = 49;
419
423
  _iterator.f();
420
- return _context5.finish(50);
421
- case 53:
424
+ return _context5.finish(49);
425
+ case 52:
422
426
  _i2++;
423
- _context5.next = 18;
427
+ _context5.next = 17;
424
428
  break;
425
- case 56:
426
- _context5.next = 74;
429
+ case 55:
430
+ _context5.next = 73;
427
431
  break;
428
- case 58:
432
+ case 57:
429
433
  _i3 = 0, _arr3 = ["height", "blocks"];
430
- case 59:
434
+ case 58:
431
435
  if (!(_i3 < _arr3.length)) {
432
- _context5.next = 66;
436
+ _context5.next = 65;
433
437
  break;
434
438
  }
435
439
  _v2 = _arr3[_i3];
436
- _context5.next = 63;
440
+ _context5.next = 62;
437
441
  return this.set(this[_v2], _v2);
438
- case 63:
442
+ case 62:
439
443
  _i3++;
440
- _context5.next = 59;
444
+ _context5.next = 58;
441
445
  break;
442
- case 66:
446
+ case 65:
443
447
  _i4 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
444
- case 67:
448
+ case 66:
445
449
  if (!(_i4 < _arr4.length)) {
446
- _context5.next = 74;
450
+ _context5.next = 73;
447
451
  break;
448
452
  }
449
453
  _v3 = _arr4[_i4];
450
- _context5.next = 71;
454
+ _context5.next = 70;
451
455
  return this.putAll(_v3);
452
- case 71:
456
+ case 70:
453
457
  _i4++;
454
- _context5.next = 67;
458
+ _context5.next = 66;
455
459
  break;
456
- case 74:
460
+ case 73:
457
461
  case "end":
458
462
  return _context5.stop();
459
463
  }
460
- }, _callee5, this, [[25, 47, 50, 53]]);
464
+ }, _callee5, this, [[24, 46, 49, 52]]);
461
465
  }));
462
466
  function init() {
463
467
  return _init.apply(this, arguments);
package/esm/aoconnect-base.js CHANGED
@@ -338,7 +338,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
338
338
  }
339
339
  if (p.compressed) {
340
340
  const start = Date.now()
341
- p.memory = mem.waosm.decompress(p.memory, p.original_size)
341
+ p.memory = mem.decompress(p.memory, p.original_size)
342
342
  p.compressed = false
343
343
  }
344
344
  const res = await p.handle(p.memory, msg, _env)
@@ -476,7 +476,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
476
476
  }
477
477
  if (p.compressed) {
478
478
  const start = Date.now()
479
- p.memory = mem.waosm.decompress(p.memory, p.original_size)
479
+ p.memory = mem.decompress(p.memory, p.original_size)
480
480
  p.compressed = false
481
481
  }
482
482
  const res = await p.handle(p.memory, msg, _env)
@@ -669,7 +669,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
669
669
  }
670
670
  if (p.compressed) {
671
671
  const start = Date.now()
672
- p.memory = mem.waosm.decompress(p.memory, p.original_size)
672
+ p.memory = mem.decompress(p.memory, p.original_size)
673
673
  p.compressed = false
674
674
  }
675
675
  const res = await p.handle(p.memory, msg, _env)
package/esm/armem-base.js CHANGED
@@ -45,6 +45,15 @@ export default class ArMemBase {
45
45
  this.scheduler = scheduler
46
46
  this.SU_URL = SU_URL
47
47
  }
48
+ compress(memory) {
49
+ const waosm = new this.Waosm()
50
+ return waosm.compress(memory)
51
+ }
52
+ decompress(memory, size) {
53
+ const waosm = new this.Waosm()
54
+ return waosm.decompress(memory, size)
55
+ }
56
+
48
57
  async owner(di) {
49
58
  return base64url.encode(
50
59
  Buffer.from(await crypto.subtle.digest("SHA-256", di.rawOwner))
@@ -72,10 +81,9 @@ export default class ArMemBase {
72
81
  if (key === "env") {
73
82
  let memory = val.memory
74
83
  try {
75
- memory = this.waosm.compress(val.memory)
84
+ memory = this.compress(val.memory)
76
85
  } catch (e) {
77
86
  console.log(e)
78
- memory = compress(val.memory)
79
87
  }
80
88
  this[key][field].original_size = val.memory.length
81
89
  await this.db.put(
@@ -162,7 +170,6 @@ export default class ArMemBase {
162
170
  if (this.isInit) return
163
171
  this.isInit = true
164
172
  if (typeof this._init === "function") await this._init()
165
- this.waosm = new this.Waosm()
166
173
  if (this.db) {
167
174
  for (const v of ["height", "blocks"]) this[v] = await this.get(v)
168
175
  for (const v of [
@@ -185,13 +192,7 @@ export default class ArMemBase {
185
192
  if (key.match(/^env/)) {
186
193
  let v3 = await this.db.get(v2)
187
194
  if (is(Uint8Array, v3.memory)) {
188
- try {
189
- v3.compressed = true
190
- //v3.memory = this.waosm.decompress(v3.memory, v3.original_size)
191
- } catch (e) {
192
- console.log(e)
193
- v3.memory = decompress(v3.memory)
194
- }
195
+ v3.compressed = true
195
196
  }
196
197
  this[v][field] = v3
197
198
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wao",
3
- "version": "0.16.3",
3
+ "version": "0.16.4",
4
4
  "bin": {
5
5
  "wao": "./cjs/cli.js",
6
6
  "wao-esm": "./esm/cli.js"