wao 0.36.0 → 0.36.2

package/cjs/hb.js

@@ -77,8 +77,11 @@ var HB = /*#__PURE__*/function () {
       url = _ref2$url === void 0 ? "http://localhost:10001" : _ref2$url,
       _ref2$cu = _ref2.cu,
       cu = _ref2$cu === void 0 ? "http://localhost:6363" : _ref2$cu,
-      jwk = _ref2.jwk;
+      jwk = _ref2.jwk,
+      _ref2$format = _ref2.format,
+      format = _ref2$format === void 0 ? "httpsig" : _ref2$format;
     _classCallCheck(this, HB);
+    this.format = format;
     this.cu = cu;
     this.url = url;
     if (jwk) this._init(jwk);
@@ -393,20 +396,33 @@ var HB = /*#__PURE__*/function () {
     key: "compute",
     value: function () {
       var _compute = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref5) {
-        var pid, slot, _ref5$path, path;
+        var pid, slot, _ref5$path, path, res;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               pid = _ref5.pid, slot = _ref5.slot, _ref5$path = _ref5.path, path = _ref5$path === void 0 ? "" : _ref5$path;
               if (path && !/^\//.test(path)) path = "/" + path;
-              _context12.next = 4;
+              if (!(this.format === "ans104")) {
+                _context12.next = 9;
+                break;
+              }
+              _context12.next = 5;
+              return this.get({
+                path: "/".concat(pid, "/compute").concat(path),
+                slot: slot
+              });
+            case 5:
+              res = _context12.sent;
+              return _context12.abrupt("return", res.out);
+            case 9:
+              _context12.next = 11;
               return this.getJSON({
                 path: "/".concat(pid, "/compute").concat(path),
                 slot: slot
               });
-            case 4:
+            case 11:
               return _context12.abrupt("return", _context12.sent);
-            case 5:
+            case 12:
             case "end":
               return _context12.stop();
           }
@@ -476,7 +492,7 @@ var HB = /*#__PURE__*/function () {
                 data: data,
                 pid: this.cache,
                 tags: {
-                  "content-type": type
+                  "Content-Type": type
                 }
               });
             case 9:
@@ -584,7 +600,7 @@ var HB = /*#__PURE__*/function () {
             case 0:
               _ref7 = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {}, pid = _ref7.pid, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, data = _ref7.data;
               _tags = (0, _ramda.mergeLeft)(tags, {
-                type: "Message",
+                Type: "Message",
                 target: pid
               });
               if (data) _tags.data = data;
@@ -670,14 +686,13 @@ var HB = /*#__PURE__*/function () {
                 signingFormat: "ANS-104"
               }));
               signer = new _sdk.ArweaveSigner(this.jwk);
-              console.log(_tags);
               di = (0, _arbundles.createData)(data, signer, {
                 tags: _tags
               });
-              _context19.next = 7;
+              _context19.next = 6;
               return di.sign(signer);
-            case 7:
-              _context19.next = 9;
+            case 6:
+              _context19.next = 8;
               return fetch("".concat(this.url).concat(path), {
                 method: "POST",
                 headers: {
@@ -686,19 +701,19 @@ var HB = /*#__PURE__*/function () {
                 },
                 body: di.binary
               });
-            case 9:
+            case 8:
               res = _context19.sent;
               _context19.t0 = _hbsig.structured_to;
               _context19.t1 = _hbsig.httpsig_from;
-              _context19.next = 14;
+              _context19.next = 13;
               return toMsg(res);
-            case 14:
+            case 13:
               _context19.t2 = _context19.sent;
               _context19.t3 = (0, _context19.t1)(_context19.t2);
               _headers = (0, _context19.t0)(_context19.t3);
               res.out = _headers;
               return _context19.abrupt("return", res);
-            case 19:
+            case 18:
             case "end":
               return _context19.stop();
           }
@@ -734,7 +749,7 @@ var HB = /*#__PURE__*/function () {
                 break;
               }
               _tags = (0, _ramda.mergeLeft)(tags, {
-                type: "Message"
+                Type: "Message"
               });
               _context20.next = 6;
               return this.post104({
@@ -748,7 +763,7 @@ var HB = /*#__PURE__*/function () {
               break;
             case 9:
               _tags2 = (0, _ramda.mergeLeft)(tags, {
-                type: "Message",
+                Type: "Message",
                 target: pid
               });
               if (data) _tags2.data = data;
@@ -865,19 +880,31 @@ var HB = /*#__PURE__*/function () {
     key: "now",
     value: function () {
       var _now = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23(_ref12) {
-        var pid, _ref12$path, path;
+        var pid, _ref12$path, path, res;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
               pid = _ref12.pid, _ref12$path = _ref12.path, path = _ref12$path === void 0 ? "" : _ref12$path;
               if (path && !/^\//.test(path)) path = "/" + path;
-              _context23.next = 4;
+              if (!(this.format === "ans104")) {
+                _context23.next = 9;
+                break;
+              }
+              _context23.next = 5;
+              return this.get({
+                path: "/".concat(pid, "/now").concat(path)
+              });
+            case 5:
+              res = _context23.sent;
+              return _context23.abrupt("return", res.out);
+            case 9:
+              _context23.next = 11;
               return this.getJSON({
                 path: "/".concat(pid, "/now").concat(path)
               });
-            case 4:
+            case 11:
               return _context23.abrupt("return", _context23.sent);
-            case 5:
+            case 12:
             case "end":
               return _context23.stop();
           }
@@ -999,10 +1026,10 @@ var HB = /*#__PURE__*/function () {
                 tags: (0, _ramda.mergeLeft)(tags, {
                   "codec-device": "ans104@1.0",
                   "random-seed": (0, _utils.seed)(16),
-                  type: "Process",
+                  Type: "Process",
                   "execution-device": "test-device@1.0",
                   device: "process@1.0",
-                  scheduler: this.operator
+                  Scheduler: this.operator
                 })
               });
             case 7:
@@ -1014,10 +1041,10 @@ var HB = /*#__PURE__*/function () {
               _context27.next = 13;
               return this.commit((0, _ramda.mergeLeft)(tags, {
                 "random-seed": (0, _utils.seed)(16),
-                type: "Process",
+                Type: "Process",
                 "execution-device": "test-device@1.0",
                 device: "process@1.0",
-                scheduler: this.operator
+                Scheduler: this.operator
               }), {
                 path: false
               });
@@ -1027,7 +1054,7 @@ var HB = /*#__PURE__*/function () {
               _context27.t3 = {
                 path: "/~process@1.0/schedule",
                 body: _context27.t1,
-                scheduler: _context27.t2
+                Scheduler: _context27.t2
               };
               _context27.next = 18;
               return _context27.t0.post.call(_context27.t0, _context27.t3);
@@ -1160,7 +1187,7 @@ var HB = /*#__PURE__*/function () {
                 path: "/~relay@1.0/call",
                 method: "GET",
                 "relay-path": "".concat(this.cu, "/results/").concat(process).concat(params),
-                "content-type": "application/json"
+                "Content-Type": "application/json"
               });
             case 9:
               res = _context30.sent;
@@ -1204,7 +1231,7 @@ var HB = /*#__PURE__*/function () {
                 path: "/~relay@1.0/call",
                 method: "POST",
                 "relay-path": "".concat(this.cu, "/dry-run?process-id=").concat(pid),
-                "content-type": "application/json",
+                "Content-Type": "application/json",
                 "relay-body": JSON.stringify(json)
               });
             case 6:

package/esm/hb.js

@@ -24,7 +24,9 @@ class HB {
     url = "http://localhost:10001",
     cu = "http://localhost:6363",
     jwk,
+    format = "httpsig",
   } = {}) {
+    this.format = format
     this.cu = cu
     this.url = url
     if (jwk) this._init(jwk)
@@ -104,7 +106,12 @@ class HB {
 
   async compute({ pid, slot, path = "" }) {
     if (path && !/^\//.test(path)) path = "/" + path
-    return await this.getJSON({ path: `/${pid}/compute${path}`, slot })
+    if (this.format === "ans104") {
+      const res = await this.get({ path: `/${pid}/compute${path}`, slot })
+      return res.out
+    } else {
+      return await this.getJSON({ path: `/${pid}/compute${path}`, slot })
+    }
   }
 
   async computeLegacy({ pid, slot }) {
@@ -120,7 +127,7 @@ class HB {
     const { slot } = await this.scheduleFlat({
       data,
       pid: this.cache,
-      tags: { "content-type": type },
+      tags: { "Content-Type": type },
     })
     const msgs = await this.messages({ pid: this.cache, from: slot, limit: 1 })
     return msgs.edges[0].node.message.Id
@@ -139,7 +146,7 @@ class HB {
   }
 
   async scheduleFlat({ pid, tags = {}, data } = {}) {
-    let _tags = mergeLeft(tags, { type: "Message", target: pid })
+    let _tags = mergeLeft(tags, { Type: "Message", target: pid })
     if (data) _tags.data = data
     let res = await this.post({ path: "/~process@1.0/schedule", body: _tags })
     return { slot: res.out.slot, res, pid }
@@ -156,7 +163,6 @@ class HB {
   async post104({ path = "/~process@1.0/schedule", tags = {}, data = "1984" }) {
     const _tags = buildTags(mergeLeft(tags, { signingFormat: "ANS-104" }))
     const signer = new ArweaveSigner(this.jwk)
-    console.log(_tags)
     const di = createData(data, signer, { tags: _tags })
     await di.sign(signer)
     let res = await fetch(`${this.url}${path}`, {
@@ -175,14 +181,14 @@ class HB {
   async schedule({ pid, tags = {}, data } = {}) {
     let res = null
     if (this.format === "ans104") {
-      let _tags = mergeLeft(tags, { type: "Message" })
+      let _tags = mergeLeft(tags, { Type: "Message" })
       res = await this.post104({
         path: `/${pid}/schedule`,
         tags: _tags,
         data: data ?? "1984",
       })
     } else {
-      let _tags = mergeLeft(tags, { type: "Message", target: pid })
+      let _tags = mergeLeft(tags, { Type: "Message", target: pid })
       if (data) _tags.data = data
       let body = await this.commit(_tags, { path: false })
       let signed = await this.sign({ path: `/${pid}/schedule`, body })
@@ -212,7 +218,12 @@ class HB {
 
   async now({ pid, path = "" }) {
     if (path && !/^\//.test(path)) path = "/" + path
-    return await this.getJSON({ path: `/${pid}/now${path}` })
+    if (this.format === "ans104") {
+      const res = await this.get({ path: `/${pid}/now${path}` })
+      return res.out
+    } else {
+      return await this.getJSON({ path: `/${pid}/now${path}` })
+    }
   }
 
   async slot({ pid, path = "" }) {
@@ -244,10 +255,10 @@ class HB {
         tags: mergeLeft(tags, {
           "codec-device": "ans104@1.0",
           "random-seed": seed(16),
-          type: "Process",
+          Type: "Process",
           "execution-device": "test-device@1.0",
           device: "process@1.0",
-          scheduler: this.operator,
+          Scheduler: this.operator,
         }),
       })
     } else {
@@ -256,14 +267,14 @@ class HB {
         body: await this.commit(
           mergeLeft(tags, {
             "random-seed": seed(16),
-            type: "Process",
+            Type: "Process",
             "execution-device": "test-device@1.0",
             device: "process@1.0",
-            scheduler: this.operator,
+            Scheduler: this.operator,
           }),
           { path: false }
         ),
-        scheduler: this.operator,
+        Scheduler: this.operator,
       })
     }
     return { res, pid: res.out.process }
@@ -304,7 +315,7 @@ class HB {
       path: "/~relay@1.0/call",
       method: "GET",
       "relay-path": `${this.cu}/results/${process}${params}`,
-      "content-type": "application/json",
+      "Content-Type": "application/json",
     })
     return JSON.parse(res.body)
   }
@@ -317,7 +328,7 @@ class HB {
       path: "/~relay@1.0/call",
       method: "POST",
       "relay-path": `${this.cu}/dry-run?process-id=${pid}`,
-      "content-type": "application/json",
+      "Content-Type": "application/json",
       "relay-body": JSON.stringify(json),
     })
     return JSON.parse(res.body)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.36.0",
+  "version": "0.36.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"