@kne/fastify-app-manager 0.1.12 → 0.1.14

package/libs/controllers/gateway.js

@@ -1,5 +1,7 @@
 const fp = require('fastify-plugin');
+const http = require('node:http');
 const { Readable } = require('node:stream');
+const httpProxy = require('http-proxy');
 const { rewriteLocation, rewriteSetCookiePath, shouldRewriteBody, rewriteBody, tagEtag, restoreConditionalHeaders } = require('../utils/pathRewrite');
 const { wantsHtml, renderUnavailablePage, getStatusText } = require('../utils/unavailablePage');
 
@@ -7,17 +9,20 @@ module.exports = fp(async (fastify, options) => {
   const ns = options.name;
   const pathPrefix = options.pathPrefix.replace(/\/$/, '') || '/app';
 
-  const proxyToApp = async (request, reply, app, { stripPrefix } = {}) => {
-    let targetPath = request.raw.url || '/';
-    if (stripPrefix) {
-      const mount = `${pathPrefix}/${app.name}`;
-      if (targetPath === mount || targetPath.startsWith(mount + '/') || targetPath.startsWith(mount + '?')) {
-        targetPath = targetPath.slice(mount.length) || '/';
-        if (!targetPath.startsWith('/')) {
-          targetPath = `/${targetPath}`;
-        }
-      }
+  const pathMatcher = new RegExp(`^${pathPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}/([^/?#]+)`);
+
+  const stripMountPrefix = (url, appName) => {
+    const mount = `${pathPrefix}/${appName}`;
+    if (url === mount || url.startsWith(mount + '/') || url.startsWith(mount + '?')) {
+      const rest = url.slice(mount.length) || '/';
+      return rest.startsWith('/') ? rest : `/${rest}`;
     }
+    return url;
+  };
+
+  const proxyToApp = async (request, reply, app, { stripPrefix } = {}) => {
+    const rawUrl = request.raw.url || '/';
+    const targetPath = stripPrefix ? stripMountPrefix(rawUrl, app.name) : rawUrl;
 
     const dest = `http://127.0.0.1:${app.port}${targetPath}`;
     const mountPrefix = `${pathPrefix}/${app.name}`;
@@ -128,7 +133,7 @@ module.exports = fp(async (fastify, options) => {
       return byHost.status === 'running' ? proxyToApp(request, reply, byHost, { stripPrefix: false }) : replyUnavailable(request, reply, byHost);
     }
 
-    const match = url.match(new RegExp(`^${pathPrefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}/([^/?#]+)`));
+    const match = url.match(pathMatcher);
     if (match) {
       const appName = decodeName(match[1]);
       const app = await services.app.findByPathName(appName, { running: false });
@@ -138,4 +143,68 @@ module.exports = fp(async (fastify, options) => {
       return replyUnavailable(request, reply, { name: appName, status: 'missing' });
     }
   });
+
+  const wsProxy = httpProxy.createProxyServer({ changeOrigin: true });
+
+  const rejectUpgrade = (socket, statusCode) => {
+    if (!socket.writable) {
+      return socket.destroy();
+    }
+    socket.end(`HTTP/1.1 ${statusCode} ${http.STATUS_CODES[statusCode]}\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`);
+  };
+
+  const resolveUpgradeTarget = async req => {
+    const url = req.url || '/';
+    if (url.startsWith(options.prefix)) {
+      return null;
+    }
+    const services = fastify[ns]?.services;
+    if (!services?.app) {
+      return null;
+    }
+    const byHost = await services.app.findByHost(req.headers.host, { running: false });
+    if (byHost) {
+      return { app: byHost, targetPath: url };
+    }
+    const match = url.match(pathMatcher);
+    if (!match) {
+      return null;
+    }
+    const appName = decodeName(match[1]);
+    const app = await services.app.findByPathName(appName, { running: false });
+    return { app: app || { name: appName, status: 'missing' }, targetPath: stripMountPrefix(url, appName) };
+  };
+
+  // reply-from only speaks plain HTTP, so WebSocket handshakes under an app go through http-proxy instead.
+  const onUpgrade = async (req, socket, head) => {
+    socket.on('error', () => socket.destroy());
+    let target;
+    try {
+      target = await resolveUpgradeTarget(req);
+    } catch (error) {
+      fastify.log.error(error);
+      return rejectUpgrade(socket, 502);
+    }
+    if (!target) {
+      return;
+    }
+    // Node servers allow half-open sockets; once our side has finished writing (tunnel ended or upgrade declined) drop the connection.
+    socket.once('finish', () => socket.destroy());
+    const { app, targetPath } = target;
+    if (app.status !== 'running') {
+      return rejectUpgrade(socket, app.status === 'missing' ? 404 : 503);
+    }
+
+    req.url = targetPath;
+    wsProxy.ws(req, socket, head, { target: `http://127.0.0.1:${app.port}` }, error => {
+      fastify.log.warn({ err: error, app: app.name }, 'websocket upgrade proxy failed');
+      rejectUpgrade(socket, 502);
+    });
+  };
+
+  fastify.server.on('upgrade', onUpgrade);
+  fastify.addHook('onClose', async () => {
+    fastify.server.removeListener('upgrade', onUpgrade);
+    wsProxy.close();
+  });
 });

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.12",
+  "version": "0.1.14",
   "description": "Fastify 单机应用市场插件：版本上传、PM2 托管、路径/域名反代与日志 SSE",
   "main": "index.js",
   "scripts": {
@@ -71,6 +71,7 @@
     "adm-zip": "^0.6.0",
     "ajv": "^8.17.1",
     "fs-extra": "^11.4.0",
+    "http-proxy": "^1.18.1",
     "jsdom": "^29.1.1",
     "lodash": "^4.18.1",
     "pm2": "^7.0.4",