@mdfriday/foundry 26.2.9 → 26.2.10

package/dist/worker/worker-node.js

@@ -95220,7 +95220,6 @@ var init_pool_manager = __esm({
     "use strict";
     init_log();
     workerpool = __toESM2(require("workerpool"));
-    init_worker_main();
     os = __toESM2(require("os"));
     log57 = getDomainLogger("application", { component: "pool-manager" });
     WorkerPoolManager = class {
@@ -95242,21 +95241,28 @@ var init_pool_manager = __esm({
        * 这样可以正确识别 Electron/Obsidian 环境（有 Node.js API 但只支持 Web Workers）
        */
       detectEnvironment() {
-        if (typeof Worker !== "undefined" && typeof globalThis.window !== "undefined") {
-          log57.debug("Detected Web Worker support (browser/Electron environment)");
-          return "browser";
-        }
         if (typeof process !== "undefined" && process.versions && process.versions.node) {
           try {
             require.resolve("worker_threads");
             log57.debug("Detected Node.js Worker Threads support");
+            if (process.versions.electron) {
+              log57.info("\u2728 Detected Electron environment - using Node.js Worker Threads (full Node.js API support)");
+            }
             return "node";
           } catch {
-            log57.debug("Node.js detected but worker_threads unavailable, falling back to browser mode");
-            return "browser";
+            log57.debug("Node.js detected but worker_threads unavailable");
+            if (typeof Worker !== "undefined" && typeof globalThis.window !== "undefined") {
+              log57.warn("\u26A0\uFE0F  Falling back to Web Workers (limited: no Node.js API access)");
+              return "browser";
+            }
+            throw new Error("No worker support available (neither Worker Threads nor Web Workers)");
           }
         }
-        log57.debug("Using browser mode as default");
+        if (typeof Worker !== "undefined" && typeof globalThis.window !== "undefined") {
+          log57.debug("Detected Web Worker support (pure browser environment)");
+          return "browser";
+        }
+        log57.warn("Unable to detect environment reliably, defaulting to browser mode");
         return "browser";
       }
       /**
@@ -95332,34 +95338,19 @@ var init_pool_manager = __esm({
       /**
        * 初始化浏览器 Worker 池
        * 
-       * 在浏览器/Electron 环境中，workerpool 会自动创建 Web Workers
+       * ⚠️ 当前不支持纯浏览器环境的并行处理
+       * 原因：SSG 依赖 Node.js 文件系统 API（fs、path 等），Web Workers 无法访问
+       * 
+       * 注：Electron/Obsidian 应该使用 Node.js Worker Threads（在 detectEnvironment 中处理）
        */
       async initializeBrowserPool() {
-        log57.info("\u{1F310} Initializing browser worker pool...");
-        const hasWorker = typeof Worker !== "undefined";
-        log57.debug("Browser environment details:", {
-          hasWorker,
-          hasWindow: typeof globalThis.window !== "undefined",
-          hasNavigator: typeof navigator !== "undefined",
-          hardwareConcurrency: typeof navigator !== "undefined" ? navigator.hardwareConcurrency : "N/A"
-        });
-        try {
-          this.pool = workerpool.pool({
-            minWorkers: this.workerCount,
-            maxWorkers: this.workerCount,
-            workerType: "web"
-          });
-          log57.info(`\u2705 Browser worker pool created with ${this.workerCount} workers`);
-          log57.debug("Pool configuration:", {
-            minWorkers: this.workerCount,
-            maxWorkers: this.workerCount,
-            workerType: "web"
-          });
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          log57.error(`Failed to create browser worker pool: ${message}`);
-          throw error;
-        }
+        log57.error("\u274C Browser/Web Workers mode is not supported for SSG parallel processing");
+        log57.info("\u{1F4A1} Reason: SSG requires Node.js file system access (fs, path, etc.)");
+        log57.info("\u{1F4A1} Electron/Obsidian: Should use Node.js Worker Threads instead");
+        log57.info("\u{1F4A1} Pure browser: Parallel processing not available, use serial mode");
+        throw new Error(
+          "PARALLEL_NOT_SUPPORTED: SSG parallel processing requires Node.js file system access. Web Workers cannot access fs/path modules. System will fall back to serial processing."
+        );
       }
       /**
        * 执行 Worker 任务
@@ -95382,15 +95373,14 @@ var init_pool_manager = __esm({
             log57.debug("\u{1F4E5} Node worker response received", { success: response.success });
             return response;
           } else {
-            log57.debug("\u{1F310} Using browser worker (handleWorkerTask function)");
-            log57.debug("handleWorkerTask type:", typeof handleWorkerTask);
+            log57.debug("\u{1F310} Using browser worker (calling registered processTask)");
             log57.debug("Task being sent to worker:", JSON.stringify({
               type: task.type,
               projDir: task.projDir,
               moduleDir: task.moduleDir,
               pageTasksCount: task.pageTasks?.length
             }));
-            const response = await this.pool.exec(handleWorkerTask, [task]);
+            const response = await this.pool.exec("processTask", [task]);
             log57.debug("\u{1F4E5} Browser worker response received", {
               success: response.success,
               hasData: !!response.data,
@@ -96265,9 +96255,21 @@ async function serveSSG(projDir, modulesDir, markdown, onProgress, httpClient) {
     process.chdir(projDir);
     const tasks2 = await collectAllPageTasks(projDir, modulesDir, markdown, onProgress, httpClient);
     if (tasks2.length > 80) {
-      await processSSGParallel(projDir, modulesDir, markdown, onProgress, httpClient);
-      return getDomainInstances();
+      log60.info(`\u{1F4CA} Found ${tasks2.length} pages, attempting parallel processing...`);
+      try {
+        await processSSGParallel(projDir, modulesDir, markdown, onProgress, httpClient);
+        return getDomainInstances();
+      } catch (parallelError) {
+        const errorMessage = parallelError instanceof Error ? parallelError.message : String(parallelError);
+        if (errorMessage.includes("PARALLEL_NOT_SUPPORTED")) {
+          log60.warn("\u26A0\uFE0F  Parallel processing not available, falling back to serial processing");
+          log60.info(`\u{1F504} Processing ${tasks2.length} pages in serial mode...`);
+          return await generateStaticSiteWithProgress(projDir, modulesDir, markdown, onProgress, httpClient);
+        }
+        throw parallelError;
+      }
     }
+    log60.info(`\u{1F4CA} Found ${tasks2.length} pages, using serial processing...`);
     return await generateStaticSiteWithProgress(projDir, modulesDir, markdown, onProgress, httpClient);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -96372,105 +96374,105 @@ var init_ssg = __esm({
   }
 });
 
+// internal/application/worker/worker-node.ts
+var workerpool2 = __toESM2(require("workerpool"));
+
 // internal/application/worker/worker-state.ts
-var log61, WorkerState;
-var init_worker_state = __esm({
-  "internal/application/worker/worker-state.ts"() {
-    "use strict";
-    init_log();
-    init_page_filter();
-    log61 = getDomainLogger("application", { component: "worker-state" });
-    WorkerState = class {
-      constructor(projDir, moduleDir) {
-        this.projDir = projDir;
-        this.moduleDir = moduleDir;
-      }
-      initialized = false;
-      /**
-       * 初始化 Worker 环境（只执行一次）
-       */
-      async initialize() {
-        if (this.initialized) {
-          log61.warn("Worker already initialized, skipping...");
-          return;
-        }
-        const startTime = performance.now();
-        log61.info("\u{1F680} Initializing worker environment...", {
-          projDir: this.projDir,
-          moduleDir: this.moduleDir
-        });
-        this.initialized = true;
-        const duration = performance.now() - startTime;
-        log61.info(`\u2705 Worker environment initialized in ${duration.toFixed(2)}ms`);
-      }
-      /**
-       * 处理一个批次的页面任务
-       * 运行完整的 SSG 流程，但通过过滤器只处理指定任务
-       * 
-       * @param pageTasks - 包含语言和路径信息的任务列表
-       */
-      async processBatch(pageTasks) {
-        if (!this.initialized) {
-          throw new Error("Worker not initialized. Call initialize() first.");
-        }
-        const startTime = performance.now();
-        const errors2 = [];
-        log61.info(`\u{1F4E6} Processing batch: ${pageTasks.length} tasks`);
-        try {
-          setPageFilter(pageTasks);
-          log61.debug(`Filter set for ${pageTasks.length} tasks`);
-          const { generateStaticSite: generateStaticSite2 } = await Promise.resolve().then(() => (init_ssg(), ssg_exports));
-          await generateStaticSite2(this.projDir, this.moduleDir);
-          log61.debug("\u2705 Tasks processed (filtered)");
-          const duration = performance.now() - startTime;
-          const result = {
-            success: true,
-            processedCount: pageTasks.length,
-            totalCount: pageTasks.length,
-            duration,
-            errors: errors2
-          };
-          log61.info(`\u2705 Batch processed: ${pageTasks.length} tasks in ${duration.toFixed(2)}ms`);
-          return result;
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          const errorMsg = `Batch processing failed: ${message}`;
-          log61.error(`\u274C ${errorMsg}`);
-          errors2.push(errorMsg);
-          const duration = performance.now() - startTime;
-          return {
-            success: false,
-            processedCount: 0,
-            totalCount: pageTasks.length,
-            duration,
-            errors: errors2
-          };
-        } finally {
-          clearPageFilter();
-        }
-      }
-      /**
-       * 清理资源
-       */
-      async cleanup() {
-        log61.info("\u{1F9F9} Cleaning up worker resources...");
-        this.initialized = false;
-      }
-      /**
-       * 获取统计信息
-       */
-      getStats() {
-        return {
-          initialized: this.initialized,
-          projDir: this.projDir,
-          moduleDir: this.moduleDir
-        };
-      }
+init_log();
+init_page_filter();
+var log61 = getDomainLogger("application", { component: "worker-state" });
+var WorkerState = class {
+  constructor(projDir, moduleDir) {
+    this.projDir = projDir;
+    this.moduleDir = moduleDir;
+  }
+  initialized = false;
+  /**
+   * 初始化 Worker 环境（只执行一次）
+   */
+  async initialize() {
+    if (this.initialized) {
+      log61.warn("Worker already initialized, skipping...");
+      return;
+    }
+    const startTime = performance.now();
+    log61.info("\u{1F680} Initializing worker environment...", {
+      projDir: this.projDir,
+      moduleDir: this.moduleDir
+    });
+    this.initialized = true;
+    const duration = performance.now() - startTime;
+    log61.info(`\u2705 Worker environment initialized in ${duration.toFixed(2)}ms`);
+  }
+  /**
+   * 处理一个批次的页面任务
+   * 运行完整的 SSG 流程，但通过过滤器只处理指定任务
+   * 
+   * @param pageTasks - 包含语言和路径信息的任务列表
+   */
+  async processBatch(pageTasks) {
+    if (!this.initialized) {
+      throw new Error("Worker not initialized. Call initialize() first.");
+    }
+    const startTime = performance.now();
+    const errors2 = [];
+    log61.info(`\u{1F4E6} Processing batch: ${pageTasks.length} tasks`);
+    try {
+      setPageFilter(pageTasks);
+      log61.debug(`Filter set for ${pageTasks.length} tasks`);
+      const { generateStaticSite: generateStaticSite2 } = await Promise.resolve().then(() => (init_ssg(), ssg_exports));
+      await generateStaticSite2(this.projDir, this.moduleDir);
+      log61.debug("\u2705 Tasks processed (filtered)");
+      const duration = performance.now() - startTime;
+      const result = {
+        success: true,
+        processedCount: pageTasks.length,
+        totalCount: pageTasks.length,
+        duration,
+        errors: errors2
+      };
+      log61.info(`\u2705 Batch processed: ${pageTasks.length} tasks in ${duration.toFixed(2)}ms`);
+      return result;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const errorMsg = `Batch processing failed: ${message}`;
+      log61.error(`\u274C ${errorMsg}`);
+      errors2.push(errorMsg);
+      const duration = performance.now() - startTime;
+      return {
+        success: false,
+        processedCount: 0,
+        totalCount: pageTasks.length,
+        duration,
+        errors: errors2
+      };
+    } finally {
+      clearPageFilter();
+    }
+  }
+  /**
+   * 清理资源
+   */
+  async cleanup() {
+    log61.info("\u{1F9F9} Cleaning up worker resources...");
+    this.initialized = false;
+  }
+  /**
+   * 获取统计信息
+   */
+  getStats() {
+    return {
+      initialized: this.initialized,
+      projDir: this.projDir,
+      moduleDir: this.moduleDir
     };
   }
-});
+};
 
 // internal/application/worker/worker-main.ts
+init_log();
+var log62 = getDomainLogger("application", { component: "worker-main" });
+var workerState = null;
 async function handleWorkerTask(task) {
   log62.info(`\u{1F528} handleWorkerTask called with task type: ${task.type}`);
   log62.debug("Task details:", {
@@ -96601,20 +96603,8 @@ async function handleCleanup() {
     data: { message: "Worker cleaned up successfully" }
   };
 }
-var log62, workerState;
-var init_worker_main = __esm({
-  "internal/application/worker/worker-main.ts"() {
-    "use strict";
-    init_worker_state();
-    init_log();
-    log62 = getDomainLogger("application", { component: "worker-main" });
-    workerState = null;
-  }
-});
 
 // internal/application/worker/worker-node.ts
-var workerpool2 = __toESM2(require("workerpool"));
-init_worker_main();
 async function processTask(task) {
   return await handleWorkerTask(task);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdfriday/foundry",
-  "version": "26.2.9",
+  "version": "26.2.10",
   "description": "The core engine of MDFriday. Convert Markdown and shortcodes into fully themed static sites – Hugo-style, powered by TypeScript.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/worker/worker-inline.js

@@ -1 +0,0 @@
-"use strict";(()=>{if(typeof self.importScripts=="function")try{self.importScripts("workerpool")}catch(e){console.error("Failed to import workerpool:",e)}self.addEventListener("message",async e=>{let o=e.data;try{self.postMessage({success:!1,error:"Browser worker needs special initialization. Use workerpool.pool() with proper options."})}catch(s){let r=s instanceof Error?s.message:String(s);self.postMessage({success:!1,error:r})}});})();