extension-develop 4.0.6 → 4.0.7-canary.1783860631.e2b9b285

package/dist/0~dev-server.mjs

@@ -5,9 +5,10 @@ import { rspack } from "@rspack/core";
 import { RspackDevServer } from "@rspack/dev-server";
 import { merge } from "webpack-merge";
 import { WebSocket, WebSocketServer } from "ws";
+import { hasProjectDependency, findNearestProjectManifestDirSync } from "./80.mjs";
 import { createPlaywrightMetadataWriter, autoExitModeEnabled, autoExitForceKill, loadCommandConfig, extensionJsRunnerError, portInUse, devServerStartTimeout, autoExitTriggered, loadCustomConfig, loadBrowserConfig, sanitize, resolveCompanionExtensionsConfig, getSpecialFoldersDataForProjectRoot } from "./101.mjs";
 import { CONTROL_WS_PATH, clearControlToken, writeControlToken } from "./875.mjs";
-import { dispatchReload, readContentScriptCount, createChangedSourcesTracker, classifyReloadFromSources } from "./839.mjs";
+import { createChangedSourcesTracker, dispatchReload, readContentScriptCount, buildSourceFeatureIndex, classifyReloadFromSources } from "./839.mjs";
 import { setupNoBrowserBannerOnFirstDone, webpackConfig, resolveConnectableHost, setupCompilerLifecycleHooks } from "./0~rspack-config.mjs";
 import * as __rspack_external_path from "path";
 import * as __rspack_external_crypto from "crypto";
@@ -75,25 +76,9 @@ class PortManager {
     }
 }
 function hasDependency(projectPath, dependency) {
-    const findNearestPackageJsonDirectory = (startPath)=>{
-        let currentDirectory = startPath;
-        const maxDepth = 4;
-        for(let i = 0; i < maxDepth; i++){
-            const candidate = __rspack_external_path.join(currentDirectory, 'package.json');
-            if (__rspack_external_fs.existsSync(candidate)) return currentDirectory;
-            const parentDirectory = __rspack_external_path.dirname(currentDirectory);
-            if (parentDirectory === currentDirectory) break;
-            currentDirectory = parentDirectory;
-        }
-    };
-    const packageJsonDirectory = findNearestPackageJsonDirectory(projectPath);
-    if (!packageJsonDirectory) return false;
-    const packageJsonPath = __rspack_external_path.join(packageJsonDirectory, 'package.json');
-    if (!__rspack_external_fs.existsSync(packageJsonPath)) return false;
-    const packageJson = JSON.parse(__rspack_external_fs.readFileSync(packageJsonPath, 'utf8'));
-    const dependencies = packageJson.dependencies || {};
-    const devDependencies = packageJson.devDependencies || {};
-    return !!dependencies[dependency] || !!devDependencies[dependency];
+    const manifestDirectory = findNearestProjectManifestDirSync(projectPath, 4);
+    if (!manifestDirectory) return false;
+    return hasProjectDependency(manifestDirectory, dependency);
 }
 function isUsingJSFramework(projectPath) {
     const frameworks = [
@@ -464,6 +449,7 @@ class BridgeBroker {
     evalAllowed = new Map();
     pending = new Map();
     staleResyncTimes = [];
+    pendingReload;
     constructor(options){
         this.instanceId = options.instanceId;
         this.runId = options.runId;
@@ -530,8 +516,19 @@ class BridgeBroker {
             conn.send(frame);
             notified++;
         } catch  {}
+        this.pendingReload = 0 === notified ? frame : void 0;
         return notified;
     }
+    pingProducers() {
+        let pinged = 0;
+        for (const [conn, role] of this.roles)if ('producer' === role) try {
+            conn.send({
+                type: 'ping'
+            });
+            pinged++;
+        } catch  {}
+        return pinged;
+    }
     ingestLog(incoming) {
         const event = this.ring.push(incoming);
         this.file?.write(event);
@@ -577,6 +574,11 @@ class BridgeBroker {
         }
         if ('producer' !== hello.role && 'consumer' !== hello.role) return void conn.close(CLOSE_BAD_HELLO, 'unknown role');
         this.roles.set(conn, hello.role);
+        if ('producer' === hello.role && this.pendingReload) {
+            const frame = this.pendingReload;
+            this.pendingReload = void 0;
+            conn.send(frame);
+        }
         if ('consumer' === hello.role) {
             const ready = {
                 type: 'ready',
@@ -745,6 +747,7 @@ class BridgeBroker {
 }
 const SLOW_CONSUMER_BYTES = 8388608;
 const CLOSE_SLOW_CONSUMER = 4008;
+const PRODUCER_KEEPALIVE_INTERVAL_MS = 20000;
 let connSeq = 0;
 function startControlServer(options) {
     const { broker } = options;
@@ -793,10 +796,13 @@ function startControlServer(options) {
         wss.on('listening', ()=>{
             const address = wss.address();
             const port = 'object' == typeof address && address ? address.port : 0;
+            const keepalive = setInterval(()=>broker.pingProducers(), PRODUCER_KEEPALIVE_INTERVAL_MS);
+            keepalive.unref?.();
             resolve({
                 port,
                 broker,
                 close: ()=>new Promise((res)=>{
+                        clearInterval(keepalive);
                         for (const client of wss.clients)try {
                             client.terminate();
                         } catch  {}
@@ -807,6 +813,9 @@ function startControlServer(options) {
     });
 }
 function controlPortFilePath(packageJsonDir, browser) {
+    return __rspack_external_path.join(packageJsonDir, '.extension-js', `control-port-${browser}`);
+}
+function legacyControlPortFilePath(packageJsonDir, browser) {
     return __rspack_external_path.join(packageJsonDir, 'dist', 'extension-js', browser, 'control-port');
 }
 function readPersistedControlPort(filePath) {
@@ -826,6 +835,7 @@ function writePersistedControlPort(filePath, port) {
     } catch  {}
 }
 function shouldWriteAssetToDisk(filePath) {
+    if (/(?:^|[/\\])\.\.(?:[/\\]|$)/.test(filePath)) return false;
     return !/(?:^|[/\\])manifest\.json$/i.test(filePath);
 }
 function isSamePath(left, right) {
@@ -963,8 +973,9 @@ function installManifestDiskWriteGuard(manifestOutputPath) {
 }
 async function dev_server_devServer(projectStructure, devOptions) {
     process.env.EXTENSION_BROWSER_LAUNCH_ENABLED = devOptions.noBrowser ? '0' : '1';
-    const { manifestPath, packageJsonPath } = projectStructure;
-    const packageJsonDir = __rspack_external_path.dirname(packageJsonPath);
+    const { manifestPath, packageJsonPath, denoJsonPath } = projectStructure;
+    const projectManifestPath = packageJsonPath || denoJsonPath;
+    const packageJsonDir = projectManifestPath ? __rspack_external_path.dirname(projectManifestPath) : __rspack_external_path.dirname(manifestPath);
     const commandConfig = await loadCommandConfig(packageJsonDir, 'dev');
     const browserConfig = await loadBrowserConfig(packageJsonDir, devOptions.browser);
     const portManager = new PortManager(8080);
@@ -1017,7 +1028,7 @@ async function dev_server_devServer(projectStructure, devOptions) {
         bridgeLogFile.start();
         bridgeActionsFile?.start();
         const controlPortFile = controlPortFilePath(packageJsonDir, browserName);
-        const preferredControlPort = readPersistedControlPort(controlPortFile);
+        const preferredControlPort = readPersistedControlPort(controlPortFile) ?? readPersistedControlPort(legacyControlPortFilePath(packageJsonDir, browserName));
         let controlServer;
         try {
             controlServer = await startControlServer({
@@ -1095,11 +1106,14 @@ async function dev_server_devServer(projectStructure, devOptions) {
                 return;
             }
             const outputPath = String(compilation.options?.output?.path || '');
+            const contextDir = String(compilation.options?.context || '');
             const { forcedFull, changedSources: sources } = changedSources.snapshot();
             const instruction = classifyReloadFromSources({
                 changedSources: sources,
                 forcedFull,
-                getContentScriptCount: ()=>readContentScriptCount(compilation, outputPath)
+                getContentScriptCount: ()=>readContentScriptCount(compilation, outputPath),
+                getSourceFeatureIndex: ()=>buildSourceFeatureIndex(compilation, contextDir),
+                outputPath
             });
             await dispatchReload(instruction, {
                 broker: bridgeBroker
@@ -1126,7 +1140,8 @@ async function dev_server_devServer(projectStructure, devOptions) {
         manifestPath,
         readyPath: metadata.readyPath
     });
-    if (void 0 !== devOptions.port && devOptions.port !== port) console.log(portInUse(devOptions.port, port));
+    const requestedPort = Number(devOptions.port);
+    if (Number.isFinite(requestedPort) && requestedPort !== port) console.log(portInUse(requestedPort, port));
     const serverConfig = {
         host: devServerHost,
         allowedHosts: 'all',