@kne/fastify-app-manager 0.1.4 → 0.1.6

package/README.md

@@ -311,7 +311,7 @@ await fastify.listen({ port: 3000 });
 | version | string | 是 | 版本号；同应用内唯一 |
 | label | string | 否 | 版本说明 |
 
-成功返回 `appVersion` 记录（含 `artifactPath`、`hasMigration` 等）。包非法或 npm 失败时回滚产物并返回 400。
+成功返回 `appVersion` 记录（含 `artifactPath`、`hasMigration` 等）。包在临时目录完成解压、校验与 `npm install` 后才写入版本表，上传中或失败的包不会出现在版本列表；包非法或 npm 失败时清理临时目录并返回 400。版本号已存在返回 409；同版本号仅残留软删除记录时会先彻底清除再写入。
 
 ##### GET `{prefix}/app/version/list`
 

package/libs/controllers/gateway.js

@@ -1,4 +1,5 @@
 const fp = require('fastify-plugin');
+const { Readable } = require('node:stream');
 const { rewriteLocation, rewriteSetCookiePath, shouldRewriteBody, rewriteBody } = require('../utils/pathRewrite');
 
 module.exports = fp(async (fastify, options) => {
@@ -20,6 +21,12 @@ module.exports = fp(async (fastify, options) => {
     const dest = `http://127.0.0.1:${app.port}${targetPath}`;
     const mountPrefix = `${pathPrefix}/${app.name}`;
 
+    // The gateway runs in onRequest, before body parsing; reply-from only forwards request.body,
+    // so hand it the raw stream or POST/PUT bodies reach the app empty.
+    if (request.method !== 'GET' && request.method !== 'HEAD') {
+      request.body = request.raw;
+    }
+
     return reply.from(dest, {
       rewriteRequestHeaders: (req, headers) => {
         const next = { ...headers };
@@ -51,7 +58,8 @@ module.exports = fp(async (fastify, options) => {
           }
           const buf = Buffer.concat(chunks.map(c => (Buffer.isBuffer(c) ? c : Buffer.from(c))));
           const text = rewriteBody(buf.toString('utf8'), mountPrefix);
-          return reply.send(text);
+          // A stream payload keeps host onSend hooks that wrap string bodies (e.g. response envelopes) from altering app responses.
+          return reply.send(Readable.from([Buffer.from(text)], { objectMode: false }));
         }
         return reply.send(res.stream);
       }

package/libs/services/app.js

@@ -1,5 +1,6 @@
 const fp = require('fastify-plugin');
 const path = require('node:path');
+const crypto = require('node:crypto');
 const fs = require('fs-extra');
 const portPool = require('../utils/portPool');
 const { mergeEnv, maskEnvForResponse, applyEnvPatch, mergePm2Config, normalizeSecretKeys, collectSecretKeys } = require('../utils/env');
@@ -184,41 +185,62 @@ module.exports = fp(async (fastify, options) => {
     if (!app) {
       httpError(404, `app ${name} not found; create it first`);
     }
-    const dup = await models.appVersion.findOne({ where: { appName: name, version } });
-    if (dup) {
+    // The (app_name, version) unique index also covers soft-deleted rows, so they must be purged before reuse.
+    const dup = await models.appVersion.findOne({ where: { appName: name, version }, paranoid: false });
+    if (dup && !dup.isSoftDeleted()) {
       httpError(409, `version ${version} already exists`);
     }
+    if (dup) {
+      await dup.destroy({ force: true });
+    }
 
-    const versionRow = await models.appVersion.create({
-      appName: name,
-      version,
-      label: label || null,
-      artifactPath: path.join(app.rootPath, 'versions', 'pending'),
-      hasMigration: false,
-      migrationPath: options.sqlPath
-    });
-
-    const artifactPath = path.join(app.rootPath, 'versions', String(versionRow.id));
+    // Prepare outside the version table so failed or in-progress uploads never appear in the version list.
+    const versionsDir = path.join(app.rootPath, 'versions');
+    const stagingPath = path.join(versionsDir, `.staging-${crypto.randomUUID()}`);
+    let prepared;
     try {
-      const prepared = await prepareVersionArtifact({
+      prepared = await prepareVersionArtifact({
         zipBuffer,
-        artifactPath,
+        artifactPath: stagingPath,
         maxZipSize: options.maxZipSize,
         maxZipEntries: options.maxZipEntries,
         npmInstallTimeoutMs: options.npmInstallTimeoutMs,
         sqlPath: options.sqlPath
       });
-      await versionRow.update({
-        artifactPath,
-        hasMigration: prepared.hasMigration,
-        migrationPath: prepared.migrationPath
-      });
-      return versionRow.toJSON();
     } catch (e) {
-      await fs.remove(artifactPath).catch(() => {});
-      await versionRow.destroy().catch(() => {});
+      await fs.remove(stagingPath).catch(() => {});
       httpError(400, e.message);
     }
+
+    let artifactPath = null;
+    try {
+      return await models.appVersion.sequelize.transaction(async transaction => {
+        const versionRow = await models.appVersion.create(
+          {
+            appName: name,
+            version,
+            label: label || null,
+            artifactPath: stagingPath,
+            hasMigration: prepared.hasMigration,
+            migrationPath: prepared.migrationPath
+          },
+          { transaction }
+        );
+        artifactPath = path.join(versionsDir, String(versionRow.id));
+        await fs.move(stagingPath, artifactPath);
+        await versionRow.update({ artifactPath }, { transaction });
+        return versionRow.toJSON();
+      });
+    } catch (e) {
+      await fs.remove(stagingPath).catch(() => {});
+      if (artifactPath) {
+        await fs.remove(artifactPath).catch(() => {});
+      }
+      if (e.name === 'SequelizeUniqueConstraintError') {
+        httpError(409, `version ${version} already exists`);
+      }
+      throw e;
+    }
   };
 
   const listVersions = async ({ name, perPage = 20, currentPage = 1 }) => {

package/package.json

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