@pronto-tools-and-more/pronto 11.1.0 → 11.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "11.1.0",
+  "version": "11.3.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,16 +17,16 @@
     "@lvce-editor/ipc": "^11.7.0",
     "@lvce-editor/json-rpc": "^5.3.0",
     "@lvce-editor/verror": "^1.6.0",
-    "@pronto-tools-and-more/file-watcher": "11.1.0",
-    "@pronto-tools-and-more/files": "11.1.0",
-    "@pronto-tools-and-more/network-process": "11.1.0",
-    "@pronto-tools-and-more/sass-compiler": "11.1.0",
-    "@pronto-tools-and-more/components-renderer": "11.1.0",
-    "@pronto-tools-and-more/components": "11.1.0",
-    "@pronto-tools-and-more/schema-process": "11.1.0",
-    "@pronto-tools-and-more/diff-process": "11.1.0",
-    "@pronto-tools-and-more/type-checker": "11.1.0",
-    "@pronto-tools-and-more/custom-js-functions": "11.1.0",
+    "@pronto-tools-and-more/file-watcher": "11.3.0",
+    "@pronto-tools-and-more/files": "11.3.0",
+    "@pronto-tools-and-more/network-process": "11.3.0",
+    "@pronto-tools-and-more/sass-compiler": "11.3.0",
+    "@pronto-tools-and-more/components-renderer": "11.3.0",
+    "@pronto-tools-and-more/components": "11.3.0",
+    "@pronto-tools-and-more/schema-process": "11.3.0",
+    "@pronto-tools-and-more/diff-process": "11.3.0",
+    "@pronto-tools-and-more/type-checker": "11.3.0",
+    "@pronto-tools-and-more/custom-js-functions": "11.3.0",
     "execa": "^9.5.2",
     "express": "^4.21.2"
   },

package/src/parts/App/App.js

@@ -1,12 +1,13 @@
 import express from "express";
 import { join } from "node:path";
 import * as FilesPath from "../FilesPath/FilesPath.js";
+import * as HandleConfigLoader from "../HandleConfigLoader/HandleConfigLoader.js";
 import * as HandleCss from "../HandleCss/HandleCss.js";
+import * as HandleCustomServer from "../HandleCustomServer/HandleCustomServer.js";
 import * as HandleFeaturesJson from "../HandleFeaturesJson/HandleFeaturesJson.js";
 import * as HandleIndex from "../HandleIndex/HandleIndex.js";
 import * as HandleMainJs from "../HandleMainJs/HandleMainJs.js";
 import * as HandleViews from "../HandleViews/HandleViews.js";
-import * as HandleCustomServer from "../HandleCustomServer/HandleCustomServer.js";
 import * as ProxyPath from "../ProxyPath/ProxyPath.js";
 
 export const create = ({
@@ -42,6 +43,10 @@ export const create = ({
       filesPath: FilesPath.filesPath,
     })
   );
+  app.get(
+    "/assets/scripts/configLoader.js",
+    HandleConfigLoader.handleConfigLoader
+  );
   app.get(
     "/modules/main.js",
     HandleMainJs.handleMainJs({

package/src/parts/Etag/Etag.js

@@ -0,0 +1,11 @@
+import * as crypto from "node:crypto";
+
+export const fromStats = (stats) => {
+  let hash = crypto.createHash("sha1");
+  for (const stat of stats) {
+    hash.update(`${stat.ino}`);
+    hash.update(`${stat.size}`);
+    hash.update(`${stat.mtime}`);
+  }
+  return hash.digest("base64");
+};

package/src/parts/GetCssEtag/GetCssEtag.js

@@ -0,0 +1,27 @@
+import { readdir, stat } from "fs/promises";
+import { join } from "path";
+import * as Etag from "../Etag/Etag.js";
+
+export const getCssEtag = async (storefrontPath) => {
+  try {
+    const scssPath = join(storefrontPath, "assets", "scss");
+    const dirents = await readdir(scssPath, {
+      recursive: true,
+    });
+    const stats = await Promise.all(
+      dirents.map(async (dirent) => {
+        const absolutePath = join(scssPath, dirent);
+        const info = await stat(absolutePath);
+        return {
+          size: info.size,
+          mtime: info.mtime,
+          ino: info.ino,
+        };
+      })
+    );
+    return Etag.fromStats(stats);
+  } catch (error) {
+    console.warn(`Failed to compute css etag ${error}`);
+    return `css-${Math.random()}`;
+  }
+};

package/src/parts/GetOrCreateRendererIpc/GetOrCreateRendererIpc.js

@@ -0,0 +1,21 @@
+import * as GetRendererIpc from "../GetRendererIpc/GetRendererIpc.js";
+
+const state = {
+  /**
+   * @type {Promise[]}
+   */
+  preloadedIpcs: [],
+};
+
+export const getOrCreateRendererIpc = async (tsconfigPath, isBuild) => {
+  const cachedIpc = state.preloadedIpcs.pop();
+  if (cachedIpc) {
+    state.preloadedIpcs.push(GetRendererIpc.getRendererIpc(tsconfigPath));
+    return cachedIpc;
+  }
+  const oursPromise = GetRendererIpc.getRendererIpc(tsconfigPath);
+  if (!isBuild) {
+    state.preloadedIpcs.push(GetRendererIpc.getRendererIpc(tsconfigPath));
+  }
+  return oursPromise;
+};

package/src/parts/GetRendererIpc/GetRendererIpc.js

@@ -6,11 +6,6 @@ import * as JsonRpc from "../JsonRpc/JsonRpc.js";
 import * as UnhandleIpc from "../UnhandleIpc/UnhandleIpc.js";
 
 export const getRendererIpc = async (tsconfigPath) => {
-  // TODO when in watch mode, create a queue of renderers.
-  // swc takes ~500ms to load
-  // while the current request is being processed, launch a new renderer process and load swc
-  // when the actual next request comes, reuse that process, saving ~700ms setup time
-
   const ipc = await IpcParent.create({
     path: ComponentsRendererPath.componentsRendererPath,
     method: IpcParentType.NodeForkedProcess, // TODO worker could be faster

package/src/parts/HandleConfigLoader/HandleConfigLoader.js

@@ -0,0 +1,7 @@
+export const handleConfigLoader = async (req, res) => {
+  // the default config loader makes
+  // useless http requests
+  // so remove it
+  res.setHeader("content-type", "application/javascript");
+  res.end("");
+};

package/src/parts/HandleCss/HandleCss.js

@@ -3,6 +3,7 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import * as CompileSass from "../CompileSass/CompileSass.js";
 import * as Config from "../Config/Config.js";
+import * as GetCssEtag from "../GetCssEtag/GetCssEtag.js";
 import * as UpdateCss from "../UpdateCss/UpdateCss.js";
 
 export const handleCss = (storeFrontPath) => async (req, res, next) => {
@@ -13,7 +14,15 @@ export const handleCss = (storeFrontPath) => async (req, res, next) => {
   res.setHeader("content-type", "text/css");
   if (pathName === "/assets/custom.css") {
     try {
+      const ifNoneMatch = req.headers["if-none-match"];
+      const cssEtag = await GetCssEtag.getCssEtag(storeFrontPath);
+      if (ifNoneMatch && ifNoneMatch === cssEtag) {
+        res.statusCode = 304;
+        res.end();
+        return;
+      }
       const result = await CompileSass.compileSass(Config.rootSassFile);
+      res.setHeader("Etag", cssEtag);
       res.end(result.css);
     } catch (error) {
       console.warn(error);

package/src/parts/HandleViewsReactComponents/HandleViewsReactComponents.js

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import * as GetRendererIpc from "../GetRendererIpc/GetRendererIpc.js";
+import * as GetOrCreateRendererIpc from "../GetOrCreateRendererIpc/GetOrCreateRendererIpc.js";
 import * as HandleViewsSplit from "../HandleViewsSplit/HandleViewsSplit.js";
 
 export const handleViewsReactComponents = async (
@@ -28,7 +28,10 @@ export const handleViewsReactComponents = async (
       throw new Error(`components path not found: ${componentsPath}`);
     }
 
-    const renderer = await GetRendererIpc.getRendererIpc(tsconfigPath);
+    const renderer = await GetOrCreateRendererIpc.getOrCreateRendererIpc(
+      tsconfigPath,
+      isBuild
+    );
     const result = await renderer.invoke(
       "RenderViews.renderViews",
       componentsPath,

package/src/parts/UpdateIndexHtml/UpdateIndexHtml.js

@@ -23,6 +23,7 @@ const replacementSnippetBody = (appId, baseUrl, contentUrl, platform) =>
 const occurrenceSnippetHead = "</head>";
 const replacementSnippetHead = `
     <link rel="stylesheet" href="/theme.css" />
+    <link rel="stylesheet" href="/assets/custom.css" />
     </head>`;
 
 export const updateIndexHtml = (

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '11.1.0'
+export const version = '11.3.0'