@blocklet/sdk 1.8.32 → 1.8.34

package/lib/wallet-handler.js

@@ -1,97 +1,130 @@
-const get = require('lodash/get');
-const { WalletHandlers: Handler } = require('@arcblock/did-auth');
-const Notification = require('./service/notification');
-
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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 };
+};
+const get_1 = __importDefault(require("lodash/get"));
+const did_auth_1 = require("@arcblock/did-auth");
+const notification_1 = __importStar(require("./service/notification"));
 const noop = () => ({});
-
 const CONNECTED_DID_KEY = 'headers[x-connected-did]';
-
 // whether app web page is in mobile DID wallet
 const inMobileWallet = (didwallet) => {
-  return didwallet && ['ios', 'android'].includes(didwallet.os);
+    return didwallet && ['ios', 'android'].includes(didwallet.os);
 };
-
-class WalletHandlers extends Handler {
-  /**
-   * @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
-   */
-  constructor({ autoConnect = true, connectedDidOnly = false, sendNotificationFn, options = {}, ...opts }) {
-    if (autoConnect && connectedDidOnly) {
-      options.sessionDidKey = CONNECTED_DID_KEY;
-    }
-
-    super({ options, ...opts });
-
-    this.enableConnect = !!autoConnect;
-    this.sendNotificationFn = sendNotificationFn || Notification.sendToUser.bind(Notification);
-  }
-
-  getConnectedDid = ({ req, didwallet, extraParams }) => {
-    if (extraParams && extraParams.autoConnect === 'false') {
-      return null;
-    }
-
-    if (!this.enableConnect) {
-      return null;
-    }
-
-    if (inMobileWallet(didwallet)) {
-      return null;
-    }
-
-    return get(req, CONNECTED_DID_KEY);
-  };
-
-  attach({ onStart = noop, ...opts }) {
-    const _onStart = async (params) => {
-      const extra = (await onStart(params)) || {};
-
-      const connectedDid = this.getConnectedDid(params);
-
-      // fill extra
-      extra.connectedDid = connectedDid || '';
-      extra.saveConnect = this.enableConnect;
-
-      // send notification to wallet to trigger wallet to auto connect
-      if (connectedDid) {
-        // wallet use check url to check status of the session
-        let checkUrl = '';
-        try {
-          checkUrl = new URL(decodeURIComponent(new URL(params.deepLink).searchParams.get('url')));
-          checkUrl.pathname = checkUrl.pathname.replace(/auth$/, 'status');
-        } catch (e) {
-          checkUrl = '';
-          console.error(e);
-        }
-
-        const message = {
-          type: 'connect',
-          url: params.deepLink,
+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
+     */
+    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));
+        this.getConnectedDid = ({ req, didwallet, extraParams }) => {
+            if (extraParams && extraParams.autoConnect === 'false') {
+                return null;
+            }
+            if (!this.enableConnect) {
+                return null;
+            }
+            if (inMobileWallet(didwallet)) {
+                return null;
+            }
+            return (0, get_1.default)(req, CONNECTED_DID_KEY);
         };
-
-        if (checkUrl) {
-          message.checkUrl = checkUrl.href;
-        }
-
-        // sendNotificationFn maybe custom function so we need params
-        this.sendNotificationFn(connectedDid, message, params).catch((err) => {
-          console.error(err);
-          if (typeof opts.onError === 'function') {
-            opts.onError(err);
-          }
+        this.enableConnect = !!autoConnect;
+        this.sendNotificationFn = sendNotificationFn || notification_1.sendToUser.bind(notification_1.default);
+    }
+    attach(_a) {
+        var { onStart = noop } = _a, opts = __rest(_a, ["onStart"]);
+        const realOnStart = (params) => __awaiter(this, void 0, void 0, function* () {
+            // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
+            const extra = (yield onStart(params)) || {};
+            const connectedDid = this.getConnectedDid(params);
+            // fill extra
+            extra.connectedDid = connectedDid || '';
+            extra.saveConnect = this.enableConnect;
+            // send notification to wallet to trigger wallet to auto connect
+            if (connectedDid) {
+                // wallet use check url to check status of the session
+                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');
+                }
+                catch (e) {
+                    checkUrl = '';
+                    console.error(e);
+                }
+                const message = {
+                    type: 'connect',
+                    url: params.deepLink,
+                };
+                if (checkUrl) {
+                    message.checkUrl = checkUrl.href;
+                }
+                // sendNotificationFn maybe custom function so we need params
+                this.sendNotificationFn(connectedDid, message, params).catch((err) => {
+                    console.error(err);
+                    if (typeof opts.onError === 'function') {
+                        opts.onError(err);
+                    }
+                });
+            }
+            return extra;
         });
-      }
-
-      return extra;
-    };
-
-    super.attach({
-      onStart: _onStart,
-      ...opts,
-    });
-  }
+        // @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));
+    }
 }
-
 module.exports = WalletHandlers;

package/lib/wallet.d.ts

@@ -0,0 +1,3 @@
+import { WalletObject } from '@ocap/wallet';
+declare const getWallet: () => WalletObject;
+export = getWallet;

package/lib/wallet.js

@@ -1,11 +1,10 @@
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
-const { types } = require('@ocap/mcrypto');
-
-module.exports = () => {
-  const type =
-    process.env.BLOCKLET_WALLET_TYPE !== 'eth'
-      ? WalletType({ role: types.RoleType.ROLE_APPLICATION, pk: types.KeyType.ED25519, hash: types.HashType.SHA3 })
-      : 'eth';
-
-  return fromSecretKey(process.env.BLOCKLET_APP_SK, type);
+"use strict";
+const wallet_1 = require("@ocap/wallet");
+const mcrypto_1 = require("@ocap/mcrypto");
+const getWallet = () => {
+    const type = process.env.BLOCKLET_WALLET_TYPE !== 'eth'
+        ? (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 })
+        : 'eth';
+    return (0, wallet_1.fromSecretKey)(process.env.BLOCKLET_APP_SK, type);
 };
+module.exports = getWallet;

package/package.json

@@ -3,34 +3,41 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.32",
+  "version": "1.8.34",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
   "files": [
     "lib",
     "service"
   ],
   "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
-    "coverage": "npm run test -- --coverage"
+    "verify": "npm run lint:fix && npm run test && npm run build",
+    "lint": "eslint src tests service",
+    "lint:fix": "npm run lint -- --fix",
+    "test": "jest --forceExit --detectOpenHandles",
+    "coverage": "npm run test -- --coverage",
+    "clean": "rm -fr lib",
+    "prebuild": "npm run clean && npm run types",
+    "types": "rm -rf ./src/types && node tools/version.js && ts-node tools/types.js && rm -f ./src/types/index.ts && prettier --write ./src/types/notification.ts",
+    "build": "tsc",
+    "build:watch": "npm run build -- -w"
   },
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.32",
-    "@abtnode/constant": "1.8.32",
-    "@arcblock/did-auth": "1.18.1",
-    "@arcblock/jwt": "1.18.1",
-    "@arcblock/ws": "1.18.1",
-    "@blocklet/constant": "1.8.32",
-    "@blocklet/meta": "1.8.32",
-    "@did-connect/authenticator": "^2.1.24",
-    "@did-connect/handler": "^2.1.24",
+    "@abtnode/client": "1.8.34",
+    "@abtnode/constant": "1.8.34",
+    "@arcblock/did-auth": "1.18.13",
+    "@arcblock/jwt": "1.18.13",
+    "@arcblock/ws": "1.18.13",
+    "@blocklet/constant": "1.8.34",
+    "@blocklet/meta": "1.8.34",
+    "@did-connect/authenticator": "^2.1.26",
+    "@did-connect/handler": "^2.1.26",
     "@nedb/core": "^2.0.5",
-    "@ocap/mcrypto": "1.18.1",
-    "@ocap/wallet": "1.18.1",
+    "@ocap/mcrypto": "1.18.13",
+    "@ocap/wallet": "1.18.13",
     "axios": "^0.27.2",
     "fs-extra": "^10.1.0",
     "joi": "17.6.3",
@@ -43,8 +50,23 @@
     "@nedb/core": "^2.0.5"
   },
   "devDependencies": {
+    "@arcblock/eslint-config-ts": "^0.2.3",
+    "@types/express": "^4.17.14",
+    "@types/jest": "^29.2.0",
+    "@types/json-stable-stringify": "^1.0.34",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^18.11.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
     "detect-port": "^1.5.1",
-    "jest": "^27.5.1"
+    "eslint": "^8.25.0",
+    "jest": "^29.2.0",
+    "joi-to-typescript": "^4.0.6",
+    "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": "8502244aeda5926b3433c1dd9142e63233e3c23c"
+  "gitHead": "c5fbb8e57493db62f212217cfde1980c82f00297"
 }