@blocklet/sdk 1.16.7 → 1.16.8-beta-ca58a421

package/lib/component/index.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParentWebEndpoint = exports.getChildWebEndpoint = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.call = void 0;
 const util_1 = require("@blocklet/meta/lib/util");
 const axios_1 = __importDefault(require("axios"));
-const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const get_1 = __importDefault(require("lodash/get"));
 const url_join_1 = __importDefault(require("url-join"));
 const config_1 = require("../config");
-const wallet_1 = __importDefault(require("../wallet"));
+const verify_sign_1 = require("../util/verify-sign");
 const parseMountPoints = () => {
     const mountPoints = JSON.parse(process.env.BLOCKLET_MOUNT_POINTS) || [];
     mountPoints.forEach((x) => {
@@ -20,18 +19,15 @@ const parseMountPoints = () => {
     });
     return mountPoints;
 };
-const sign = (data) => {
-    const wallet = (0, wallet_1.default)();
-    const signData = typeof data === 'undefined' ? {} : data;
-    return { 'x-component-sig': wallet.sign((0, json_stable_stringify_1.default)(signData)) };
-};
 const doCall = async ({ url, ...options }) => {
     try {
         const resp = await (0, axios_1.default)({
             url,
             ...options,
-            headers: { ...sign(options.data ?? {}) },
-            timeout: 60000,
+            headers: {
+                'x-component-sig': (0, verify_sign_1.sign)(options.data),
+            },
+            timeout: 60 * 1000,
         });
         config_1.logger.info(`call ${url} api success`);
         return resp;

package/lib/middlewares/component.js

@@ -1,21 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySig = void 0;
-const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
-const wallet_1 = __importDefault(require("../wallet"));
 const config_1 = require("../config");
+const verify_sign_1 = require("../util/verify-sign");
 const verifySig = (req, res, next) => {
     try {
-        const wallet = (0, wallet_1.default)();
         const sig = req.get('x-component-sig');
         if (!sig) {
             return res.status(400).json({ error: 'Bad Request' });
         }
         const data = typeof req.body === 'undefined' ? {} : req.body;
-        const verified = wallet.verify((0, json_stable_stringify_1.default)(data), sig);
+        const verified = (0, verify_sign_1.verify)(data, sig);
         if (!verified) {
             return res.status(401).json({ error: 'verify sig failed' });
         }

package/lib/service/auth.d.ts

@@ -7,6 +7,7 @@ declare class AuthService {
     constructor(httpEndpoint?: string);
 }
 interface AuthService {
+    login: (params: object) => Promise<string>;
     getUser(did: string, options?: {
         enableConnectedAccount?: boolean;
         enableNormalize?: boolean;

package/lib/service/auth.js

@@ -13,6 +13,7 @@ const constant_1 = __importDefault(require("@abtnode/constant"));
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const version_1 = require("../version");
 const wallet_2 = __importDefault(require("../wallet"));
+const service_api_1 = __importDefault(require("../util/service-api"));
 const { NODE_SERVICES, WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
@@ -57,6 +58,7 @@ class AuthService {
         const client = new AuthClient(httpEndpoint);
         const apiList = [
             // user
+            'login',
             'getUsers',
             'getUser',
             'getOwner',
@@ -126,6 +128,16 @@ class AuthService {
             const fn = client[api];
             this[api] = apiFnMap[api] ? apiFnMap[api](fn) : apiFallback(fn);
         });
+        this.login = async (data) => {
+            try {
+                const { data: resData } = await service_api_1.default.post('/user/login', data);
+                return resData;
+            }
+            catch (err) {
+                console.error(err.response ? err.response.data : err);
+                throw new Error(err.response ? err.response.data : err.message);
+            }
+        };
         // eslint-disable-next-line no-constructor-return
         return new Proxy(this, {
             get(target, propKey) {

package/lib/util/service-api.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 用于在 SDK 中像 blocklet-service 发起 http 请求
+ * 该封装中，会在请求的 header 中增加签名信息，确保安全性（签名信息的验证由 blocklet-service 的接口去做验证）
+ */
+declare const axios: import("axios").AxiosInstance;
+export default axios;

package/lib/util/service-api.js

@@ -0,0 +1,36 @@
+"use strict";
+/**
+ * 用于在 SDK 中像 blocklet-service 发起 http 请求
+ * 该封装中，会在请求的 header 中增加签名信息，确保安全性（签名信息的验证由 blocklet-service 的接口去做验证）
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const version_1 = require("../version");
+const constants_1 = require("./constants");
+const verify_sign_1 = require("./verify-sign");
+const axios = axios_1.default.create({
+    // 为当前机器的内部调用，必须禁止 proxy 配置
+    proxy: false,
+    baseURL: `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}`,
+    // 内部调用，超时时间不用过长
+    timeout: 6 * 1000,
+    headers: {
+        'User-Agent': `BlockletSDK/${version_1.version}`,
+        // TODO: @zhanghan 有上述 user-agent 应该就够了，应该不需要 x-blocklet-api-version 来指定版本号
+        'x-blocklet-api-version': version_1.version,
+        // NOTICE: 需要注入以下两个 header，才能使 blocklet-service 中的代码识别到当前的 blocklet 环境
+        'x-blocklet-did': process.env.BLOCKLET_DID,
+        'x-blocklet-component-id': process.env.BLOCKLET_REAL_DID,
+    },
+});
+axios.interceptors.request.use((config) => {
+    // 同时对 post 和 get 参数做签名，确保同时支持 post get 请求的校验
+    const { data = {}, params = {} } = config;
+    // 签名使用的是当前 blocklet 的 appSk，固命名为 x-blocklet-sig，以后可做统一使用
+    config.headers['x-blocklet-sig'] = (0, verify_sign_1.sign)({ data, params });
+    return config;
+});
+exports.default = axios;

package/lib/util/verify-sign.d.ts

@@ -0,0 +1,10 @@
+import { DIDTypeShortcut } from '@arcblock/did';
+declare const verify: (data: object, sig: string, { type, appSk }?: {
+    type?: DIDTypeShortcut;
+    appSk?: string;
+}) => boolean;
+declare const sign: (data: object, { type, appSk }?: {
+    type?: DIDTypeShortcut;
+    appSk?: string;
+}) => string;
+export { verify, sign };

package/lib/util/verify-sign.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sign = exports.verify = void 0;
+const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
+const wallet_1 = __importDefault(require("../wallet"));
+const verify = (data, sig, { type, appSk } = {}) => {
+    try {
+        if (!sig) {
+            throw new Error('empty sig');
+        }
+        const wallet = (0, wallet_1.default)(type, appSk);
+        const verified = wallet.verify((0, json_stable_stringify_1.default)(data || {}), sig);
+        return verified;
+    }
+    catch {
+        throw new Error('verify sig failed');
+    }
+};
+exports.verify = verify;
+const sign = (data, { type, appSk } = {}) => {
+    const wallet = (0, wallet_1.default)(type, appSk);
+    return wallet.sign((0, json_stable_stringify_1.default)(data || {}));
+};
+exports.sign = sign;

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.16.7";
+declare const version = "1.16.8";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.16.7';
+const version = '1.16.8';
 exports.version = version;
 exports.default = { version };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.7",
+  "version": "1.16.8-beta-ca58a421",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.7",
-    "@abtnode/constant": "1.16.7",
+    "@abtnode/client": "1.16.8-beta-ca58a421",
+    "@abtnode/constant": "1.16.8-beta-ca58a421",
     "@arcblock/did": "1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/jwt": "1.18.78",
     "@arcblock/ws": "1.18.78",
-    "@blocklet/constant": "1.16.7",
-    "@blocklet/env": "1.16.7",
-    "@blocklet/meta": "1.16.7",
+    "@blocklet/constant": "1.16.8-beta-ca58a421",
+    "@blocklet/env": "1.16.8-beta-ca58a421",
+    "@blocklet/meta": "1.16.8-beta-ca58a421",
     "@did-connect/authenticator": "^2.1.54",
     "@did-connect/handler": "^2.1.54",
     "@nedb/core": "^2.1.5",
@@ -72,5 +72,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "dadd7bfa319e2ee5144bdccb6e280ffe4b8d2679"
+  "gitHead": "d0f724c8082572a01b6e9287df6c3d0663ec9c57"
 }