@kne/fastify-app-manager 0.1.13 → 0.1.14

package/libs/services/app.js

@@ -241,7 +241,7 @@ module.exports = fp(async (fastify, options) => {
       order: [['createdAt', 'DESC']]
     });
     return {
-      pageData: rows.map(toPublicApp),
+      pageData: rows.map(row => Object.assign(toPublicApp(row), { deployment: deployProgress.active(row.name) })),
       totalCount: count
     };
   };
@@ -265,7 +265,7 @@ module.exports = fp(async (fastify, options) => {
 
   const detail = async ({ name }) => {
     const app = await getByName(name);
-    return toPublicApp(app);
+    return Object.assign(toPublicApp(app), { deployment: deployProgress.active(app.name) });
   };
 
   const versionSqlDir = ver => path.join(ver.artifactPath, 'server', ver.migrationPath || options.sqlPath || 'sql');
@@ -938,7 +938,7 @@ module.exports = fp(async (fastify, options) => {
       httpError(404, 'version not found');
     }
 
-    const progress = deployProgress.begin(app.name, progressId || crypto.randomUUID());
+    const progress = deployProgress.begin(app.name, progressId || crypto.randomUUID(), { versionId: String(ver.id), version: ver.version });
     let step = 'package';
     progress.report(step, 'running');
     try {

package/libs/utils/deployProgress.js

@@ -12,8 +12,8 @@ const createDeployProgress = () => {
   emitter.setMaxListeners(0);
   const latest = new Map();
 
-  const begin = (name, progressId) => {
-    const state = { progressId, events: [] };
+  const begin = (name, progressId, { versionId = null, version = null } = {}) => {
+    const state = { progressId, versionId, version, startedAt: new Date().toISOString(), events: [] };
     latest.set(name, state);
     const report = (step, status, { detail = null, message = null } = {}) => {
       const event = { progressId, step, status, detail, message, at: new Date().toISOString() };
@@ -30,6 +30,23 @@ const createDeployProgress = () => {
 
   const isFinished = event => event.status === 'error' || (event.step === 'ready' && event.status !== 'running');
 
+  /** 尚未结束的最近一次部署；准备部署包阶段应用仍是旧状态与旧版本，需靠它判断哪个版本正在部署 */
+  const active = name => {
+    const state = latest.get(name);
+    if (!state || state.events.some(isFinished)) {
+      return null;
+    }
+    const last = state.events[state.events.length - 1];
+    return {
+      progressId: state.progressId,
+      versionId: state.versionId,
+      version: state.version,
+      startedAt: state.startedAt,
+      step: last ? last.step : null,
+      detail: last ? last.detail : null
+    };
+  };
+
   /** 等到该次部署出错或就绪阶段结束（或超时）；返回 { progressId, ok, timedOut, events } */
   const wait = (name, progressId, { timeoutMs = 120000 } = {}) =>
     new Promise(resolve => {
@@ -57,7 +74,7 @@ const createDeployProgress = () => {
       timer = setTimeout(() => finish(true), timeoutMs);
     });
 
-  return { emitter, begin, snapshot, clear, wait };
+  return { emitter, begin, snapshot, active, clear, wait };
 };
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-app-manager",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Fastify 单机应用市场插件：版本上传、PM2 托管、路径/域名反代与日志 SSE",
   "main": "index.js",
   "scripts": {