@blocklet/did-space-js 1.1.2 → 1.1.4

package/dist/client/index.js

@@ -19,6 +19,9 @@ class SpaceClient {
         this.options.endpoint = this.options.endpoint
             ? this.normalizeEndpoint(this.options.endpoint)
             : this.options.endpoint;
+        this.options.wallet =
+            this.options.wallet ||
+                (this.options.auth && 'wallet' in this.options.auth ? this.options.auth.wallet : undefined);
     }
     /**
      *

package/dist/commands/base.js

@@ -47,7 +47,7 @@ class BaseCommand extends stream_1.EventEmitter {
     }) {
         const endpoint = this.context.endpoint || this.context?.auth?.endpoint;
         if (endpoint) {
-            return endpoint;
+            return (0, libs_1.normalizeEndpoint)(endpoint);
         }
         if (strict) {
             if (this.context.auth || this.context.url) {
@@ -63,11 +63,11 @@ class BaseCommand extends stream_1.EventEmitter {
     getRequestUrl(key, type = 'object') {
         // 优先使用 context.endpoint
         if (this.context.endpoint) {
-            return (0, ufo_1.joinURL)(this.context.endpoint, type, this.getKey(key));
+            return (0, ufo_1.joinURL)((0, libs_1.normalizeEndpoint)(this.context.endpoint), type, this.getKey(key));
         }
         // 检查 auth 中是否有 endpoint（类型安全检查）
         if (this.context.auth && 'endpoint' in this.context.auth && this.context.auth.endpoint) {
-            return (0, ufo_1.joinURL)(this.context.auth.endpoint, type, this.getKey(key));
+            return (0, ufo_1.joinURL)((0, libs_1.normalizeEndpoint)(this.context.auth.endpoint), type, this.getKey(key));
         }
         // 使用 auth + url 组合
         if (this.context.auth && this.context.url) {

package/dist/commands/nft/put-nft-object.js

@@ -33,8 +33,9 @@ class PutNftObjectCommand extends base_1.BaseCommand {
         return didObjectURL.toString();
     }
     getDisplayUrl() {
+        const endpoint = this.getEndpoint();
         // @ts-expect-error
-        return (0, ufo_1.joinURL)(this.context.endpoint.replace(/\/api\/space.*/, ''), 'resolve', (0, libs_1.toABTDid)(this.input.did), 'display');
+        return (0, ufo_1.joinURL)(endpoint.replace(/\/api\/space.*/, ''), 'resolve', (0, libs_1.toABTDid)(this.input.did), 'display');
     }
     async getStreams() {
         const writeStream = (0, fs_extra_1.createWriteStream)(this.tempCacheObjectKey);

package/dist/commands/object/list-object.js

@@ -6,7 +6,7 @@ const security_1 = require("../../security");
 class ListObjectCommand extends base_1.BaseCommand {
     async getAxiosRequestConfig() {
         const url = this.getRequestUrl(this.input.key, 'list/');
-        const requestHeaders = await this.getRequestHeaders();
+        const requestHeaders = this.getRequestHeaders();
         const method = 'GET';
         const { headers } = await (0, security_1.signRequest)({
             url,

package/dist/commands/object/list-objects.js

@@ -15,7 +15,7 @@ class ListObjectsCommand extends base_1.BaseCommand {
     async getAxiosRequestConfig() {
         // TODO: 此处应该有 joi 校验
         const options = (0, pick_1.default)(this.input, ['recursive', 'ignoreDirectories']);
-        const url = (0, ufo_1.withQuery)(await this.getRequestUrl(this.input.key, 'lists/'), options);
+        const url = (0, ufo_1.withQuery)(this.getRequestUrl(this.input.key, 'lists/'), options);
         const requestHeaders = this.getRequestHeaders();
         const method = 'GET';
         debug('getAxiosRequestConfig.$url', url);

package/dist/commands/space/head.js

@@ -11,8 +11,9 @@ class HeadSpaceCommand extends base_1.BaseCommand {
         return Promise.resolve(null);
     }
     getUrl() {
-        if (this.context.endpoint) {
-            const array = this.context.endpoint.split('/');
+        const endpoint = this.context.endpoint || this.context?.auth?.endpoint;
+        if (endpoint) {
+            const array = (0, libs_1.normalizeEndpoint)(endpoint).split('/');
             const lastIndexOfApp = array.lastIndexOf('app');
             const url = array.filter((_, i) => i < lastIndexOfApp).join('/');
             return (0, ufo_1.withQuery)(url, {

package/dist/protocol/command.protocol.d.ts

@@ -38,6 +38,13 @@ export interface CommandOutput<D = any> {
     response?: Response;
 }
 export interface SpaceClientOptionsEndpointAuth {
+    /**
+     *
+     * @description current blocklet's wallet
+     * @type {WalletObject}
+     * @memberof SpaceClientOptionsEndpointAuth
+     */
+    wallet: WalletObject;
     /**
      *
      * @description spaces endpoint
@@ -73,7 +80,7 @@ export interface SpaceClientOptions {
      * @type {WalletObject}
      * @memberof SpaceClientOptions
      */
-    wallet: WalletObject;
+    wallet?: WalletObject;
     /**
      * @recommend use `auth` field instead
      * @description spaces endpoint

package/dist/security/request-signature.d.ts

@@ -16,7 +16,7 @@ declare function signRequest({ url, method, data, headers, wallet, delegation, t
     headers: {
         [key: string]: string;
     };
-    wallet: WalletObject;
+    wallet?: WalletObject;
     delegation?: string;
     throwError?: true | false;
 }): Promise<{

package/dist/security/request-signature.js

@@ -65,7 +65,7 @@ async function signRequest({ url, method, data, headers, wallet, delegation, thr
     if (!(0, isObject_1.default)(data)) {
         error = new Error(`data(${data}) is not an object`);
     }
-    if (!wallet) {
+    if (typeof wallet === 'undefined' || !wallet) {
         error = new Error('wallet is required');
     }
     if (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-js",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "publishConfig": {
     "access": "public"
   },
@@ -33,8 +33,8 @@
     "@arcblock/jwt": "^1.20.15",
     "@arcblock/validator": "^1.20.15",
     "@blocklet/env": "^1.16.45",
-    "@did-space/constants": "^1.1.2",
-    "@did-space/core": "^1.1.2",
+    "@did-space/constants": "^1.1.4",
+    "@did-space/core": "^1.1.4",
     "@ocap/mcrypto": "^1.20.15",
     "@ocap/util": "^1.20.15",
     "@ocap/wallet": "^1.20.15",
@@ -78,5 +78,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "922e4725da8965f66033b82f9ba28d1d691f9cc5"
+  "gitHead": "beef11c80cef09857877b2206df1c8edaef38d40"
 }