@blocklet/sdk 1.8.68 → 1.8.69-beta-54faead3

package/lib/wallet-handler.js

@@ -22,26 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -56,19 +36,21 @@ const inMobileWallet = (didwallet) => {
 };
 class WalletHandlers extends did_auth_1.WalletHandlers {
     /**
-     * @param {boolean} autoConnect enable auto connect to wallet (wallet does not need to scan qr code)
-     * @param {boolean} connectedDidOnly only current login did or connected did can connect
-     * @param {function} sendNotificationFn use in a non-blocklet environment
+     * @param {boolean} params.autoConnect enable auto connect to wallet (wallet does not need to scan qr code)
+     * @param {boolean} params.connectedDidOnly only current login did or connected did can connect
+     * @param {function} [params.sendNotificationFn] use in a non-blocklet environment
+     * @param {function} [params.sendToRelayFn]
      */
-    constructor(_a) {
-        var { autoConnect = true, connectedDidOnly = false, sendNotificationFn, options = {} } = _a, opts = __rest(_a, ["autoConnect", "connectedDidOnly", "sendNotificationFn", "options"]);
-        // FIXME: wait check
-        // if (autoConnect && connectedDidOnly) {
-        //  options.sessionDidKey = CONNECTED_DID_KEY;
-        // }
-        super(Object.assign({ options: Object.assign(Object.assign({}, options), {
-                sessionDidKey: autoConnect && connectedDidOnly ? CONNECTED_DID_KEY : options === null || options === void 0 ? void 0 : options.sessionDidKey,
-            }) }, opts));
+    constructor({ autoConnect = true, connectedDidOnly = false, sendNotificationFn = null, sendToRelayFn = null, options = {}, ...opts }) {
+        super({
+            options: {
+                ...options,
+                ...{
+                    sessionDidKey: autoConnect && connectedDidOnly ? CONNECTED_DID_KEY : options?.sessionDidKey,
+                },
+            },
+            ...opts,
+        });
         this.getConnectedDid = ({ req, didwallet, extraParams }) => {
             if (extraParams && extraParams.autoConnect === 'false') {
                 return null;
@@ -83,12 +65,16 @@ class WalletHandlers extends did_auth_1.WalletHandlers {
         };
         this.enableConnect = !!autoConnect;
         this.sendNotificationFn = sendNotificationFn || notification_1.sendToUser.bind(notification_1.default);
+        this.sendToRelayFn = sendToRelayFn || notification_1.sendToRelay.bind(notification_1.default);
+        // @ts-ignore
+        this.on('updated', (session) => {
+            this.sendToRelayFn(session.token, 'updated', session).catch(console.error);
+        });
     }
-    attach(_a) {
-        var { onStart = noop } = _a, opts = __rest(_a, ["onStart"]);
-        const realOnStart = (params) => __awaiter(this, void 0, void 0, function* () {
+    attach({ onStart = noop, ...opts }) {
+        const realOnStart = async (params) => {
             // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
-            const extra = (yield onStart(params)) || {};
+            const extra = (await onStart(params)) || {};
             const connectedDid = this.getConnectedDid(params);
             // fill extra
             extra.connectedDid = connectedDid || '';
@@ -96,9 +82,8 @@ class WalletHandlers extends did_auth_1.WalletHandlers {
             // send notification to wallet to trigger wallet to auto connect
             if (connectedDid) {
                 // wallet use check url to check status of the session
-                let checkUrl = '';
+                let checkUrl;
                 try {
-                    // @ts-expect-error TS(2322) FIXME: Type 'URL' is not assignable to type 'string'.
                     checkUrl = new URL(decodeURIComponent(new URL(params.deepLink).searchParams.get('url')));
                     checkUrl.pathname = checkUrl.pathname.replace(/auth$/, 'status');
                 }
@@ -122,9 +107,12 @@ class WalletHandlers extends did_auth_1.WalletHandlers {
                 });
             }
             return extra;
-        });
+        };
         // @ts-expect-error TS(2345) FIXME: Argument of type '{ onStart: (params: any) => Prom... Remove this comment to see the full error message
-        super.attach(Object.assign({ onStart: realOnStart }, opts));
+        super.attach({
+            onStart: realOnStart,
+            ...opts,
+        });
     }
 }
 module.exports = WalletHandlers;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.68",
+  "version": "1.8.69-beta-54faead3",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,24 +26,26 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.68",
-    "@abtnode/constant": "1.8.68",
-    "@arcblock/did-auth": "1.18.42",
-    "@arcblock/jwt": "1.18.42",
-    "@arcblock/ws": "1.18.42",
-    "@blocklet/constant": "1.8.68",
-    "@blocklet/meta": "1.8.68",
-    "@did-connect/authenticator": "^2.1.34",
-    "@did-connect/handler": "^2.1.34",
+    "@abtnode/client": "1.8.69-beta-54faead3",
+    "@abtnode/constant": "1.8.69-beta-54faead3",
+    "@arcblock/did-auth": "1.18.57",
+    "@arcblock/jwt": "1.18.57",
+    "@arcblock/ws": "1.18.57",
+    "@blocklet/constant": "1.8.69-beta-54faead3",
+    "@blocklet/meta": "1.8.69-beta-54faead3",
+    "@did-connect/authenticator": "^2.1.41",
+    "@did-connect/handler": "^2.1.41",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.42",
-    "@ocap/wallet": "1.18.42",
+    "@ocap/mcrypto": "1.18.57",
+    "@ocap/wallet": "1.18.57",
     "axios": "^0.27.2",
+    "cheerio": "^1.0.0-rc.12",
     "fs-extra": "^10.1.0",
     "joi": "17.7.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
+    "ufo": "^1.1.1",
     "url-join": "^4.0.1"
   },
   "resolutions": {
@@ -61,12 +63,12 @@
     "detect-port": "^1.5.1",
     "eslint": "^8.25.0",
     "jest": "^29.2.0",
-    "joi-to-typescript": "^4.0.6",
+    "joi-to-typescript": "^4.0.7",
     "json-stable-stringify": "^1.0.1",
     "prettier": "^2.7.1",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "1392044ac5677bde567797adeb9a6d3f0b9264b8"
+  "gitHead": "3dec0c85a77de5ba2d37c19ac769b126bfaafc86"
 }