@blocklet/sdk 1.16.33-beta-20241101-112845-28d6ce4b → 1.16.33-beta-20241102-083409-a924dd84

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

@@ -14,15 +14,25 @@ declare const getVerifyData: (req: Request, type?: SignType) => {
     sig: string;
     data: object;
 };
+type SignSeed = {
+    body?: any;
+    query?: any;
+    method?: string;
+    url?: string;
+    iat: number;
+    exp: number;
+};
 declare const getSignData: ({ data, params, method, url, }: {
     data: object;
     params: object;
     method: string;
     url: string;
+    raw?: SignSeed;
 }, signOptions?: object) => {
     sig: string;
     iat: number;
     exp: number;
     version: string;
+    raw: SignSeed;
 };
 export { verify, sign, getVerifyData, getSignData };

package/lib/util/verify-sign.js

@@ -30,6 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignData = exports.getVerifyData = exports.sign = exports.verify = void 0;
+const merge_1 = __importDefault(require("lodash/merge"));
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const ufo_1 = require("ufo");
 const constant_1 = require("@blocklet/constant");
@@ -69,13 +70,14 @@ const getLatestFn = ({ iat, exp, body, query, method, url, }) => {
     if (exp < now) {
         throw new Error('expired sig');
     }
+    const tmp = (0, ufo_1.parseURL)(url);
     const data = {
         iat,
         exp,
         body: body ?? {},
-        query: query ?? {},
+        query: (0, merge_1.default)(qs_1.default.parse(tmp.search.slice(1)), query ?? {}),
         method: method.toLowerCase(),
-        url: (0, ufo_1.parseURL)(url).pathname,
+        url: tmp.pathname,
     };
     return data;
 };
@@ -105,23 +107,25 @@ exports.getVerifyData = getVerifyData;
 const getSignData = ({ data, params, method, url, }, signOptions) => {
     const iat = Math.floor(Date.now() / 1000);
     const exp = iat + 60 * 5;
-    const signSeed = {
+    const raw = {
         iat,
         exp,
     };
+    const tmp = (0, ufo_1.parseURL)(url);
     // 此处的数据为了保持和 verify 一致，需要做一次 JSON.parse 和 qs.parse
-    signSeed.body = JSON.parse(JSON.stringify(data ?? {}));
+    raw.body = JSON.parse(JSON.stringify(data ?? {}));
     // NOTICE: 为了保持和 verify 一致，需要做一次 qs.stringify 和 qs.parse
-    signSeed.query = qs_1.default.parse(qs_1.default.stringify(params ?? {}));
-    signSeed.method = method.toLowerCase();
-    signSeed.url = (0, ufo_1.parseURL)(url).pathname;
-    const sig = sign(signSeed, signOptions);
+    raw.query = qs_1.default.parse(qs_1.default.stringify((0, merge_1.default)(qs_1.default.parse(tmp.search.slice(1)), params ?? {})));
+    raw.method = method.toLowerCase();
+    raw.url = tmp.pathname;
+    const sig = sign(raw, signOptions);
     const version = constant_1.SIG_VERSION.DEFAULT;
     return {
         sig,
         iat,
         exp,
         version,
+        raw,
     };
 };
 exports.getSignData = getSignData;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.33-beta-20241101-112845-28d6ce4b",
+  "version": "1.16.33-beta-20241102-083409-a924dd84",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,15 +27,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.33-beta-20241101-112845-28d6ce4b",
-    "@abtnode/constant": "1.16.33-beta-20241101-112845-28d6ce4b",
+    "@abtnode/client": "1.16.33-beta-20241102-083409-a924dd84",
+    "@abtnode/constant": "1.16.33-beta-20241102-083409-a924dd84",
     "@arcblock/did": "1.18.137",
     "@arcblock/did-auth": "1.18.137",
     "@arcblock/jwt": "1.18.137",
     "@arcblock/ws": "1.18.137",
-    "@blocklet/constant": "1.16.33-beta-20241101-112845-28d6ce4b",
-    "@blocklet/env": "1.16.33-beta-20241101-112845-28d6ce4b",
-    "@blocklet/meta": "1.16.33-beta-20241101-112845-28d6ce4b",
+    "@blocklet/constant": "1.16.33-beta-20241102-083409-a924dd84",
+    "@blocklet/env": "1.16.33-beta-20241102-083409-a924dd84",
+    "@blocklet/meta": "1.16.33-beta-20241102-083409-a924dd84",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -78,5 +78,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "fc6ab3b3751306ace495bc530f71dfea4e367905"
+  "gitHead": "bc8a9ea91a3012635f25fb1594d96d3a10971517"
 }