@blocklet/did-space-js 1.0.39 → 1.0.41

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

@@ -23,7 +23,7 @@ export declare abstract class IncrementalSyncBaseCommand<CommandInput extends In
         SYNC_AFTER: string;
     };
     private retryCount;
-    constructor(input: IncrementalSyncBaseCommandInput, context?: SpaceClientOptions);
+    constructor(input: CommandInput, context?: SpaceClientOptions);
     private initialize;
     abstract getLocalObjectsMap(): Promise<ObjectsMap>;
     abstract getRemoteObjectsMap(): Promise<ObjectsMap>;

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

@@ -41,7 +41,6 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
     };
     retryCount = 0;
     constructor(input, context) {
-        // @ts-expect-error
         super(input, context);
         this.initialize(input);
         this.queue = new p_queue_1.default({ concurrency: this.input.concurrency });
@@ -171,11 +170,14 @@ class IncrementalSyncBaseCommand extends base_1.BaseCommand {
                 }
                 // 本地不存在 && 远程存在, 则删除远程的
                 if (!fromObject && toObject) {
-                    return {
-                        ...toObject,
-                        action: 'DELETE',
-                        key,
-                    };
+                    if (this.input.strictSync) {
+                        return {
+                            ...toObject,
+                            action: 'DELETE',
+                            key,
+                        };
+                    }
+                    return null;
                 }
                 // 本地存在的文件 && 在远程存在 && 两者文件大小不一致, 则修改远程的
                 if (fromObject.size !== toObject.size) {

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

@@ -12,10 +12,10 @@ const isFunction_1 = __importDefault(require("lodash/isFunction"));
 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 fs_extra_1 = require("fs-extra");
 const mime_types_1 = __importDefault(require("mime-types"));
 const promises_1 = require("node:stream/promises");
+const pick_1 = __importDefault(require("lodash/pick"));
 const object_1 = require("../object");
 const logger_1 = require("../../libs/logger");
 const delete_object_1 = require("../object/delete-object");

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

@@ -10,6 +10,7 @@ export interface ObjectsMap {
 export interface SyncObject extends Object {
     action: 'PUT' | 'DELETE';
     tempAbsolutePath?: string;
+    reason?: 'localNotExists' | 'remoteNotExists' | 'sizeMismatch' | 'lastModifiedMismatch' | 'hashMismatch';
 }
 /**
  * @see s3 sync https://stackoverflow.com/questions/27932345/downloading-folders-from-aws-s3-cp-or-sync
@@ -26,7 +27,19 @@ export declare abstract class SyncFolderBaseCommand<CommandInput extends SyncFol
     static readonly DEFAULT_CONCURRENCY: number;
     static readonly MAX_CONCURRENCY: number;
     private retryCount;
-    constructor(input: SyncFolderBaseCommandInput, context?: SpaceClientOptions);
+    /**
+     * @description 本地对象
+     */
+    protected localObjectsMap: ObjectsMap;
+    /**
+     * @description 远程对象
+     */
+    protected remoteObjectsMap: ObjectsMap;
+    /**
+     * @description 保存待同步的对象，避免重复计算，可优化性能
+     */
+    protected waitSyncObjects: SyncObject[];
+    constructor(input: CommandInput, context?: SpaceClientOptions);
     abstract getLocalObjectsMap(): Promise<ObjectsMap>;
     abstract getRemoteObjectsMap(): Promise<ObjectsMap>;
     /**
@@ -60,7 +73,7 @@ export declare abstract class SyncFolderBaseCommand<CommandInput extends SyncFol
      * @memberof SyncFolderBaseCommand
      */
     protected retryRequest(error: Error | AxiosError): Promise<SyncFolderPullCommandOutput>;
-    protected retryReuqestError(error: Error): Promise<void>;
+    protected onFailed?(error: Error): Promise<void>;
     /**
      *
      * @description 比较双方的文件到底谁更新鲜，更新鲜的数据才需要被同步上去

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

@@ -38,8 +38,19 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
     static DEFAULT_CONCURRENCY = 4;
     static MAX_CONCURRENCY = (0, os_1.cpus)().length;
     retryCount = 0;
+    /**
+     * @description 本地对象
+     */
+    localObjectsMap = {};
+    /**
+     * @description 远程对象
+     */
+    remoteObjectsMap = {};
+    /**
+     * @description 保存待同步的对象，避免重复计算，可优化性能
+     */
+    waitSyncObjects = [];
     constructor(input, context) {
-        // @ts-expect-error why?暂时没想通报错的原因
         super(input, context);
         if ((0, isUndefined_1.default)(input?.concurrency)) {
             this.input.concurrency = SyncFolderBaseCommand.DEFAULT_CONCURRENCY;
@@ -59,7 +70,7 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
         else {
             this.input.retryCount = input.retryCount;
         }
-        if (!this.input.source.endsWith('/')) {
+        if (typeof this.input.source === 'string' && !this.input.source.endsWith('/')) {
             this.input.source = (0, path_1.join)(this.input.source, '/');
         }
         if (!this.input.target.endsWith('/')) {
@@ -122,7 +133,7 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
         // FIXME: retryCount === 0 表示，重试次数刚好用完了，后续优化 server 显示错误的进度 @yejianchao
         // 防呆控制，retryCount < 0 说明调用基础接口始终是失败的,遇到了预料之外的事情，因此需要停止运行
         if (this.input.retryCount <= 0 || [400, 401, 403, 404, 413].includes(statusCode)) {
-            await this.retryReuqestError(error);
+            await this.onFailed?.(error);
             await this.destroy();
             return {
                 statusCode,
@@ -142,8 +153,6 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
         await (0, libs_1.sleep)(retryDelayMs);
         return this.request();
     }
-    // eslint-disable-next-line
-    async retryReuqestError(error) { }
     /**
      *
      * @description 比较双方的文件到底谁更新鲜，更新鲜的数据才需要被同步上去
@@ -154,6 +163,9 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
      * @memberof SyncFolderBaseCommand
      */
     async getWaitSyncObjects(fromObjectsMap, toObjectsMap) {
+        if (!(0, isEmpty_1.default)(this.waitSyncObjects)) {
+            return this.waitSyncObjects;
+        }
         const intersectionKeys = [...new Set((0, keys_1.default)(fromObjectsMap).concat((0, keys_1.default)(toObjectsMap)))];
         const actions = intersectionKeys.map((key) => {
             return async () => {
@@ -167,15 +179,20 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
                         ...fromObject,
                         action: 'PUT',
                         key,
+                        reason: 'remoteNotExists',
                     };
                 }
                 // 本地不存在 && 远程存在, 则删除远程的
                 if (!fromObject && toObject) {
-                    return {
-                        ...toObject,
-                        action: 'DELETE',
-                        key,
-                    };
+                    if (this.input.strictSync) {
+                        return {
+                            ...toObject,
+                            action: 'DELETE',
+                            key,
+                            reason: 'localNotExists',
+                        };
+                    }
+                    return null;
                 }
                 // 本地存在的文件 && 在远程存在 && 两者文件大小不一致, 则修改远程的
                 if (fromObject.size !== toObject.size) {
@@ -183,6 +200,7 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
                         ...fromObject,
                         action: 'PUT',
                         key,
+                        reason: 'sizeMismatch',
                     };
                 }
                 // 本地存在的文件 && 在远程存在 && 本地日期不新鲜,则无需修改
@@ -202,6 +220,7 @@ class SyncFolderBaseCommand extends base_1.BaseCommand {
                         ...fromObject,
                         action: 'PUT',
                         key,
+                        reason: 'hashMismatch',
                     };
                 }
                 return null;

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

@@ -1,7 +1,6 @@
 import { AxiosRequestConfig } from 'axios';
 import { PostObjectsSyncCommandOutput, SyncFolderPushCommandInput, SyncFolderPushCommandOutput } from '../../meta';
-import { ObjectsMap, SyncFolderBaseCommand } from './sync-folder-base';
-import type { SpaceClientOptions } from '../../protocol';
+import { ObjectsMap, SyncFolderBaseCommand, SyncObject } from './sync-folder-base';
 /**
  * @see s3 sync https://stackoverflow.com/questions/27932345/downloading-folders-from-aws-s3-cp-or-sync
  * @see 具有 Keep-alive 和连接重用的 NodeJS https://azureossd.github.io/2022/03/10/NodeJS-with-Keep-Alives-and-Connection-Reuse/index.html
@@ -12,13 +11,22 @@ import type { SpaceClientOptions } from '../../protocol';
 export declare class SyncFolderPushCommand extends SyncFolderBaseCommand<SyncFolderPushCommandInput, SyncFolderPushCommandOutput> {
     protected readonly startTime: number;
     protected objectsSync: PostObjectsSyncCommandOutput['data'] | null;
-    constructor(input: SyncFolderPushCommandInput, context?: SpaceClientOptions);
     getAxiosRequestConfig(): Promise<AxiosRequestConfig<any> | null>;
     request(): Promise<SyncFolderPushCommandOutput>;
     getLocalObjectsMap(): Promise<ObjectsMap>;
     getRemoteObjectsMap(): Promise<ObjectsMap>;
-    protected retryReuqestError(error: Error): Promise<void>;
+    protected onFailed(error: Error): Promise<void>;
     private sync;
+    /**
+     * @see https://github.com/ArcBlock/did-spaces/issues/955#issuecomment-1873723050
+     * @description 备份的对象随时可能在进行写入操作,所以对于需要备份的文件,最佳实践是备份它们某一个时刻的副本,否则会引发错误 Error: Unexpected end of form
+     * @param {SyncObject[]} syncObject
+     * @return {*}  {Promise<SyncObject[]>}
+     * @memberof IncrementalSyncPushCommand
+     */
+    copyObjectToTmpDir(syncObject: SyncObject): Promise<SyncObject>;
+    destroyObject(syncObject: SyncObject): Promise<void>;
+    destroy(): Promise<void>;
     private createObjectsSyncAuditLog;
     private updateObjectsSyncAuditLog;
 }

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

@@ -5,26 +5,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncFolderPushCommand = void 0;
 /* eslint-disable @typescript-eslint/indent */
-const core_1 = require("@did-space/core");
 const fs_1 = require("fs");
+const core_1 = require("@did-space/core");
 const path_1 = require("path");
 const filehound_1 = __importDefault(require("filehound"));
 const isFunction_1 = __importDefault(require("lodash/isFunction"));
 const keyBy_1 = __importDefault(require("lodash/keyBy"));
 const fs_extra_1 = require("fs-extra");
-const debug_1 = __importDefault(require("debug"));
 const xbytes_1 = __importDefault(require("xbytes"));
-const pick_1 = __importDefault(require("lodash/pick"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const promises_1 = require("stream/promises");
+const debug_1 = __importDefault(require("debug"));
+const p_all_1 = __importDefault(require("p-all"));
+const pick_1 = __importDefault(require("lodash/pick"));
+const meta_1 = require("../../meta");
 const object_1 = require("../object");
 const sync_folder_base_1 = require("./sync-folder-base");
 const logger_1 = require("../../libs/logger");
 const delete_object_1 = require("../object/delete-object");
+const preview_1 = require("../preview");
 const libs_1 = require("../../libs");
 const post_objects_sync_command_1 = require("../audit-log/post-objects-sync-command");
 const put_objects_sync_command_1 = require("../audit-log/put-objects-sync-command");
 const { name, version } = require('../../../package.json');
-const debug = (0, debug_1.default)(`${name}@${version}:sync-folder-push`);
+let debug = (0, debug_1.default)(`${name}@${version}:sync-folder-push`);
+debug = console.error;
 /**
  * @see s3 sync https://stackoverflow.com/questions/27932345/downloading-folders-from-aws-s3-cp-or-sync
  * @see 具有 Keep-alive 和连接重用的 NodeJS https://azureossd.github.io/2022/03/10/NodeJS-with-Keep-Alives-and-Connection-Reuse/index.html
@@ -35,11 +40,6 @@ const debug = (0, debug_1.default)(`${name}@${version}:sync-folder-push`);
 class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
     startTime = Date.now();
     objectsSync = null;
-    constructor(input, context) {
-        super(input, context);
-        // 确保文件夹存在
-        (0, fs_extra_1.ensureDirSync)(this.input.source);
-    }
     getAxiosRequestConfig() {
         return Promise.resolve(null);
     }
@@ -52,8 +52,8 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
             }
             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('syncObjects', 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']) });
             const res = await this.sync(syncObjects);
@@ -77,23 +77,65 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         }
     }
     async getLocalObjectsMap() {
-        const files = filehound_1.default.create()
-            .path(this.input.source)
-            .includeFileStats()
-            .findSync();
-        let objects = await Promise.all(files.map((file) => {
-            const key = file.path.replace(this.input.source, '/');
-            return {
-                key,
-                name: (0, path_1.basename)(key),
-                isDir: key.endsWith('/'),
-                size: file.stats.size,
-                lastModified: new Date(file.stats.mtime).getTime(),
-                editable: true,
-                mimeType: null,
-                absolutePath: file.path,
-            };
-        }));
+        if (!(0, isEmpty_1.default)(this.localObjectsMap)) {
+            return this.localObjectsMap;
+        }
+        let objects = [];
+        if (Array.isArray(this.input.source)) {
+            objects = await (0, p_all_1.default)(this.input.source.map((x) => {
+                return async () => {
+                    if ((0, meta_1.isSourceObjectWithPath)(x)) {
+                        const { key, absolutePath } = x;
+                        const stats = await (0, fs_extra_1.stat)(absolutePath);
+                        return {
+                            key: (0, path_1.join)('/', x.key),
+                            name: (0, path_1.basename)(key),
+                            isDir: key.endsWith('/'),
+                            size: stats.size,
+                            lastModified: new Date(stats.mtime).getTime(),
+                            editable: true,
+                            mimeType: null,
+                            absolutePath,
+                        };
+                    }
+                    const { key, data } = x;
+                    const absolutePath = (0, path_1.join)(this.input.tmpDir, key);
+                    await (0, libs_1.writeData)(absolutePath, data);
+                    const stats = await (0, fs_extra_1.stat)(absolutePath);
+                    return {
+                        key: (0, path_1.join)('/', x.key),
+                        name: (0, path_1.basename)(key),
+                        isDir: key.endsWith('/'),
+                        size: stats.size,
+                        lastModified: new Date(stats.mtime).getTime(),
+                        editable: true,
+                        mimeType: null,
+                        absolutePath,
+                    };
+                };
+            }), {
+                concurrency: this.input.concurrency,
+            });
+        }
+        else {
+            const files = filehound_1.default.create()
+                .path(this.input.source)
+                .includeFileStats()
+                .findSync();
+            objects = await Promise.all(files.map((file) => {
+                const key = file.path.replace(this.input.source, '/');
+                return {
+                    key,
+                    name: (0, path_1.basename)(key),
+                    isDir: key.endsWith('/'),
+                    size: file.stats.size,
+                    lastModified: new Date(file.stats.mtime).getTime(),
+                    editable: true,
+                    mimeType: null,
+                    absolutePath: file.path,
+                };
+            }));
+        }
         if ((0, isFunction_1.default)(this.input.filter)) {
             objects = objects.filter(this.input.filter);
         }
@@ -101,13 +143,16 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         return map;
     }
     async getRemoteObjectsMap() {
+        if (!(0, isEmpty_1.default)(this.remoteObjectsMap)) {
+            return this.remoteObjectsMap;
+        }
         const { data: objects } = await new object_1.ListObjectsCommand({
             key: this.input.target,
         }, this.context).request();
         const map = (0, keyBy_1.default)(objects, (object) => object.key);
         return map;
     }
-    async retryReuqestError(error) {
+    async onFailed(error) {
         if (this.objectsSync) {
             await this.updateObjectsSyncAuditLog({
                 id: this.objectsSync.id,
@@ -138,47 +183,56 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
         });
         const actions = syncObjects.map((x) => {
             return async () => {
-                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,
-                    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;
+                try {
+                    await this.copyObjectToTmpDir(x);
+                    const sourceKey = x.tempAbsolutePath;
+                    if (!sourceKey) {
+                        return;
+                    }
+                    const targetKey = (0, path_1.join)(this.input.target, x.key);
+                    await this.triggerOnProgressHook({
+                        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;
+                    }
+                    else {
+                        await new delete_object_1.DeleteObjectCommand({
+                            key: targetKey,
+                        }, this.context).request();
+                    }
+                    // progress
+                    ++completedCount;
+                    await this.printDebugInfo({
+                        direction: 'push',
+                        completedCount,
+                        errorCount,
+                        totalCount,
+                    });
+                    await this.triggerOnAfterUploadHook({
+                        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;
-                await this.printDebugInfo({
-                    direction: 'push',
-                    completedCount,
-                    errorCount,
-                    totalCount,
-                });
-                await this.triggerOnAfterUploadHook({
-                    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}`);
             };
         });
         if (!(0, isEmpty_1.default)(this.input.metadata)) {
@@ -189,6 +243,17 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
                 }, this.context).request();
             });
         }
+        if (!(0, isEmpty_1.default)(this.input.preview)) {
+            actions.unshift(async () => {
+                await new preview_1.PutPreviewObjectCommand({
+                    key: this.input.target,
+                    // @ts-ignore TODO: 这个问题是啥？
+                    data: {
+                        ...this.input.preview,
+                    },
+                }, this.context).request();
+            });
+        }
         await this.queue.addAll(actions);
         await this.queue.onIdle();
         await this.destroy();
@@ -202,12 +267,47 @@ class SyncFolderPushCommand extends sync_folder_base_1.SyncFolderBaseCommand {
             },
         };
     }
+    /**
+     * @see https://github.com/ArcBlock/did-spaces/issues/955#issuecomment-1873723050
+     * @description 备份的对象随时可能在进行写入操作,所以对于需要备份的文件,最佳实践是备份它们某一个时刻的副本,否则会引发错误 Error: Unexpected end of form
+     * @param {SyncObject[]} syncObject
+     * @return {*}  {Promise<SyncObject[]>}
+     * @memberof IncrementalSyncPushCommand
+     */
+    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, fs_extra_1.remove)(syncObject.tempAbsolutePath);
+        }
+    }
+    async destroy() {
+        await super.destroy();
+    }
     async createObjectsSyncAuditLog() {
-        return (await new post_objects_sync_command_1.PostObjectsSyncCommand({
-            source: this.input.source,
-            target: this.input.target,
-            metadata: this.input.metadata,
-        }, this.context).request()).data;
+        if (typeof this.input.source === 'string') {
+            return (await new post_objects_sync_command_1.PostObjectsSyncCommand({
+                source: this.input.source,
+                target: this.input.target,
+                metadata: this.input.metadata,
+            }, this.context).request()).data;
+        }
+        return null;
     }
     async updateObjectsSyncAuditLog(input) {
         const { id, reason, status, errorCount, totalCount, ...rest } = input;

package/dist/libs/data.d.ts

@@ -0,0 +1,2 @@
+import type { Data } from '@did-space/core';
+export declare function writeData(target: string, data: Data): Promise<void>;

package/dist/libs/data.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeData = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const promises_1 = require("stream/promises");
+async function writeData(target, data) {
+    await (0, fs_extra_1.ensureDir)((0, path_1.dirname)(target));
+    if (typeof data === 'string' || data instanceof Buffer) {
+        return (0, fs_extra_1.outputFile)(target, data);
+    }
+    return (0, promises_1.pipeline)(data, (0, fs_extra_1.createWriteStream)(target));
+}
+exports.writeData = writeData;

package/dist/libs/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './data';
 export * from './did';
 export * from './encoding';
 export * from './error';
@@ -10,3 +11,4 @@ export * from './performance';
 export * from './sleep';
 export * from './space';
 export * from './stream';
+export * from './types';

package/dist/libs/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
+__exportStar(require("./data"), exports);
 __exportStar(require("./did"), exports);
 __exportStar(require("./encoding"), exports);
 __exportStar(require("./error"), exports);
@@ -26,3 +27,4 @@ __exportStar(require("./performance"), exports);
 __exportStar(require("./sleep"), exports);
 __exportStar(require("./space"), exports);
 __exportStar(require("./stream"), exports);
+__exportStar(require("./types"), exports);

package/dist/libs/types.d.ts

@@ -0,0 +1,2 @@
+import type { PutObjectCommandInput, SourceObject } from '../meta';
+export declare function isPutObjectCommandInput(item: PutObjectCommandInput | SourceObject): item is PutObjectCommandInput;

package/dist/libs/types.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPutObjectCommandInput = void 0;
+function isPutObjectCommandInput(item) {
+    return 'data' in item;
+}
+exports.isPutObjectCommandInput = isPutObjectCommandInput;

package/dist/meta/index.d.ts

@@ -1,5 +1,5 @@
 export * from './backup';
-export * from './incremental-backup';
+export * from './incremental';
 export * from './nft';
 export * from './object';
 export * from './restore';

package/dist/meta/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./backup"), exports);
-__exportStar(require("./incremental-backup"), exports);
+__exportStar(require("./incremental"), exports);
 __exportStar(require("./nft"), exports);
 __exportStar(require("./object"), exports);
 __exportStar(require("./restore"), exports);

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

@@ -10,10 +10,12 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
      * @description 预览模板的数据
      */
     data: z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
-        template: z.ZodLiteral<"app">;
+        template: z.ZodLiteral<"app">; /**
+         * @description 预览模板的数据
+         */
         name: z.ZodString;
         logo: z.ZodString;
     }>, "strip", z.ZodTypeAny, {
@@ -27,7 +29,7 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         name: string;
         logo: string;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodLiteral<"nft">;
@@ -47,7 +49,7 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         image: string;
         chainHost: string;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodDefault<z.ZodOptional<z.ZodLiteral<"profile">>>;
@@ -67,7 +69,7 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         email: string;
         template?: "profile" | undefined;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodLiteral<"passport">;
@@ -99,36 +101,36 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         issuedTo: string;
         verified: boolean;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
-        template: z.ZodLiteral<"discuss">;
+        template: z.ZodLiteral<"post">;
         title: z.ZodString;
-        tags: z.ZodArray<z.ZodString, "many">;
+        tags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
         url: z.ZodString;
-        createdAt: z.ZodString;
+        createdAt: z.ZodEffects<z.ZodString, string, string>;
     }>, "strip", z.ZodTypeAny, {
-        template: "discuss";
+        template: "post";
         did: string;
         title: string;
         tags: string[];
         url: string;
         createdAt: string;
     }, {
-        template: "discuss";
+        template: "post";
         did: string;
         title: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodLiteral<"blog">;
         title: z.ZodString;
         image: z.ZodString;
-        tags: z.ZodArray<z.ZodString, "many">;
+        tags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
         url: z.ZodString;
         createdAt: z.ZodEffects<z.ZodString, string, string>;
     }>, "strip", z.ZodTypeAny, {
@@ -144,17 +146,17 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         did: string;
         title: string;
         image: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodLiteral<"bookmark">;
         title: z.ZodString;
         image: z.ZodString;
-        tags: z.ZodArray<z.ZodString, "many">;
+        tags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>;
         url: z.ZodString;
         createdAt: z.ZodEffects<z.ZodString, string, string>;
     }>, "strip", z.ZodTypeAny, {
@@ -170,11 +172,11 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         did: string;
         title: string;
         image: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     }>, z.ZodObject<z.objectUtil.extendShape<{
-        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"discuss">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
+        template: z.ZodUnion<[z.ZodLiteral<"nft">, z.ZodLiteral<"profile">, z.ZodLiteral<"passport">, z.ZodLiteral<"post">, z.ZodLiteral<"blog">, z.ZodLiteral<"bookmark">, z.ZodLiteral<"project">, z.ZodLiteral<"app">]>;
         did: z.ZodEffects<z.ZodString, string, string>;
     }, {
         template: z.ZodLiteral<"project">;
@@ -218,18 +220,16 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, "strip", z.ZodTypeAny, {
         key: string;
-        metadata?: Record<string, any> | undefined;
         data?: any;
+        metadata?: Record<string, any> | undefined;
         hash?: string | undefined;
     }, {
         key: string;
-        metadata?: Record<string, any> | undefined;
         data?: any;
+        metadata?: Record<string, any> | undefined;
         hash?: string | undefined;
     }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
-    metadata: Record<string, any>;
-    key: string;
     data: {
         template: "app";
         did: string;
@@ -258,7 +258,7 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         issuedTo: string;
         verified: boolean;
     } | {
-        template: "discuss";
+        template: "post";
         did: string;
         title: string;
         tags: string[];
@@ -289,15 +289,16 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         createdAt: string;
         description?: string | undefined;
     };
+    metadata: Record<string, any>;
+    key: string;
     resources: {
         key: string;
-        metadata?: Record<string, any> | undefined;
         data?: any;
+        metadata?: Record<string, any> | undefined;
         hash?: string | undefined;
     }[];
     hash?: string | undefined;
 }, {
-    key: string;
     data: {
         template: "app";
         did: string;
@@ -326,28 +327,28 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         issuedTo: string;
         verified: boolean;
     } | {
-        template: "discuss";
+        template: "post";
         did: string;
         title: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     } | {
         template: "blog";
         did: string;
         title: string;
         image: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     } | {
         template: "bookmark";
         did: string;
         title: string;
         image: string;
-        tags: string[];
         url: string;
         createdAt: string;
+        tags?: string[] | undefined;
     } | {
         template: "project";
         did: string;
@@ -357,12 +358,13 @@ export declare const PutPreviewObjectCommandInputSchema: z.ZodObject<{
         createdAt: string;
         description?: string | undefined;
     };
+    key: string;
     metadata?: Record<string, any> | undefined;
     hash?: string | undefined;
     resources?: {
         key: string;
-        metadata?: Record<string, any> | undefined;
         data?: any;
+        metadata?: Record<string, any> | undefined;
         hash?: string | undefined;
     }[] | undefined;
 }>;

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

@@ -20,13 +20,13 @@ export declare const PutObjectCommandInputSchema: z.ZodObject<{
     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
     key: string;
-    metadata?: Record<string, any> | undefined;
     data?: any;
+    metadata?: Record<string, any> | undefined;
     hash?: string | undefined;
 }, {
     key: string;
-    metadata?: Record<string, any> | undefined;
     data?: any;
+    metadata?: Record<string, any> | undefined;
     hash?: string | undefined;
 }>;
 export interface PutObjectCommandInput extends z.infer<typeof PutObjectCommandInputSchema>, CommandInput {

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

@@ -93,6 +93,12 @@ export interface SyncBaseCommandInput extends CommandInput {
      * @memberof SyncBaseCommandInput
      */
     tmpDir?: string;
+    /**
+     * @description 是否启用严格同步, 默认是 false。如果为 true, 则会从 target 中删除多余的文件(删除 target 中存在的文件但在 source 中不存在的文件)
+     * @type {boolean}
+     * @memberof SyncBaseCommandInput
+     */
+    strictSync?: boolean;
 }
 export interface SyncBaseCommandOutputData {
     /**

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

@@ -1,4 +1,14 @@
+import type { Data } from '@did-space/core';
 import { SyncBaseCommandInput, SyncBaseCommandOutput } from './sync-base-command';
+export interface SourceObjectWithPath {
+    key: string;
+    absolutePath: string;
+}
+export interface SourceObjectWithData {
+    key: string;
+    data: Data;
+}
+export type SourceObject = SourceObjectWithPath | SourceObjectWithData;
 export interface SyncFolderBaseCommandInput extends SyncBaseCommandInput {
     /**
      *
@@ -6,7 +16,9 @@ export interface SyncFolderBaseCommandInput extends SyncBaseCommandInput {
      * @type {string}
      * @memberof SyncFolderBaseCommandInput
      */
-    source: string;
+    source: string | SourceObject[];
 }
 export interface SyncFolderBaseCommandOutput extends SyncBaseCommandOutput {
 }
+export declare function isSourceObjectWithPath(object: SourceObject): object is SourceObjectWithPath;
+export declare function isSourceObjectWithData(object: SourceObject): object is SourceObjectWithData;

package/dist/meta/sync/sync-folder-base-command.js

@@ -1,2 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSourceObjectWithData = exports.isSourceObjectWithPath = void 0;
+function isSourceObjectWithPath(object) {
+    return typeof object === 'object' && 'absolutePath' in object;
+}
+exports.isSourceObjectWithPath = isSourceObjectWithPath;
+function isSourceObjectWithData(object) {
+    return typeof object === 'object' && 'data' in object;
+}
+exports.isSourceObjectWithData = isSourceObjectWithData;

package/dist/meta/sync/sync-folder-pull-command.d.ts

@@ -1,5 +1,6 @@
 import { SyncFolderBaseCommandInput, SyncFolderBaseCommandOutput } from './sync-folder-base-command';
 export interface SyncFolderPullCommandInput extends SyncFolderBaseCommandInput {
+    source: string;
 }
 export interface SyncFolderPullCommandOutput extends SyncFolderBaseCommandOutput {
 }

package/dist/meta/sync/sync-folder-push-command.d.ts

@@ -1,7 +1,11 @@
-import type { ObjectMetadata } from '@did-space/core';
+import type { ObjectMetadata, PreviewTemplate } from '@did-space/core';
 import { SyncFolderBaseCommandInput, SyncFolderBaseCommandOutput } from './sync-folder-base-command';
 export interface SyncFolderPushCommandInput extends SyncFolderBaseCommandInput {
     metadata?: ObjectMetadata;
+    /**
+     * @description 预览模板
+     */
+    preview?: PreviewTemplate;
 }
 export interface SyncFolderPushCommandOutput extends SyncFolderBaseCommandOutput {
 }

package/dist/security/request-signature.js

@@ -15,7 +15,6 @@ const mcrypto_1 = require("@ocap/mcrypto");
 const wallet_1 = require("@ocap/wallet");
 const is_url_1 = __importDefault(require("is-url"));
 const debug_1 = __importDefault(require("debug"));
-const logger_1 = require("../libs/logger");
 const debug = (0, debug_1.default)('request-signature');
 // verifyDelegation to get actual appDid
 async function verifyDelegation(delegation, delegatee) {
@@ -126,13 +125,14 @@ async function verifyRequest({ url, method, data, headers, }) {
         data: verifyData,
     }));
     if (payload.digest !== expectedDigest) {
-        logger_1.logger.info('verifyRequest', {
+        console.error('verifyRequest.payload.digest.error', {
             url,
             signUrl,
             method,
-            data,
             headers,
+            verifyData,
         });
+        console.error('verifyRequest.payload.digest.data', data);
         throw new Error('payload.digest do not match');
     }
     return appDid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-js",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "publishConfig": {
     "access": "public"
   },
@@ -33,7 +33,7 @@
     "@arcblock/jwt": "^1.19.17",
     "@arcblock/validator": "^1.19.17",
     "@blocklet/env": "^1.16.41",
-    "@did-space/core": "^1.0.39",
+    "@did-space/core": "^1.0.41",
     "@ocap/mcrypto": "^1.19.17",
     "@ocap/util": "^1.19.17",
     "@ocap/wallet": "^1.19.17",
@@ -53,6 +53,7 @@
     "json-stable-stringify": "^1.2.1",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
+    "nanoid": "^3.3.11",
     "p-all": "3.0.0",
     "p-queue": "6.6.2",
     "ufo": "^1.5.4",
@@ -76,5 +77,5 @@
     "ts-jest": "^28.0.8",
     "typescript": "^4.9.5"
   },
-  "gitHead": "91f6b51438b570b2c8a244bd3f3a606bbb9b09d7"
+  "gitHead": "7747108164c8e0cc847146ff34eb9bf289523cc1"
 }