@lark-apaas/fullstack-cli 1.1.62-alpha.20260824160408 → 1.1.62-alpha.20260824233147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.62-alpha.20260824160408",
+  "version": "1.1.62-alpha.20260824233147",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/workspace-client-runtime.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import fs from 'node:fs';
-import http from 'node:http';
 import net from 'node:net';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
@@ -17,7 +16,6 @@ const clientHost = process.env.CLIENT_DEV_HOST || '0.0.0.0';
 const clientPort = Number(process.env.CLIENT_DEV_PORT || 8080);
 const serverHost = process.env.SERVER_HOST || '0.0.0.0';
 const serverPort = Number(process.env.SERVER_PORT || 3000);
-const internalViteHost = process.env.MIAODA_VITE_INTERNAL_HOST || '127.0.0.1';
 const vite8RuntimeEnabled = process.env.MIAODA_VITE8_RUNTIME_ENABLED === 'true';
 const devBundleEnabled = process.env.MIAODA_VITE_DEV_BUNDLE_ENABLED === 'true';
 if (devBundleEnabled && !vite8RuntimeEnabled) {
@@ -61,7 +59,8 @@ const vite8Bin = path.resolve(
   process.env.MIAODA_VITE8_BIN ||
     '/opt/miaoda/preview-runtime/node_modules/vite/bin/vite.js'
 );
-// pair_ready 的就绪口径由 MIAODA_PAIR_READY_GATE 控制：
+// pair_ready 仅作为就绪观测事件，不再阻断 Vite 公共端口。
+// 就绪口径由 MIAODA_PAIR_READY_GATE 控制：
 //   'true'（默认）= 等 Vite + Nest 双就绪（'vite-and-nest'）；
 //   'false' = 只等 Vite 就绪（'vite'），对齐 legacy 预览链路的放行语义。
 // 关闭 gate 时 Nest 就绪仍被观测并照常发 nest_listen_ready 事件，
@@ -74,8 +73,6 @@ const runtimeStartedAtEpochMs = Date.now();
 const startedAt = process.hrtime.bigint();
 let stopping = false;
 let child;
-let proxyServer;
-let pairReady = false;
 
 function durationMs(since = startedAt) {
   return Number(process.hrtime.bigint() - since) / 1_000_000;
@@ -202,26 +199,6 @@ function probeHost(host) {
   return host.replace(/^\[|\]$/g, '');
 }
 
-async function reservePort() {
-  const configured = Number(process.env.MIAODA_VITE_INTERNAL_PORT || 0);
-  if (
-    Number.isSafeInteger(configured) &&
-    configured > 0 &&
-    configured <= 65_535
-  ) {
-    return configured;
-  }
-  return await new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.once('error', reject);
-    server.listen(0, internalViteHost, () => {
-      const address = server.address();
-      const port = address && typeof address !== 'string' ? address.port : 0;
-      server.close(error => (error ? reject(error) : resolve(port)));
-    });
-  });
-}
-
 async function waitForPort(host, port, phase) {
   const listenStartedAt = process.hrtime.bigint();
   const deadline = Date.now() + 60_000;
@@ -250,93 +227,6 @@ async function waitForPort(host, port, phase) {
   throw new Error(`MIAODA_WORKSPACE_SERVICE_READY_TIMEOUT: ${phase}`);
 }
 
-function rejectBeforePair(response) {
-  response.writeHead(503, {
-    'content-type': 'text/plain; charset=utf-8',
-    'cache-control': 'no-store',
-    'retry-after': '1',
-    connection: 'close',
-  });
-  response.end('preview services are starting');
-}
-
-function proxyHttp(request, response, internalVitePort) {
-  if (!pairReady) {
-    rejectBeforePair(response);
-    return;
-  }
-  const upstream = http.request(
-    {
-      host: internalViteHost,
-      port: internalVitePort,
-      method: request.method,
-      path: request.url,
-      headers: request.headers,
-    },
-    upstreamResponse => {
-      response.writeHead(
-        upstreamResponse.statusCode || 502,
-        upstreamResponse.statusMessage,
-        upstreamResponse.headers
-      );
-      upstreamResponse.pipe(response);
-    }
-  );
-  upstream.once('error', error => {
-    if (!response.headersSent) {
-      response.writeHead(502, {
-        'content-type': 'text/plain; charset=utf-8',
-        'cache-control': 'no-store',
-      });
-    }
-    response.end(`vite upstream unavailable: ${error.code || 'unknown'}`);
-  });
-  request.pipe(upstream);
-}
-
-function proxyUpgrade(request, socket, head, internalVitePort) {
-  if (!pairReady) {
-    socket.destroy();
-    return;
-  }
-  const upstream = net.createConnection(
-    { host: internalViteHost, port: internalVitePort },
-    () => {
-      const lines = [
-        `${request.method} ${request.url} HTTP/${request.httpVersion}`,
-      ];
-      for (let index = 0; index < request.rawHeaders.length; index += 2) {
-        lines.push(
-          `${request.rawHeaders[index]}: ${request.rawHeaders[index + 1]}`
-        );
-      }
-      upstream.write(`${lines.join('\r\n')}\r\n\r\n`);
-      if (head.length > 0) upstream.write(head);
-      socket.pipe(upstream).pipe(socket);
-    }
-  );
-  upstream.once('error', () => socket.destroy());
-  socket.once('error', () => upstream.destroy());
-}
-
-async function listenPublicProxy(internalVitePort) {
-  proxyServer = http.createServer((request, response) =>
-    proxyHttp(request, response, internalVitePort)
-  );
-  proxyServer.on('upgrade', (request, socket, head) =>
-    proxyUpgrade(request, socket, head, internalVitePort)
-  );
-  await new Promise((resolve, reject) => {
-    proxyServer.once('error', reject);
-    proxyServer.listen(clientPort, clientHost, resolve);
-  });
-  emit('public_gate_listen', startedAt, {
-    host: clientHost,
-    port: clientPort,
-    readinessScope,
-  });
-}
-
 function terminate(signal = 'SIGTERM') {
   if (!child?.pid) return;
   try {
@@ -351,8 +241,6 @@ function terminate(signal = 'SIGTERM') {
 async function close(signal) {
   if (stopping) return;
   stopping = true;
-  pairReady = false;
-  proxyServer?.close();
   terminate(signal);
   setTimeout(() => terminate('SIGKILL'), 1_000).unref();
 }
@@ -377,8 +265,6 @@ if (
 }
 
 await waitForDependencies();
-const internalVitePort = await reservePort();
-await listenPublicProxy(internalVitePort);
 if (nestStartMode === 'bundle-handoff') {
   await waitForPort(serverHost, serverPort, 'nest_precedes_vite');
 }
@@ -404,9 +290,9 @@ const viteCliArgs = [
   '--config',
   viteRuntimeConfig,
   '--host',
-  internalViteHost,
+  clientHost,
   '--port',
-  String(internalVitePort),
+  String(clientPort),
   '--strictPort',
 ];
 if (devBundleEnabled) {
@@ -438,8 +324,6 @@ child = spawn(viteCommand, viteArgs, {
     MIAODA_VITE_DEV_BUNDLE_ENABLED: String(devBundleEnabled),
     MIAODA_VITE_DEPS_CACHE_ENABLED: viteDepsCacheEnabled,
     MIAODA_VITE_EPHEMERAL_CACHE_DIR: viteEphemeralCacheDir,
-    MIAODA_VITE_INTERNAL_HOST: internalViteHost,
-    MIAODA_VITE_INTERNAL_PORT: String(internalVitePort),
   },
 });
 emit('process_spawn', spawnStartedAt, {
@@ -454,59 +338,80 @@ emit('process_spawn', spawnStartedAt, {
   viteRuntimeConfig,
   viteEphemeralCacheDir:
     viteDepsCacheEnabled === 'false' ? viteEphemeralCacheDir : undefined,
-  internalViteHost,
-  internalVitePort,
+  host: clientHost,
+  port: clientPort,
+  portMode: 'direct',
 });
 
 const exitPromise = new Promise((resolve, reject) => {
   child.once('error', reject);
   child.once('exit', (code, signal) => resolve({ code, signal }));
 });
-const viteListenWait = waitForPort(
-  internalViteHost,
-  internalVitePort,
-  'vite_listen_ready'
-);
+const viteListenWait = waitForPort(clientHost, clientPort, 'vite_listen_ready');
 const viteRuntimeReadiness = [viteListenWait];
 if (devBundleEnabled) {
   viteRuntimeReadiness.push(waitForBundledDevDocument());
 } else {
   viteRuntimeReadiness.push(waitForWarmupReady());
 }
-let readinessWait = Promise.all(viteRuntimeReadiness);
-if (pairReadyGate) {
-  readinessWait = Promise.all([
-    ...viteRuntimeReadiness,
-    waitForPort(serverHost, serverPort, 'nest_listen_ready'),
-  ]);
-} else {
-  // Gate 关闭时 pair_ready 只跟随 Vite；Nest 就绪在后台继续观测，
-  // nest_listen_ready 事件照常发出，失败不阻断预览放行。
-  waitForPort(serverHost, serverPort, 'nest_listen_ready').catch(() => {});
-}
+const nestReadiness = waitForPort(serverHost, serverPort, 'nest_listen_ready')
+  .then(() => ({ ready: true }))
+  .catch(error => ({ ready: false, error }));
 await Promise.race([
-  readinessWait,
+  Promise.all(viteRuntimeReadiness),
   exitPromise.then(exit => {
     throw new Error(
       `MIAODA_WORKSPACE_VITE_EXITED_BEFORE_READY: code=${exit.code} signal=${exit.signal}`
     );
   }),
 ]);
-pairReady = true;
-emit('pair_ready', startedAt, {
-  host: clientHost,
-  port: clientPort,
-  internalViteHost,
-  internalVitePort,
-  serverHost,
-  serverPort,
-  readinessScope,
-});
 emit('startup', startedAt, {
   pid: child.pid,
   port: clientPort,
-  readinessScope,
+  readinessScope: 'vite',
+  pairReadinessScope: readinessScope,
+  portMode: 'direct',
 });
+const emitPairReady = () =>
+  emit('pair_ready', startedAt, {
+    host: clientHost,
+    port: clientPort,
+    portMode: 'direct',
+    serverHost,
+    serverPort,
+    readinessScope,
+  });
+if (pairReadyGate) {
+  void nestReadiness.then(result => {
+    if (result.ready) {
+      emitPairReady();
+    } else if (!stopping) {
+      emit('pair_ready_failed', startedAt, {
+        serverHost,
+        serverPort,
+        readinessScope,
+        reason:
+          result.error instanceof Error
+            ? result.error.message
+            : String(result.error),
+      });
+    }
+  });
+} else {
+  emitPairReady();
+  void nestReadiness.then(result => {
+    if (!result.ready && !stopping) {
+      emit('nest_readiness_observation_failed', startedAt, {
+        serverHost,
+        serverPort,
+        reason:
+          result.error instanceof Error
+            ? result.error.message
+            : String(result.error),
+      });
+    }
+  });
+}
 
 const exit = await exitPromise;
 const wasStopping = stopping;