@blocklet/did-space-js 1.0.15 → 1.0.16

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

@@ -18,6 +18,10 @@ export declare abstract class IncrementalSyncBaseCommand<CommandInput extends In
     static readonly MAX_RETRY_COUNT: number;
     static readonly DEFAULT_CONCURRENCY: number;
     static readonly MAX_CONCURRENCY: number;
+    static readonly EVENTS: {
+        SYNC_BEFORE: string;
+        SYNC_AFTER: string;
+    };
     private retryCount;
     constructor(input: IncrementalSyncBaseCommandInput, context?: SpaceClientOptions);
     private initialize;

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

@@ -35,6 +35,10 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
     static MAX_RETRY_COUNT = 10;
     static DEFAULT_CONCURRENCY = 4;
     static MAX_CONCURRENCY = (0, os_1.cpus)().length;
+    static EVENTS = {
+        SYNC_BEFORE: 'sync.before',
+        SYNC_AFTER: 'sync.after',
+    };
     retryCount = 0;
     constructor(input, context) {
         // @ts-expect-error
@@ -92,7 +96,7 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
         const remaining = totalCount - errorCount - completedCount;
         const progress = ((completedCount * 100) / totalCount).toFixed(2);
         const duration = (Date.now() - this.startTime) / 1000;
-        logger_1.logger.info(`[${direction}] pending: ${this.queue.pending}, completed: ${completedCount}, error: ${errorCount}, remaining: ${remaining}, progress: ${progress}%, total: ${totalCount}, retryCount: ${this.input.retryCount}, duration: ${duration}(s)`);
+        logger_1.logger.info(`[${direction}] target: ${this.input.target}, pending: ${this.queue.pending}, completed: ${completedCount}, error: ${errorCount}, remaining: ${remaining}, progress: ${progress}%, total: ${totalCount}, retryCount: ${this.input.retryCount}, duration: ${duration}(s)`);
     }
     /**
      *

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

@@ -114,10 +114,10 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
     }
     registerEvents() {
         this.removeAllListeners();
-        this.on('sync.before', async (input) => {
+        this.on(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_BEFORE, async (input) => {
             await this.input?.onProgress?.(input);
         });
-        this.on('sync.after', async (input) => {
+        this.on(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_AFTER, async (input) => {
             await this.input?.onAfterUpload?.(input);
         });
     }
@@ -145,10 +145,10 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
                     await this.copyObjectToTmpDir(x);
                     const sourceKey = x.tempAbsolutePath;
                     const targetKey = (0, path_1.join)(this.input.target, x.key);
-                    this.emit('sync.before', {
+                    this.emit(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_BEFORE, {
                         completed: completedCount,
                         total: totalCount,
-                        key: sourceKey,
+                        key: x.key,
                     });
                     if (x.action === 'PUT' && !(await this.shouldBeBackup(sourceKey))) {
                         debug('sync.return', {
@@ -182,10 +182,10 @@ class IncrementalSyncPushCommand extends sync_base_1.IncrementalSyncBaseCommand
                         errorCount,
                         totalCount,
                     });
-                    this.emit('sync.after', {
+                    this.emit(sync_base_1.IncrementalSyncBaseCommand.EVENTS.SYNC_AFTER, {
                         completed: completedCount,
                         total: totalCount,
-                        key: sourceKey,
+                        key: x.key,
                     });
                     // 结束上传
                     debug(`[${(0, logger_1.now)()}] [sync:${x.action}.after] ${sourceKey}=>${targetKey} size=${(0, xbytes_1.default)(x.size, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-js",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "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.15",
+    "@did-space/core": "^1.0.16",
     "@ocap/mcrypto": "^1.19.9",
     "@ocap/util": "^1.19.9",
     "@ocap/wallet": "^1.19.9",
@@ -43,7 +43,7 @@
     "dayjs": "^1.11.13",
     "debug": "^4.4.0",
     "filehound": "^1.17.6",
-    "form-data": "^4.0.1",
+    "form-data": "^4.0.2",
     "fs-extra": "^11.3.0",
     "got": "^11.8.6",
     "hasha": "^5.2.2",
@@ -76,5 +76,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "5b7c651163212bec81066afdd2f43cda21dbc9e7"
+  "gitHead": "38490648f9fce60497b731dd50399c4f00955ce3"
 }