sliftutils 1.2.15 → 1.2.17

package/builders/extensionBuild.ts

@@ -1,5 +1,4 @@
 import fs from "fs";
-import crypto from "crypto";
 import { delay } from "socket-function/src/batching";
 import { bundleEntryCaller } from "../bundler/bundleEntryCaller";
 import yargs from "yargs";
@@ -7,8 +6,6 @@ import { formatTime } from "socket-function/src/formatting/format";
 import path from "path";
 import { getAllFiles } from "../misc/fs";
 
-const BUILD_HASH_PREFIX = "::SLIFT_HOT_RELOAD_BUILD_HASH::";
-
 async function main() {
     let time = Date.now();
     //todonext
@@ -141,22 +138,6 @@ async function main() {
         console.log(`Copied ${filesCopied} changed assets`);
     }
 
-    // Hash the bundled JS outputs so the watch server can broadcast a version
-    // identifier the extension can compare against on a poll.
-    let jsOutputs = (await fs.promises.readdir(yargObj.outputFolder))
-        .filter(f => f.endsWith(".js"))
-        .sort();
-    let hasher = crypto.createHash("sha256");
-    for (let file of jsOutputs) {
-        let buf = await fs.promises.readFile(path.join(yargObj.outputFolder, file));
-        hasher.update(file);
-        hasher.update("\0");
-        hasher.update(buf);
-        hasher.update("\0");
-    }
-    let buildHash = hasher.digest("hex").slice(0, 16);
-    console.log(`${BUILD_HASH_PREFIX} ${buildHash}`);
-
     let duration = Date.now() - time;
     console.log(`Extension build completed in ${formatTime(duration)}`);
 }

package/builders/hotReload.ts

@@ -3,7 +3,6 @@ import { isInBrowser, isInChromeExtension, isInChromeExtensionBackground, isInCh
 
 const DEFAULT_WATCH_PORT = 9876;
 const CONTENT_SCRIPT_POLL_INTERVAL_MS = 1000;
-const HOT_RELOAD_HASH_STORAGE_KEY = "sliftHotReloadBuildHash";
 
 export async function enableHotReloading(config?: {
     port?: number;
@@ -22,7 +21,7 @@ export async function enableHotReloading(config?: {
     }
 }
 
-function watchPortHotReload(port = DEFAULT_WATCH_PORT, onReload: () => void, onHash?: (hash: string | undefined) => void) {
+function watchPortHotReload(port = DEFAULT_WATCH_PORT, onReload: () => void) {
     let reconnectTimer: number | undefined;
     let ws: WebSocket | undefined;
 
@@ -41,12 +40,8 @@ function watchPortHotReload(port = DEFAULT_WATCH_PORT, onReload: () => void, onH
                 try {
                     let data = JSON.parse(event.data);
                     if (data.type === "build-complete" && data.success) {
-                        if (onHash) {
-                            onHash(data.hash);
-                        } else {
-                            console.log("[Hot Reload] Build complete, reloading page...");
-                            onReload();
-                        }
+                        console.log("[Hot Reload] Build complete, reloading...");
+                        onReload();
                     }
                 } catch (error) {
                     console.error("[Hot Reload] Failed to parse message:", error);
@@ -77,48 +72,31 @@ function watchPortHotReload(port = DEFAULT_WATCH_PORT, onReload: () => void, onH
 }
 
 function chromeExtensionBackgroundHotReload(port = DEFAULT_WATCH_PORT) {
-    let currentHash: string | undefined;
-
-    watchPortHotReload(port, () => { /* unused — hash callback drives reloads */ }, (hash) => {
-        if (!hash) return;
-        void chrome.storage.local.set({ [HOT_RELOAD_HASH_STORAGE_KEY]: hash });
-        if (currentHash === undefined) {
-            currentHash = hash;
-            console.log(`[Hot Reload] Initial build hash: ${hash}`);
-            return;
-        }
-        if (hash !== currentHash) {
-            console.log(`[Hot Reload] Build hash changed (${currentHash} -> ${hash}), reloading extension...`);
-            currentHash = hash;
-            chrome.runtime.reload();
-        }
+    watchPortHotReload(port, () => {
+        chrome.runtime.reload();
     });
 }
 
 function chromeExtensionContentScriptHotReload() {
-    let lastHash: string | undefined;
-
+    // The background reloads the extension on build, which invalidates this
+    // content script's extension context. We detect that by touching
+    // chrome.storage.local on a poll — once the context is gone, the call
+    // throws "Extension context invalidated" and we refresh the page.
     setInterval(() => {
         try {
-            chrome.storage.local.get(HOT_RELOAD_HASH_STORAGE_KEY, (result) => {
+            chrome.storage.local.get(null, () => {
                 if (chrome.runtime.lastError) {
                     console.error("[Hot Reload] storage.get error:", chrome.runtime.lastError.message);
-                    return;
-                }
-                let hash: string | undefined = result?.[HOT_RELOAD_HASH_STORAGE_KEY];
-                if (!hash) return;
-                if (lastHash === undefined) {
-                    lastHash = hash;
-                    return;
-                }
-                if (hash !== lastHash) {
-                    console.log(`[Hot Reload] Build hash changed (${lastHash} -> ${hash}), refreshing page...`);
-                    lastHash = hash;
-                    window.location.reload();
                 }
             });
         } catch (error) {
+            let message = (error as Error).message ?? "";
+            if (message.includes("Extension context invalidated")) {
+                console.log("[Hot Reload] Extension context invalidated, refreshing page...");
+                window.location.reload();
+                return;
+            }
             console.error("[Hot Reload] poll error:", (error as Error).stack ?? error);
         }
     }, CONTENT_SCRIPT_POLL_INTERVAL_MS);
-}
+}

package/builders/watch.ts

@@ -5,7 +5,6 @@ import { WebSocketServer } from "ws";
 
 const DEBOUNCE_DELAY_MS = 250;
 const DEFAULT_WATCH_PORT = 9876;
-const BUILD_HASH_REGEX = /::SLIFT_HOT_RELOAD_BUILD_HASH::\s+(\S+)/g;
 
 async function main() {
     let args = process.argv.slice(2);
@@ -49,9 +48,6 @@ async function main() {
 
         wss.on("connection", (ws) => {
             console.log(`[${new Date().toLocaleTimeString()}] WebSocket client connected`);
-            if (latestBuildHash) {
-                ws.send(JSON.stringify({ type: "build-complete", success: true, hash: latestBuildHash }));
-            }
             ws.on("close", () => {
                 console.log(`[${new Date().toLocaleTimeString()}] WebSocket client disconnected`);
             });
@@ -67,7 +63,6 @@ async function main() {
     let debounceTimer: NodeJS.Timeout | undefined;
     let isRunning = false;
     let needsRerun = false;
-    let latestBuildHash: string | undefined;
 
     async function executeCommand() {
         if (isRunning) {
@@ -80,25 +75,14 @@ async function main() {
 
         try {
             console.log(`\n[${new Date().toLocaleTimeString()}] Running: ${command}`);
-            let output = await runPromise(command);
+            await runPromise(command);
             console.log(`[${new Date().toLocaleTimeString()}] Completed successfully`);
 
-            // Extract the most recent [BUILD_HASH] line emitted by the build.
-            let match: RegExpExecArray | null;
-            let lastHash: string | undefined;
-            BUILD_HASH_REGEX.lastIndex = 0;
-            while ((match = BUILD_HASH_REGEX.exec(output)) !== null) {
-                lastHash = match[1];
-            }
-            if (lastHash) {
-                latestBuildHash = lastHash;
-            }
-
             // Notify all connected WebSocket clients
             if (wss) {
                 wss.clients.forEach((client) => {
                     if (client.readyState === 1) { // 1 = OPEN
-                        client.send(JSON.stringify({ type: "build-complete", success: true, hash: latestBuildHash }));
+                        client.send(JSON.stringify({ type: "build-complete", success: true }));
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "1.2.15",
+    "version": "1.2.17",
     "main": "index.js",
     "license": "MIT",
     "files": [
@@ -50,7 +50,7 @@
         "mobx": "^6.13.3",
         "preact-old-types": "^10.28.1",
         "shell-quote": "^1.8.3",
-        "socket-function": "^1.1.23",
+        "socket-function": "^1.1.30",
         "typenode": "*",
         "typesafecss": "*",
         "ws": "^8.18.3",

package/yarn.lock

@@ -1940,10 +1940,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-socket-function@^1.1.23:
-  version "1.1.23"
-  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.1.23.tgz#d734b932f19fdae492304f7d5218b04e8907d26f"
-  integrity sha512-L4DKMUlD8YKjhf8LybwxIqFWEiKz/WlZbJPtXgYI5EwN8NPS/0UunBIJ7yLS8XNMqJZoqhaTI7KzbySs+ZOSPQ==
+socket-function@^1.1.30:
+  version "1.1.30"
+  resolved "https://registry.yarnpkg.com/socket-function/-/socket-function-1.1.30.tgz#adeb9614996e727518e2abdc7a1aa90544d669cd"
+  integrity sha512-EcqNpM8i0icBr2iU80aovXI05aUBrB4P4e9U7EQyju68TGAMagdA4OQXi+V1MHUipH/3nIdw3UAVYv+kFwZwnQ==
   dependencies:
     "@types/pako" "^2.0.3"
     "@types/ws" "^8.5.3"