@blocklet/did-space-js 1.0.12 → 1.0.14

package/dist/client/index.js

@@ -28,7 +28,7 @@ class SpaceClient {
      */
     async putNftObject(command) {
         try {
-            command.context = this.options;
+            Object.assign(command.context, this.options);
             return await command.request();
         }
         catch (error) {

package/dist/commands/audit-log/post-objects-sync-command.js

@@ -14,7 +14,7 @@ class PostObjectsSyncCommand extends base_1.BaseCommand {
         if (error) {
             throw error;
         }
-        this.input = data;
+        Object.assign(this.input, data);
     }
     getAxiosRequestConfig() {
         return Promise.resolve(null);

package/dist/commands/audit-log/put-objects-sync-command.js

@@ -14,7 +14,7 @@ class PutObjectsSyncCommand extends base_1.BaseCommand {
         if (error) {
             throw error;
         }
-        this.input = data;
+        Object.assign(this.input, data);
     }
     getAxiosRequestConfig() {
         return Promise.resolve(null);

package/dist/commands/backup/post-app-backup.js

@@ -9,11 +9,13 @@ const base_1 = require("../base");
 class PostAppBackupCommand extends base_1.BaseCommand {
     constructor(input, context) {
         super(input, context);
-        const { error, value } = backup_1.PostAppBackupCommandInputSchema.validate(input);
+        const { error, value } = backup_1.PostAppBackupCommandInputSchema.validate(input, {
+            allowUnknown: true,
+        });
         if (error) {
             throw error;
         }
-        this.input = value;
+        Object.assign(this.input, value);
     }
     getAxiosRequestConfig() {
         return Promise.resolve(null);

package/dist/commands/backup/put-app-backup.js

@@ -9,11 +9,13 @@ const base_1 = require("../base");
 class PutAppBackupCommand extends base_1.BaseCommand {
     constructor(input, context) {
         super(input, context);
-        const { error, value } = meta_1.PutAppBackupCommandInputSchema.validate(input);
+        const { error, value } = meta_1.PutAppBackupCommandInputSchema.validate(input, {
+            allowUnknown: true,
+        });
         if (error) {
             throw error;
         }
-        this.input = value;
+        Object.assign(this.input, value);
     }
     getAxiosRequestConfig() {
         return Promise.resolve(null);

package/dist/commands/base.d.ts

@@ -11,11 +11,12 @@ export interface GetKeyOptions {
     encode?: true | false;
 }
 export declare abstract class BaseCommand<BaseCommandInput extends CommandInput, BaseCommandOutput extends CommandOutput> extends EventEmitter implements CommandProtocol<BaseCommandInput, BaseCommandOutput> {
-    input: BaseCommandInput;
-    context: SpaceClientOptions;
+    readonly input: BaseCommandInput;
+    readonly context: SpaceClientOptions;
     constructor(input: BaseCommandInput, context?: SpaceClientOptions);
     abstract getAxiosRequestConfig(): Promise<AxiosRequestConfig | null>;
     getKey(key: string, options?: GetKeyOptions): string;
     request(): Promise<BaseCommandOutput>;
     resolveMiddleware(res?: AxiosResponse<BaseCommandOutput['data'], any>): Promise<BaseCommandOutput>;
+    abort(): void;
 }

package/dist/commands/base.js

@@ -11,15 +11,16 @@ const core_1 = require("@did-space/core");
 const stream_1 = require("stream");
 const libs_1 = require("../libs");
 class BaseCommand extends stream_1.EventEmitter {
-    input;
-    context;
+    input = {};
+    context = {};
     constructor(input, context = {}) {
         super();
-        this.input = input;
-        this.context = context;
+        Object.assign(this.input, input);
+        Object.assign(this.context, context);
         if ((0, did_1.isValid)(process.env.BLOCKLET_COMPONENT_DID)) {
             this.context.componentDid = process.env.BLOCKLET_COMPONENT_DID;
         }
+        this.context.abortController = this.context.abortController ?? this.input.abortController ?? new AbortController();
     }
     getKey(key, options = { encode: true }) {
         const path = (0, isEmpty_1.default)(this.context.componentDid)
@@ -43,5 +44,8 @@ class BaseCommand extends stream_1.EventEmitter {
             data: res?.data,
         });
     }
+    abort() {
+        this.context.abortController?.abort();
+    }
 }
 exports.BaseCommand = BaseCommand;

package/dist/commands/incremental-sync/sync-base.js

@@ -119,7 +119,9 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
         });
         // FIXME: retryCount === 0 表示，重试次数刚好用完了，后续优化 server 显示错误的进度 @yejianchao
         // 防呆控制，retryCount < 0 说明调用基础接口始终是失败的,遇到了预料之外的事情，因此需要停止运行
-        if (this.input.retryCount <= 0 || [400, 401, 403, 404, 413].includes(statusCode)) {
+        if (this.input.retryCount <= 0 ||
+            [400, 401, 403, 404, 413].includes(statusCode) ||
+            this.context.abortController?.signal.aborted) {
             return {
                 statusCode,
                 statusMessage: (0, libs_1.getErrorMessage)(error),
@@ -229,6 +231,8 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
         return true;
     }
     async destroy() {
+        this.queue.pause();
+        this.queue.clear();
         if (await (0, fs_extra_1.pathExists)(this.input.tmpDir)) {
             await (0, fs_extra_1.remove)(this.input.tmpDir);
         }

package/dist/commands/incremental-sync/sync-push.d.ts

@@ -19,12 +19,14 @@ export declare class IncrementalSyncPushCommand extends IncrementalSyncBaseComma
     /**
      * @see https://github.com/ArcBlock/did-spaces/issues/955#issuecomment-1873723050
      * @description 备份的对象随时可能在进行写入操作,所以对于需要备份的文件,最佳实践是备份它们某一个时刻的副本,否则会引发错误 Error: Unexpected end of form
-     * @param {SyncObject[]} waitSyncObjects
+     * @param {SyncObject[]} syncObject
      * @return {*}  {Promise<SyncObject[]>}
      * @memberof IncrementalSyncPushCommand
      */
-    copyObjects(waitSyncObjects: SyncObject[]): Promise<SyncObject[]>;
+    copyObjectToTmpDir(syncObject: SyncObject): Promise<SyncObject>;
+    destroyObject(syncObject: SyncObject): Promise<void>;
     getObject(absolutePath: string): Promise<Object>;
     registerEvents(): void;
     private sync;
+    private throwErrorIfAborted;
 }

package/dist/commands/incremental-sync/sync-push.js

@@ -13,7 +13,6 @@ const keyBy_1 = __importDefault(require("lodash/keyBy"));
 const debug_1 = __importDefault(require("debug"));
 const xbytes_1 = __importDefault(require("xbytes"));
 const pick_1 = __importDefault(require("lodash/pick"));
-const p_all_1 = __importDefault(require("p-all"));
 const fs_extra_1 = require("fs-extra");
 const mime_types_1 = __importDefault(require("mime-types"));
 const promises_1 = require("node:stream/promises");
@@ -21,6 +20,7 @@ const object_1 = require("../object");
 const logger_1 = require("../../libs/logger");
 const delete_object_1 = require("../object/delete-object");
 const sync_base_1 = require("./sync-base");
+const libs_1 = require("../../libs");
 const { name, version } = require('../../../package.json');
 const debug = (0, debug_1.default)(`${name}@${version}:sync-folder-push`);
 /**
@@ -37,10 +37,10 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
     }
     async request() {
         try {
+            this.throwErrorIfAborted();
             const localObjectsMap = await this.getLocalObjectsMap();
             const remoteObjectsMap = await this.getRemoteObjectsMap();
-            const waitSyncObjects = await this.getWaitSyncObjects(localObjectsMap, remoteObjectsMap);
-            const syncObjects = await this.copyObjects(waitSyncObjects);
+            const syncObjects = await this.getWaitSyncObjects(localObjectsMap, remoteObjectsMap);
             debug(`[${(0, logger_1.now)()}] [waitUpload] waitUploadCount=${syncObjects.length}`);
             debug(`[${(0, logger_1.now)()}] [context]`, { input: this.input, context: (0, pick_1.default)(this.context, ['endpoint']) });
             return await this.sync(syncObjects);
@@ -52,7 +52,9 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
     // eslint-disable-next-line require-await
     async getLocalObjectsMap() {
         // @note: 注意,此处不要先计算文件 hash
-        let objects = this.input.source;
+        let objects = this.input.source.filter((object) => {
+            return object.name !== '.DS_Store';
+        });
         if ((0, isFunction_1.default)(this.input.filter)) {
             objects = objects.filter(this.input.filter);
         }
@@ -69,32 +71,31 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
     /**
      * @see https://github.com/ArcBlock/did-spaces/issues/955#issuecomment-1873723050
      * @description 备份的对象随时可能在进行写入操作,所以对于需要备份的文件,最佳实践是备份它们某一个时刻的副本,否则会引发错误 Error: Unexpected end of form
-     * @param {SyncObject[]} waitSyncObjects
+     * @param {SyncObject[]} syncObject
      * @return {*}  {Promise<SyncObject[]>}
      * @memberof IncrementalSyncPushCommand
      */
-    async copyObjects(waitSyncObjects) {
-        await (0, p_all_1.default)(waitSyncObjects.map((x) => {
-            return async () => {
-                const source = x.absolutePath;
-                const target = (0, path_1.join)(this.input.tmpDir, x.key);
-                if (x.action !== 'PUT' || !(await (0, fs_extra_1.pathExists)(source))) {
-                    return;
-                }
-                if (!(await (0, fs_extra_1.pathExists)(target))) {
-                    await (0, fs_extra_1.ensureDir)((0, path_1.dirname)(target));
-                    await (0, promises_1.pipeline)((0, fs_1.createReadStream)(source), (0, fs_1.createWriteStream)(target));
-                }
-                const targetObject = await this.getObject(target);
-                x.size = targetObject.size;
-                x.lastModified = targetObject.lastModified;
-                x.hash = await (0, core_1.getHash)((0, fs_1.createReadStream)(targetObject.absolutePath));
-                x.absolutePath = targetObject.absolutePath;
-            };
-        }), {
-            concurrency: this.input.concurrency,
-        });
-        return waitSyncObjects;
+    async copyObjectToTmpDir(syncObject) {
+        const source = syncObject.absolutePath;
+        const tempAbsolutePath = (0, path_1.join)(this.input.tmpDir, syncObject.key);
+        if (syncObject.action !== 'PUT' || !(await (0, fs_extra_1.pathExists)(source))) {
+            return syncObject;
+        }
+        if (!(await (0, fs_extra_1.pathExists)(tempAbsolutePath))) {
+            await (0, fs_extra_1.ensureDir)((0, path_1.dirname)(tempAbsolutePath));
+            await (0, promises_1.pipeline)((0, fs_1.createReadStream)(source), (0, fs_1.createWriteStream)(tempAbsolutePath));
+        }
+        const tempObject = await this.getObject(tempAbsolutePath);
+        syncObject.size = tempObject.size;
+        syncObject.lastModified = tempObject.lastModified;
+        syncObject.hash = await (0, core_1.getHash)((0, fs_1.createReadStream)(tempObject.absolutePath));
+        syncObject.tempAbsolutePath = tempObject.absolutePath;
+        return syncObject;
+    }
+    async destroyObject(syncObject) {
+        if (syncObject.tempAbsolutePath && (await (0, fs_extra_1.pathExists)(syncObject.tempAbsolutePath))) {
+            await (0, libs_1.remove)(syncObject.tempAbsolutePath);
+        }
     }
     async getObject(absolutePath) {
         const fileStat = await (0, fs_extra_1.stat)(absolutePath);
@@ -139,54 +140,61 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
         });
         const actions = syncObjects.map((x) => {
             return async () => {
-                const sourceKey = x.absolutePath;
-                const targetKey = (0, path_1.join)(this.input.target, x.key);
-                if (x.action === 'PUT' && !(await this.shouldBeBackup(sourceKey))) {
-                    debug('sync.return', {
-                        sourceKey,
-                        [`$pathExists(${sourceKey})`]: false,
+                try {
+                    this.throwErrorIfAborted();
+                    await this.copyObjectToTmpDir(x);
+                    const sourceKey = x.tempAbsolutePath;
+                    const targetKey = (0, path_1.join)(this.input.target, x.key);
+                    this.emit('sync.before', {
+                        completed: completedCount,
+                        total: totalCount,
+                        key: sourceKey,
                     });
-                    return;
-                }
-                this.emit('sync.before', {
-                    completed: completedCount,
-                    total: totalCount,
-                    key: sourceKey,
-                });
-                // 开始上传
-                debug(`[${(0, logger_1.now)()}] [sync:${x.action}.before] ${sourceKey} => ${targetKey} size=${(0, xbytes_1.default)(x.size, {
-                    iec: true,
-                })} completed=${completedCount} total=${totalCount}`);
-                if (x.action === 'PUT') {
-                    await new object_1.PutObjectCommand({
-                        key: targetKey,
-                        data: (0, fs_1.createReadStream)(sourceKey),
-                        hash: x.hash,
-                    }, this.context).request();
-                    totalSize += x.size;
+                    if (x.action === 'PUT' && !(await this.shouldBeBackup(sourceKey))) {
+                        debug('sync.return', {
+                            sourceKey,
+                            [`$pathExists(${sourceKey})`]: false,
+                        });
+                        return;
+                    }
+                    // 开始上传
+                    debug(`[${(0, logger_1.now)()}] [sync:${x.action}.before] ${sourceKey} => ${targetKey} size=${(0, xbytes_1.default)(x.size, {
+                        iec: true,
+                    })} completed=${completedCount} total=${totalCount}`);
+                    if (x.action === 'PUT') {
+                        await new object_1.PutObjectCommand({
+                            key: targetKey,
+                            data: (0, fs_1.createReadStream)(sourceKey),
+                            hash: x.hash,
+                        }, this.context).request();
+                        totalSize += x.size;
+                    }
+                    else {
+                        await new delete_object_1.DeleteObjectCommand({
+                            key: targetKey,
+                        }, this.context).request();
+                    }
+                    // progress
+                    ++completedCount;
+                    this.printDebugInfo({
+                        direction: 'push',
+                        completedCount,
+                        errorCount,
+                        totalCount,
+                    });
+                    this.emit('sync.after', {
+                        completed: completedCount,
+                        total: totalCount,
+                        key: sourceKey,
+                    });
+                    // 结束上传
+                    debug(`[${(0, logger_1.now)()}] [sync:${x.action}.after] ${sourceKey}=>${targetKey} size=${(0, xbytes_1.default)(x.size, {
+                        iec: true,
+                    })} completed=${completedCount} total=${totalCount}`);
                 }
-                else {
-                    await new delete_object_1.DeleteObjectCommand({
-                        key: targetKey,
-                    }, this.context).request();
+                finally {
+                    await this.destroyObject(x);
                 }
-                // progress
-                ++completedCount;
-                this.printDebugInfo({
-                    direction: 'push',
-                    completedCount,
-                    errorCount,
-                    totalCount,
-                });
-                this.emit('sync.after', {
-                    completed: completedCount,
-                    total: totalCount,
-                    key: sourceKey,
-                });
-                // 结束上传
-                debug(`[${(0, logger_1.now)()}] [sync:${x.action}.after] ${sourceKey}=>${targetKey} size=${(0, xbytes_1.default)(x.size, {
-                    iec: true,
-                })} completed=${completedCount} total=${totalCount}`);
             };
         });
         await this.queue.addAll(actions);
@@ -201,5 +209,11 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
             },
         };
     }
+    throwErrorIfAborted() {
+        if (this.context.abortController?.signal.aborted) {
+            this.queue.pause();
+            throw new Error('Operation has been aborted');
+        }
+    }
 }
 exports.IncrementalSyncPushCommand = IncrementalSyncPushCommand;

package/dist/commands/preview/delete-preview-object.js

@@ -13,7 +13,7 @@ class DeletePreviewObjectCommand extends base_1.BaseCommand {
         return Promise.resolve(null);
     }
     async resolveMiddleware() {
-        this.input = await meta_1.GetPreviewObjectCommandInputSchema.parseAsync(this.input);
+        Object.assign(this.input, await meta_1.GetPreviewObjectCommandInputSchema.parseAsync(this.input));
         const url = (0, ufo_1.joinURL)(this.context.endpoint, 'object', this.getKey((0, path_1.join)(this.input.key, '.meta/preview.yml')));
         const method = 'DELETE';
         const { headers } = await (0, security_1.signRequest)({

package/dist/commands/preview/get-preview-object.js

@@ -17,7 +17,7 @@ class GetPreviewObjectCommand extends base_1.BaseCommand {
         return Promise.resolve(null);
     }
     async resolveMiddleware() {
-        this.input = await meta_1.GetPreviewObjectCommandInputSchema.parseAsync(this.input);
+        Object.assign(this.input, await meta_1.GetPreviewObjectCommandInputSchema.parseAsync(this.input));
         const url = (0, ufo_1.joinURL)(this.context.endpoint, 'object', this.getKey((0, path_1.join)(this.input.key, '.meta/preview.yml')));
         const method = 'GET';
         const { headers } = await (0, security_1.signRequest)({

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

@@ -21,7 +21,7 @@ class PutPreviewObjectCommand extends base_1.BaseCommand {
         return Promise.resolve(null);
     }
     async normalize() {
-        this.input = await meta_1.PutPreviewObjectCommandInputSchema.parseAsync(this.input);
+        Object.assign(this.input, await meta_1.PutPreviewObjectCommandInputSchema.parseAsync(this.input));
         for (const resource of this.input.resources) {
             if (!resource.key.startsWith(this.input.key)) {
                 console.error(`Resource key(${resource.key}) must start with ${this.input.key}`, { resource });

package/dist/commands/restore/put-app-restore.js

@@ -13,7 +13,7 @@ class PutAppRestoreCommand extends base_1.BaseCommand {
         if (error) {
             throw error;
         }
-        this.input = value;
+        Object.assign(this.input, value);
     }
     getAxiosRequestConfig() {
         return Promise.resolve(null);

package/dist/commands/sync/sync-folder-base.d.ts

@@ -9,6 +9,7 @@ export interface ObjectsMap {
 }
 export interface SyncObject extends Object {
     action: 'PUT' | 'DELETE';
+    tempAbsolutePath?: string;
 }
 /**
  * @see s3 sync https://stackoverflow.com/questions/27932345/downloading-folders-from-aws-s3-cp-or-sync

package/dist/libs/api.d.ts

@@ -1,3 +1,4 @@
+import { type Got } from 'got';
 export declare const MIN: number;
 export declare const api: import("axios").AxiosInstance;
-export declare const gotApi: import("got").Got;
+export declare const gotApi: Got;

package/dist/libs/fs.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import type { RmOptions } from 'fs';
+/**
+ *
+ * @see https://github.com/nodejs/node/issues/39853#issuecomment-906843478
+ * @see https://stackoverflow.com/q/48529030
+ * @export
+ */
+export declare function remove(path: string, options?: RmOptions): Promise<void>;

package/dist/libs/fs.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remove = void 0;
+const promises_1 = require("fs/promises");
+/**
+ *
+ * @see https://github.com/nodejs/node/issues/39853#issuecomment-906843478
+ * @see https://stackoverflow.com/q/48529030
+ * @export
+ */
+async function remove(path, options = {
+    force: true,
+    maxRetries: 3,
+}) {
+    await (0, promises_1.truncate)(path);
+    await (0, promises_1.rm)(path, options);
+}
+exports.remove = remove;

package/dist/libs/index.d.ts

@@ -2,10 +2,11 @@ export * from './api';
 export * from './did';
 export * from './encoding';
 export * from './error';
+export * from './fs';
 export * from './hash';
 export * from './logger';
 export * from './object-integrality';
 export * from './performance';
+export * from './sleep';
 export * from './space';
 export * from './stream';
-export * from './sleep';

package/dist/libs/index.js

@@ -18,10 +18,11 @@ __exportStar(require("./api"), exports);
 __exportStar(require("./did"), exports);
 __exportStar(require("./encoding"), exports);
 __exportStar(require("./error"), exports);
+__exportStar(require("./fs"), exports);
 __exportStar(require("./hash"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./object-integrality"), exports);
 __exportStar(require("./performance"), exports);
+__exportStar(require("./sleep"), exports);
 __exportStar(require("./space"), exports);
 __exportStar(require("./stream"), exports);
-__exportStar(require("./sleep"), exports);

package/dist/meta/backup/post-app-backup-command.d.ts

@@ -1,6 +1,6 @@
 import { AppBackup, AuditLogStatus } from '@did-space/core';
 import type { ObjectSchema } from 'joi';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export type AppBackupData = AppBackup & {
     id: string;
     userDid: string;
@@ -10,7 +10,7 @@ export type AppBackupData = AppBackup & {
     updatedAt: string;
 };
 export declare const PostAppBackupCommandInputSchema: ObjectSchema<any>;
-export interface PostAppBackupCommandInput extends Pick<AppBackupData, 'userDid' | 'referrer' | 'appName' | 'appDescription' | 'serverDid' | 'signerDid'> {
+export interface PostAppBackupCommandInput extends Pick<AppBackupData, 'userDid' | 'referrer' | 'appName' | 'appDescription' | 'serverDid' | 'signerDid'>, CommandInput {
 }
 export interface PostAppBackupCommandOutput extends CommandOutput<Required<AppBackupData>> {
 }

package/dist/meta/backup/put-app-backup-command.d.ts

@@ -1,7 +1,7 @@
 import type { ObjectSchema } from 'joi';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 import { AppBackupData } from './post-app-backup-command';
 export declare const PutAppBackupCommandInputSchema: ObjectSchema<any>;
-export type PutAppBackupCommandInput = Required<Pick<AppBackupData, 'id'>> & Partial<AppBackupData>;
+export type PutAppBackupCommandInput = Required<Pick<AppBackupData, 'id'>> & Partial<AppBackupData> & CommandInput;
 export interface PutAppBackupCommandOutput extends CommandOutput<Required<AppBackupData>> {
 }

package/dist/meta/nft/put-nft-object-command.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { WalletObject } from '@ocap/wallet';
 import { Readable } from 'stream';
-import type { CommandOutput } from '../../protocol';
-export interface PutNftObjectCommandInput {
+import type { CommandInput, CommandOutput } from '../../protocol';
+export interface PutNftObjectCommandInput extends CommandInput {
     /**
      * @description assetDid
      * @example z8iZnaYxnkMD5AKRjTKiCb8pQr1ut8UantAcf

package/dist/meta/object/delete-object-command.d.ts

@@ -1,5 +1,5 @@
-import type { CommandOutput } from '../../protocol';
-export interface DeleteObjectCommandInput {
+import type { CommandInput, CommandOutput } from '../../protocol';
+export interface DeleteObjectCommandInput extends CommandInput {
     key: string;
 }
 export interface DeleteObjectCommandOutput extends CommandOutput<void> {

package/dist/meta/object/get-object-command.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
 import type { AxiosResponseHeaders, RawAxiosResponseHeaders } from 'axios';
-import type { CommandOutput } from '../../protocol';
-export interface GetObjectCommandInput {
+import type { CommandInput, CommandOutput } from '../../protocol';
+export interface GetObjectCommandInput extends CommandInput {
     key: string;
 }
 export interface GetObjectCommandOutput extends CommandOutput<Readable> {

package/dist/meta/object/head-object-command.d.ts

@@ -1,6 +1,6 @@
 import type { Response } from 'got';
-import type { CommandOutput } from '../../protocol';
-export interface HeadSpaceCommandInput {
+import type { CommandInput, CommandOutput } from '../../protocol';
+export interface HeadSpaceCommandInput extends CommandInput {
     /**
      * @description 对象的大小
      * @default {0}

package/dist/meta/object/list-object-command.d.ts

@@ -1,6 +1,6 @@
 import { Object } from '@did-space/core';
-import type { CommandOutput } from '../../protocol';
-export interface ListObjectCommandInput {
+import type { CommandInput, CommandOutput } from '../../protocol';
+export interface ListObjectCommandInput extends CommandInput {
     key: string;
 }
 export type ListObjectCommandOutput = CommandOutput<Object>;

package/dist/meta/object/list-objects-command.d.ts

@@ -1,6 +1,6 @@
 import { Object } from '@did-space/core';
-import { CommandOutput } from '../../protocol';
-export interface ListObjectsCommandInput {
+import { CommandInput, CommandOutput } from '../../protocol';
+export interface ListObjectsCommandInput extends CommandInput {
     key: string;
     recursive?: false | true;
     ignoreDirectories?: false | true;

package/dist/meta/object/preview-object-command.d.ts

@@ -1,6 +1,6 @@
 import { PreviewTemplate } from '@did-space/core';
 import { z } from 'zod';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
     /**
      * @description 文件夹的路径,必须以 / 结尾
@@ -366,7 +366,7 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         hash?: string | undefined;
     }[] | undefined;
 }>;
-export interface PutPreviewObjectCommandInput extends z.infer<typeof PutPreviewObjectCommandInputSchema> {
+export interface PutPreviewObjectCommandInput extends z.infer<typeof PutPreviewObjectCommandInputSchema>, CommandInput {
 }
 export type PutPreviewObjectCommandOutput = CommandOutput<void>;
 export declare const GetPreviewObjectCommandInputSchema: z.ZodObject<{
@@ -376,7 +376,7 @@ export declare const GetPreviewObjectCommandInputSchema: z.ZodObject<{
 }, {
     key: string;
 }>;
-export interface GetPreviewObjectCommandInput extends z.infer<typeof GetPreviewObjectCommandInputSchema> {
+export interface GetPreviewObjectCommandInput extends z.infer<typeof GetPreviewObjectCommandInputSchema>, CommandInput {
 }
 export type GetPreviewObjectCommandOutput = CommandOutput<PreviewTemplate>;
 export declare const DeletePreviewObjectCommandInputSchema: z.ZodObject<{
@@ -386,6 +386,6 @@ export declare const DeletePreviewObjectCommandInputSchema: z.ZodObject<{
 }, {
     key: string;
 }>;
-export interface DeletePreviewObjectCommandInput extends z.infer<typeof DeletePreviewObjectCommandInputSchema> {
+export interface DeletePreviewObjectCommandInput extends z.infer<typeof DeletePreviewObjectCommandInputSchema>, CommandInput {
 }
 export type DeletePreviewObjectCommandOutput = CommandOutput<void>;

package/dist/meta/object/preview-object-command.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeletePreviewObjectCommandInputSchema = exports.GetPreviewObjectCommandInputSchema = exports.PutPreviewObjectCommandInputSchema = void 0;
+/* eslint-disable @typescript-eslint/indent */
 const core_1 = require("@did-space/core");
 const zod_1 = require("zod");
 const put_object_command_1 = require("./put-object-command");

package/dist/meta/object/put-object-command.d.ts

@@ -1,6 +1,6 @@
 import { Data } from '@did-space/core';
 import { z } from 'zod';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export declare const PutObjectCommandInputSchema: z.ZodObject<{
     /**
      * @description 可以是一个文件名或者文件夹
@@ -29,7 +29,7 @@ export declare const PutObjectCommandInputSchema: z.ZodObject<{
     data?: any;
     hash?: string | undefined;
 }>;
-export interface PutObjectCommandInput extends z.infer<typeof PutObjectCommandInputSchema> {
+export interface PutObjectCommandInput extends z.infer<typeof PutObjectCommandInputSchema>, CommandInput {
     data?: Data;
 }
 export type PutObjectCommandOutput = CommandOutput<void>;

package/dist/meta/restore/post-app-restore-command.d.ts

@@ -1,6 +1,6 @@
 import { AppRestore, AuditLogStatus } from '@did-space/core';
 import type { ObjectSchema } from 'joi';
-import { CommandOutput } from '../../protocol/command.protocol';
+import { CommandOutput, type CommandInput } from '../../protocol/command.protocol';
 export type AppRestoreData = AppRestore & {
     id: string;
     userDid: string;
@@ -10,7 +10,7 @@ export type AppRestoreData = AppRestore & {
     updatedAt: string;
 };
 export declare const PostAppRestoreCommandInputSchema: ObjectSchema<any>;
-export interface PostAppRestoreCommandInput extends Pick<AppRestoreData, 'userDid' | 'referrer' | 'serverDid'> {
+export interface PostAppRestoreCommandInput extends Pick<AppRestoreData, 'userDid' | 'referrer' | 'serverDid'>, CommandInput {
 }
 export interface PostAppRestoreCommandOutput extends CommandOutput<Required<AppRestoreData>> {
 }

package/dist/meta/restore/post-app-restore-command.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostAppRestoreCommandInputSchema = void 0;
+/* eslint-disable @typescript-eslint/indent */
 const validator_1 = require("@arcblock/validator");
 exports.PostAppRestoreCommandInputSchema = validator_1.Joi.object({
     userDid: validator_1.Joi.DID(),

package/dist/meta/restore/put-app-restore-command.d.ts

@@ -1,7 +1,7 @@
 import type { ObjectSchema } from 'joi';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 import { AppRestoreData } from './post-app-restore-command';
 export declare const PutAppRestoreCommandInputSchema: ObjectSchema<any>;
-export type PutAppRestoreCommandInput = Required<Pick<AppRestoreData, 'id'>> & Partial<AppRestoreData>;
+export type PutAppRestoreCommandInput = Required<Pick<AppRestoreData, 'id'>> & Partial<AppRestoreData> & CommandInput;
 export interface PutAppRestoreCommandOutput extends CommandOutput<Required<AppRestoreData>> {
 }

package/dist/meta/sync/post-objects-sync-command.d.ts

@@ -1,6 +1,6 @@
 import { AuditLogModel, AuditLogAction } from '@did-space/core';
 import { z } from 'zod';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export declare const PostObjectsSyncCommandInputSchema: z.ZodObject<{
     source: z.ZodString;
     target: z.ZodString;
@@ -14,7 +14,7 @@ export declare const PostObjectsSyncCommandInputSchema: z.ZodObject<{
     source: string;
     metadata?: Record<string, any> | undefined;
 }>;
-export interface PostObjectsSyncCommandInput extends z.infer<typeof PostObjectsSyncCommandInputSchema> {
+export interface PostObjectsSyncCommandInput extends z.infer<typeof PostObjectsSyncCommandInputSchema>, CommandInput {
 }
 export interface PostObjectsSyncCommandOutput extends CommandOutput<AuditLogModel<AuditLogAction.APP_OBJECTS_SYNC>> {
 }

package/dist/meta/sync/put-objects-sync-command.d.ts

@@ -1,6 +1,6 @@
 import { AuditLogModel, AuditLogAction, AuditLogStatus } from '@did-space/core';
 import { z } from 'zod';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export declare const PutObjectsSyncCommandInputSchema: z.ZodObject<{
     id: z.ZodString;
     status: z.ZodNativeEnum<typeof AuditLogStatus>;
@@ -29,7 +29,7 @@ export declare const PutObjectsSyncCommandInputSchema: z.ZodObject<{
     reason?: string | undefined;
     successCount?: number | undefined;
 }>;
-export interface PutObjectsSyncCommandInput extends z.infer<typeof PutObjectsSyncCommandInputSchema> {
+export interface PutObjectsSyncCommandInput extends z.infer<typeof PutObjectsSyncCommandInputSchema>, CommandInput {
 }
 export interface PutObjectsSyncCommandOutput extends CommandOutput<AuditLogModel<AuditLogAction.APP_OBJECTS_SYNC>> {
 }

package/dist/meta/sync/sync-base-command.d.ts

@@ -1,5 +1,5 @@
 import { Object } from '@did-space/core';
-import type { CommandOutput } from '../../protocol';
+import type { CommandInput, CommandOutput } from '../../protocol';
 export interface OnProgressInput {
     /**
      *
@@ -46,7 +46,7 @@ export interface OnAfterUploadInput {
      */
     key: string;
 }
-export interface SyncBaseCommandInput {
+export interface SyncBaseCommandInput extends CommandInput {
     /**
      *
      * @description 将 source 同步到 target, 文件夹请添加尾杠 /

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

@@ -1,6 +1,12 @@
 import type { WalletObject } from '@ocap/wallet';
 import type { Response } from 'got';
 export interface CommandInput {
+    /**
+     * @description
+     * @type {AbortController}
+     * @memberof CommandInput
+     */
+    abortController?: AbortController;
 }
 export interface CommandOutput<D = any> {
     /**
@@ -60,6 +66,12 @@ export interface SpaceClientOptions {
      * @memberof SpaceClientOptions
      */
     componentDid?: string;
+    /**
+     * @description
+     * @type {AbortController}
+     * @memberof SpaceClientOptions
+     */
+    abortController?: AbortController;
 }
 export interface CommandProtocol<Input extends CommandInput, Output extends CommandOutput> {
     input: Input;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-js",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "publishConfig": {
     "access": "public"
   },
@@ -33,7 +33,7 @@
     "@arcblock/jwt": "^1.19.9",
     "@arcblock/validator": "^1.19.9",
     "@blocklet/env": "^1.16.38",
-    "@did-space/core": "^1.0.12",
+    "@did-space/core": "^1.0.14",
     "@ocap/mcrypto": "^1.19.9",
     "@ocap/util": "^1.19.9",
     "@ocap/wallet": "^1.19.9",
@@ -45,7 +45,7 @@
     "filehound": "^1.17.6",
     "form-data": "^4.0.1",
     "fs-extra": "^11.3.0",
-    "got": "11.8.6",
+    "got": "^11.8.6",
     "hasha": "^5.2.2",
     "is-url": "^1.2.4",
     "joi": "^17.13.3",
@@ -76,5 +76,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "3dedeeeefac5358e622f7975c7880b91902ca8f3"
+  "gitHead": "1ab815d7d3a8933de2c866cff6d6abe31ef70ffc"
 }