elm-pages 3.0.0-beta.21 → 3.0.0-beta.23

package/README.md

@@ -81,7 +81,7 @@ https://github.com/dillonkearns/elm-pages/projects
 You will see an error if the NPM and Elm package do not have a matching Compatibility Key. Usually it's best to upgrade to the latest version of both the Elm and NPM
 packages when you upgrade. However, in case you want to install versions that are behind the latest, the Compatibility Key is included here for reference.
 
-Current Compatibility Key: 7.
+Current Compatibility Key: 8.
 
 ## Contributors ✨
 

package/generator/src/cli.js

@@ -12,7 +12,7 @@ import * as renderer from "./render.js";
 import { globbySync } from "globby";
 import * as esbuild from "esbuild";
 import { rewriteElmJson } from "./rewrite-elm-json.js";
-import { ensureDirSync, deleteIfExists } from "./file-helpers.js";
+import { ensureDirSync } from "./file-helpers.js";
 import * as url from "url";
 
 import * as commander from "commander";
@@ -43,9 +43,6 @@ async function main() {
     )
     .description("run a full site build")
     .action(async (options) => {
-      if (!options.keepCache) {
-        clearHttpAndPortCache();
-      }
       options.base = normalizeUrl(options.base);
       await build.run(options);
     });
@@ -76,9 +73,6 @@ async function main() {
     .option("--base <basePath>", "serve site under a base path", "/")
     .option("--https", "uses a https server")
     .action(async (options) => {
-      if (!options.keepCache) {
-        clearHttpAndPortCache();
-      }
       options.base = normalizeUrl(options.base);
       await dev.start(options);
     });
@@ -334,25 +328,6 @@ function safeSubscribe(program, portName, subscribeFunction) {
     program.ports[portName].subscribe(subscribeFunction);
 }
 
-function clearHttpAndPortCache() {
-  const directory = ".elm-pages/http-response-cache";
-  if (fs.existsSync(directory)) {
-    fs.readdir(directory, (err, files) => {
-      if (err) {
-        throw err;
-      }
-
-      for (const file of files) {
-        fs.unlink(path.join(directory, file), (err) => {
-          if (err) {
-            throw err;
-          }
-        });
-      }
-    });
-  }
-}
-
 /**
  * @param {string} rawPagePath
  */

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 7;
+export const compatibilityKey = 8;
 
-export const packageVersion = "3.0.0-beta.21";
+export const packageVersion = "3.0.0-beta.23";

package/generator/src/compile-elm.js

@@ -136,9 +136,11 @@ function spawnElmMake(options, elmEntrypointPath, outputPath, cwd) {
       }
     );
     if (await fsHelpers.fileExists(outputPath)) {
-      await fsPromises.unlink(outputPath, {
-        force: true /* ignore errors if file doesn't exist */,
-      });
+      try {
+        await fsPromises.unlink(outputPath, {
+          force: true /* ignore errors if file doesn't exist */,
+        });
+      } catch (e) {}
     }
     let commandOutput = "";
 

package/generator/src/dev-server.js

@@ -39,6 +39,40 @@ export async function start(options) {
   let threadReadyQueue = [];
   let pool = [];
 
+  function invalidatePool() {
+    pool.forEach((thread) => {
+      if (thread.used) {
+        thread.stale = true;
+      }
+    });
+    restartIdleWorkersIfStale();
+  }
+
+  function restartIdleWorkersIfStale() {
+    pool.forEach((thread) => {
+      if (thread.stale && thread.ready) {
+        reinitThread(thread);
+      }
+    });
+  }
+
+  function reinitThread(thisThread) {
+    thisThread.worker && thisThread.worker.terminate();
+    // TODO remove event listeners to avoid memory leak?
+    // thread.worker.removeAllListeners("message");
+    // thread.worker.removeAllListeners("error");
+    thisThread.ready = false;
+    thisThread.stale = false;
+    thisThread.used = false;
+    thisThread.worker = new Worker(path.join(__dirname, "./render-worker.js"), {
+      env: SHARE_ENV,
+      workerData: { basePath: options.base },
+    });
+    thisThread.worker.once("online", () => {
+      thisThread.ready = true;
+    });
+  }
+
   ensureDirSync(path.join(process.cwd(), ".elm-pages", "http-response-cache"));
   const cpuCount = os.cpus().length;
 
@@ -232,32 +266,13 @@ export async function start(options) {
     if (pathThatChanged === "elm.json") {
       watchElmSourceDirs(false);
     } else if (pathThatChanged.endsWith(".elm")) {
+      invalidatePool();
       if (elmMakeRunning) {
       } else {
         let codegenError = null;
         if (needToRerunCodegen(eventName, pathThatChanged)) {
           try {
             await codegen.generate(options.base);
-            clientElmMakeProcess = compileElmForBrowser(options);
-            pendingCliCompile = compileCliApp(
-              options,
-              ".elm-pages/Main.elm",
-              path.join(process.cwd(), "elm-stuff/elm-pages/", "elm.js"),
-              // "elm.js",
-              "elm-stuff/elm-pages/",
-              path.join("elm-stuff/elm-pages/", "elm.js")
-            );
-
-            Promise.all([clientElmMakeProcess, pendingCliCompile])
-              .then(() => {
-                elmMakeRunning = false;
-              })
-              .catch(() => {
-                elmMakeRunning = false;
-              });
-            clients.forEach((client) => {
-              client.response.write(`data: elm.js\n\n`);
-            });
           } catch (error) {
             codegenError = error;
           }
@@ -275,10 +290,7 @@ export async function start(options) {
           pendingCliCompile = compileCliApp(
             options,
             ".elm-pages/Main.elm",
-
             path.join(process.cwd(), "elm-stuff/elm-pages/", "elm.js"),
-
-            // "elm.js",
             "elm-stuff/elm-pages/",
             path.join("elm-stuff/elm-pages/", "elm.js")
           );
@@ -361,6 +373,8 @@ export async function start(options) {
       };
 
       readyThread.ready = false;
+      await pendingCliCompile;
+      readyThread.used = true;
       readyThread.worker.postMessage({
         mode: "dev-server",
         pathname,
@@ -607,6 +621,7 @@ export async function start(options) {
   }
 
   function runPendingWork() {
+    restartIdleWorkersIfStale();
     const readyThreads = pool.filter((thread) => thread.ready);
     readyThreads.forEach((readyThread) => {
       const startTask = threadReadyQueue.shift();
@@ -631,6 +646,7 @@ export async function start(options) {
         workerData: { basePath },
       }),
       ready: false,
+      used: false,
     };
     newWorker.worker.once("online", () => {
       newWorker.ready = true;

package/generator/src/render-worker.js

@@ -2,7 +2,6 @@ import * as renderer from "../../generator/src/render.js";
 import * as path from "node:path";
 import * as fs from "./dir-helpers.js";
 import { readFileSync, writeFileSync } from "node:fs";
-import { stat } from "fs/promises";
 import { parentPort, threadId, workerData } from "node:worker_threads";
 import * as url from "node:url";
 
@@ -48,13 +47,10 @@ async function requireElm(mode) {
     process.cwd(),
     "elm-stuff/elm-pages/elm.cjs"
   );
-  let elmImportPath = compiledElmPath;
   let pathAsUrl = url.pathToFileURL(compiledElmPath);
-  const changedTime = (await stat(compiledElmPath)).mtimeMs;
-  pathAsUrl.searchParams.append("changed", `${changedTime}`);
   const warnOriginal = console.warn;
   console.warn = function () {};
-  const Elm = (await import(elmImportPath)).default;
+  const Elm = (await import(pathAsUrl.toString())).default;
   console.warn = warnOriginal;
   return Elm;
 }

package/generator/static-code/hmr.js

@@ -5,15 +5,69 @@ var eventSource = null;
 let updateAppContentJson = new Promise((resolve, reject) => resolve(() => {}));
 
 function connect(sendContentJsonPort, initialErrorPage) {
+  let reconnectFrequencySeconds = 1;
+  // reconnect logic based on: https://stackoverflow.com/a/61148682/383983
   // Listen for the server to tell us that an HMR update is available
-  eventSource = new EventSource("/stream");
-  window.reloadOnOk = initialErrorPage;
-  if (initialErrorPage) {
-    handleEvent(sendContentJsonPort, { data: "content.dat" });
+  function waitFunc() {
+    return reconnectFrequencySeconds * 1000;
   }
-  eventSource.onmessage = async function (evt) {
-    handleEvent(sendContentJsonPort, evt);
-  };
+  function tryToSetupFunc() {
+    setupEventSource();
+    reconnectFrequencySeconds *= 2;
+    if (reconnectFrequencySeconds >= 8) {
+      reconnectFrequencySeconds = 8;
+    }
+  }
+  function reconnectFunc() {
+    console.log(
+      `Attempting dev server reconnect in ${reconnectFrequencySeconds}...`
+    );
+    setTimeout(tryToSetupFunc, waitFunc());
+  }
+  function setupEventSource() {
+    eventSource = new EventSource("/stream");
+    window.reloadOnOk = initialErrorPage;
+
+    try {
+      if (initialErrorPage) {
+        handleEvent(sendContentJsonPort, { data: "content.dat" });
+      }
+    } catch (e) {}
+    eventSource.onopen = async function () {
+      hideError();
+      reconnectFrequencySeconds = 1;
+    };
+    eventSource.onerror = async function (evt) {
+      eventSource && eventSource.close();
+      reconnectFunc();
+
+      showReconnectBanner();
+    };
+    eventSource.onmessage = async function (evt) {
+      handleEvent(sendContentJsonPort, evt);
+    };
+  }
+
+  setupEventSource();
+}
+
+function showReconnectBanner() {
+  showError({
+    type: "compile-errors",
+    errors: [
+      {
+        path: "",
+        name: "",
+        problems: [
+          {
+            title: "",
+            // region: "",
+            message: ["Dev server is disconnected..."],
+          },
+        ],
+      },
+    ],
+  });
 }
 
 async function handleEvent(sendContentJsonPort, evt) {
@@ -28,8 +82,7 @@ async function handleEvent(sendContentJsonPort, evt) {
 
     try {
       await fetchContentJson;
-      const elmJsResponse = await elmJsRequest;
-      thenApplyHmr(elmJsResponse);
+      thenApplyHmr(await elmJsRequest);
     } catch (errorJson) {
       if (typeof errorJson === "string") {
         errorJson = JSON.parse(errorJson);
@@ -116,8 +169,7 @@ var myDisposeCallback = function () {
 var module = {
   hot: {
     accept: async function () {
-      const sendInUpdatedContentJson = await updateAppContentJson;
-      sendInUpdatedContentJson();
+      (await updateAppContentJson)();
     },
 
     dispose: function (callback) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",

package/src/Pages/Internal/Platform/CompatibilityKey.elm

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    7
+    8

package/src/Pages/Internal/Platform.elm

@@ -269,7 +269,7 @@ init config flags url key =
               , url = url
               , currentPath = url.path
               , pageData = Err "Not found"
-              , ariaNavigationAnnouncement = "Error" -- TODO use error page title for announcement?
+              , ariaNavigationAnnouncement = "Page Not Found" -- TODO use error page title for announcement?
               , userFlags = flags
               , notFound = Just info
               , transition = Nothing
@@ -764,7 +764,86 @@ update config appMsg model =
                             _ ->
                                 ( model, NoEffect )
                     )
-                |> Result.withDefault ( model, NoEffect )
+                |> Result.withDefault
+                    (let
+                        pageDataResult : Maybe (InitKind sharedData pageData actionData errorPage)
+                        pageDataResult =
+                            case Bytes.Decode.decode config.decodeResponse pageDataBytes of
+                                Just (ResponseSketch.RenderPage _ _) ->
+                                    Nothing
+
+                                Just (ResponseSketch.HotUpdate pageData shared actionData) ->
+                                    OkPage shared pageData actionData
+                                        |> Just
+
+                                Just (ResponseSketch.NotFound notFound) ->
+                                    NotFound notFound
+                                        |> Just
+
+                                _ ->
+                                    Nothing
+                     in
+                     case pageDataResult of
+                        Just (OkPage sharedData pageData actionData) ->
+                            let
+                                urls : { currentUrl : Url, basePath : List String }
+                                urls =
+                                    { currentUrl = model.url
+                                    , basePath = config.basePath
+                                    }
+
+                                pagePath : Path
+                                pagePath =
+                                    urlsToPagePath urls
+
+                                userFlags : Pages.Flags.Flags
+                                userFlags =
+                                    model.userFlags
+                                        |> Decode.decodeValue
+                                            (Decode.field "userFlags" Decode.value)
+                                        |> Result.withDefault Json.Encode.null
+                                        |> Pages.Flags.BrowserFlags
+
+                                ( userModel, userCmd ) =
+                                    Just
+                                        { path =
+                                            { path = pagePath
+                                            , query = model.url.query
+                                            , fragment = model.url.fragment
+                                            }
+                                        , metadata = config.urlToRoute model.url
+                                        , pageUrl =
+                                            Just
+                                                { protocol = model.url.protocol
+                                                , host = model.url.host
+                                                , port_ = model.url.port_
+                                                , path = pagePath
+                                                , query = model.url.query |> Maybe.map QueryParams.fromString
+                                                , fragment = model.url.fragment
+                                                }
+                                        }
+                                        |> config.init userFlags sharedData pageData actionData
+
+                                cmd : Effect userMsg pageData actionData sharedData userEffect errorPage
+                                cmd =
+                                    UserCmd userCmd
+                            in
+                            ( { model
+                                | pageData =
+                                    Ok
+                                        { userModel = userModel
+                                        , sharedData = sharedData
+                                        , pageData = pageData
+                                        , actionData = actionData
+                                        }
+                                , notFound = Nothing
+                              }
+                            , cmd
+                            )
+
+                        _ ->
+                            ( model, NoEffect )
+                    )
 
         FetcherStarted fetcherKey transitionId fetcherData initiatedAt ->
             ( { model