@tachybase/module-backup 1.6.20 → 1.6.22

package/dist/externalVersion.js

@@ -1,11 +1,11 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.6.20",
-  "@tego/client": "1.6.11",
+  "@tachybase/client": "1.6.22",
+  "@tego/client": "1.6.13",
   "@ant-design/icons": "6.1.0",
   "antd": "5.22.5",
-  "@tachybase/schema": "1.6.11",
-  "@tego/server": "1.6.11",
+  "@tachybase/schema": "1.6.13",
+  "@tego/server": "1.6.13",
   "dayjs": "1.11.13",
   "lodash": "4.17.21",
   "react-i18next": "16.2.1"

package/dist/node_modules/@hapi/topo/package.json

@@ -1 +1 @@
-{"name":"@hapi/topo","description":"Topological sorting with grouping support","version":"6.0.2","repository":"git://github.com/hapijs/topo","main":"lib/index.js","types":"lib/index.d.ts","files":["lib"],"keywords":["topological","sort","toposort","topsort"],"eslintConfig":{"extends":["plugin:@hapi/module"]},"dependencies":{"@hapi/hoek":"^11.0.2"},"devDependencies":{"@hapi/code":"^9.0.3","@hapi/eslint-plugin":"*","@hapi/lab":"^25.1.2","@types/node":"^17.0.31","typescript":"~4.6.4"},"scripts":{"test":"lab -a @hapi/code -t 100 -L -Y","test-cov-html":"lab -a @hapi/code -t 100 -L -r html -o coverage.html"},"license":"BSD-3-Clause","_lastModified":"2026-05-21T10:32:39.363Z"}
+{"name":"@hapi/topo","description":"Topological sorting with grouping support","version":"6.0.2","repository":"git://github.com/hapijs/topo","main":"lib/index.js","types":"lib/index.d.ts","files":["lib"],"keywords":["topological","sort","toposort","topsort"],"eslintConfig":{"extends":["plugin:@hapi/module"]},"dependencies":{"@hapi/hoek":"^11.0.2"},"devDependencies":{"@hapi/code":"^9.0.3","@hapi/eslint-plugin":"*","@hapi/lab":"^25.1.2","@types/node":"^17.0.31","typescript":"~4.6.4"},"scripts":{"test":"lab -a @hapi/code -t 100 -L -Y","test-cov-html":"lab -a @hapi/code -t 100 -L -r html -o coverage.html"},"license":"BSD-3-Clause","_lastModified":"2026-06-16T10:35:02.430Z"}

package/dist/node_modules/archiver/package.json

@@ -1 +1 @@
-{"name":"archiver","version":"7.0.1","description":"a streaming interface for archive generation","homepage":"https://github.com/archiverjs/node-archiver","author":{"name":"Chris Talkington","url":"http://christalkington.com/"},"repository":{"type":"git","url":"https://github.com/archiverjs/node-archiver.git"},"bugs":{"url":"https://github.com/archiverjs/node-archiver/issues"},"license":"MIT","main":"index.js","files":["index.js","lib"],"engines":{"node":">= 14"},"scripts":{"test":"mocha --reporter dot","bench":"node benchmark/simple/pack-zip.js"},"dependencies":{"archiver-utils":"^5.0.2","async":"^3.2.4","buffer-crc32":"^1.0.0","readable-stream":"^4.0.0","readdir-glob":"^1.1.2","tar-stream":"^3.0.0","zip-stream":"^6.0.1"},"devDependencies":{"archiver-jsdoc-theme":"1.1.3","chai":"4.4.1","jsdoc":"4.0.2","mkdirp":"3.0.1","mocha":"10.3.0","rimraf":"5.0.5","stream-bench":"0.1.2","tar":"6.2.0","yauzl":"3.1.2"},"keywords":["archive","archiver","stream","zip","tar"],"publishConfig":{"registry":"https://registry.npmjs.org/"},"_lastModified":"2026-05-21T10:32:39.265Z"}
+{"name":"archiver","version":"7.0.1","description":"a streaming interface for archive generation","homepage":"https://github.com/archiverjs/node-archiver","author":{"name":"Chris Talkington","url":"http://christalkington.com/"},"repository":{"type":"git","url":"https://github.com/archiverjs/node-archiver.git"},"bugs":{"url":"https://github.com/archiverjs/node-archiver/issues"},"license":"MIT","main":"index.js","files":["index.js","lib"],"engines":{"node":">= 14"},"scripts":{"test":"mocha --reporter dot","bench":"node benchmark/simple/pack-zip.js"},"dependencies":{"archiver-utils":"^5.0.2","async":"^3.2.4","buffer-crc32":"^1.0.0","readable-stream":"^4.0.0","readdir-glob":"^1.1.2","tar-stream":"^3.0.0","zip-stream":"^6.0.1"},"devDependencies":{"archiver-jsdoc-theme":"1.1.3","chai":"4.4.1","jsdoc":"4.0.2","mkdirp":"3.0.1","mocha":"10.3.0","rimraf":"5.0.5","stream-bench":"0.1.2","tar":"6.2.0","yauzl":"3.1.2"},"keywords":["archive","archiver","stream","zip","tar"],"publishConfig":{"registry":"https://registry.npmjs.org/"},"_lastModified":"2026-06-16T10:35:02.332Z"}

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.9.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"types/index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^3.2.1"},"devDependencies":{"eslint":"^8.27.0","sinon":"^15.0.1","tap":"^16.3.3","tsd":"^0.26.0"},"engines":{"node":">=12.0.0"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"files":["lib","types","LICENSE","README.md"],"_lastModified":"2026-05-21T10:32:40.544Z"}
+{"name":"cron-parser","version":"4.9.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"types/index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^3.2.1"},"devDependencies":{"eslint":"^8.27.0","sinon":"^15.0.1","tap":"^16.3.3","tsd":"^0.26.0"},"engines":{"node":">=12.0.0"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"files":["lib","types","LICENSE","README.md"],"_lastModified":"2026-06-16T10:35:03.142Z"}

package/dist/node_modules/semver/package.json

@@ -1 +1 @@
-{"name":"semver","version":"7.7.2","description":"The semantic version parser used by npm.","main":"index.js","scripts":{"test":"tap","snap":"tap","lint":"npm run eslint","postlint":"template-oss-check","lintfix":"npm run eslint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force","eslint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""},"devDependencies":{"@npmcli/eslint-config":"^5.0.0","@npmcli/template-oss":"4.24.3","benchmark":"^2.1.4","tap":"^16.0.0"},"license":"ISC","repository":{"type":"git","url":"git+https://github.com/npm/node-semver.git"},"bin":{"semver":"bin/semver.js"},"files":["bin/","lib/","classes/","functions/","internal/","ranges/","index.js","preload.js","range.bnf"],"tap":{"timeout":30,"coverage-map":"map.js","nyc-arg":["--exclude","tap-snapshots/**"]},"engines":{"node":">=10"},"author":"GitHub Inc.","templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.24.3","engines":">=10","distPaths":["classes/","functions/","internal/","ranges/","index.js","preload.js","range.bnf"],"allowPaths":["/classes/","/functions/","/internal/","/ranges/","/index.js","/preload.js","/range.bnf","/benchmarks"],"publish":"true"},"_lastModified":"2026-05-21T10:32:39.603Z"}
+{"name":"semver","version":"7.7.2","description":"The semantic version parser used by npm.","main":"index.js","scripts":{"test":"tap","snap":"tap","lint":"npm run eslint","postlint":"template-oss-check","lintfix":"npm run eslint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force","eslint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""},"devDependencies":{"@npmcli/eslint-config":"^5.0.0","@npmcli/template-oss":"4.24.3","benchmark":"^2.1.4","tap":"^16.0.0"},"license":"ISC","repository":{"type":"git","url":"git+https://github.com/npm/node-semver.git"},"bin":{"semver":"bin/semver.js"},"files":["bin/","lib/","classes/","functions/","internal/","ranges/","index.js","preload.js","range.bnf"],"tap":{"timeout":30,"coverage-map":"map.js","nyc-arg":["--exclude","tap-snapshots/**"]},"engines":{"node":">=10"},"author":"GitHub Inc.","templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.24.3","engines":">=10","distPaths":["classes/","functions/","internal/","ranges/","index.js","preload.js","range.bnf"],"allowPaths":["/classes/","/functions/","/internal/","/ranges/","/index.js","/preload.js","/range.bnf","/benchmarks"],"publish":"true"},"_lastModified":"2026-06-16T10:35:02.687Z"}

package/dist/node_modules/yauzl/package.json

@@ -1 +1 @@
-{"name":"yauzl","version":"3.2.0","description":"yet another unzip library for node","engines":{"node":">=12"},"main":"index.js","scripts":{"test":"node test/test.js"},"repository":{"type":"git","url":"git+https://github.com/thejoshwolfe/yauzl.git"},"keywords":["unzip","zip","stream","archive","file"],"author":"Josh Wolfe <thejoshwolfe@gmail.com>","license":"MIT","bugs":{"url":"https://github.com/thejoshwolfe/yauzl/issues"},"homepage":"https://github.com/thejoshwolfe/yauzl","dependencies":{"buffer-crc32":"~0.2.3","pend":"~1.2.0"},"devDependencies":{"bl":"^6.0.11"},"files":["fd-slicer.js","index.js"],"_lastModified":"2026-05-21T10:32:39.772Z"}
+{"name":"yauzl","version":"3.2.0","description":"yet another unzip library for node","engines":{"node":">=12"},"main":"index.js","scripts":{"test":"node test/test.js"},"repository":{"type":"git","url":"git+https://github.com/thejoshwolfe/yauzl.git"},"keywords":["unzip","zip","stream","archive","file"],"author":"Josh Wolfe <thejoshwolfe@gmail.com>","license":"MIT","bugs":{"url":"https://github.com/thejoshwolfe/yauzl/issues"},"homepage":"https://github.com/thejoshwolfe/yauzl","dependencies":{"buffer-crc32":"~0.2.3","pend":"~1.2.0"},"devDependencies":{"bl":"^6.0.11"},"files":["fd-slicer.js","index.js"],"_lastModified":"2026-06-16T10:35:02.874Z"}

package/dist/server/dumper.d.ts

@@ -61,9 +61,10 @@ export declare class Dumper extends AppMigrator {
     backUpFilePath(fileName: string, appName?: string): string;
     lockFilePath(fileName: string, appName?: string): string;
     writeLockFile(fileName: string, appName?: string): Promise<string>;
-    cleanLockFile(fileName: string, appName: string): Promise<void>;
+    cleanLockFile(fileName: string, appName?: string): Promise<void>;
     getLockFile(appName: string): Promise<string>;
-    runDumpTask(options: DumpOptions): Promise<void>;
+    startDumpTask(options: DumpOptions): string;
+    runDumpTask(options: DumpOptions): Promise<string>;
     dumpableCollectionsGroupByGroup(): Promise<{
         [x: string]: Pick<any, string>[];
     }>;

package/dist/server/dumper.js

@@ -65,9 +65,11 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
     return this.dumpTasks.get(taskId);
   }
   static async getFileStatus(filePath, appName) {
-    const lockFile = filePath + ".lock";
-    const progressFile = filePath + ".progress";
-    const fileName = import_node_path.default.basename(filePath);
+    const isLockFilePath = import_node_path.default.extname(filePath) === ".lock";
+    const backupFilePath = isLockFilePath ? filePath.slice(0, -".lock".length) : filePath;
+    const lockFile = isLockFilePath ? filePath : filePath + ".lock";
+    const progressFile = backupFilePath + ".progress";
+    const fileName = import_node_path.default.basename(backupFilePath);
     return import_node_fs.default.promises.stat(lockFile).then(async (lockFileStat) => {
       if (lockFileStat.isFile()) {
         if (lockFileStat.ctime.getTime() < Date.now() - 2 * 60 * 60 * 1e3) {
@@ -96,7 +98,7 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
       }
     }).catch((error) => {
       if (error.code === "ENOENT") {
-        return import_node_fs.default.promises.stat(filePath).then((backupFileStat) => {
+        return import_node_fs.default.promises.stat(backupFilePath).then((backupFileStat) => {
           if (backupFileStat.isFile()) {
             return {
               name: fileName,
@@ -220,13 +222,30 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
     await this.writeLockFile(backupFileName, appName);
     return backupFileName;
   }
-  async runDumpTask(options) {
-    await this.dump({
+  startDumpTask(options) {
+    const taskId = options.fileName || _Dumper.generateFileName();
+    const taskPromise = this.dump({
       groups: options.groups,
-      fileName: options.fileName,
+      fileName: taskId,
       appName: options.appName,
       userId: options.userId
     });
+    _Dumper.dumpTasks.set(taskId, taskPromise);
+    taskPromise.then(
+      () => {
+        _Dumper.dumpTasks.delete(taskId);
+      },
+      () => {
+        _Dumper.dumpTasks.delete(taskId);
+      }
+    );
+    return taskId;
+  }
+  async runDumpTask(options) {
+    const taskId = this.startDumpTask(options);
+    const taskPromise = _Dumper.getTaskPromise(taskId);
+    await taskPromise;
+    return taskId;
   }
   async dumpableCollectionsGroupByGroup() {
     return (0, import_lodash.default)(await this.dumpableCollections()).map((c) => import_lodash.default.pick(c, ["name", "group", "origin", "title", "isView", "inherits"])).groupBy("group").mapValues((items) => import_lodash.default.sortBy(items, (item) => item.name)).value();

package/dist/server/progress-tracker.d.ts

@@ -60,7 +60,7 @@ export declare class ProgressManager {
     /**
      * 清理进度文件
      */
-    cleanProgressFile(fileName: string, appName: string): Promise<void>;
+    cleanProgressFile(fileName: string, appName?: string): Promise<void>;
     /**
      * 创建进度跟踪器
      */

package/dist/server/progress-tracker.js

@@ -134,6 +134,7 @@ const _ProgressManager = class _ProgressManager {
    */
   async writeProgress(fileName, progress, appName, userId) {
     const filePath = this.progressFilePath(fileName, appName);
+    await import_promises.default.mkdir(import_node_path.default.dirname(filePath), { recursive: true });
     await import_promises.default.writeFile(filePath, JSON.stringify(progress), "utf8");
     this.pushProgressViaWebSocket(fileName, progress, userId, appName);
   }

package/dist/server/resourcers/backup-files.js

@@ -182,8 +182,9 @@ var backup_files_default = {
       let useWorker = data.method === "worker" || data.method === "priority" && ((_c = app.worker) == null ? void 0 : _c.available);
       const dumper = new import_dumper.Dumper(ctx.tego);
       const taskId = await dumper.getLockFile(ctx.tego.name);
+      let taskPromise;
       if (useWorker) {
-        app.worker.callPluginMethod({
+        taskPromise = app.worker.callPluginMethod({
           plugin: import_server2.default,
           method: "workerCreateBackUp",
           params: {
@@ -194,28 +195,33 @@ var backup_files_default = {
           },
           // 目前限制方法并发为1
           concurrency: 1
-        }).then((res) => {
-          app.noticeManager.notify("backup", { level: "info", msg: ctx.t("Done", { ns: "backup" }) });
-        }).catch((error) => {
-          app.noticeManager.notify("backup", { level: "error", msg: error.message });
-        }).finally(() => {
-          dumper.cleanLockFile(taskId, ctx.tego.name);
         });
       } else {
         const plugin = app.pm.get(import_server2.default);
-        plugin.workerCreateBackUp({
+        taskPromise = plugin.workerCreateBackUp({
           dataTypes: data.dataTypes,
           appName: ctx.tego.name,
           filename: taskId,
           userId
-        }).then((res) => {
-          app.noticeManager.notify("backup", { level: "info", msg: ctx.t("Done", { ns: "backup" }) });
-        }).catch((error) => {
-          app.noticeManager.notify("backup", { level: "error", msg: error.message });
-        }).finally(() => {
-          dumper.cleanLockFile(taskId, ctx.tego.name);
         });
       }
+      import_dumper.Dumper.dumpTasks.set(taskId, taskPromise);
+      void (async () => {
+        try {
+          await taskPromise;
+          app.noticeManager.notify("backup", { level: "info", msg: ctx.t("Done", { ns: "backup" }) });
+        } catch (error) {
+          const msg = error instanceof Error ? error.message : error ? String(error) : ctx.t("Backup failed", { ns: "backup" });
+          app.noticeManager.notify("backup", { level: "error", msg });
+        } finally {
+          import_dumper.Dumper.dumpTasks.delete(taskId);
+          try {
+            await dumper.cleanLockFile(taskId, ctx.tego.name);
+          } catch (error) {
+            app.logger.error("clean backup lock file error", error);
+          }
+        }
+      })();
       ctx.body = {
         key: taskId
       };

package/dist/server/restorer.d.ts

@@ -28,9 +28,9 @@ export declare class Restorer extends AppMigrator {
         insert?: boolean;
         clear?: boolean;
         rowCondition?: (row: any) => boolean;
-    }): Promise<void>;
+    }): Promise<void | string>;
     importDb(options: RestoreOptions): Promise<void>;
-    insertMetaRows({ rows, collectionName, columns, fieldAttributes, rawAttributes, addSchemaTableName, options }: {
+    insertMetaRows({ rows, collectionName, columns, fieldAttributes, rawAttributes, addSchemaTableName, options, }: {
         rows: any;
         collectionName: any;
         columns: any;
@@ -38,6 +38,6 @@ export declare class Restorer extends AppMigrator {
         rawAttributes: any;
         addSchemaTableName: any;
         options: any;
-    }): Promise<any>;
+    }): Promise<void | string>;
 }
 export {};

package/dist/server/restorer.js

@@ -206,7 +206,7 @@ class Restorer extends import_app_migrator.AppMigrator {
       await import_promises.default.stat(collectionMetaPath);
     } catch (e) {
       app.logger.info(`${collectionName} has no meta`);
-      return;
+      return options.insert === false ? "" : void 0;
     }
     const metaContent = await import_promises.default.readFile(collectionMetaPath, "utf8");
     const meta = JSON.parse(metaContent);
@@ -217,7 +217,7 @@ class Restorer extends import_app_migrator.AppMigrator {
     const columns = meta["columns"];
     if (columns.length === 0) {
       app.logger.info(`${collectionName} has no columns`);
-      return;
+      return options.insert === false ? "" : void 0;
     }
     const fieldAttributes = import_lodash.default.mapValues(meta.attributes, (attr) => {
       if (attr.isCollectionField) {
@@ -264,11 +264,12 @@ class Restorer extends import_app_migrator.AppMigrator {
     }
     const batchSize = 1e3;
     let batch = [];
+    const sqlResults = [];
     let allLength = 0;
     await (0, import_utils.readEveryLines)(collectionDataPath, async (line) => {
       batch.push(line);
       if (batch.length >= batchSize) {
-        await this.insertMetaRows({
+        const result = await this.insertMetaRows({
           rows: batch,
           collectionName,
           columns,
@@ -277,12 +278,15 @@ class Restorer extends import_app_migrator.AppMigrator {
           addSchemaTableName,
           options
         });
+        if (result) {
+          sqlResults.push(result);
+        }
         allLength += batchSize;
         batch = [];
       }
     });
-    if (!this.importedCollections.includes(collectionName)) {
-      await this.insertMetaRows({
+    if (batch.length > 0) {
+      const result = await this.insertMetaRows({
         rows: batch,
         collectionName,
         columns,
@@ -291,8 +295,14 @@ class Restorer extends import_app_migrator.AppMigrator {
         addSchemaTableName,
         options
       });
+      if (result) {
+        sqlResults.push(result);
+      }
       allLength += batch.length;
     }
+    if (options.insert === false) {
+      return sqlResults.join("\n");
+    }
     app.logger.info(`${collectionName} imported with ${allLength} rows`);
     if (meta.autoIncrement) {
       const queryInterface = app.db.queryInterface;
@@ -306,7 +316,9 @@ class Restorer extends import_app_migrator.AppMigrator {
         currentVal: meta.autoIncrement.currentVal
       });
     }
-    this.importedCollections.push(collectionName);
+    if (!this.importedCollections.includes(collectionName)) {
+      this.importedCollections.push(collectionName);
+    }
   }
   async importDb(options) {
     const sqlContentPath = import_node_path.default.resolve(this.workDir, "sql-content.json");
@@ -336,13 +348,20 @@ class Restorer extends import_app_migrator.AppMigrator {
       }
     }
   }
-  async insertMetaRows({ rows, collectionName, columns, fieldAttributes, rawAttributes, addSchemaTableName, options }) {
+  async insertMetaRows({
+    rows,
+    collectionName,
+    columns,
+    fieldAttributes,
+    rawAttributes,
+    addSchemaTableName,
+    options
+  }) {
     const app = this.app;
     const db = app.db;
     if (rows.length === 0) {
       app.logger.info(`${collectionName} has no data to import`);
-      this.importedCollections.push(collectionName);
-      return;
+      return options.insert === false ? "" : void 0;
     }
     const rowsWithMeta = rows.map(
       (row) => JSON.parse(row).map((val, index) => [columns[index], val]).reduce((carry, [column, val]) => {
@@ -358,8 +377,7 @@ class Restorer extends import_app_migrator.AppMigrator {
     });
     if (rowsWithMeta.length === 0) {
       app.logger.info(`${collectionName} has no data to import`);
-      this.importedCollections.push(collectionName);
-      return;
+      return options.insert === false ? "" : void 0;
     }
     const insertGeneratorAttributes = import_lodash.default.mapKeys(rawAttributes, (value, key) => {
       return value.field;

package/dist/server/server.js

@@ -272,12 +272,17 @@ const _PluginBackupRestoreServer = class _PluginBackupRestoreServer extends impo
     this.schedule(cronJob, null, false);
   }
   async workerCreateBackUp(data) {
-    await new import_dumper.Dumper(this.app).runDumpTask({
+    const taskId = new import_dumper.Dumper(this.app).startDumpTask({
       groups: new Set(data.dataTypes),
       appName: data.appName,
       fileName: data.filename,
       userId: data.userId
     });
+    const taskPromise = import_dumper.Dumper.getTaskPromise(taskId);
+    if (!taskPromise) {
+      throw new Error(`Backup task ${taskId} is not tracked for app ${data.appName}`);
+    }
+    await taskPromise;
   }
 };
 _PluginBackupRestoreServer.inspectFields = ["repeat", "enabled"];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-backup",
   "displayName": "App backup & restore",
-  "version": "1.6.20",
+  "version": "1.6.22",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "keywords": [
     "System management"
@@ -20,10 +20,10 @@
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
     "@hapi/topo": "^6.0.2",
-    "@tachybase/schema": "1.6.11",
-    "@tachybase/test": "1.6.11",
-    "@tego/client": "1.6.11",
-    "@tego/server": "1.6.11",
+    "@tachybase/schema": "1.6.13",
+    "@tachybase/test": "1.6.13",
+    "@tego/client": "1.6.13",
+    "@tego/server": "1.6.13",
     "@types/archiver": "^5.3.4",
     "@types/file-saver": "^2.0.7",
     "@types/lodash": "^4.17.20",
@@ -43,8 +43,11 @@
     "semver": "7.7.2",
     "tar": "^7.4.3",
     "yauzl": "^3.2.0",
-    "@tachybase/client": "1.6.20",
-    "@tachybase/module-worker-thread": "1.6.20"
+    "@tachybase/client": "1.6.22",
+    "@tachybase/plugin-audit-logs": "1.6.22",
+    "@tachybase/plugin-field-sequence": "1.6.22",
+    "@tachybase/plugin-block-map": "1.6.22",
+    "@tachybase/module-worker-thread": "1.6.22"
   },
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
   "displayName.zh-CN": "应用的备份与还原",