@tachybase/module-backup 1.5.0 → 1.6.0

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

@@ -65,7 +65,7 @@ var backup_files_default = {
       const count = backupFiles.length;
       const rows = await Promise.all(
         backupFiles.slice((page - 1) * pageSize, page * pageSize).map(async (file) => {
-          return await import_dumper.Dumper.getFileStatus(file.endsWith(".lock") ? file.replace(".lock", "") : file);
+          return await import_dumper.Dumper.getFileStatus(file.endsWith(".lock") ? file.replace(".lock", "") : file, ctx.app.name);
         })
       );
       ctx.body = {
@@ -112,14 +112,15 @@ var backup_files_default = {
      * @param next
      */
     async create(ctx, next) {
-      var _a, _b;
+      var _a, _b, _c;
       const data = ctx.request.body;
       const app = ctx.app;
-      if (data.method === "worker" && !((_a = app.worker) == null ? void 0 : _a.available)) {
+      const userId = (_a = ctx.state.currentUser) == null ? void 0 : _a.id;
+      if (data.method === "worker" && !((_b = app.worker) == null ? void 0 : _b.available)) {
         ctx.throw(500, ctx.t("No worker thread", { ns: "worker-thread" }));
         return next();
       }
-      let useWorker = data.method === "worker" || data.method === "priority" && ((_b = app.worker) == null ? void 0 : _b.available);
+      let useWorker = data.method === "worker" || data.method === "priority" && ((_c = app.worker) == null ? void 0 : _c.available);
       const dumper = new import_dumper.Dumper(ctx.app);
       const taskId = await dumper.getLockFile(ctx.app.name);
       if (useWorker) {
@@ -129,7 +130,8 @@ var backup_files_default = {
           params: {
             dataTypes: data.dataTypes,
             appName: ctx.app.name,
-            filename: taskId
+            filename: taskId,
+            userId
           },
           // 目前限制方法并发为1
           concurrency: 1
@@ -145,7 +147,8 @@ var backup_files_default = {
         plugin.workerCreateBackUp({
           dataTypes: data.dataTypes,
           appName: ctx.app.name,
-          filename: taskId
+          filename: taskId,
+          userId
         }).then((res) => {
           app.noticeManager.notify("backup", { level: "info", msg: ctx.t("Done", { ns: "backup" }) });
         }).catch((error) => {

package/dist/server/server.d.ts

@@ -15,5 +15,6 @@ export default class PluginBackupRestoreServer extends Plugin {
         dataTypes: string[];
         appName: string;
         filename: string;
+        userId?: number;
     }): Promise<void>;
 }

package/dist/server/server.js

@@ -57,6 +57,53 @@ const _PluginBackupRestoreServer = class _PluginBackupRestoreServer extends impo
   }
   async load() {
     this.app.resourcer.define(import_backup_files.default);
+    const gateway = import_server.Gateway.getInstance();
+    const ws = gateway["wsServer"];
+    if (ws == null ? void 0 : ws.wss) {
+      const appName = this.app.name;
+      ws.wss.on(
+        "connection",
+        async (websocket) => {
+          websocket.on("message", async (data) => {
+            var _a, _b, _c;
+            if (data.toString() !== "ping") {
+              try {
+                const userMeg = JSON.parse(data.toString());
+                if (userMeg.type === "signIn") {
+                  if (!((_a = userMeg.payload) == null ? void 0 : _a.token)) {
+                    return;
+                  }
+                  try {
+                    const analysis = await ((_c = (_b = this.app.authManager) == null ? void 0 : _b.jwt) == null ? void 0 : _c.verifyToken(userMeg.payload.token));
+                    const userId = analysis.userId;
+                    const client = ws.webSocketClients.get(websocket.id);
+                    if (client) {
+                      client.tags.forEach((tag2) => {
+                        if (tag2.startsWith("app:")) {
+                          client.tags.delete(tag2);
+                        }
+                      });
+                      const tag = `app:${appName}#${userId}`;
+                      client.tags.add(tag);
+                      this.app.logger.debug(`[Backup] WebSocket signIn: set tag ${tag} for connection ${websocket.id}`);
+                    } else {
+                      this.app.logger.warn(
+                        `[Backup] WebSocket signIn: client not found for connection ${websocket.id}`
+                      );
+                    }
+                  } catch (error) {
+                    this.app.logger.warn("[Backup] WebSocket signIn message connection error:", error);
+                  }
+                }
+              } catch (error) {
+              }
+            }
+          });
+        }
+      );
+    } else {
+      this.app.logger.warn("[Backup] WebSocket server not available, backup progress will not be pushed via WebSocket");
+    }
     this.app.on("afterStart", async (app) => {
       const cronJobs = await app.db.getRepository(import_constants.COLLECTION_AUTOBACKUP).find({
         filter: { enabled: true }
@@ -228,7 +275,8 @@ const _PluginBackupRestoreServer = class _PluginBackupRestoreServer extends impo
     await new import_dumper.Dumper(this.app).runDumpTask({
       groups: new Set(data.dataTypes),
       appName: data.appName,
-      fileName: data.filename
+      fileName: data.filename,
+      userId: data.userId
     });
   }
 };

package/package.json

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