extension-develop 3.16.1 → 3.17.0-canary.312.672c4f2

package/dist/0~dev-server.mjs

@@ -47,65 +47,29 @@ function resolveInstanceIdOverride() {
 class PortManager {
     basePort;
     currentInstance = null;
-    constructor(_browser, _projectPath, basePort = 8080){
+    constructor(basePort = 8080){
         this.basePort = basePort;
     }
-    async allocatePorts(_browser, _projectPath, requestedPort) {
-        try {
-            const isValidRequested = 'number' == typeof requestedPort && requestedPort >= 0 && requestedPort < 65536;
-            const base = isValidRequested ? requestedPort : this.basePort;
-            const port = await findAvailablePortNear(base);
-            const webSocketPort = await findAvailablePortNear(port + 1);
-            const instanceId = resolveInstanceIdOverride() || __rspack_external_crypto.randomBytes(8).toString('hex');
-            this.currentInstance = {
-                instanceId,
-                port,
-                webSocketPort
-            };
-            return {
-                port,
-                webSocketPort,
-                instanceId
-            };
-        } catch (error) {
-            throw error;
-        }
+    async allocatePorts(requestedPort) {
+        const isValidRequested = 'number' == typeof requestedPort && requestedPort >= 0 && requestedPort < 65536;
+        const base = isValidRequested ? requestedPort : this.basePort;
+        const port = await findAvailablePortNear(base);
+        const instanceId = resolveInstanceIdOverride() || __rspack_external_crypto.randomBytes(8).toString('hex');
+        this.currentInstance = {
+            instanceId,
+            port
+        };
+        return {
+            port,
+            instanceId
+        };
     }
     getCurrentInstance() {
         return this.currentInstance;
     }
-    async updateExtensionId(extensionId) {
-        if (this.currentInstance) this.currentInstance.extensionId = extensionId;
-    }
     async terminateCurrentInstance() {
         this.currentInstance = null;
     }
-    getPortInfo(allocation) {
-        return `Port: ${allocation.port}, WebSocket: ${allocation.webSocketPort}, Instance: ${allocation.instanceId.slice(0, 8)}`;
-    }
-    async isPortInUse(port) {
-        return new Promise((resolve)=>{
-            const server = __rspack_external_net.createServer();
-            server.once('error', ()=>resolve(true));
-            server.once('listening', ()=>{
-                server.close(()=>resolve(false));
-            });
-            server.listen(port, '127.0.0.1');
-        });
-    }
-    async getRunningInstances() {
-        return this.currentInstance ? [
-            this.currentInstance
-        ] : [];
-    }
-    async getStats() {
-        return {
-            total: this.currentInstance ? 1 : 0,
-            running: this.currentInstance ? 1 : 0,
-            terminated: 0,
-            error: 0
-        };
-    }
 }
 function hasDependency(projectPath, dependency) {
     const findNearestPackageJsonDirectory = (startPath)=>{
@@ -207,9 +171,8 @@ function setupCleanupHandlers(devServer, portManager) {
         console.error('[Extension.js Runner] Uncaught exception.', error);
         await cleanup();
     });
-    process.on('unhandledRejection', async (reason, promise)=>{
+    process.on('unhandledRejection', (reason, promise)=>{
         console.error('[Extension.js Runner] Unhandled rejection.', promise, reason);
-        await cleanup();
     });
     const cancelAutoExit = setupAutoExit(process.env.EXTENSION_AUTO_EXIT_MS, process.env.EXTENSION_FORCE_KILL_MS, cleanup);
     const cancelAndCleanup = async ()=>{
@@ -218,7 +181,6 @@ function setupCleanupHandlers(devServer, portManager) {
         } catch  {}
         await cleanup();
     };
-    process.on('ERROR', cancelAndCleanup);
     process.on('SIGINT', cancelAndCleanup);
     process.on('SIGTERM', cancelAndCleanup);
     process.on('SIGHUP', cancelAndCleanup);
@@ -367,9 +329,9 @@ async function dev_server_devServer(projectStructure, devOptions) {
     const packageJsonDir = __rspack_external_path.dirname(packageJsonPath);
     const commandConfig = await loadCommandConfig(packageJsonDir, 'dev');
     const browserConfig = await loadBrowserConfig(packageJsonDir, devOptions.browser);
-    const portManager = new PortManager(devOptions.browser, packageJsonDir, 8080);
+    const portManager = new PortManager(8080);
     const desiredPort = 'string' == typeof devOptions.port ? parseInt(devOptions.port, 10) : devOptions.port;
-    const portAllocation = await portManager.allocatePorts(devOptions.browser, packageJsonDir, desiredPort);
+    const portAllocation = await portManager.allocatePorts(desiredPort);
     const currentInstance = portManager.getCurrentInstance();
     if (!currentInstance) throw new Error('Failed to create instance');
     const port = portAllocation.port;
@@ -456,8 +418,10 @@ async function dev_server_devServer(projectStructure, devOptions) {
                     __rspack_external_path.join(packageJsonDir, 'dist', '**/*')
                 ],
                 ignoreInitial: true,
-                usePolling: true,
-                interval: 1000
+                ...'true' === process.env.EXTENSION_WATCH_POLL ? {
+                    usePolling: true,
+                    interval: parseInt(String(process.env.EXTENSION_WATCH_POLL_INTERVAL || '1000'), 10)
+                } : {}
             }
         },
         client: false,