@portel/photon 1.34.0 → 1.34.2

package/dist/daemon/server.js

@@ -27,7 +27,7 @@ import { getDefaultContext } from '../context.js';
 import { EnvStore, resolvePhotonNamespace } from '../context-store.js';
 import { createLogger } from '../shared/logger.js';
 import { getErrorMessage } from '../shared/error-handler.js';
-import { timingSafeEqual, readBody, SimpleRateLimiter, ipInAllowlist, parseAllowlistEnv, } from '../shared/security.js';
+import { timingSafeEqual, readBody, SimpleRateLimiter, ipInAllowlist, parseAllowlistEnv, getCorsOrigin, } from '../shared/security.js';
 import { audit } from '../shared/audit.js';
 import { recordExecution, previewResult, readExecutionHistory, sweepAllBases as sweepExecutionHistoryBases, } from './execution-history.js';
 import { WorkerManager } from './worker-manager.js';
@@ -1734,7 +1734,9 @@ function watchBaseForProactiveMetadata(basePath, _isDefaultBase) {
         watchDebounce.set(debounceKey, timer);
     };
     try {
-        const watcher = safeWatchDir(basePath, (_eventType, filename) => onChange(filename));
+        const watcher = safeWatchDir(basePath, (_eventType, filename) => onChange(filename), {
+            bunPollMaxEntries: BUN_DIR_POLL_MAX_ENTRIES,
+        });
         baseDirWatchers.set(basePath, watcher);
     }
     catch (err) {
@@ -1976,7 +1978,9 @@ function startWebhookServer(port) {
         return;
     webhookServer = http.createServer((req, res) => {
         void (async () => {
-            res.setHeader('Access-Control-Allow-Origin', '*');
+            const corsOrigin = getCorsOrigin(req);
+            if (corsOrigin)
+                res.setHeader('Access-Control-Allow-Origin', corsOrigin);
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
             res.setHeader('Access-Control-Allow-Headers', 'Content-Type, X-Webhook-Secret, X-Photon-Name');
             if (req.method === 'OPTIONS') {
@@ -2968,7 +2972,7 @@ async function handleRequest(request, socket) {
         const key = compositeKey(photonName, request.workingDir);
         const sessionManager = sessionManagers.get(key);
         if (sessionManager) {
-            await sessionManager.clearInstances();
+            await sessionManager.clearInstances('clear-instances');
         }
         return { type: 'result', id: request.id, success: true, data: { cleared: !!sessionManager } };
     }
@@ -4638,6 +4642,7 @@ async function applyPatchToInstance(instance, photonName, ops, workingDir) {
  */
 const IS_BUN = !!process.versions.bun;
 const POLL_INTERVAL_MS = 2000; // 2s — good balance between latency and CPU
+const BUN_DIR_POLL_MAX_ENTRIES = parseNonNegativeEnvInt('PHOTON_BUN_DIR_POLL_MAX_ENTRIES', 512);
 /** Track active poll timers so they can be cleaned up on shutdown */
 const pollTimers = new Set();
 function safeWatchFile(filePath, callback) {
@@ -4686,12 +4691,37 @@ function safeWatchFile(filePath, callback) {
         },
     };
 }
-function safeWatchDir(dirPath, callback) {
+function countDirEntries(dirPath) {
+    try {
+        return fs.readdirSync(dirPath).length;
+    }
+    catch {
+        return null;
+    }
+}
+function shouldSkipBunDirPoll(dirPath, maxEntries) {
+    if (!IS_BUN || maxEntries === 0)
+        return false;
+    const count = countDirEntries(dirPath);
+    if (count === null || count <= maxEntries)
+        return false;
+    logger.warn('Skipping Bun directory polling watcher for oversized directory', {
+        dir: dirPath,
+        entries: count,
+        maxEntries,
+    });
+    return true;
+}
+function safeWatchDir(dirPath, callback, options = {}) {
     if (!IS_BUN) {
         const w = fs.watch(dirPath, (eventType, filename) => callback(eventType, filename));
         return w;
     }
     // Bun fallback: readdir snapshot diffing
+    if (options.bunPollMaxEntries !== undefined &&
+        shouldSkipBunDirPoll(dirPath, options.bunPollMaxEntries)) {
+        return { close() { } };
+    }
     let prevEntries = new Map(); // name -> mtimeMs
     try {
         for (const entry of fs.readdirSync(dirPath)) {
@@ -4836,7 +4866,7 @@ function watchPhotonFile(photonName, photonPath) {
                     for (const key of keysToDelete) {
                         const manager = sessionManagers.get(key);
                         if (manager)
-                            await manager.clearInstances();
+                            await manager.clearInstances('photon-deleted');
                         sessionManagers.delete(key);
                         photonPaths.delete(key);
                         workingDirs.delete(key);
@@ -4914,6 +4944,22 @@ function unwatchPhotonFile(watchPath) {
         watchDebounce.delete(watchPath);
     }
 }
+function unwatchPhotonPath(photonPath) {
+    let watchPath = photonPath;
+    try {
+        watchPath = fs.realpathSync(photonPath);
+    }
+    catch {
+        // Symlink target may already be gone; fall back to caller path.
+    }
+    unwatchPhotonFile(watchPath);
+    const debounceKey = path.resolve(photonPath);
+    const timer = watchDebounce.get(debounceKey);
+    if (timer) {
+        clearTimeout(timer);
+        watchDebounce.delete(debounceKey);
+    }
+}
 /**
  * Detect whether a missing workingDir was renamed (moved) or deleted.
  *
@@ -5041,7 +5087,7 @@ function watchWorkingDir(workingDir) {
                         for (const key of deletedDirKeys) {
                             const manager = sessionManagers.get(key);
                             if (manager)
-                                await manager.clearInstances();
+                                await manager.clearInstances('working-dir-deleted');
                             sessionManagers.delete(key);
                             photonPaths.delete(key);
                             workingDirs.delete(key);
@@ -5108,7 +5154,7 @@ function watchStateDir(workingDir) {
                     const key = compositeKey(filename, workingDir);
                     const manager = sessionManagers.get(key);
                     if (manager) {
-                        await manager.clearInstances();
+                        await manager.clearInstances('state-dir-deleted');
                     }
                 })();
             }, 150);
@@ -5602,13 +5648,11 @@ function startupWatchPhotonDir(photonDir, defaultBase) {
             if (photonPaths.has(photonKey) && !fs.existsSync(filePath)) {
                 photonPaths.delete(photonKey);
                 // fileWatchers is keyed by file path, not composite key
-                const watcher = fileWatchers.get(filePath);
-                if (watcher) {
-                    watcher.close();
-                    fileWatchers.delete(filePath);
-                }
+                unwatchPhotonPath(filePath);
                 logger.info('Photon file removed', { photonName, path: filePath });
             }
+        }, {
+            bunPollMaxEntries: BUN_DIR_POLL_MAX_ENTRIES,
         });
         if (typeof dirWatcher.on === 'function') {
             dirWatcher.on('error', () => { }); // Non-fatal