termdock 1.4.155 → 1.4.156

package/dist/server/entry.js

@@ -27,7 +27,7 @@ import { RuntimeMonitor } from './utils/runtimeMonitor.js';
 import { startOnboardingServer, stopOnboardingServer, getOnboardingServerUrl } from './onboardingServer.js';
 import { CertificateWatcher } from './certificateWatcher.js';
 import { startTermdockLogMaintenance, writeDiffTraceLog, writeErrorLog, writeJsonLog, writeTextLog, } from './utils/serverLogger.js';
-import { resolveRuntimeClientDist } from './utils/runtimeClient.js';
+import { pinBundledRuntimeClientDist, resolveRuntimeClientDist } from './utils/runtimeClient.js';
 import { getTermdockVersion, TERMDOCK_CAPABILITIES, TERMDOCK_PROTOCOL_VERSION, } from './utils/version.js';
 import { PORT, DEFAULT_HOST } from './config.js';
 const CLIENT_STATE_COOKIE = 'termdock-client';
@@ -448,35 +448,28 @@ export function createApp(options = {}) {
     // 文件系统路由（继承 /api/terminal 上的 auth + CSRF 保护）
     app.use('/api/terminal/fs', filesystemRoutes);
     if (fs.existsSync(bundledClientIndexPath)) {
-        let cachedClientPath = '';
-        let cachedCompression = null;
-        let cachedStatic = null;
-        const activeClientHandlers = () => {
-            const clientPath = resolveRuntimeClientDist(bundledClientDistPath);
-            if (clientPath !== cachedClientPath || !cachedCompression || !cachedStatic) {
-                cachedClientPath = clientPath;
-                cachedCompression = createStaticCompressionMiddleware(clientPath);
-                cachedStatic = express.static(clientPath, {
-                    setHeaders: (res, filePath, stat) => {
-                        void stat;
-                        const relativePath = `/${path.relative(clientPath, filePath).split(path.sep).join('/')}`;
-                        setStaticCacheHeaders({ url: relativePath, path: relativePath }, res);
-                    },
-                });
-            }
-            return { clientPath, compression: cachedCompression, staticFiles: cachedStatic };
-        };
+        const selectedClientPath = resolveRuntimeClientDist(bundledClientDistPath);
+        const clientPath = selectedClientPath === bundledClientDistPath
+            ? pinBundledRuntimeClientDist(bundledClientDistPath)
+            : selectedClientPath;
+        const compression = createStaticCompressionMiddleware(clientPath);
+        const staticFiles = express.static(clientPath, {
+            setHeaders: (res, filePath, stat) => {
+                void stat;
+                const relativePath = `/${path.relative(clientPath, filePath).split(path.sep).join('/')}`;
+                setStaticCacheHeaders({ url: relativePath, path: relativePath }, res);
+            },
+        });
         app.use((req, res, next) => {
-            const handlers = activeClientHandlers();
-            handlers.compression(req, res, (compressionError) => {
+            compression(req, res, (compressionError) => {
                 if (compressionError)
                     return next(compressionError);
-                handlers.staticFiles(req, res, next);
+                staticFiles(req, res, next);
             });
         });
         app.get(/^(?!\/api(?:\/|$)|\/health$|\/onboarding(?:\/|$)|\/ca(?:\/|$)).*/, (req, res) => {
             setStaticCacheHeaders(req, res);
-            res.sendFile(path.join(activeClientHandlers().clientPath, 'index.html'));
+            res.sendFile(path.join(clientPath, 'index.html'));
         });
     }
     return app;

package/dist/server/utils/runtimeClient.js

@@ -1,3 +1,4 @@
+import crypto from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -9,6 +10,78 @@ function readManifest(filePath) {
         return null;
     }
 }
+function isCompleteSnapshot(clientDist, serverBundleHash) {
+    const marker = readManifest(path.join(clientDist, '..', '..', 'snapshot-manifest.json'));
+    return marker?.schemaVersion === 1
+        && marker.serverBundleHash === serverBundleHash
+        && marker.clientEntrypoint === 'dist/client/index.html'
+        && fs.existsSync(path.join(clientDist, 'index.html'));
+}
+/**
+ * Keep the browser bundle served by this process immutable for its lifetime.
+ *
+ * `npm install --global` replaces files underneath a still-running Termdock
+ * process. Without a snapshot, Express immediately starts serving the new
+ * index/assets while the in-memory server is still the old version. That can
+ * pair a newer terminal protocol client with an older WebSocket server until
+ * the user confirms the restart.
+ */
+export function pinBundledRuntimeClientDist(defaultClientDist, homeDir = os.homedir()) {
+    try {
+        const packageRoot = path.resolve(defaultClientDist, '..', '..');
+        const manifest = readManifest(path.join(packageRoot, 'runtime-manifest.json'));
+        if (manifest?.schemaVersion !== 1
+            || typeof manifest.serverBundleHash !== 'string'
+            || manifest.clientEntrypoint !== 'dist/client/index.html'
+            || !fs.existsSync(path.join(defaultClientDist, 'index.html'))) {
+            return defaultClientDist;
+        }
+        const snapshotKey = crypto
+            .createHash('sha256')
+            .update(manifest.serverBundleHash)
+            .digest('hex')
+            .slice(0, 24);
+        const snapshotsRoot = path.join(homeDir, '.termdock', 'client-snapshots');
+        const snapshotRoot = path.join(snapshotsRoot, snapshotKey);
+        const snapshotClientDist = path.join(snapshotRoot, 'dist', 'client');
+        if (isCompleteSnapshot(snapshotClientDist, manifest.serverBundleHash)) {
+            return snapshotClientDist;
+        }
+        fs.mkdirSync(snapshotsRoot, { recursive: true, mode: 0o700 });
+        const temporaryRoot = fs.mkdtempSync(path.join(snapshotsRoot, `.${snapshotKey}-`));
+        const temporaryClientDist = path.join(temporaryRoot, 'dist', 'client');
+        try {
+            fs.cpSync(defaultClientDist, temporaryClientDist, {
+                recursive: true,
+                preserveTimestamps: true,
+            });
+            fs.writeFileSync(path.join(temporaryRoot, 'snapshot-manifest.json'), `${JSON.stringify({
+                schemaVersion: 1,
+                serverBundleHash: manifest.serverBundleHash,
+                clientEntrypoint: 'dist/client/index.html',
+            })}\n`, { mode: 0o600 });
+            try {
+                fs.renameSync(temporaryRoot, snapshotRoot);
+            }
+            catch (error) {
+                if (error.code !== 'EEXIST')
+                    throw error;
+            }
+        }
+        finally {
+            if (fs.existsSync(temporaryRoot)) {
+                fs.rmSync(temporaryRoot, { recursive: true, force: true });
+            }
+        }
+        return isCompleteSnapshot(snapshotClientDist, manifest.serverBundleHash)
+            ? snapshotClientDist
+            : defaultClientDist;
+    }
+    catch {
+        // A read-only home or interrupted snapshot must never block the server.
+        return defaultClientDist;
+    }
+}
 export function resolveRuntimeClientDist(defaultClientDist, homeDir = os.homedir()) {
     try {
         const defaultPackageRoot = path.resolve(defaultClientDist, '..', '..');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.155",
+  "version": "1.4.156",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.155",
+  "version": "1.4.156",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-HOcSzDZKWX251Njijj5fna89AzzVkOmrgAV2AuvVlJk=",
-  "serverBundleHash": "sha256-0Ff/a3stFg47uLUati8tKSYtUhBxfHRcZBwpYMq9KCk=",
+  "serverBundleHash": "sha256-03guIBU3l8lNaGGjmY7l/fSgflPMZ++rwcORglMctvo=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }