@kne/fastify-app-manager 0.1.9 → 0.1.11

package/libs/services/dbops.js

@@ -4,7 +4,7 @@ const fs = require('fs-extra');
 const AdmZip = require('adm-zip');
 const { createSequelizeFromEnv, SQL_MIGRATIONS_TABLE } = require('../utils/migrate');
 const { resolveAppDbEnv, hasAppDbConfig } = require('../utils/env');
-const { resolveDbScope, normalizeOwnedTables, isSystemTable, resolveTablePrefix } = require('../utils/dbIdentity');
+const { resolveDbScope, normalizeOwnedTables, isSystemTable, resolveTablePrefix, filterOwnedTables } = require('../utils/dbIdentity');
 const { assertReadOnlyQuerySql } = require('../utils/sqlQueryGuard');
 
 module.exports = fp(async (fastify, options) => {
@@ -83,15 +83,7 @@ module.exports = fp(async (fastify, options) => {
     return { table, columns, primaryKey };
   };
 
-  const getOwnedTables = (app, allTables) => {
-    const scope = resolveDbScope(app.env || {}, app.options || {});
-    const existing = new Set(allTables);
-    if (scope === 'dedicated') {
-      return allTables.filter(t => !isSystemTable(t));
-    }
-    const owned = normalizeOwnedTables(app.options?.ownedTables);
-    return owned.filter(t => existing.has(t));
-  };
+  const getOwnedTables = (app, allTables) => filterOwnedTables({ appEnv: app.env || {}, ownedTables: app.options?.ownedTables, allTables });
 
   const assertTableOwned = (app, allTables, table) => {
     const owned = getOwnedTables(app, allTables);

package/libs/services/migration.js

@@ -1,12 +1,10 @@
 const fp = require('fastify-plugin');
-const path = require('node:path');
-const fs = require('fs-extra');
-const { listSqlFiles } = require('../utils/validatePackage');
 const { isValidSqlFileName, readExecutedMigrations, recordMigration, removeMigrationRecord } = require('../utils/migrate');
 
 module.exports = fp(async (fastify, options) => {
   const { models } = fastify[options.name];
   const getDbops = () => fastify[options.name].services.dbops;
+  const getAppService = () => fastify[options.name].services.app;
 
   const httpError = (statusCode, message) => {
     if (fastify.httpErrors) {
@@ -27,8 +25,7 @@ module.exports = fp(async (fastify, options) => {
     if (!ver || ver.appName !== name) {
       httpError(404, 'version not found');
     }
-    const sqlDir = path.join(ver.artifactPath, 'server', ver.migrationPath || options.sqlPath);
-    return { app, ver, sqlDir };
+    return { app, ver };
   };
 
   const assertFileName = file => {
@@ -37,25 +34,20 @@ module.exports = fp(async (fastify, options) => {
     }
   };
 
-  const assertFileExists = async (sqlDir, file) => {
+  const getFiles = ver => getAppService().getMigrationFiles(ver);
+
+  const findFile = async (ver, file) => {
     assertFileName(file);
-    const filePath = path.join(sqlDir, file);
-    if (!(await fs.pathExists(filePath))) {
+    const item = (await getFiles(ver)).find(f => f.name === file);
+    if (!item) {
       httpError(404, `sql file ${file} not found`);
     }
-    return filePath;
-  };
-
-  const syncHasMigration = async (ver, sqlDir) => {
-    const hasMigration = (await listSqlFiles(sqlDir)).length > 0;
-    if (ver.hasMigration !== hasMigration) {
-      await ver.update({ hasMigration });
-    }
+    return item;
   };
 
   const list = async ({ name, versionId }) => {
-    const { app, ver, sqlDir } = await resolveVersion({ name, versionId });
-    const files = await listSqlFiles(sqlDir);
+    const { app, ver } = await resolveVersion({ name, versionId });
+    const files = await getFiles(ver);
     let executedMap = new Map();
     let dbError = null;
     try {
@@ -63,18 +55,13 @@ module.exports = fp(async (fastify, options) => {
     } catch (e) {
       dbError = e.message;
     }
-    const pageData = await Promise.all(
-      files.map(async file => {
-        const stat = await fs.stat(path.join(sqlDir, file));
-        return {
-          name: file,
-          size: stat.size,
-          updatedAt: stat.mtime,
-          executed: dbError ? null : executedMap.has(file),
-          executedAt: executedMap.get(file) || null
-        };
-      })
-    );
+    const pageData = files.map(item => ({
+      name: item.name,
+      size: Buffer.byteLength(item.content || '', 'utf8'),
+      updatedAt: item.updatedAt || null,
+      executed: dbError ? null : executedMap.has(item.name),
+      executedAt: executedMap.get(item.name) || null
+    }));
     return {
       versionId: String(ver.id),
       version: ver.version,
@@ -87,32 +74,33 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const content = async ({ name, versionId, file }) => {
-    const { sqlDir } = await resolveVersion({ name, versionId });
-    const filePath = await assertFileExists(sqlDir, file);
-    return { name: file, content: await fs.readFile(filePath, 'utf8') };
+    const { ver } = await resolveVersion({ name, versionId });
+    const item = await findFile(ver, file);
+    return { name: file, content: item.content || '' };
   };
 
   const save = async ({ name, versionId, file, content: sql }) => {
     assertFileName(file);
-    const { ver, sqlDir } = await resolveVersion({ name, versionId });
-    await fs.ensureDir(sqlDir);
-    await fs.writeFile(path.join(sqlDir, file), sql || '', 'utf8');
-    await syncHasMigration(ver, sqlDir);
+    const { ver } = await resolveVersion({ name, versionId });
+    const files = (await getFiles(ver)).filter(f => f.name !== file);
+    files.push({ name: file, content: sql || '', updatedAt: new Date().toISOString() });
+    await getAppService().saveMigrationFiles(ver, files);
     return { name: file };
   };
 
   const remove = async ({ name, versionId, file }) => {
-    const { ver, sqlDir } = await resolveVersion({ name, versionId });
-    const filePath = await assertFileExists(sqlDir, file);
-    await fs.remove(filePath);
-    await syncHasMigration(ver, sqlDir);
+    const { ver } = await resolveVersion({ name, versionId });
+    await findFile(ver, file);
+    await getAppService().saveMigrationFiles(
+      ver,
+      (await getFiles(ver)).filter(f => f.name !== file)
+    );
     return { name: file };
   };
 
   const execute = async ({ name, versionId, file }) => {
-    const { app, sqlDir } = await resolveVersion({ name, versionId });
-    const filePath = await assertFileExists(sqlDir, file);
-    const sql = await fs.readFile(filePath, 'utf8');
+    const { app, ver } = await resolveVersion({ name, versionId });
+    const { content: sql } = await findFile(ver, file);
     const dbops = getDbops();
     let beforeTables = [];
     let afterTables = [];
@@ -131,8 +119,8 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const mark = async ({ name, versionId, file }) => {
-    const { app, sqlDir } = await resolveVersion({ name, versionId });
-    await assertFileExists(sqlDir, file);
+    const { app, ver } = await resolveVersion({ name, versionId });
+    await findFile(ver, file);
     await getDbops().withSequelize(app, sequelize => recordMigration(sequelize, file));
     return { name: file, executed: true };
   };

package/libs/utils/dbIdentity.js

@@ -1,5 +1,5 @@
 const path = require('node:path');
-const { hasAppDbConfig } = require('./env');
+const { isAppDbEnabled } = require('./env');
 
 const SYSTEM_TABLES = new Set(['_fs_sql_migrations']);
 
@@ -69,12 +69,8 @@ const assertDefaultAppDbSeparated = (defaultAppDb, hostSequelize) => {
   }
 };
 
-const resolveDbScope = (appEnv = {}, options = {}) => {
-  if (options.dbScope === 'dedicated' || options.dbScope === 'shared') {
-    return options.dbScope;
-  }
-  return hasAppDbConfig(appEnv) ? 'dedicated' : 'shared';
-};
+// 与 startProcess 注入的连接一致：只看 env（独立库配置 + DB_DEDICATED 开关）。options.dbScope 只是认领表时写入的缓存，env 变化后会过期
+const resolveDbScope = (appEnv = {}) => (isAppDbEnabled(appEnv) ? 'dedicated' : 'shared');
 
 const normalizeOwnedTables = tables => [...new Set((Array.isArray(tables) ? tables : []).map(t => String(t || '').trim()).filter(Boolean))];
 
@@ -104,8 +100,21 @@ const resolveTablePrefix = (appName, appEnv = {}) => {
   return buildTablePrefix(appName);
 };
 
+/**
+ * 共享库：只认登记过的表；独立库：库内业务表全归本应用，但显式配了 DB_TABLE_PREFIX 说明该库与其它系统共用，只认本前缀的表
+ */
+const filterOwnedTables = ({ appEnv = {}, ownedTables, allTables = [] }) => {
+  if (resolveDbScope(appEnv) === 'dedicated') {
+    const prefix = String(appEnv.DB_TABLE_PREFIX || '').trim();
+    return allTables.filter(t => !isSystemTable(t) && (!prefix || String(t).startsWith(prefix)));
+  }
+  const existing = new Set(allTables);
+  return normalizeOwnedTables(ownedTables).filter(t => existing.has(t));
+};
+
 module.exports = {
   SYSTEM_TABLES,
+  filterOwnedTables,
   fingerprintDbConfig,
   fingerprintFromEnv,
   assertDefaultAppDbSeparated,

package/libs/utils/deployProgress.js

@@ -0,0 +1,37 @@
+const { EventEmitter } = require('node:events');
+
+/** 部署阶段，按顺序推进：准备部署包 → SQL 迁移 → 启动进程 → 等待就绪 */
+const DEPLOY_STEPS = ['package', 'migrate', 'start', 'ready'];
+
+/**
+ * 每个应用只保留最近一次部署的进度事件，供 SSE 订阅与断线重连回放。
+ * 事件：{ progressId, step, status: 'running' | 'done' | 'skipped' | 'error', detail?, message?, at }
+ */
+const createDeployProgress = () => {
+  const emitter = new EventEmitter();
+  emitter.setMaxListeners(0);
+  const latest = new Map();
+
+  const begin = (name, progressId) => {
+    const state = { progressId, events: [] };
+    latest.set(name, state);
+    const report = (step, status, { detail = null, message = null } = {}) => {
+      const event = { progressId, step, status, detail, message, at: new Date().toISOString() };
+      state.events.push(event);
+      emitter.emit(`deploy:${name}`, event);
+      return event;
+    };
+    return { progressId, report };
+  };
+
+  const snapshot = name => latest.get(name) || null;
+
+  const clear = name => latest.delete(name);
+
+  return { emitter, begin, snapshot, clear };
+};
+
+module.exports = {
+  DEPLOY_STEPS,
+  createDeployProgress
+};

package/libs/utils/env.js

@@ -23,6 +23,22 @@ const hasAppDbConfig = (appEnv = {}) => {
   return !!appEnv.DB_DATABASE;
 };
 
+const DB_DEDICATED_KEY = 'DB_DEDICATED';
+const DB_CONNECTION_KEYS = ['DB_DIALECT', 'DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_STORAGE'];
+
+// 配好独立库后默认启用；DB_DEDICATED=false 时保留配置但回落共享库
+const isAppDbEnabled = (appEnv = {}) =>
+  hasAppDbConfig(appEnv) &&
+  String(appEnv[DB_DEDICATED_KEY] ?? '')
+    .trim()
+    .toLowerCase() !== 'false';
+
+const omitDbConnection = (appEnv = {}) => {
+  const next = Object.assign({}, appEnv);
+  DB_CONNECTION_KEYS.forEach(key => delete next[key]);
+  return next;
+};
+
 const buildDefaultAppDbEnv = (defaultAppDb = {}) => {
   const dialect = defaultAppDb.dialect || 'sqlite';
   const env = { DB_DIALECT: dialect };
@@ -59,10 +75,11 @@ const buildDefaultAppDbEnv = (defaultAppDb = {}) => {
  */
 const resolveAppDbEnv = ({ passthroughEnvKeys = [], appEnv = {}, defaultAppDb = null, port = null, includePort = false, appName = null, injectTablePrefix = true } = {}) => {
   const base = Object.assign({}, pickHostEnv(passthroughEnvKeys));
-  if (defaultAppDb && !hasAppDbConfig(appEnv)) {
+  const useAppDb = isAppDbEnabled(appEnv || {});
+  if (defaultAppDb && !useAppDb) {
     Object.assign(base, buildDefaultAppDbEnv(defaultAppDb));
   }
-  Object.assign(base, appEnv || {});
+  Object.assign(base, useAppDb ? appEnv || {} : omitDbConnection(appEnv || {}));
   if (includePort && port != null) {
     base.PORT = String(port);
   }
@@ -105,17 +122,17 @@ const isSecretKey = (key, pattern, secretKeys = []) => {
   return isPatternSecretKey(key, pattern);
 };
 
-// 由系统写入维护：不在接口中返回，也不接受外部新增 / 修改 / 删除
+// 由系统写入维护：不在接口中返回，也不接受外部新增 / 修改 / 删除；宿主可通过 systemEnvKeys 选项追加
 const SYSTEM_ENV_KEYS = ['DB_TABLE_PREFIX'];
 
-const isSystemEnvKey = key => SYSTEM_ENV_KEYS.includes(key);
+const isSystemEnvKey = (key, systemEnvKeys = []) => SYSTEM_ENV_KEYS.includes(key) || (systemEnvKeys || []).includes(key);
 
-const omitSystemEnv = (appEnv = {}) => Object.fromEntries(Object.entries(appEnv || {}).filter(([key]) => !isSystemEnvKey(key)));
+const omitSystemEnv = (appEnv = {}, systemEnvKeys = []) => Object.fromEntries(Object.entries(appEnv || {}).filter(([key]) => !isSystemEnvKey(key, systemEnvKeys)));
 
-const maskEnvForResponse = (appEnv = {}, { secretEnvKeyPattern, secretEnvKeys = [] } = {}) => {
+const maskEnvForResponse = (appEnv = {}, { secretEnvKeyPattern, secretEnvKeys = [], systemEnvKeys = [] } = {}) => {
   const masked = {};
   const explicit = normalizeSecretKeys(secretEnvKeys);
-  for (const [key, value] of Object.entries(omitSystemEnv(appEnv))) {
+  for (const [key, value] of Object.entries(omitSystemEnv(appEnv, systemEnvKeys))) {
     if (isSecretKey(key, secretEnvKeyPattern, explicit)) {
       masked[key] = value == null || value === '' ? null : SECRET_MASK;
     } else {
@@ -131,11 +148,11 @@ const maskEnvForResponse = (appEnv = {}, { secretEnvKeyPattern, secretEnvKeys =
  * SECRET_MASK => keep existing (when key is secret by pattern or explicit list)
  * other => set
  */
-const applyEnvPatch = (current = {}, patch = {}, { secretEnvKeyPattern, secretEnvKeys = [] } = {}) => {
+const applyEnvPatch = (current = {}, patch = {}, { secretEnvKeyPattern, secretEnvKeys = [], systemEnvKeys = [] } = {}) => {
   const next = Object.assign({}, current);
   const explicit = normalizeSecretKeys(secretEnvKeys);
   for (const [key, value] of Object.entries(patch || {})) {
-    if (isSystemEnvKey(key)) {
+    if (isSystemEnvKey(key, systemEnvKeys)) {
       continue;
     }
     if (value === null) {
@@ -153,10 +170,10 @@ const applyEnvPatch = (current = {}, patch = {}, { secretEnvKeyPattern, secretEn
 /**
  * 响应中的密钥键列表 = 显式列表 ∪ 当前 env 中匹配 pattern 的键
  */
-const collectSecretKeys = (appEnv = {}, { secretEnvKeyPattern, secretEnvKeys = [] } = {}) => {
+const collectSecretKeys = (appEnv = {}, { secretEnvKeyPattern, secretEnvKeys = [], systemEnvKeys = [] } = {}) => {
   const explicit = normalizeSecretKeys(secretEnvKeys);
   const fromPattern = Object.keys(appEnv || {}).filter(key => isPatternSecretKey(key, secretEnvKeyPattern));
-  return normalizeSecretKeys([...explicit, ...fromPattern]).filter(key => !isSystemEnvKey(key));
+  return normalizeSecretKeys([...explicit, ...fromPattern]).filter(key => !isSystemEnvKey(key, systemEnvKeys));
 };
 
 const PM2_CONFIG_KEYS = ['exec_mode', 'instances', 'autorestart', 'max_memory_restart', 'max_restarts', 'min_uptime', 'kill_timeout', 'merge_logs'];
@@ -176,6 +193,8 @@ module.exports = {
   normalizeSecretKeys,
   pickHostEnv,
   hasAppDbConfig,
+  DB_DEDICATED_KEY,
+  isAppDbEnabled,
   buildDefaultAppDbEnv,
   resolveAppDbEnv,
   mergeEnv,

package/libs/utils/pathRewrite.js

@@ -27,9 +27,11 @@ const rewriteSetCookiePath = (setCookie, mountPrefix) => {
   });
 };
 
-const TEXTUAL_TYPES = /text\/|javascript|json|xml|svg/i;
+const TEXTUAL_TYPES = /text\/|json|xml|svg/i;
+// 前端脚本已按注入的 runtimePublicUrl / runtimeApiUrl 自行拼前缀（如 axios baseURL + '/api/...'），再改写会得到 /app/x/app/x/api
+const SCRIPT_TYPES = /javascript|ecmascript/i;
 
-const shouldRewriteBody = contentType => TEXTUAL_TYPES.test(contentType || '');
+const shouldRewriteBody = contentType => TEXTUAL_TYPES.test(contentType || '') && !SCRIPT_TYPES.test(contentType || '');
 
 const rewriteBody = (body, mountPrefix, prefixes = ['/static', '/api', '/account']) => {
   if (!body || !mountPrefix) {
@@ -47,9 +49,32 @@ const rewriteBody = (body, mountPrefix, prefixes = ['/static', '/api', '/account
   return text;
 };
 
+// 路径模式响应体经网关改写，ETag 带上改写规则版本，与子应用原始文件及旧规则下的缓存区分；改写规则变化时递增
+const ETAG_SUFFIX = '-gw2';
+
+const tagEtag = etag => (typeof etag === 'string' && etag.endsWith('"') ? `${etag.slice(0, -1)}${ETAG_SUFFIX}"` : etag);
+
+// 只有本网关签发的 ETag 才还原后交给子应用协商缓存；其它（旧规则缓存）去掉条件头，强制返回完整内容
+const restoreConditionalHeaders = headers => {
+  const next = { ...headers };
+  const tags = String(next['if-none-match'] || '')
+    .split(',')
+    .map(tag => tag.trim())
+    .filter(Boolean);
+  if (tags.length && tags.every(tag => tag.endsWith(`${ETAG_SUFFIX}"`))) {
+    next['if-none-match'] = tags.map(tag => `${tag.slice(0, -(ETAG_SUFFIX.length + 1))}"`).join(', ');
+  } else {
+    delete next['if-none-match'];
+    delete next['if-modified-since'];
+  }
+  return next;
+};
+
 module.exports = {
   rewriteLocation,
   rewriteSetCookiePath,
   shouldRewriteBody,
-  rewriteBody
+  rewriteBody,
+  tagEtag,
+  restoreConditionalHeaders
 };

package/libs/utils/version.js

@@ -33,8 +33,10 @@ const runNpmInstall = (cwd, timeoutMs) =>
     });
   });
 
-const prepareVersionArtifact = async ({ zipBuffer, artifactPath, maxZipSize, maxZipEntries, npmInstallTimeoutMs, sqlPath }) => {
+/** install=false 时只解压校验，不装依赖（用于不常驻磁盘的版本上传） */
+const prepareVersionArtifact = async ({ zipBuffer, artifactPath, maxZipSize, maxZipEntries, npmInstallTimeoutMs, sqlPath, install = true, onProgress }) => {
   await fs.emptyDir(artifactPath);
+  onProgress && onProgress('extract');
   const extractDir = path.join(artifactPath, '_extract');
   await extractZipSafe(zipBuffer, extractDir, { maxZipSize, maxZipEntries });
   const packageRoot = await resolvePackageRoot(extractDir);
@@ -60,7 +62,10 @@ const prepareVersionArtifact = async ({ zipBuffer, artifactPath, maxZipSize, max
   });
 
   const serverDir = path.join(artifactPath, 'server');
-  await runNpmInstall(serverDir, npmInstallTimeoutMs);
+  if (install) {
+    onProgress && onProgress('install');
+    await runNpmInstall(serverDir, npmInstallTimeoutMs);
+  }
 
   const sqlDir = path.join(serverDir, sqlPath || 'sql');
   const sqlFiles = await listSqlFiles(sqlDir);

package/libs/utils/versionSql.js

@@ -0,0 +1,33 @@
+const path = require('node:path');
+const fs = require('fs-extra');
+const { listSqlFiles } = require('./validatePackage');
+
+/** 读取目录内的 .sql 为 [{ name, content, updatedAt }] */
+const readSqlDir = async sqlDir => {
+  const files = [];
+  for (const name of await listSqlFiles(sqlDir)) {
+    const filePath = path.join(sqlDir, name);
+    const [content, stat] = await Promise.all([fs.readFile(filePath, 'utf8'), fs.stat(filePath)]);
+    files.push({ name, content, updatedAt: stat.mtime.toISOString() });
+  }
+  return files;
+};
+
+/** 以 files 为准覆盖目录内的 .sql：删掉多余的，写入全部 */
+const writeSqlDir = async (sqlDir, files) => {
+  await fs.ensureDir(sqlDir);
+  const keep = new Set(files.map(item => item.name));
+  for (const name of await listSqlFiles(sqlDir)) {
+    if (!keep.has(name)) {
+      await fs.remove(path.join(sqlDir, name));
+    }
+  }
+  for (const item of files) {
+    await fs.writeFile(path.join(sqlDir, item.name), item.content || '', 'utf8');
+  }
+};
+
+module.exports = {
+  readSqlDir,
+  writeSqlDir
+};

package/package.json

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