wao 0.35.2 → 0.35.4

package/cjs/hb.js

@@ -79,18 +79,12 @@ var HB = /*#__PURE__*/function () {
       }
       return signEncoded;
     }()
-  }, {
-    key: "isArConnect",
-    value: function isArConnect() {
-      var _this$jwk, _this$jwk2;
-      return ((_this$jwk = this.jwk) === null || _this$jwk === void 0 ? void 0 : _this$jwk.id) || ((_this$jwk2 = this.jwk) === null || _this$jwk2 === void 0 ? void 0 : _this$jwk2.walletName) === "ArConnect";
-    }
   }, {
     key: "_init",
     value: function _init(jwk) {
       this.jwk = jwk;
       this.signer = (0, _aoconnect.createSigner)(jwk, this.url);
-      if (!this.isArConnect()) this.addr = (0, _utils.toAddr)(jwk.n);
+      this.addr = (0, _utils.toAddr)(jwk.n);
       this.sign = (0, _hbsig.signer)({
         signer: this.signer,
         url: this.url
@@ -103,26 +97,26 @@ var HB = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (this._info) {
+              if (this.operator) {
                 _context2.next = 10;
                 break;
               }
               _context2.prev = 1;
               _context2.next = 4;
-              return this.g("/~meta@1.0/info");
+              return this.g("/~meta@1.0/info/address");
             case 4:
-              this._info = _context2.sent;
-              this.operator = this._info.address;
+              this.operator = _context2.sent;
               _context2.next = 10;
               break;
-            case 8:
-              _context2.prev = 8;
+            case 7:
+              _context2.prev = 7;
               _context2.t0 = _context2["catch"](1);
+              console.log(_context2.t0);
             case 10:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[1, 8]]);
+        }, _callee2, this, [[1, 7]]);
       }));
       function setInfo() {
         return _setInfo.apply(this, arguments);
@@ -942,7 +936,7 @@ var HB = /*#__PURE__*/function () {
               t = (0, _ramda.mergeLeft)(tags, {
                 "data-protocol": "ao",
                 variant: "ao.TN.1",
-                authority: this._info.address,
+                authority: this.operator,
                 module: module !== null && module !== void 0 ? module : "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
                 device: "process@1.0",
                 "execution-device": "stack@1.0",
@@ -1065,16 +1059,13 @@ var HB = /*#__PURE__*/function () {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               _ref17 = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {}, _ref17$tags = _ref17.tags, tags = _ref17$tags === void 0 ? {} : _ref17$tags, pid = _ref17.pid, action = _ref17.action, data = _ref17.data;
-              _context29.next = 3;
-              return this.setInfo();
-            case 3:
               if (typeof action === "string") tags.Action = action;
               json = {
                 Tags: (0, _utils.buildTags)(_objectSpread({}, tags)),
-                Owner: this.operator
+                Owner: this.addr
               };
               if (data) json.Data = data;
-              _context29.next = 8;
+              _context29.next = 6;
               return this.post({
                 path: "/~relay@1.0/call",
                 method: "POST",
@@ -1082,10 +1073,10 @@ var HB = /*#__PURE__*/function () {
                 "content-type": "application/json",
                 "relay-body": JSON.stringify(json)
               });
-            case 8:
+            case 6:
               res = _context29.sent;
               return _context29.abrupt("return", JSON.parse(res.body));
-            case 10:
+            case 8:
             case "end":
               return _context29.stop();
           }
@@ -1325,18 +1316,20 @@ var HB = /*#__PURE__*/function () {
                   i++;
                 }
               }
-              _context34.next = 9;
+              console.log("".concat(this.url).concat(path).concat(_json).concat(_params));
+              _context34.next = 10;
               return fetch("".concat(this.url).concat(path).concat(_json).concat(_params));
-            case 9:
+            case 10:
               response = _context34.sent;
+              console.log(response);
               headers = {};
               response.headers.forEach(function (v, k) {
                 return headers[k] = v;
               });
               _context34.t0 = headers;
-              _context34.next = 15;
+              _context34.next = 17;
               return response.text();
-            case 15:
+            case 17:
               _context34.t1 = _context34.sent;
               _context34.t2 = response.status;
               http = {
@@ -1345,7 +1338,7 @@ var HB = /*#__PURE__*/function () {
                 status: _context34.t2
               };
               return _context34.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsigUtils.from)(http)), http));
-            case 19:
+            case 21:
             case "end":
               return _context34.stop();
           }

package/cjs/workspace/package.json

@@ -10,6 +10,6 @@
   },
   "dependencies": {
     "hbsig": "^0.1.3",
-    "wao": "^0.35.1"
+    "wao": "^0.35.4"
   }
 }

package/esm/hb.js

@@ -25,22 +25,21 @@ class HB {
       url: this.url,
     })
   }
-  isArConnect() {
-    return this.jwk?.id || this.jwk?.walletName === "ArConnect"
-  }
+
   _init(jwk) {
     this.jwk = jwk
     this.signer = createSigner(jwk, this.url)
-    if (!this.isArConnect()) this.addr = toAddr(jwk.n)
+    this.addr = toAddr(jwk.n)
     this.sign = signer({ signer: this.signer, url: this.url })
   }
 
   async setInfo() {
-    if (!this._info) {
+    if (!this.operator) {
       try {
-        this._info = await this.g("/~meta@1.0/info")
-        this.operator = this._info.address
-      } catch (e) {}
+        this.operator = await this.g("/~meta@1.0/info/address")
+      } catch (e) {
+        console.log(e)
+      }
     }
   }
 
@@ -214,7 +213,7 @@ class HB {
     let t = mergeLeft(tags, {
       "data-protocol": "ao",
       variant: "ao.TN.1",
-      authority: this._info.address,
+      authority: this.operator,
       module: module ?? "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
       device: "process@1.0",
       "execution-device": "stack@1.0",
@@ -250,9 +249,8 @@ class HB {
   }
 
   async dryrun({ tags = {}, pid, action, data } = {}) {
-    await this.setInfo()
     if (typeof action === "string") tags.Action = action
-    let json = { Tags: buildTags({ ...tags }), Owner: this.operator }
+    let json = { Tags: buildTags({ ...tags }), Owner: this.addr }
     if (data) json.Data = data
     const res = await this.post({
       path: "/~relay@1.0/call",
@@ -301,7 +299,9 @@ class HB {
         i++
       }
     }
+    console.log(`${this.url}${path}${_json}${_params}`)
     const response = await fetch(`${this.url}${path}${_json}${_params}`)
+    console.log(response)
     let headers = {}
     response.headers.forEach((v, k) => (headers[k] = v))
     const http = {

package/esm/workspace/package.json

@@ -10,6 +10,6 @@
   },
   "dependencies": {
     "hbsig": "^0.1.3",
-    "wao": "^0.35.1"
+    "wao": "^0.35.4"
   }
 }

package/package.json

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