vite-ssg-optimized 0.24.2-optimized.46 → 0.24.2-optimized.48

package/dist/node/cli.cjs

@@ -4,7 +4,7 @@ const process = require('node:process');
 const kolorist = require('kolorist');
 const yargs = require('yargs');
 const helpers = require('yargs/helpers');
-const node = require('../shared/vite-ssg-optimized.5745cadc.cjs');
+const node = require('../shared/vite-ssg-optimized.bb5ba938.cjs');
 require('node:module');
 require('node:path');
 require('@unhead/ssr');

package/dist/node/cli.mjs

@@ -2,7 +2,7 @@ import process from 'node:process';
 import { gray, bold, red, reset, underline } from 'kolorist';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { b as build } from '../shared/vite-ssg-optimized.41dde896.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.72fc9757.mjs';
 import 'node:module';
 import 'node:path';
 import '@unhead/ssr';

package/dist/node.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const node = require('./shared/vite-ssg-optimized.5745cadc.cjs');
+const node = require('./shared/vite-ssg-optimized.bb5ba938.cjs');
 require('node:module');
 require('node:path');
 require('node:process');

package/dist/node.mjs

@@ -1,4 +1,4 @@
-export { b as build } from './shared/vite-ssg-optimized.41dde896.mjs';
+export { b as build } from './shared/vite-ssg-optimized.72fc9757.mjs';
 import 'node:module';
 import 'node:path';
 import 'node:process';

package/dist/shared/build.worker.cjs

@@ -2,7 +2,7 @@
 
 const node_module = require('node:module');
 const node_worker_threads = require('node:worker_threads');
-const node = require('./vite-ssg-optimized.5745cadc.cjs');
+const node = require('./vite-ssg-optimized.bb5ba938.cjs');
 const kolorist = require('kolorist');
 const vite = require('vite');
 require('node:path');

package/dist/shared/build.worker.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
 import { parentPort, workerData } from 'node:worker_threads';
-import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.41dde896.mjs';
+import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.72fc9757.mjs';
 import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';

package/dist/shared/{vite-ssg-optimized.41dde896.mjs → vite-ssg-optimized.72fc9757.mjs}

@@ -1043,6 +1043,9 @@ class BuildWorkerProxy {
   off(type, listener) {
     this.worker.off(type, listener);
   }
+  once(type, listener) {
+    this.worker.once(type, listener);
+  }
   async send(type, args) {
     const id = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
@@ -1055,7 +1058,9 @@ class BuildWorkerProxy {
     return promise;
   }
   terminate() {
-    return this.worker.terminate();
+    return this.worker.terminate().finally(() => {
+      this.pending.clear();
+    });
   }
 }
 
@@ -1117,11 +1122,11 @@ function createProxy(options) {
     env: process$1.env,
     workerData: options
   });
-  process$1.on("SIGINT", workerProxy.terminate.bind(workerProxy));
-  process$1.on("SIGTERM", workerProxy.terminate.bind(workerProxy));
-  process$1.on("SIGBREAK", workerProxy.terminate.bind(workerProxy));
-  process$1.on("beforeExit", workerProxy.terminate.bind(workerProxy));
-  process$1.on("exit", workerProxy.terminate.bind(workerProxy));
+  process$1.once("SIGINT", workerProxy.terminate.bind(workerProxy));
+  process$1.once("SIGTERM", workerProxy.terminate.bind(workerProxy));
+  process$1.once("SIGBREAK", workerProxy.terminate.bind(workerProxy));
+  process$1.once("beforeExit", workerProxy.terminate.bind(workerProxy));
+  process$1.once("exit", workerProxy.terminate.bind(workerProxy));
   return workerProxy;
 }
 async function build(ssgOptions = {}, viteConfig = {}) {
@@ -1195,15 +1200,24 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ...createProxyOptions,
     workerId: index
   }));
-  const terminateWorkers = async (onFinished2) => {
+  const workersInUse = /* @__PURE__ */ new Map();
+  const terminateWorker = async (worker, onFinished2) => {
     if (onFinished2) {
-      await Promise.all(workers.map((worker) => execInWorker(worker, onFinished2)));
+      await execInWorker(worker, onFinished2);
+    }
+    const foundIndex = workers.indexOf(worker);
+    if (foundIndex > -1) {
+      workers.splice(foundIndex, 1);
     }
-    await Promise.all(workers.splice(0, workers.length).map((worker) => worker.terminate()));
+    await worker.terminate().finally(() => {
+      workersInUse.delete(worker);
+    });
+  };
+  const terminateWorkers = async (onFinished2) => {
+    await Promise.all(workers.map((worker) => terminateWorker(worker, onFinished2)));
   };
   let workerIndex = 0;
   const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  const workersInUse = /* @__PURE__ */ new Map();
   const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
   const selectIdleWorker = () => workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
   const selectWorker = async (workerIndex2) => {
@@ -1216,10 +1230,15 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     }
     const workerPromises = workersInUse.get(worker) || [];
     const delayPromise = new Promise((resolve) => setImmediate(resolve));
-    workersInUse.set(worker, [...workerPromises, delayPromise]);
+    workerPromises.push(delayPromise);
+    workersInUse.set(worker, workerPromises);
     delayPromise.finally(() => {
-      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
-      workersInUse.set(worker, workerPromises);
+      const workerPromises2 = workersInUse.get(worker) || [];
+      const foundIndex = workerPromises2.indexOf(delayPromise);
+      if (foundIndex > -1) {
+        workerPromises2.splice(foundIndex, 1);
+      }
+      workersInUse.set(worker, workerPromises2);
     });
     return worker;
   };
@@ -1245,11 +1264,38 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   indexHTML = rewriteScripts(indexHTML, script);
   const IS_PROD = nodeEnv === "production";
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
+  const workerRunCount = /* @__PURE__ */ new WeakMap();
+  const MAX_RUNS_PER_WORKER = 50;
+  let lastWorkerIndex = workers.length - 1;
+  function replaceWorker(workerProxy) {
+    const index = workers.indexOf(workerProxy);
+    if (index === -1) {
+      return workerProxy;
+    }
+    ++lastWorkerIndex;
+    config.logger.info(`${blue("[vite-ssg]")} ${yellow(`Replace worker #${index} => #${lastWorkerIndex}`)}`);
+    const workerPromises = workersInUse.get(workerProxy) || [];
+    const newWorkerProxy = createProxy({
+      ...createProxyOptions,
+      workerId: lastWorkerIndex
+    });
+    workers[index] = newWorkerProxy;
+    Promise.allSettled(workerPromises).then(async () => {
+      await terminateWorker(workerProxy, onFinished);
+    });
+    return newWorkerProxy;
+  }
   const queue = new PQueue({ concurrency });
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency);
     queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      let workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      const currentCount = (workerRunCount.get(workerProxy) ?? 0) + 1;
+      workerRunCount.set(workerProxy, currentCount);
+      if (currentCount > MAX_RUNS_PER_WORKER) {
+        workerRunCount.delete(workerProxy);
+        workerProxy = replaceWorker(workerProxy);
+      }
       let retryCount = 0;
       const maxRetries = 3;
       const execOpts = {
@@ -1266,6 +1312,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       };
       const taskPromise = executeTaskInWorker(workerProxy, execOpts);
       const workerPromises = workersInUse.get(workerProxy) || [];
+      workerPromises.push(taskPromise);
       workersInUse.set(workerProxy, workerPromises);
       const retryFn = async (e) => {
         if (retryCount++ < maxRetries) {
@@ -1275,8 +1322,12 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         throw e;
       };
       taskPromise.catch(retryFn).finally(() => {
-        workerPromises.splice(workerPromises.indexOf(taskPromise), 1);
-        workersInUse.set(workerProxy, workerPromises);
+        const workerPromises2 = workersInUse.get(workerProxy) || [];
+        const foundIndex = workerPromises2.indexOf(taskPromise);
+        if (foundIndex > -1) {
+          workerPromises2.splice(foundIndex, 1);
+        }
+        workersInUse.set(workerProxy, workerPromises2);
       });
       return taskPromise;
     });

package/dist/shared/{vite-ssg-optimized.5745cadc.cjs → vite-ssg-optimized.bb5ba938.cjs}

@@ -1052,6 +1052,9 @@ class BuildWorkerProxy {
   off(type, listener) {
     this.worker.off(type, listener);
   }
+  once(type, listener) {
+    this.worker.once(type, listener);
+  }
   async send(type, args) {
     const id = crypto.randomUUID();
     const promise = new Promise((resolve, reject) => {
@@ -1064,7 +1067,9 @@ class BuildWorkerProxy {
     return promise;
   }
   terminate() {
-    return this.worker.terminate();
+    return this.worker.terminate().finally(() => {
+      this.pending.clear();
+    });
   }
 }
 
@@ -1122,15 +1127,15 @@ async function buildServer(config, viteConfig, { ssrEntry, ssgOut, format, mock
 }
 function createProxy(options) {
   const workerExt = options.format === "esm" ? ".mjs" : ".cjs";
-  const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.5745cadc.cjs', document.baseURI).href))), {
+  const workerProxy = new BuildWorkerProxy(new URL(`./build.worker${workerExt}`, (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.bb5ba938.cjs', document.baseURI).href))), {
     env: process__default.env,
     workerData: options
   });
-  process__default.on("SIGINT", workerProxy.terminate.bind(workerProxy));
-  process__default.on("SIGTERM", workerProxy.terminate.bind(workerProxy));
-  process__default.on("SIGBREAK", workerProxy.terminate.bind(workerProxy));
-  process__default.on("beforeExit", workerProxy.terminate.bind(workerProxy));
-  process__default.on("exit", workerProxy.terminate.bind(workerProxy));
+  process__default.once("SIGINT", workerProxy.terminate.bind(workerProxy));
+  process__default.once("SIGTERM", workerProxy.terminate.bind(workerProxy));
+  process__default.once("SIGBREAK", workerProxy.terminate.bind(workerProxy));
+  process__default.once("beforeExit", workerProxy.terminate.bind(workerProxy));
+  process__default.once("exit", workerProxy.terminate.bind(workerProxy));
   return workerProxy;
 }
 async function build(ssgOptions = {}, viteConfig = {}) {
@@ -1204,15 +1209,24 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ...createProxyOptions,
     workerId: index
   }));
-  const terminateWorkers = async (onFinished2) => {
+  const workersInUse = /* @__PURE__ */ new Map();
+  const terminateWorker = async (worker, onFinished2) => {
     if (onFinished2) {
-      await Promise.all(workers.map((worker) => execInWorker(worker, onFinished2)));
+      await execInWorker(worker, onFinished2);
+    }
+    const foundIndex = workers.indexOf(worker);
+    if (foundIndex > -1) {
+      workers.splice(foundIndex, 1);
     }
-    await Promise.all(workers.splice(0, workers.length).map((worker) => worker.terminate()));
+    await worker.terminate().finally(() => {
+      workersInUse.delete(worker);
+    });
+  };
+  const terminateWorkers = async (onFinished2) => {
+    await Promise.all(workers.map((worker) => terminateWorker(worker, onFinished2)));
   };
   let workerIndex = 0;
   const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  const workersInUse = /* @__PURE__ */ new Map();
   const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
   const selectIdleWorker = () => workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
   const selectWorker = async (workerIndex2) => {
@@ -1225,15 +1239,20 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     }
     const workerPromises = workersInUse.get(worker) || [];
     const delayPromise = new Promise((resolve) => setImmediate(resolve));
-    workersInUse.set(worker, [...workerPromises, delayPromise]);
+    workerPromises.push(delayPromise);
+    workersInUse.set(worker, workerPromises);
     delayPromise.finally(() => {
-      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
-      workersInUse.set(worker, workerPromises);
+      const workerPromises2 = workersInUse.get(worker) || [];
+      const foundIndex = workerPromises2.indexOf(delayPromise);
+      if (foundIndex > -1) {
+        workerPromises2.splice(foundIndex, 1);
+      }
+      workersInUse.set(worker, workerPromises2);
     });
     return worker;
   };
   const serverEntry = prefix + node_path.join(ssgOut, node_path.parse(ssrEntry).name + ext).replace(/\\/g, "/");
-  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.5745cadc.cjs', document.baseURI).href)));
+  const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/vite-ssg-optimized.bb5ba938.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
@@ -1254,11 +1273,38 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   indexHTML = rewriteScripts(indexHTML, script);
   const IS_PROD = nodeEnv === "production";
   indexHTML = await formatHtml(indexHTML, IS_PROD ? "minify" : formatting, minifyOptions);
+  const workerRunCount = /* @__PURE__ */ new WeakMap();
+  const MAX_RUNS_PER_WORKER = 50;
+  let lastWorkerIndex = workers.length - 1;
+  function replaceWorker(workerProxy) {
+    const index = workers.indexOf(workerProxy);
+    if (index === -1) {
+      return workerProxy;
+    }
+    ++lastWorkerIndex;
+    config.logger.info(`${kolorist.blue("[vite-ssg]")} ${kolorist.yellow(`Replace worker #${index} => #${lastWorkerIndex}`)}`);
+    const workerPromises = workersInUse.get(workerProxy) || [];
+    const newWorkerProxy = createProxy({
+      ...createProxyOptions,
+      workerId: lastWorkerIndex
+    });
+    workers[index] = newWorkerProxy;
+    Promise.allSettled(workerPromises).then(async () => {
+      await terminateWorker(workerProxy, onFinished);
+    });
+    return newWorkerProxy;
+  }
   const queue = new PQueue({ concurrency });
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency);
     queue.add(async () => {
-      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      let workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
+      const currentCount = (workerRunCount.get(workerProxy) ?? 0) + 1;
+      workerRunCount.set(workerProxy, currentCount);
+      if (currentCount > MAX_RUNS_PER_WORKER) {
+        workerRunCount.delete(workerProxy);
+        workerProxy = replaceWorker(workerProxy);
+      }
       let retryCount = 0;
       const maxRetries = 3;
       const execOpts = {
@@ -1275,6 +1321,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       };
       const taskPromise = executeTaskInWorker(workerProxy, execOpts);
       const workerPromises = workersInUse.get(workerProxy) || [];
+      workerPromises.push(taskPromise);
       workersInUse.set(workerProxy, workerPromises);
       const retryFn = async (e) => {
         if (retryCount++ < maxRetries) {
@@ -1284,8 +1331,12 @@ async function build(ssgOptions = {}, viteConfig = {}) {
         throw e;
       };
       taskPromise.catch(retryFn).finally(() => {
-        workerPromises.splice(workerPromises.indexOf(taskPromise), 1);
-        workersInUse.set(workerProxy, workerPromises);
+        const workerPromises2 = workersInUse.get(workerProxy) || [];
+        const foundIndex = workerPromises2.indexOf(taskPromise);
+        if (foundIndex > -1) {
+          workerPromises2.splice(foundIndex, 1);
+        }
+        workersInUse.set(workerProxy, workerPromises2);
       });
       return taskPromise;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-ssg-optimized",
-  "version": "0.24.2-optimized.46",
+  "version": "0.24.2-optimized.48",
   "description": "Server-side generation for Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",