@nocobase/plugin-backups 2.1.17 → 2.1.19

package/dist/externalVersion.js

@@ -8,17 +8,17 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.17",
+  "@nocobase/client": "2.1.19",
   "react": "18.2.0",
-  "@nocobase/flow-engine": "2.1.17",
-  "@nocobase/client-v2": "2.1.17",
-  "@nocobase/cache": "2.1.17",
-  "@nocobase/lock-manager": "2.1.17",
-  "@nocobase/server": "2.1.17",
+  "@nocobase/flow-engine": "2.1.19",
+  "@nocobase/client-v2": "2.1.19",
+  "@nocobase/cache": "2.1.19",
+  "@nocobase/lock-manager": "2.1.19",
+  "@nocobase/server": "2.1.19",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.17",
+  "@nocobase/database": "2.1.19",
   "sequelize": "6.35.2",
-  "@nocobase/test": "2.1.17",
+  "@nocobase/test": "2.1.19",
   "@formily/antd-v5": "1.2.3",
   "@formily/react": "2.3.7",
   "@formily/reactive": "2.3.7",
@@ -27,7 +27,7 @@ module.exports = {
   "@ant-design/icons": "5.6.1",
   "ahooks": "3.7.8",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-file-manager": "2.1.17",
-  "@nocobase/resourcer": "2.1.17",
-  "@nocobase/utils": "2.1.17"
+  "@nocobase/plugin-file-manager": "2.1.19",
+  "@nocobase/resourcer": "2.1.19",
+  "@nocobase/utils": "2.1.19"
 };

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":"2026-07-01T04:45:58.816Z"}
+{"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":"2026-07-03T14:32:49.510Z"}

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

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","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":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-07-01T04:45:57.624Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","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":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-07-03T14:32:48.867Z"}

package/dist/node_modules/fs-extra/package.json

@@ -1 +1 @@
-{"name":"fs-extra","version":"9.1.0","description":"fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as recursive mkdir, copy, and remove.","engines":{"node":">=10"},"homepage":"https://github.com/jprichardson/node-fs-extra","repository":{"type":"git","url":"https://github.com/jprichardson/node-fs-extra"},"keywords":["fs","file","file system","copy","directory","extra","mkdirp","mkdir","mkdirs","recursive","json","read","write","extra","delete","remove","touch","create","text","output","move","promise"],"author":"JP Richardson <jprichardson@gmail.com>","license":"MIT","dependencies":{"at-least-node":"^1.0.0","graceful-fs":"^4.2.0","jsonfile":"^6.0.1","universalify":"^2.0.0"},"devDependencies":{"coveralls":"^3.0.0","klaw":"^2.1.1","klaw-sync":"^3.0.2","minimist":"^1.1.1","mocha":"^5.0.5","nyc":"^15.0.0","proxyquire":"^2.0.1","read-dir-files":"^0.1.1","standard":"^14.1.0"},"main":"./lib/index.js","files":["lib/","!lib/**/__tests__/"],"scripts":{"full-ci":"npm run lint && npm run coverage","coverage":"nyc -r lcovonly npm run unit","coveralls":"coveralls < coverage/lcov.info","lint":"standard","test-find":"find ./lib/**/__tests__ -name *.test.js | xargs mocha","test":"npm run lint && npm run unit","unit":"node test.js"},"_lastModified":"2026-07-01T04:45:59.478Z"}
+{"name":"fs-extra","version":"9.1.0","description":"fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as recursive mkdir, copy, and remove.","engines":{"node":">=10"},"homepage":"https://github.com/jprichardson/node-fs-extra","repository":{"type":"git","url":"https://github.com/jprichardson/node-fs-extra"},"keywords":["fs","file","file system","copy","directory","extra","mkdirp","mkdir","mkdirs","recursive","json","read","write","extra","delete","remove","touch","create","text","output","move","promise"],"author":"JP Richardson <jprichardson@gmail.com>","license":"MIT","dependencies":{"at-least-node":"^1.0.0","graceful-fs":"^4.2.0","jsonfile":"^6.0.1","universalify":"^2.0.0"},"devDependencies":{"coveralls":"^3.0.0","klaw":"^2.1.1","klaw-sync":"^3.0.2","minimist":"^1.1.1","mocha":"^5.0.5","nyc":"^15.0.0","proxyquire":"^2.0.1","read-dir-files":"^0.1.1","standard":"^14.1.0"},"main":"./lib/index.js","files":["lib/","!lib/**/__tests__/"],"scripts":{"full-ci":"npm run lint && npm run coverage","coverage":"nyc -r lcovonly npm run unit","coveralls":"coveralls < coverage/lcov.info","lint":"standard","test-find":"find ./lib/**/__tests__ -name *.test.js | xargs mocha","test":"npm run lint && npm run unit","unit":"node test.js"},"_lastModified":"2026-07-03T14:32:49.891Z"}

package/dist/node_modules/semver/package.json

@@ -1 +1 @@
-{"name":"semver","version":"7.6.0","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.21.3","tap":"^16.0.0"},"license":"ISC","repository":{"type":"git","url":"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"},"dependencies":{"lru-cache":"^6.0.0"},"author":"GitHub Inc.","templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.21.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"],"publish":"true"},"_lastModified":"2026-07-01T04:45:59.806Z"}
+{"name":"semver","version":"7.6.0","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.21.3","tap":"^16.0.0"},"license":"ISC","repository":{"type":"git","url":"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"},"dependencies":{"lru-cache":"^6.0.0"},"author":"GitHub Inc.","templateOSS":{"//@npmcli/template-oss":"This file is partially managed by @npmcli/template-oss. Edits may be overwritten.","version":"4.21.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"],"publish":"true"},"_lastModified":"2026-07-03T14:32:50.078Z"}

package/dist/node_modules/yauzl/package.json

@@ -1 +1 @@
-{"name":"yauzl","version":"3.3.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-07-01T04:45:59.268Z"}
+{"name":"yauzl","version":"3.3.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-07-03T14:32:49.653Z"}

package/dist/server/adapters/database.js

@@ -48,7 +48,6 @@ var import_promises = require("stream/promises");
 var import_util = require("util");
 var import_utils = require("../utils");
 const exec = (0, import_util.promisify)(import_child_process.exec);
-const D$$ = import_os.default.platform() === "win32" ? "$$" : "\\$\\$";
 const STREAM_BUFFER_SIZE = 2 * 1024 * 1024;
 const run = async (command, envVars = {}) => {
   try {
@@ -65,16 +64,45 @@ const run = async (command, envVars = {}) => {
     throw new Error(`${error.message}`);
   }
 };
+const runSpawn = async (command, args, envVars = {}) => {
+  return new Promise((resolve, reject) => {
+    const child = (0, import_child_process.spawn)(command, args, {
+      env: { ...process.env, ...envVars },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const stdout = [];
+    const stderr = [];
+    let settled = false;
+    child.stdout.on("data", (chunk) => stdout.push(Buffer.from(chunk)));
+    child.stderr.on("data", (chunk) => stderr.push(Buffer.from(chunk)));
+    child.on("error", (error) => {
+      settled = true;
+      reject(error);
+    });
+    child.on("close", (code) => {
+      if (settled) {
+        return;
+      }
+      if (code === 0) {
+        settled = true;
+        resolve(Buffer.concat(stdout).toString());
+        return;
+      }
+      const errorMessage = Buffer.concat(stderr).toString().trim() || `${command} exited with code ${code}`;
+      settled = true;
+      reject(new Error(errorMessage));
+    });
+  });
+};
 const formatPathInEnv = (path2) => {
-  if (path2 && /\s/.test(path2) && !/^".*"$/.test(path2) && !/^'.*'$/.test(path2)) {
-    return `"${path2}"`;
+  if ((path2 == null ? void 0 : path2.startsWith('"')) && path2.endsWith('"') || (path2 == null ? void 0 : path2.startsWith("'")) && path2.endsWith("'")) {
+    return path2.slice(1, -1);
   }
   return path2;
 };
 const escapeStringLiteral = (value) => String(value).replace(/'/g, "''");
 const quotePgIdentifier = (value) => `"${String(value).replace(/"/g, '""')}"`;
-const quoteShellArg = (value) => `'${String(value).replace(/'/g, "'\\''")}'`;
-const quotePgTablePattern = (table) => quoteShellArg(String(table).split(".").map(quotePgIdentifier).join("."));
+const quotePgTablePattern = (table) => String(table).split(".").map(quotePgIdentifier).join(".");
 const isPgRestoreSchemaTocEntry = (line) => /^\d+;\s+\d+\s+\d+\s+SCHEMA\s+-\s+/.test(line);
 const parsePgTableReference = (table, defaultSchema) => {
   const parts = String(table).split(".");
@@ -110,21 +138,16 @@ class BaseDBAdapter {
   async clientVersion(_) {
   }
   assertCommand = (command) => {
-    try {
-      (0, import_child_process.execSync)(`${command} --version`);
-    } catch (error) {
+    const result = (0, import_child_process.spawnSync)(command, ["--version"], { encoding: "utf8" });
+    if (result.error || result.status !== 0) {
       throw new Error(
         `Command ${command} not found, please install it first. Check reference here: https://docs.nocobase.com/ops-management/backup-manager/`
       );
     }
   };
   hasCommand(command) {
-    try {
-      (0, import_child_process.execSync)(`${command} --version`);
-      return true;
-    } catch (_error) {
-      return false;
-    }
+    const result = (0, import_child_process.spawnSync)(command, ["--version"], { encoding: "utf8" });
+    return !result.error && result.status === 0;
   }
 }
 class MySQLAdapter extends BaseDBAdapter {
@@ -426,27 +449,40 @@ class PostgresAdapter extends BaseDBAdapter {
   async clientVersion(op) {
     const cmd = op === "backup" ? this.getBackupCommandName() : this.getRestoreCommandName();
     try {
-      return (0, import_child_process.execSync)(`${cmd} --version`).toString();
+      return await runSpawn(cmd, ["--version"]);
     } catch (_error) {
       return void 0;
     }
   }
   async backup({ dir, includeTables, excludeTables }) {
-    const { username, host, port, database, password } = this.dbOpts;
+    const { database, password } = this.dbOpts;
     const filePath = `${dir}/data`;
     const backupSchema = this.getBackupSchema();
-    const schemaOption = backupSchema ? `--schema=${backupSchema}` : "";
     const expandedExcludeTables = Array.isArray(excludeTables) ? [.../* @__PURE__ */ new Set([...excludeTables, ...await this.getOwnedSequenceTables(excludeTables, backupSchema)])] : [];
-    const includeOption = Array.isArray(includeTables) && includeTables.length ? includeTables.map((table) => `-t ${quotePgTablePattern(qualifyPgTablePattern(table, backupSchema))}`).join(" ") : "";
-    const excludeOption = expandedExcludeTables.length ? expandedExcludeTables.map((table) => `-T ${quotePgTablePattern(qualifyPgTablePattern(table, backupSchema))}`).join(" ") : "";
-    const command = `${this.getBackupCommandName()} ${includeOption} ${excludeOption} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -F c -b --quote-all-identifiers ${schemaOption} -f ${filePath} ${database}`;
-    await run(command, this.getPasswordEnvVars(password));
+    const includeArgs = Array.isArray(includeTables) && includeTables.length ? includeTables.flatMap((table) => ["-t", quotePgTablePattern(qualifyPgTablePattern(table, backupSchema))]) : [];
+    const excludeArgs = expandedExcludeTables.length ? expandedExcludeTables.flatMap((table) => [
+      "-T",
+      quotePgTablePattern(qualifyPgTablePattern(table, backupSchema))
+    ]) : [];
+    const args = [
+      ...includeArgs,
+      ...excludeArgs,
+      ...this.getConnectionArgs(false),
+      "-F",
+      "c",
+      "-b",
+      "--quote-all-identifiers",
+      ...backupSchema ? [`--schema=${backupSchema}`] : [],
+      "-f",
+      filePath,
+      database
+    ];
+    await runSpawn(this.getBackupCommandName(), args, this.getPasswordEnvVars(password));
   }
   async getOwnedSequenceTables(excludeTables, backupSchema) {
     if (!Array.isArray(excludeTables) || !excludeTables.length) {
       return [];
     }
-    const { username, host, port, database, password } = this.dbOpts;
     const tableRefs = excludeTables.map((table) => parsePgTableReference(table, backupSchema)).filter((ref) => ref.table);
     if (!tableRefs.length) {
       return [];
@@ -468,10 +504,32 @@ class PostgresAdapter extends BaseDBAdapter {
         AND dep.deptype IN ('a', 'i')
         AND (excluded.schema_name IS NULL OR tbl_ns.nspname = excluded.schema_name)
     `;
-    const command = `${this.getSqlCommandName()} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -At -c ${quoteShellArg(query)}`;
-    const output = String(await run(command, this.getPasswordEnvVars(password)));
+    const output = String(await this.runSql(query, ["-At"]));
     return output.split("\n").map((line) => line.trim()).filter(Boolean);
   }
+  getConnectionArgs(includeDatabase = true) {
+    const { username, host, port, database } = this.dbOpts;
+    return [
+      "-U",
+      username,
+      "-h",
+      host,
+      ...port ? ["-p", String(port)] : [],
+      ...includeDatabase ? ["-d", database] : []
+    ];
+  }
+  runSql(query, extraArgs = [], toolchain = this.backupToolchain) {
+    const { password } = this.dbOpts;
+    return runSpawn(
+      this.getSqlCommandName(toolchain),
+      [...this.getConnectionArgs(), ...extraArgs, "-c", query],
+      this.getPasswordEnvVars(password, toolchain)
+    );
+  }
+  runRestore(args, toolchain = this.backupToolchain) {
+    const { password } = this.dbOpts;
+    return runSpawn(this.getRestoreCommandName(toolchain), args, this.getPasswordEnvVars(password, toolchain));
+  }
   async restore({
     filePath,
     schema,
@@ -479,7 +537,6 @@ class PostgresAdapter extends BaseDBAdapter {
     restoreMode,
     toolchain = this.backupToolchain
   }) {
-    const { username, host, port, database, password } = this.dbOpts;
     let schemaOption = this.dbOpts.schema;
     if (schema && !schemaOption) {
       schemaOption = "public";
@@ -495,8 +552,8 @@ class PostgresAdapter extends BaseDBAdapter {
     const schemaNameCondition = schemaOption ? `WHERE schemaname = '${schemaOption}'` : `WHERE schemaname NOT IN ('pg_catalog', 'information_schema')`;
     const relnamespaceCondition = schemaOption ? `WHERE relnamespace = '${schemaOption}'::regnamespace` : `WHERE tgrelid IN (SELECT oid FROM pg_class WHERE relnamespace NOT IN (SELECT oid FROM pg_catalog.pg_namespace WHERE nspname IN ('pg_catalog', 'information_schema')))`;
     if (restoreMode === "preserveTables") {
-      const dropViewsCommand = `${this.getSqlCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "
-    DO ${D$$} DECLARE r RECORD;
+      const dropViewsQuery = `
+    DO $$ DECLARE r RECORD;
     BEGIN
     FOR r IN (
       SELECT schemaname, viewname, false AS materialized FROM pg_views ${schemaNameCondition}
@@ -513,11 +570,11 @@ class PostgresAdapter extends BaseDBAdapter {
         WHEN OTHERS THEN
       END;
     END LOOP;
-    END ${D$$};"`.replace(/\n/g, " ");
-      await run(dropViewsCommand, this.getPasswordEnvVars(password, toolchain));
+    END $$;`;
+      await this.runSql(dropViewsQuery, [], toolchain);
     } else if (!skipDropAllTables) {
-      const dropDataCommand = `${this.getSqlCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "
-    DO ${D$$} DECLARE r RECORD;
+      const dropDataQuery = `
+    DO $$ DECLARE r RECORD;
     BEGIN
     FOR r IN (SELECT viewname,schemaname FROM pg_views ${schemaNameCondition}) LOOP
         BEGIN
@@ -555,14 +612,23 @@ class PostgresAdapter extends BaseDBAdapter {
       END;
     END LOOP;
 
-    END ${D$$};"`.replace(/\n/g, " ");
-      await run(dropDataCommand, this.getPasswordEnvVars(password, toolchain));
+    END $$;`;
+      await this.runSql(dropDataQuery, [], toolchain);
     }
     if (schema === schemaOption || !schemaOption) {
       const restoreList = restoreMode === "preserveTables" ? await this.createRestoreListWithoutSchema(filePath, toolchain) : void 0;
-      const pgRestoreCommand = `${this.getRestoreCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} --clean --if-exists --no-owner -j ${j} ${(restoreList == null ? void 0 : restoreList.option) ?? ""} ${filePath}`;
+      const restoreArgs = [
+        ...this.getConnectionArgs(),
+        "--clean",
+        "--if-exists",
+        "--no-owner",
+        "-j",
+        String(j),
+        ...restoreList ? ["-L", restoreList.filePath] : [],
+        filePath
+      ];
       try {
-        await run(pgRestoreCommand, this.getPasswordEnvVars(password, toolchain));
+        await this.runRestore(restoreArgs, toolchain);
       } finally {
         if (restoreList) {
           await fsPromises.unlink(restoreList.filePath).catch(() => {
@@ -571,12 +637,12 @@ class PostgresAdapter extends BaseDBAdapter {
       }
     } else {
       const srcSchema = schema || "public";
-      const pgRestoreCommand = this.buildSchemaRestoreCommand(srcSchema, schemaOption, filePath, j, toolchain);
-      await this.restoreSchema(srcSchema, schemaOption, pgRestoreCommand, toolchain);
+      const pgRestoreArgs = this.buildSchemaRestoreArgs(srcSchema, schemaOption, filePath, j, toolchain);
+      await this.restoreSchema(srcSchema, schemaOption, pgRestoreArgs, toolchain);
     }
   }
   async createRestoreListWithoutSchema(filePath, toolchain = this.backupToolchain) {
-    const listOutput = String(await run(`${this.getRestoreCommandName(toolchain)} --list ${quoteShellArg(filePath)}`));
+    const listOutput = String(await this.runRestore(["--list", filePath], toolchain));
     const filteredList = listOutput.split("\n").filter((line) => !isPgRestoreSchemaTocEntry(line)).join("\n");
     const listFilePath = import_path.default.join(
       import_os.default.tmpdir(),
@@ -584,51 +650,57 @@ class PostgresAdapter extends BaseDBAdapter {
     );
     await fsPromises.writeFile(listFilePath, filteredList);
     return {
-      option: `-L ${quoteShellArg(listFilePath)}`,
       filePath: listFilePath
     };
   }
-  buildSchemaRestoreCommand(srcSchema, _targetSchema, filePath, jobs, toolchain = this.backupToolchain) {
-    const { username, host, port, database } = this.dbOpts;
-    return `${this.getRestoreCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -n ${srcSchema} -d ${database} --clean --if-exists --no-owner -j ${jobs} ${filePath}`;
+  buildSchemaRestoreArgs(srcSchema, _targetSchema, filePath, jobs, _toolchain = this.backupToolchain) {
+    return [
+      ...this.getConnectionArgs(),
+      "-n",
+      srcSchema,
+      "--clean",
+      "--if-exists",
+      "--no-owner",
+      "-j",
+      String(jobs),
+      filePath
+    ];
   }
-  async restoreSchema(srcSchema, targetSchema, pgRestoreCommand, toolchain = this.backupToolchain) {
-    const { username, host, port, database, password } = this.dbOpts;
+  async restoreSchema(srcSchema, targetSchema, pgRestoreArgs, toolchain = this.backupToolchain) {
     const ts = Date.now();
-    const sqlCommandName = this.getSqlCommandName(toolchain);
-    const preCommand = `${sqlCommandName} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "
-    DO ${D$$}
+    const preQuery = `
+    DO $$
     BEGIN
         IF EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = '${srcSchema}') THEN
             EXECUTE 'ALTER SCHEMA ${srcSchema} RENAME TO ${srcSchema}_${ts}';
         END IF;
         EXECUTE 'CREATE SCHEMA ${srcSchema}';
-    END ${D$$};"`.replace(/\n/g, " ");
-    const postCommand = `${sqlCommandName} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "
-    DO ${D$$}
+    END $$;`;
+    const postQuery = `
+    DO $$
     BEGIN
         EXECUTE 'DROP SCHEMA ${targetSchema} CASCADE';
         EXECUTE 'ALTER SCHEMA ${srcSchema} RENAME TO ${targetSchema}';
         IF EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = '${srcSchema}_${ts}') THEN
             EXECUTE 'ALTER SCHEMA ${srcSchema}_${ts} RENAME TO ${srcSchema}';
         END IF;
-    END ${D$$};"`.replace(/\n/g, " ");
-    await run(preCommand, this.getPasswordEnvVars(password, toolchain));
+    END $$;`;
+    await this.runSql(preQuery, [], toolchain);
     try {
-      await run(pgRestoreCommand, this.getPasswordEnvVars(password, toolchain));
+      await this.runRestore(pgRestoreArgs, toolchain);
     } finally {
-      await run(postCommand, this.getPasswordEnvVars(password, toolchain));
+      await this.runSql(postQuery, [], toolchain);
     }
     await this.syncCollectionSchemaMetadata(srcSchema, targetSchema, toolchain);
   }
   async syncCollectionSchemaMetadata(srcSchema, targetSchema, toolchain = this.backupToolchain) {
-    const { username, host, port, database, password, tablePrefix } = this.dbOpts;
+    const { tablePrefix } = this.dbOpts;
     const collectionsTable = `${tablePrefix || ""}collections`;
     const targetSchemaLiteral = escapeStringLiteral(targetSchema);
     const srcSchemaLiteral = escapeStringLiteral(srcSchema);
     const collectionsTableLiteral = escapeStringLiteral(collectionsTable);
-    const updateCollectionSchemaCommand = `${this.getSqlCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "
-    DO ${D$$}
+    const updateCollectionSchemaQuery = `
+    DO $$
     DECLARE
         collections_table text := '${collectionsTableLiteral}';
     BEGIN
@@ -646,8 +718,8 @@ class PostgresAdapter extends BaseDBAdapter {
               '${srcSchemaLiteral}'
             );
         END IF;
-    END ${D$$};"`.replace(/\n/g, " ");
-    await run(updateCollectionSchemaCommand, this.getPasswordEnvVars(password, toolchain));
+    END $$;`;
+    await this.runSql(updateCollectionSchemaQuery, [], toolchain);
   }
 }
 class KingbaseAdapter extends PostgresAdapter {
@@ -684,23 +756,32 @@ class KingbaseAdapter extends PostgresAdapter {
   getBackupSchema() {
     return this.dbOpts.schema || "public";
   }
-  buildSchemaRestoreCommand(srcSchema, targetSchema, filePath, jobs, toolchain = this.backupToolchain) {
+  buildSchemaRestoreArgs(srcSchema, targetSchema, filePath, jobs, toolchain = this.backupToolchain) {
     if (toolchain === "postgres") {
-      return super.buildSchemaRestoreCommand(srcSchema, targetSchema, filePath, jobs, toolchain);
+      return super.buildSchemaRestoreArgs(srcSchema, targetSchema, filePath, jobs, toolchain);
     }
-    const { username, host, port, database } = this.dbOpts;
-    return `${this.getRestoreCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -g ${srcSchema} -G ${targetSchema} -d ${database} --clean --if-exists --no-owner -j ${jobs} ${filePath}`;
+    return [
+      ...this.getConnectionArgs(),
+      "-g",
+      srcSchema,
+      "-G",
+      targetSchema,
+      "--clean",
+      "--if-exists",
+      "--no-owner",
+      "-j",
+      String(jobs),
+      filePath
+    ];
   }
-  async restoreSchema(srcSchema, targetSchema, restoreCommand, toolchain = this.backupToolchain) {
+  async restoreSchema(srcSchema, targetSchema, restoreArgs, toolchain = this.backupToolchain) {
     if (toolchain === "postgres") {
-      await super.restoreSchema(srcSchema, targetSchema, restoreCommand, toolchain);
+      await super.restoreSchema(srcSchema, targetSchema, restoreArgs, toolchain);
       return;
     }
-    const { username, host, port, database, password } = this.dbOpts;
-    const targetSchemaIdentifier = quotePgIdentifier(targetSchema).replace(/"/g, '\\"');
-    const createSchemaCommand = `${this.getSqlCommandName(toolchain)} -U ${username} -h ${host} ${port ? `-p ${port}` : ""} -d ${database} -c "CREATE SCHEMA IF NOT EXISTS ${targetSchemaIdentifier};"`;
-    await run(createSchemaCommand, this.getPasswordEnvVars(password, toolchain));
-    await run(restoreCommand, this.getPasswordEnvVars(password, toolchain));
+    const targetSchemaIdentifier = quotePgIdentifier(targetSchema);
+    await this.runSql(`CREATE SCHEMA IF NOT EXISTS ${targetSchemaIdentifier};`, [], toolchain);
+    await this.runRestore(restoreArgs, toolchain);
     await this.syncCollectionSchemaMetadata(srcSchema, targetSchema, toolchain);
   }
 }

package/dist/server/managers/backup.d.ts

@@ -11,7 +11,7 @@ import { ResourcerContext } from '@nocobase/resourcer';
 import Application from '@nocobase/server';
 import { Readable } from 'stream';
 export interface BackupSettings {
-    storageId?: string;
+    storageId?: string | number | null;
     encryptionPassword: string;
     enableFilesBackup: boolean;
     keep?: number;
@@ -42,11 +42,14 @@ export interface BackupTaskResult {
     message?: string;
     inProgress: boolean;
 }
+type BackupSettingsInput = BackupSettings & {
+    toJSON?: () => Partial<BackupSettings>;
+};
 export declare class BackupManager {
     #private;
     app: Application;
     ctx: ResourcerContext | null;
-    constructor(app: Application, ctx: ResourcerContext | null, settings: BackupSettings);
+    constructor(app: Application, ctx: ResourcerContext | null, settings: BackupSettingsInput);
     protected set backupPrefix(backupPrefix: string);
     protected set backupDir(backupDir: string);
     protected set tempDir(tempDir: string);
@@ -58,3 +61,4 @@ export declare class BackupManager {
     list(): Promise<BackupFile[]>;
     createReadStream(fileName: string): Promise<Readable>;
 }
+export {};

package/dist/server/managers/backup.js

@@ -66,7 +66,7 @@ class BackupManager {
   constructor(app, ctx, settings) {
     this.app = app;
     this.ctx = ctx;
-    this.#settings = settings;
+    this.#settings = this.#normalizeBackupSettings(settings);
     this.#dbAdapter = (0, import_database.getDBAdapter)(app.db.options);
     this.#backupTasksCacheName = import_utils2.BACKUP_TASKS_CACHE_NAME;
     this.#backupPrefix = "backup_";
@@ -90,6 +90,12 @@ class BackupManager {
   set backupTasksCacheName(backupTasksCacheName) {
     this.#backupTasksCacheName = backupTasksCacheName;
   }
+  #normalizeBackupSettings(settings) {
+    if (typeof settings.toJSON === "function") {
+      return settings.toJSON();
+    }
+    return { ...settings };
+  }
   async createBackupName() {
     await this.#dbAdapter.check("backup");
     await import_promises.default.mkdir(this.#backupDir, { recursive: true });

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "备份管理器",
   "description": "Provides backup and restore functionality, supports scheduled backups, and ensures data security and quick recovery.",
   "description.zh-CN": "提供备份与还原功能，支持定时备份，确保数据安全与快速恢复。",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "license": "Apache-2.0",
   "main": "dist/server/index.js",
   "nocobase": {
@@ -50,5 +50,5 @@
   "keywords": [
     "System management"
   ],
-  "gitHead": "9f8515d8a236f6584ce8a52e6b86082173a02bf4"
+  "gitHead": "c316683666cfb478cb355b971c8f067a4f925fcb"
 }