@tachybase/module-backup 0.23.58 → 1.0.6

package/dist/externalVersion.js

@@ -1,14 +1,14 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.58",
-  "@tachybase/components": "0.23.58",
+  "@tachybase/client": "1.0.6",
+  "@tachybase/components": "1.0.6",
   "@ant-design/icons": "5.5.2",
   "antd": "5.22.5",
-  "@tachybase/server": "0.23.58",
-  "@tachybase/utils": "0.23.58",
-  "@tachybase/database": "0.23.58",
+  "@tachybase/server": "1.0.6",
+  "@tachybase/utils": "1.0.6",
+  "@tachybase/database": "1.0.6",
   "dayjs": "1.11.13",
   "lodash": "4.17.21",
   "react-i18next": "15.2.0",
-  "@tachybase/actions": "0.23.58"
+  "@tachybase/actions": "1.0.6"
 };

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":"2025-03-06T09:58:49.921Z"}
+{"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":"2025-04-02T02:57:13.012Z"}

package/dist/node_modules/archiver/package.json

@@ -1 +1 @@
-{"name":"archiver","version":"5.3.2","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":">= 10"},"scripts":{"test":"mocha --reporter dot","bench":"node benchmark/simple/pack-zip.js"},"dependencies":{"archiver-utils":"^2.1.0","async":"^3.2.4","buffer-crc32":"^0.2.1","readable-stream":"^3.6.0","readdir-glob":"^1.1.2","tar-stream":"^2.2.0","zip-stream":"^4.1.0"},"devDependencies":{"archiver-jsdoc-theme":"^1.1.3","chai":"^4.3.7","jsdoc":"^3.6.4","mkdirp":"^2.1.5","mocha":"^9.0.2","rimraf":"^4.3.1","stream-bench":"^0.1.2","tar":"^6.1.13","yauzl":"^2.9.0"},"keywords":["archive","archiver","stream","zip","tar"],"publishConfig":{"registry":"https://registry.npmjs.org/"},"_lastModified":"2025-03-06T09:58:49.736Z"}
+{"name":"archiver","version":"5.3.2","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":">= 10"},"scripts":{"test":"mocha --reporter dot","bench":"node benchmark/simple/pack-zip.js"},"dependencies":{"archiver-utils":"^2.1.0","async":"^3.2.4","buffer-crc32":"^0.2.1","readable-stream":"^3.6.0","readdir-glob":"^1.1.2","tar-stream":"^2.2.0","zip-stream":"^4.1.0"},"devDependencies":{"archiver-jsdoc-theme":"^1.1.3","chai":"^4.3.7","jsdoc":"^3.6.4","mkdirp":"^2.1.5","mocha":"^9.0.2","rimraf":"^4.3.1","stream-bench":"^0.1.2","tar":"^6.1.13","yauzl":"^2.9.0"},"keywords":["archive","archiver","stream","zip","tar"],"publishConfig":{"registry":"https://registry.npmjs.org/"},"_lastModified":"2025-04-02T02:57:12.820Z"}

package/dist/node_modules/mkdirp/package.json

@@ -1 +1 @@
-{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"1.0.4","main":"index.js","keywords":["mkdir","directory","make dir","make","dir","recursive","native"],"repository":{"type":"git","url":"https://github.com/isaacs/node-mkdirp.git"},"scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true,"coverage-map":"map.js"},"devDependencies":{"require-inject":"^1.4.4","tap":"^14.10.7"},"bin":"bin/cmd.js","license":"MIT","engines":{"node":">=10"},"files":["bin","lib","index.js"],"_lastModified":"2025-03-06T09:58:49.824Z"}
+{"name":"mkdirp","description":"Recursively mkdir, like `mkdir -p`","version":"1.0.4","main":"index.js","keywords":["mkdir","directory","make dir","make","dir","recursive","native"],"repository":{"type":"git","url":"https://github.com/isaacs/node-mkdirp.git"},"scripts":{"test":"tap","snap":"tap","preversion":"npm test","postversion":"npm publish","postpublish":"git push origin --follow-tags"},"tap":{"check-coverage":true,"coverage-map":"map.js"},"devDependencies":{"require-inject":"^1.4.4","tap":"^14.10.7"},"bin":"bin/cmd.js","license":"MIT","engines":{"node":">=10"},"files":["bin","lib","index.js"],"_lastModified":"2025-04-02T02:57:12.916Z"}

package/dist/node_modules/semver/package.json

@@ -1 +1 @@
-{"name":"semver","version":"7.6.3","description":"The semantic version parser used by npm.","main":"index.js","scripts":{"test":"tap","snap":"tap","lint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"","postlint":"template-oss-check","lintfix":"npm run lint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force"},"devDependencies":{"@npmcli/eslint-config":"^4.0.0","@npmcli/template-oss":"4.22.0","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.22.0","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":"2025-03-06T09:58:50.151Z"}
+{"name":"semver","version":"7.6.3","description":"The semantic version parser used by npm.","main":"index.js","scripts":{"test":"tap","snap":"tap","lint":"eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"","postlint":"template-oss-check","lintfix":"npm run lint -- --fix","posttest":"npm run lint","template-oss-apply":"template-oss-apply --force"},"devDependencies":{"@npmcli/eslint-config":"^4.0.0","@npmcli/template-oss":"4.22.0","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.22.0","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":"2025-04-02T02:57:13.246Z"}

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":"2025-03-06T09:58:50.309Z"}
+{"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":"2025-04-02T02:57:13.407Z"}

package/dist/server/dumper.d.ts

@@ -3,6 +3,7 @@ import { AppMigrator } from './app-migrator';
 type DumpOptions = {
     groups: Set<DumpRulesGroupType>;
     fileName?: string;
+    appName?: string;
 };
 type BackUpStatusOk = {
     name: string;
@@ -40,15 +41,16 @@ export declare class Dumper extends AppMigrator {
     collectionsGroupByDataTypes(): Promise<{
         [k: string]: any[];
     }>;
-    backUpStorageDir(): string;
+    backUpStorageDir(appName?: string): string;
     allBackUpFilePaths(options?: {
         includeInProgress?: boolean;
         dir?: string;
+        appName?: string;
     }): Promise<string[]>;
-    backUpFilePath(fileName: string): string;
-    lockFilePath(fileName: string): string;
-    writeLockFile(fileName: string): Promise<void>;
-    cleanLockFile(fileName: string): Promise<void>;
+    backUpFilePath(fileName: string, appName?: string): string;
+    lockFilePath(fileName: string, appName?: string): string;
+    writeLockFile(fileName: string, appName?: string): Promise<void>;
+    cleanLockFile(fileName: string, appName?: string): Promise<void>;
     runDumpTask(options: Omit<DumpOptions, 'fileName'>): Promise<string>;
     dumpableCollectionsGroupByGroup(): Promise<{
         [x: string]: Pick<any, string>[];
@@ -63,7 +65,7 @@ export declare class Dumper extends AppMigrator {
     dumpCollection(options: {
         name: string;
     }): Promise<void>;
-    packDumpedDir(fileName: string): Promise<{
+    packDumpedDir(fileName: string, appName?: string): Promise<{
         filePath: string;
         dirname: string;
     }>;

package/dist/server/dumper.js

@@ -134,11 +134,14 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
     const grouped = import_lodash.default.groupBy(await this.dumpableCollections(), "group");
     return Object.fromEntries(Object.entries(grouped).map(([key, value]) => [key, value.map((item) => item.name)]));
   }
-  backUpStorageDir() {
+  backUpStorageDir(appName) {
+    if (appName && appName !== "main") {
+      return import_path.default.resolve(process.cwd(), "storage", "backups", appName);
+    }
     return import_path.default.resolve(process.cwd(), "storage", "backups");
   }
   async allBackUpFilePaths(options) {
-    const dirname = (options == null ? void 0 : options.dir) || this.backUpStorageDir();
+    const dirname = (options == null ? void 0 : options.dir) || this.backUpStorageDir(options == null ? void 0 : options.appName);
     const includeInProgress = options == null ? void 0 : options.includeInProgress;
     try {
       const files = await import_promises.default.readdir(dirname);
@@ -165,34 +168,35 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
       return [];
     }
   }
-  backUpFilePath(fileName) {
-    const dirname = this.backUpStorageDir();
+  backUpFilePath(fileName, appName) {
+    const dirname = this.backUpStorageDir(appName);
     return import_path.default.resolve(dirname, fileName);
   }
-  lockFilePath(fileName) {
+  lockFilePath(fileName, appName) {
     const lockFile = fileName + ".lock";
-    const dirname = this.backUpStorageDir();
+    const dirname = this.backUpStorageDir(appName);
     return import_path.default.resolve(dirname, lockFile);
   }
-  async writeLockFile(fileName) {
-    const dirname = this.backUpStorageDir();
+  async writeLockFile(fileName, appName) {
+    const dirname = this.backUpStorageDir(appName);
     await (0, import_mkdirp.default)(dirname);
-    const filePath = this.lockFilePath(fileName);
+    const filePath = this.lockFilePath(fileName, appName);
     await import_promises.default.writeFile(filePath, "lock", "utf8");
   }
-  async cleanLockFile(fileName) {
-    const filePath = this.lockFilePath(fileName);
+  async cleanLockFile(fileName, appName) {
+    const filePath = this.lockFilePath(fileName, appName);
     await import_promises.default.unlink(filePath);
   }
   async runDumpTask(options) {
     const backupFileName = _Dumper.generateFileName();
-    await this.writeLockFile(backupFileName);
+    await this.writeLockFile(backupFileName, options.appName);
     if (import_worker_threads.isMainThread) {
       const promise = this.dump({
         groups: options.groups,
-        fileName: backupFileName
+        fileName: backupFileName,
+        appName: options.appName
       }).finally(() => {
-        this.cleanLockFile(backupFileName);
+        this.cleanLockFile(backupFileName, options.appName);
         _Dumper.dumpTasks.delete(backupFileName);
         this.app.noticeManager.notify("backup", { msg: "Done" });
       });
@@ -201,12 +205,13 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
       try {
         await this.dump({
           groups: options.groups,
-          fileName: backupFileName
+          fileName: backupFileName,
+          appName: options.appName
         });
       } catch (err) {
         throw err;
       } finally {
-        this.cleanLockFile(backupFileName);
+        this.cleanLockFile(backupFileName, options.appName);
       }
     }
     return backupFileName;
@@ -235,7 +240,7 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
     });
     await this.dumpDb(options);
     const backupFileName = options.fileName || _Dumper.generateFileName();
-    const filePath = await this.packDumpedDir(backupFileName);
+    const filePath = await this.packDumpedDir(backupFileName, options.appName);
     await this.clearWorkDir();
     return filePath;
   }
@@ -380,8 +385,8 @@ const _Dumper = class _Dumper extends import_app_migrator.AppMigrator {
     }
     await import_promises.default.writeFile(import_path.default.resolve(collectionDataDir, "meta"), JSON.stringify(meta), "utf8");
   }
-  async packDumpedDir(fileName) {
-    const dirname = this.backUpStorageDir();
+  async packDumpedDir(fileName, appName) {
+    const dirname = this.backUpStorageDir(appName);
     await (0, import_mkdirp.default)(dirname);
     const filePath = import_path.default.resolve(dirname, fileName);
     const output = import_fs.default.createWriteStream(filePath);

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

@@ -60,7 +60,8 @@ var backup_files_default = {
       const { page = import_actions.DEFAULT_PAGE, pageSize = import_actions.DEFAULT_PER_PAGE } = ctx.action.params;
       const dumper = new import_dumper.Dumper(ctx.app);
       const backupFiles = await dumper.allBackUpFilePaths({
-        includeInProgress: true
+        includeInProgress: true,
+        appName: ctx.app.name
       });
       const count = backupFiles.length;
       const rows = await Promise.all(
@@ -80,7 +81,7 @@ var backup_files_default = {
     async get(ctx, next) {
       const { filterByTk } = ctx.action.params;
       const dumper = new import_dumper.Dumper(ctx.app);
-      const filePath = dumper.backUpFilePath(filterByTk);
+      const filePath = dumper.backUpFilePath(filterByTk, ctx.app.name);
       async function sendError(message, status = 404) {
         ctx.body = { status: "error", message };
         ctx.status = status;
@@ -153,7 +154,7 @@ var backup_files_default = {
     async download(ctx, next) {
       const { filterByTk } = ctx.action.params;
       const dumper = new import_dumper.Dumper(ctx.app);
-      const filePath = dumper.backUpFilePath(filterByTk);
+      const filePath = dumper.backUpFilePath(filterByTk, ctx.app.name);
       const fileState = await import_dumper.Dumper.getFileStatus(filePath);
       if (fileState.status !== "ok") {
         throw new Error(`Backup file ${filterByTk} not found`);
@@ -174,7 +175,7 @@ var backup_files_default = {
         }
         if (filterByTk) {
           const dumper = new import_dumper.Dumper(ctx.app);
-          return dumper.backUpFilePath(filterByTk);
+          return dumper.backUpFilePath(filterByTk, ctx.app.name);
         }
       })();
       if (!filePath) {
@@ -190,7 +191,7 @@ var backup_files_default = {
     async destroy(ctx, next) {
       const { filterByTk } = ctx.action.params;
       const dumper = new import_dumper.Dumper(ctx.app);
-      const filePath = dumper.backUpFilePath(filterByTk);
+      const filePath = dumper.backUpFilePath(filterByTk, ctx.app.name);
       await import_promises.default.unlink(filePath);
       ctx.body = {
         status: "ok"

package/dist/server/server.js

@@ -46,7 +46,8 @@ class PluginBackupRestoreServer extends import_server.Plugin {
   async workerCreateBackUp(data) {
     const dumper = new import_dumper.Dumper(this.app);
     return dumper.runDumpTask({
-      groups: new Set(data.dataTypes)
+      groups: new Set(data.dataTypes),
+      appName: this.app.name
     });
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-backup",
   "displayName": "App backup & restore",
-  "version": "0.23.58",
+  "version": "1.0.6",
   "description": "Backup and restore applications for scenarios such as application replication, migration, and upgrades.",
   "keywords": [
     "System management"
@@ -30,16 +30,16 @@
     "semver": "^7.6.3",
     "tar": "^6.2.1",
     "yauzl": "^3.2.0",
-    "@tachybase/components": "0.23.58",
-    "@tachybase/module-worker-thread": "0.23.58"
+    "@tachybase/components": "1.0.6",
+    "@tachybase/module-worker-thread": "1.0.6"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.58",
-    "@tachybase/client": "0.23.58",
-    "@tachybase/server": "0.23.58",
-    "@tachybase/database": "0.23.58",
-    "@tachybase/test": "0.23.58",
-    "@tachybase/utils": "0.23.58"
+    "@tachybase/actions": "1.0.6",
+    "@tachybase/client": "1.0.6",
+    "@tachybase/server": "1.0.6",
+    "@tachybase/database": "1.0.6",
+    "@tachybase/test": "1.0.6",
+    "@tachybase/utils": "1.0.6"
   },
   "description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
   "displayName.zh-CN": "应用的备份与还原",