@blocklet/did-space-js 1.0.42 → 1.0.44

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

@@ -23,10 +23,22 @@ export declare abstract class IncrementalSyncBaseCommand<CommandInput extends In
         SYNC_AFTER: string;
     };
     private retryCount;
+    protected syncObjectRuntimeMap: Record<string, {
+        errorCount: number;
+        completedCount: number;
+        totalSize: number;
+    }>;
     constructor(input: CommandInput, context?: SpaceClientOptions);
     private initialize;
     abstract getLocalObjectsMap(): Promise<ObjectsMap>;
     abstract getRemoteObjectsMap(): Promise<ObjectsMap>;
+    /**
+     * @description 初始化同步对象运行时 map
+     * @param {SyncObject[]} syncObjects
+     * @return {*}  {Promise<void>}
+     * @memberof IncrementalSyncBaseCommand
+     */
+    protected initializeSyncObjectRuntimeMap(syncObjects: SyncObject[]): void;
     /**
      *
      * @description 仅在开启调试模式时，输出调试信息，
@@ -76,5 +88,9 @@ export declare abstract class IncrementalSyncBaseCommand<CommandInput extends In
      * @memberof IncrementalSyncBaseCommand
      */
     protected shouldBeBackup(absolutePath: string): Promise<boolean>;
+    get errorCount(): number;
+    get completedCount(): number;
+    get totalSize(): number;
+    get totalCount(): number;
     destroy(): Promise<void>;
 }

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

@@ -40,6 +40,7 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
         SYNC_AFTER: 'sync.after',
     };
     retryCount = 0;
+    syncObjectRuntimeMap = {};
     constructor(input, context) {
         super(input, context);
         this.initialize(input);
@@ -72,6 +73,24 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
             (0, fs_extra_1.ensureDirSync)(this.input.tmpDir);
         }
     }
+    /**
+     * @description 初始化同步对象运行时 map
+     * @param {SyncObject[]} syncObjects
+     * @return {*}  {Promise<void>}
+     * @memberof IncrementalSyncBaseCommand
+     */
+    initializeSyncObjectRuntimeMap(syncObjects) {
+        // 仅需要在首次进行初始化
+        if ((0, isEmpty_1.default)(this.syncObjectRuntimeMap)) {
+            syncObjects.forEach((x) => {
+                this.syncObjectRuntimeMap[x.key] = {
+                    errorCount: 0,
+                    completedCount: 0,
+                    totalSize: 0,
+                };
+            });
+        }
+    }
     /**
      *
      * @description 仅在开启调试模式时，输出调试信息，
@@ -236,6 +255,18 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
         }
         return true;
     }
+    get errorCount() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.errorCount, 0);
+    }
+    get completedCount() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.completedCount, 0);
+    }
+    get totalSize() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.totalSize, 0);
+    }
+    get totalCount() {
+        return Object.keys(this.syncObjectRuntimeMap).length;
+    }
     async destroy() {
         this.queue.pause();
         this.queue.clear();

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

@@ -41,6 +41,7 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
             const localObjectsMap = await this.getLocalObjectsMap();
             const remoteObjectsMap = await this.getRemoteObjectsMap();
             const syncObjects = await this.getWaitSyncObjects(localObjectsMap, remoteObjectsMap);
+            this.initializeSyncObjectRuntimeMap(syncObjects);
             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);
@@ -124,18 +125,13 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
     async sync(syncObjects) {
         this.queue.removeAllListeners();
         this.registerEvents();
-        let errorCount = 0;
-        let completedCount = 0;
-        let totalSize = 0;
-        const totalCount = syncObjects.length;
         // @ts-expect-error
         this.queue.on('error', async () => {
-            errorCount += 1;
             await this.printDebugInfo({
                 direction: 'push',
-                completedCount,
-                errorCount,
-                totalCount,
+                completedCount: this.completedCount,
+                errorCount: this.errorCount,
+                totalCount: this.totalCount,
             });
         });
         const actions = syncObjects.map((x) => {
@@ -146,8 +142,8 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
                     const sourceKey = x.tempAbsolutePath;
                     const targetKey = (0, path_1.join)(this.input.target, x.key);
                     this.emit(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_BEFORE, {
-                        completed: completedCount,
-                        total: totalCount,
+                        completed: this.completedCount,
+                        total: this.totalCount,
                         key: x.key,
                     });
                     if (x.action === 'PUT' && !(await this.shouldBeBackup(sourceKey))) {
@@ -160,14 +156,14 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
                     // 开始上传
                     debug(`[${(0, logger_1.now)()}] [sync:${x.action}.before] ${sourceKey} => ${targetKey} size=${(0, xbytes_1.default)(x.size, {
                         iec: true,
-                    })} completed=${completedCount} total=${totalCount}`);
+                    })} completed=${this.completedCount} total=${this.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;
+                        this.syncObjectRuntimeMap[x.key].totalSize = x.size;
                     }
                     else {
                         await new delete_object_1.DeleteObjectCommand({
@@ -175,22 +171,26 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
                         }, this.context).request();
                     }
                     // progress
-                    ++completedCount;
+                    this.syncObjectRuntimeMap[x.key].completedCount = 1;
                     this.printDebugInfo({
                         direction: 'push',
-                        completedCount,
-                        errorCount,
-                        totalCount,
+                        completedCount: this.completedCount,
+                        errorCount: this.errorCount,
+                        totalCount: this.totalCount,
                     });
                     this.emit(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_AFTER, {
-                        completed: completedCount,
-                        total: totalCount,
+                        completed: this.completedCount,
+                        total: this.totalCount,
                         key: x.key,
                     });
                     // 结束上传
                     debug(`[${(0, logger_1.now)()}] [sync:${x.action}.after] ${sourceKey}=>${targetKey} size=${(0, xbytes_1.default)(x.size, {
                         iec: true,
-                    })} completed=${completedCount} total=${totalCount}`);
+                    })} completed=${this.completedCount} total=${this.totalCount}`);
+                }
+                catch (error) {
+                    this.syncObjectRuntimeMap[x.key].errorCount = 1;
+                    throw error;
                 }
                 finally {
                     await this.destroyObject(x);
@@ -203,9 +203,9 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
             statusCode: 200,
             data: {
                 count: actions.length,
-                errorCount,
+                errorCount: this.errorCount,
                 duration: (Date.now() - this.startTime) / 1000,
-                size: totalSize,
+                size: this.totalSize,
             },
         };
     }

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

@@ -125,7 +125,7 @@ class PutNftObjectCommand extends base_1.BaseCommand {
                     ...formData.getHeaders(),
                 },
                 // @FIXME: @yejianchao 后续根据文件计算出一个合理的超时时间
-                timeout: 5 * libs_1.MIN,
+                timeout: 5 * libs_1.TIMEOUT,
             };
             return config;
         }

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

@@ -39,9 +39,19 @@ export declare abstract class SyncFolderBaseCommand<CommandInput extends SyncFol
      * @description 保存待同步的对象，避免重复计算，可优化性能
      */
     protected waitSyncObjects: SyncObject[];
+    protected syncObjectRuntimeMap: Record<string, {
+        errorCount: number;
+        completedCount: number;
+        totalSize: number;
+    }>;
     constructor(input: CommandInput, context?: SpaceClientOptions);
     abstract getLocalObjectsMap(): Promise<ObjectsMap>;
     abstract getRemoteObjectsMap(): Promise<ObjectsMap>;
+    protected initializeSyncObjectRuntimeMap(syncObjects: SyncObject[]): void;
+    get errorCount(): number;
+    get completedCount(): number;
+    get totalSize(): number;
+    get totalCount(): number;
     /**
      *
      * @description 仅在开启调试模式时，输出调试信息，

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

@@ -50,6 +50,7 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
      * @description 保存待同步的对象，避免重复计算，可优化性能
      */
     waitSyncObjects = [];
+    syncObjectRuntimeMap = {};
     constructor(input, context) {
         super(input, context);
         if ((0, isUndefined_1.default)(input?.concurrency)) {
@@ -82,6 +83,25 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
         }
         this.queue = new p_queue_1.default({ concurrency: this.input.concurrency });
     }
+    initializeSyncObjectRuntimeMap(syncObjects) {
+        if ((0, isEmpty_1.default)(this.syncObjectRuntimeMap)) {
+            syncObjects.forEach((x) => {
+                this.syncObjectRuntimeMap[x.key] = { errorCount: 0, completedCount: 0, totalSize: 0 };
+            });
+        }
+    }
+    get errorCount() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.errorCount, 0);
+    }
+    get completedCount() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.completedCount, 0);
+    }
+    get totalSize() {
+        return Object.values(this.syncObjectRuntimeMap).reduce((acc, curr) => acc + curr.totalSize, 0);
+    }
+    get totalCount() {
+        return Object.keys(this.syncObjectRuntimeMap).length;
+    }
     /**
      *
      * @description 仅在开启调试模式时，输出调试信息，

package/dist/commands/sync/sync-folder-pull.js

@@ -13,6 +13,7 @@ const pick_1 = __importDefault(require("lodash/pick"));
 const filehound_1 = __importDefault(require("filehound"));
 const debug_1 = __importDefault(require("debug"));
 const xbytes_1 = __importDefault(require("xbytes"));
+const lodash_1 = require("lodash");
 const get_object_1 = require("../object/get-object");
 const object_1 = require("../object");
 const libs_1 = require("../../libs");
@@ -35,6 +36,7 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
             const remoteObjectsMap = await this.getRemoteObjectsMap();
             const localObjectsMap = await this.getLocalObjectsMap();
             const waitSyncObjects = await this.getWaitSyncObjects(remoteObjectsMap, localObjectsMap);
+            this.initializeSyncObjectRuntimeMap(waitSyncObjects);
             debug(`[${(0, logger_1.now)()}] [waitDownload]`, `waitDownloadCount=${waitSyncObjects.length}`);
             debug(`[${(0, logger_1.now)()}] [context]`, { input: this.input, context: (0, pick_1.default)(this.context, ['endpoint']) });
             return await this.sync(waitSyncObjects);
@@ -45,6 +47,9 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         }
     }
     async getRemoteObjectsMap() {
+        if (!(0, lodash_1.isEmpty)(this.remoteObjectsMap)) {
+            return this.remoteObjectsMap;
+        }
         let { data: objects } = await new object_1.ListObjectsCommand({ key: (0, path_1.join)(this.input.source) }, this.context).request();
         if ((0, isFunction_1.default)(this.input.filter)) {
             objects = objects.filter(this.input.filter);
@@ -53,6 +58,9 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         return map;
     }
     getLocalObjectsMap() {
+        if (!(0, lodash_1.isEmpty)(this.localObjectsMap)) {
+            return Promise.resolve(this.localObjectsMap);
+        }
         const files = filehound_1.default.create()
             .path(this.input.target)
             .includeFileStats()
@@ -76,18 +84,13 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
     }
     async sync(syncObjects) {
         this.queue.removeAllListeners();
-        let errorCount = 0;
-        let completedCount = 0;
-        let totalSize = 0;
-        const totalCount = syncObjects.length;
         // @ts-expect-error
-        this.queue.on('error', async () => {
-            errorCount += 1;
-            await this.printDebugInfo({
+        this.queue.on('error', () => {
+            this.printDebugInfo({
                 direction: 'pull',
-                completedCount,
-                errorCount,
-                totalCount,
+                completedCount: this.completedCount,
+                errorCount: this.errorCount,
+                totalCount: this.totalCount,
             });
         });
         const actions = syncObjects.map((x) => {
@@ -99,14 +102,14 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
                 const sourceKey = (0, path_1.join)(this.input.source, x.key);
                 const targetKey = (0, path_1.join)(this.input.target, x.key);
                 await this.triggerOnProgressHook({
-                    completed: completedCount,
-                    total: totalCount,
+                    completed: this.completedCount,
+                    total: this.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}`);
+                })} completed=${this.completedCount} total=${this.totalCount}`);
                 const { data: stream, headers } = await new get_object_1.GetObjectCommand({
                     key: sourceKey,
                 }, this.context).request();
@@ -119,23 +122,23 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
                     await (0, libs_1.verifyObjectHash)(targetKey, headers['x-hash']);
                 }
                 // progress
-                ++completedCount;
+                this.syncObjectRuntimeMap[x.key].completedCount = 1;
                 await this.printDebugInfo({
                     direction: 'pull',
-                    completedCount,
-                    errorCount,
-                    totalCount,
+                    completedCount: this.completedCount,
+                    errorCount: this.errorCount,
+                    totalCount: this.totalCount,
                 });
                 await this.triggerOnAfterUploadHook({
-                    completed: completedCount,
-                    total: totalCount,
+                    completed: this.completedCount,
+                    total: this.totalCount,
                     key: sourceKey,
                 });
                 // 下载完成
-                totalSize += x.size;
+                this.syncObjectRuntimeMap[x.key].totalSize = x.size;
                 debug(`[${(0, logger_1.now)()}] [sync:${x.action}.after] ${sourceKey} => ${targetKey} size=${(0, xbytes_1.default)(x.size, {
                     iec: true,
-                })} completed=${completedCount} total=${totalCount}`);
+                })} completed=${this.completedCount} total=${this.totalCount}`);
             };
         });
         await this.queue.addAll(actions);
@@ -143,10 +146,10 @@ class SyncFolderPullCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         return {
             statusCode: 200,
             data: {
-                errorCount,
+                errorCount: this.errorCount,
                 count: actions.length,
                 duration: (Date.now() - this.startTime) / 1000,
-                size: totalSize,
+                size: this.totalSize,
             },
         };
     }

package/dist/libs/api.d.ts

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

package/dist/libs/api.js

@@ -26,25 +26,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gotApi = exports.api = exports.MIN = void 0;
+exports.gotApi = exports.api = exports.TIMEOUT = void 0;
 const axios_1 = __importDefault(require("axios"));
 const agentkeepalive_1 = __importStar(require("agentkeepalive"));
 const got_1 = __importDefault(require("got"));
-exports.MIN = 60 * 1000;
+exports.TIMEOUT = 1000 * 60 * 60 * 6;
 const httpAgent = new agentkeepalive_1.default({
     maxSockets: 64,
     maxFreeSockets: 16,
-    timeout: exports.MIN,
-    freeSocketTimeout: exports.MIN,
-    keepAliveMsecs: exports.MIN,
+    timeout: exports.TIMEOUT,
+    freeSocketTimeout: exports.TIMEOUT,
+    keepAliveMsecs: exports.TIMEOUT,
     keepAlive: true,
 });
 const httpsAgent = new agentkeepalive_1.HttpsAgent({
     maxSockets: 64,
     maxFreeSockets: 16,
-    timeout: exports.MIN,
-    freeSocketTimeout: exports.MIN,
-    keepAliveMsecs: exports.MIN,
+    timeout: exports.TIMEOUT,
+    freeSocketTimeout: exports.TIMEOUT,
+    keepAliveMsecs: exports.TIMEOUT,
     keepAlive: true,
 });
 exports.api = axios_1.default.create({
@@ -58,7 +58,7 @@ exports.gotApi = got_1.default.extend({
         http: httpAgent,
         https: httpsAgent,
     },
-    timeout: 1000 * 60 * 60,
+    timeout: exports.TIMEOUT,
     retry: {
         limit: 3,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-js",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "publishConfig": {
     "access": "public"
   },
@@ -32,8 +32,8 @@
     "@arcblock/did": "^1.19.19",
     "@arcblock/jwt": "^1.19.19",
     "@arcblock/validator": "^1.19.19",
-    "@blocklet/env": "^1.16.41",
-    "@did-space/core": "^1.0.42",
+    "@blocklet/env": "^1.16.42-beta-20250408-072924-4b6a877a",
+    "@did-space/core": "^1.0.44",
     "@ocap/mcrypto": "^1.19.19",
     "@ocap/util": "^1.19.19",
     "@ocap/wallet": "^1.19.19",
@@ -77,5 +77,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "d80947cf1c12bcac67034d22e816e3aec2fb466f"
+  "gitHead": "5b4c87e2a4fbc3db28c6c95cd1799d1466844f53"
 }