vite-ssg-optimized 0.24.2-optimized.17 → 0.24.2-optimized.19

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.fd4c7acc.cjs');
+const node = require('../shared/vite-ssg-optimized.79d27333.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.b7ba09da.mjs';
+import { b as build } from '../shared/vite-ssg-optimized.22da6b90.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.fd4c7acc.cjs');
+const node = require('./shared/vite-ssg-optimized.79d27333.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.b7ba09da.mjs';
+export { b as build } from './shared/vite-ssg-optimized.22da6b90.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.fd4c7acc.cjs');
+const node = require('./vite-ssg-optimized.79d27333.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 { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.b7ba09da.mjs';
+import { g as getBeastiesOrCritters, e as executeTaskFn } from './vite-ssg-optimized.22da6b90.mjs';
 import { gray, blue, red, yellow } from 'kolorist';
 import { resolveConfig } from 'vite';
 import 'node:path';

package/dist/shared/{vite-ssg-optimized.b7ba09da.mjs → vite-ssg-optimized.22da6b90.mjs}

@@ -1243,21 +1243,32 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   process$1.on("SIGBREAK", terminateWorkers);
   process$1.on("beforeExit", terminateWorkers);
   process$1.on("exit", terminateWorkers);
+  let workerIndex = 0;
   const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  let workersInUse = /* @__PURE__ */ new Map();
-  const selectWorker = async () => {
-    const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
-    const worker = workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
+  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) => {
+    const index = workerIndex2 ?? Math.round(Math.random() * numberOfWorkers);
+    const maybeWorker = workers[index % numberOfWorkers];
+    const worker = maybeWorker && workerTasksRunning(maybeWorker) < maxTasksPerWorker ? maybeWorker : selectIdleWorker();
     if (!worker) {
       await Promise.race(Array.from(workersInUse.values()).flat());
-      return selectWorker();
+      return selectWorker(workerIndex2);
     }
+    const workerPromises = workersInUse.get(worker) || [];
+    const delayPromise = new Promise((resolve) => setImmediate(resolve));
+    workersInUse.set(worker, [...workerPromises, delayPromise]);
+    delayPromise.finally(() => {
+      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
+      workersInUse.set(worker, workerPromises);
+    });
     return worker;
   };
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency);
     queue.add(async () => {
-      const workerProxy = await selectWorker();
+      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
       const taskPromise = executeTaskInWorker(workerProxy, {
         route
       });

package/dist/shared/{vite-ssg-optimized.fd4c7acc.cjs → vite-ssg-optimized.79d27333.cjs}

@@ -1193,7 +1193,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const prefix = format === "esm" && process__default.platform === "win32" ? "file://" : "";
   const ext = format === "esm" ? ".mjs" : ".cjs";
   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.fd4c7acc.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.79d27333.cjs', document.baseURI).href)));
   const { createApp, includedRoutes: serverEntryIncludedRoutes } = format === "esm" ? await import(serverEntry) : _require(serverEntry);
   const includedRoutes = serverEntryIncludedRoutes || configIncludedRoutes;
   const { routes } = await createApp(false);
@@ -1220,7 +1220,7 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   const queue = new PQueue({ concurrency });
   const workerExt = format === "esm" ? ".mjs" : ".cjs";
   const createProxy = (index) => {
-    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.fd4c7acc.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.79d27333.cjs', document.baseURI).href))), {
       env: process__default.env,
       workerData: {
         workerId: index,
@@ -1252,21 +1252,32 @@ async function build(ssgOptions = {}, viteConfig = {}) {
   process__default.on("SIGBREAK", terminateWorkers);
   process__default.on("beforeExit", terminateWorkers);
   process__default.on("exit", terminateWorkers);
+  let workerIndex = 0;
   const maxTasksPerWorker = Math.ceil(concurrency / numberOfWorkers);
-  let workersInUse = /* @__PURE__ */ new Map();
-  const selectWorker = async () => {
-    const workerTasksRunning = (w) => workersInUse.get(w)?.length || 0;
-    const worker = workers.filter((w) => workerTasksRunning(w) < maxTasksPerWorker).sort((a, b) => workerTasksRunning(a) - workerTasksRunning(b))[0];
+  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) => {
+    const index = workerIndex2 ?? Math.round(Math.random() * numberOfWorkers);
+    const maybeWorker = workers[index % numberOfWorkers];
+    const worker = maybeWorker && workerTasksRunning(maybeWorker) < maxTasksPerWorker ? maybeWorker : selectIdleWorker();
     if (!worker) {
       await Promise.race(Array.from(workersInUse.values()).flat());
-      return selectWorker();
+      return selectWorker(workerIndex2);
     }
+    const workerPromises = workersInUse.get(worker) || [];
+    const delayPromise = new Promise((resolve) => setImmediate(resolve));
+    workersInUse.set(worker, [...workerPromises, delayPromise]);
+    delayPromise.finally(() => {
+      workerPromises.splice(workerPromises.indexOf(delayPromise), 1);
+      workersInUse.set(worker, workerPromises);
+    });
     return worker;
   };
   for (const route of routesPaths) {
     await queue.onSizeLessThan(concurrency);
     queue.add(async () => {
-      const workerProxy = await selectWorker();
+      const workerProxy = await selectWorker(workerIndex++ % numberOfWorkers);
       const taskPromise = executeTaskInWorker(workerProxy, {
         route
       });

package/package.json

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