vite-ssg-optimized 0.24.2-optimized.52 → 0.24.2-optimized.53

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.9afed1ac.cjs');
+const node = require('../shared/vite-ssg-optimized.e0773de0.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.9123ca04.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.8d456b79.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.9afed1ac.cjs');
+const node = require('./shared/vite-ssg-optimized.e0773de0.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.9123ca04.mjs';
+export { b as build } from './shared/vite-ssg-optimized.8d456b79.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.9afed1ac.cjs');
+const node = require('./vite-ssg-optimized.e0773de0.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.9123ca04.mjs';
+import { p as plainify, e as executeTaskFn, a as buildClient, c as buildServer } from './vite-ssg-optimized.8d456b79.mjs';
 import { red, gray, blue } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';

package/dist/shared/{vite-ssg-optimized.9123ca04.mjs → vite-ssg-optimized.8d456b79.mjs}

@@ -1279,7 +1279,15 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const workerRunCount = /* @__PURE__ */ new WeakMap();
   const MAX_RUNS_PER_WORKER = 100;
   let lastWorkerIndex = workers.length - 1;
-  function replaceWorker(workerProxy) {
+  const workerProxyMap = /* @__PURE__ */ new Map();
+  const workerTransitionPromises = [];
+  const pendingTasks = () => {
+    return Array.from(workerProxyMap.keys()).map((worker) => workersInUse.get(worker) || []).flat();
+  };
+  async function replaceWorker(workerProxy) {
+    if (workerProxyMap.has(workerProxy)) {
+      return await workerProxyMap.get(workerProxy);
+    }
     const index = workers.indexOf(workerProxy);
     if (index === -1) {
       return workerProxy;
@@ -1287,16 +1295,29 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ++lastWorkerIndex;
     config.logger.info(`${blue("[vite-ssg]")} ${yellow(`Replace worker #${workerProxy.id} => #${lastWorkerIndex}`)}`);
     const workerPromises = workersInUse.get(workerProxy) || [];
-    const newWorkerProxy = createProxy({
-      ...createProxyOptions,
-      workerId: lastWorkerIndex
-    });
-    workers[index] = newWorkerProxy;
-    Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
+    const transitionPromise = Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
       await new Promise((resolve) => setTimeout(resolve, 4));
       await terminateWorker(workerProxy, onFinished);
+      workerTransitionPromises.splice(workerTransitionPromises.indexOf(transitionPromise), 1);
+      workerProxyMap.delete(workerProxy);
     });
-    return newWorkerProxy;
+    workerTransitionPromises.push(transitionPromise);
+    workerProxyMap.set(workerProxy, Promise.resolve().then(async () => {
+      while (pendingTasks().length > MAX_RUNS_PER_WORKER / 5) {
+        await new Promise((resolve) => setTimeout(resolve, 300));
+      }
+      while (workerTransitionPromises.length > 2) {
+        console.log(`${gray("[vite-ssg]")} ${yellow(`Waiting for worker transition to finish. ${workerTransitionPromises.length} transitions running`)}`);
+        await Promise.race(workerTransitionPromises);
+      }
+      const newWorkerProxy = createProxy({
+        ...createProxyOptions,
+        workerId: lastWorkerIndex
+      });
+      workers[index] = newWorkerProxy;
+      return newWorkerProxy;
+    }));
+    return await workerProxyMap.get(workerProxy);
   }
   const queue = new PQueue({ concurrency });
   let shouldBreak = false;
@@ -1323,8 +1344,8 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       const currentCount = (workerRunCount.get(workerProxy) ?? 0) + 1;
       workerRunCount.set(workerProxy, currentCount);
       if (currentCount > MAX_RUNS_PER_WORKER) {
+        workerProxy = await replaceWorker(workerProxy);
         workerRunCount.delete(workerProxy);
-        workerProxy = replaceWorker(workerProxy);
       }
       let retryCount = 0;
       const maxRetries = 3;

package/dist/shared/{vite-ssg-optimized.9afed1ac.cjs → vite-ssg-optimized.e0773de0.cjs}

@@ -1135,7 +1135,7 @@ 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.9afed1ac.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.e0773de0.cjs', document.baseURI).href))), {
     env: process__default.env,
     workerData: options
   });
@@ -1264,7 +1264,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     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.9afed1ac.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.e0773de0.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
@@ -1288,7 +1288,15 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const workerRunCount = /* @__PURE__ */ new WeakMap();
   const MAX_RUNS_PER_WORKER = 100;
   let lastWorkerIndex = workers.length - 1;
-  function replaceWorker(workerProxy) {
+  const workerProxyMap = /* @__PURE__ */ new Map();
+  const workerTransitionPromises = [];
+  const pendingTasks = () => {
+    return Array.from(workerProxyMap.keys()).map((worker) => workersInUse.get(worker) || []).flat();
+  };
+  async function replaceWorker(workerProxy) {
+    if (workerProxyMap.has(workerProxy)) {
+      return await workerProxyMap.get(workerProxy);
+    }
     const index = workers.indexOf(workerProxy);
     if (index === -1) {
       return workerProxy;
@@ -1296,16 +1304,29 @@ async function build(ssgOptions = {}, viteConfig = {}) {
     ++lastWorkerIndex;
     config.logger.info(`${kolorist.blue("[vite-ssg]")} ${kolorist.yellow(`Replace worker #${workerProxy.id} => #${lastWorkerIndex}`)}`);
     const workerPromises = workersInUse.get(workerProxy) || [];
-    const newWorkerProxy = createProxy({
-      ...createProxyOptions,
-      workerId: lastWorkerIndex
-    });
-    workers[index] = newWorkerProxy;
-    Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
+    const transitionPromise = Promise.allSettled([...workerPromises, Promise.resolve()]).then(async () => {
       await new Promise((resolve) => setTimeout(resolve, 4));
       await terminateWorker(workerProxy, onFinished);
+      workerTransitionPromises.splice(workerTransitionPromises.indexOf(transitionPromise), 1);
+      workerProxyMap.delete(workerProxy);
     });
-    return newWorkerProxy;
+    workerTransitionPromises.push(transitionPromise);
+    workerProxyMap.set(workerProxy, Promise.resolve().then(async () => {
+      while (pendingTasks().length > MAX_RUNS_PER_WORKER / 5) {
+        await new Promise((resolve) => setTimeout(resolve, 300));
+      }
+      while (workerTransitionPromises.length > 2) {
+        console.log(`${kolorist.gray("[vite-ssg]")} ${kolorist.yellow(`Waiting for worker transition to finish. ${workerTransitionPromises.length} transitions running`)}`);
+        await Promise.race(workerTransitionPromises);
+      }
+      const newWorkerProxy = createProxy({
+        ...createProxyOptions,
+        workerId: lastWorkerIndex
+      });
+      workers[index] = newWorkerProxy;
+      return newWorkerProxy;
+    }));
+    return await workerProxyMap.get(workerProxy);
   }
   const queue = new PQueue({ concurrency });
   let shouldBreak = false;
@@ -1332,8 +1353,8 @@ async function build(ssgOptions = {}, viteConfig = {}) {
       const currentCount = (workerRunCount.get(workerProxy) ?? 0) + 1;
       workerRunCount.set(workerProxy, currentCount);
       if (currentCount > MAX_RUNS_PER_WORKER) {
+        workerProxy = await replaceWorker(workerProxy);
         workerRunCount.delete(workerProxy);
-        workerProxy = replaceWorker(workerProxy);
       }
       let retryCount = 0;
       const maxRetries = 3;

package/package.json

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