wao 0.40.1 → 0.41.0

package/cjs/ao.js

@@ -119,7 +119,9 @@ var AO = /*#__PURE__*/function () {
       var _hbOpt = {
         format: this.format
       };
-      if (typeof _hb === "string" && _hb !== "ans104") _hbOpt.url = _hb;
+      // `hb` can be "ans104" / "httpsig" (format selector with default URL),
+      // or an actual URL string. Only treat it as a URL when it looks like one.
+      if (typeof _hb === "string" && _hb !== "ans104" && _hb !== "httpsig" && /^(https?:\/\/|\/\/|[a-zA-Z0-9_.-]+:\d+)/.test(_hb)) _hbOpt.url = _hb;
       this.hb = new _hb2["default"](_hbOpt);
       this.mode = mode !== null && mode !== void 0 ? mode : "legacy";
     }
@@ -1220,7 +1222,7 @@ var AO = /*#__PURE__*/function () {
     key: "msg",
     value: function () {
       var _msg = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(_ref13) {
-        var pid, jwk, data, _ref13$act, act, _ref13$tags, tags, _ref13$check, check, get, _ref13$timeout, timeout, _ref13$mode, mode, _ref13$limit, limit, err, _yield$this$ar$checkW2, mid, res, schedArgs, _yield$this$hb$pushAO2, pushSlot, pushOutbox, _res5, callerAddr, hasCallerReply, raw, parsed, out, _tags3, _mid, _t24, _t25, _t26, _t27, _t28, _t29, _t30, _t31;
+        var pid, jwk, data, _ref13$act, act, _ref13$tags, tags, _ref13$check, check, get, _ref13$timeout, timeout, _ref13$mode, mode, _ref13$limit, limit, err, _yield$this$ar$checkW2, mid, res, schedArgs, _yield$this$hb$pushAO2, pushSlot, pushOutbox, _res5, _pushTimeoutMs, callerAddr, hasCallerReply, raw, parsed, out, _tags3, _mid, _t24, _t25, _t26, _t27, _t28, _t29, _t30, _t31;
         return _regenerator().w(function (_context10) {
           while (1) switch (_context10.p = _context10.n) {
             case 0:
@@ -1342,12 +1344,22 @@ var AO = /*#__PURE__*/function () {
               });
             case 26:
               res = _context10.v;
+              // v0.9-FINAL's push device can enter long-running recursive loops
+              // for cross-process Send().receive() coroutines. Race the push
+              // call against a 20s timeout so msg() can return rather than
+              // wait forever; the now/results probe below still has a chance
+              // to pick up a partial reply.
+              _pushTimeoutMs = 20000;
               _context10.p = 27;
               _context10.n = 28;
-              return this.hb.get({
+              return Promise.race([this.hb.get({
                 path: "/".concat(pid, "/push"),
                 slot: mid
-              });
+              }), new Promise(function (_r, rej) {
+                return setTimeout(function () {
+                  return rej(new Error("push timeout"));
+                }, _pushTimeoutMs);
+              })]);
             case 28:
               _context10.n = 30;
               break;
@@ -1609,11 +1621,11 @@ var AO = /*#__PURE__*/function () {
     value: function () {
       var _ress2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(_ref16) {
         var _this4 = this;
-        var pid, limit, asc, cursor, err, msgs, next, res, sort, _t34;
+        var pid, limit, asc, from, err, msgs, next, res, sort, _t34;
         return _regenerator().w(function (_context14) {
           while (1) switch (_context14.p = _context14.n) {
             case 0:
-              pid = _ref16.pid, limit = _ref16.limit, asc = _ref16.asc, cursor = _ref16.cursor;
+              pid = _ref16.pid, limit = _ref16.limit, asc = _ref16.asc, from = _ref16.from;
               err = null;
               msgs = null;
               next = null;
@@ -1629,7 +1641,7 @@ var AO = /*#__PURE__*/function () {
                 process: pid,
                 limit: limit,
                 sort: sort,
-                from: cursor
+                from: from
               });
             case 2:
               res = _context14.v;
@@ -1641,7 +1653,7 @@ var AO = /*#__PURE__*/function () {
                 process: pid,
                 limit: limit,
                 sort: sort,
-                from: cursor
+                from: from
               });
             case 4:
               res = _context14.v;
@@ -2566,7 +2578,7 @@ var Process = /*#__PURE__*/function () {
   }, {
     key: "r",
     value: function () {
-      var _r = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31() {
+      var _r2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31() {
         var _len3,
           opt,
           _key3,
@@ -2582,7 +2594,7 @@ var Process = /*#__PURE__*/function () {
         }, _callee31, this);
       }));
       function r() {
-        return _r.apply(this, arguments);
+        return _r2.apply(this, arguments);
       }
       return r;
     }()