@telepath-computer/television-desktop 0.1.112 → 0.1.142

package/README.md

@@ -14,8 +14,9 @@ npm i -g @telepath-computer/television-desktop
 tv-desktop
 ```
 
-A connect window opens; point it at a running Television server (URL +
-token, or a `--public` server with an empty token).
+A connect window opens; point it at a running Television server. Enter the
+server URL plus token when the server runs with `--auth`; leave the token blank
+for no-auth servers.
 
 ## macOS notes
 

package/dist/connect.html

@@ -92,7 +92,7 @@
           <input id="serverURL" type="url" placeholder="https://example.com" required autofocus />
         </label>
         <label>
-          Token <span style="text-transform: none; letter-spacing: 0; color: #555;">(leave blank for --public servers)</span>
+          Token <span style="text-transform: none; letter-spacing: 0; color: #555;">(leave blank for no-auth servers)</span>
           <input id="token" type="password" />
         </label>
         <div class="error" id="error"></div>

package/dist/electron.cjs

@@ -64,7 +64,11 @@ var WINDOW_WIDTH = 1400;
 var WINDOW_HEIGHT = 1e3;
 var TRAFFIC_LIGHT_POSITION = { x: 12, y: 12 };
 var SET_CONNECTION_CHANNEL = "television:set-connection";
+var TEST_EXTERNAL_OPEN_CHANNEL = "television:test:external-open";
 var TEST_FIXTURE_FLAG = "--test-fixture";
+if (process.env.TV_ELECTRON_CHROMIUM_LOGS !== "1") {
+  import_electron2.app.commandLine?.appendSwitch("log-level", "3");
+}
 function buildRemoteURL({ serverURL, token }) {
   const url = new URL(serverURL);
   url.searchParams.set("mode", "electron");
@@ -76,6 +80,17 @@ function readTestFixtureURL(argv) {
   if (idx === -1 || idx === argv.length - 1) return null;
   return argv[idx + 1] ?? null;
 }
+function isExternalOpenURL(url) {
+  return url.startsWith("http://") || url.startsWith("https://");
+}
+function recordExternalOpenForTest(url) {
+  const globalState = globalThis;
+  const log = globalState.__televisionExternalOpenLog ??= [];
+  log.push(url);
+  for (const window of import_electron2.BrowserWindow.getAllWindows()) {
+    window.webContents.send(TEST_EXTERNAL_OPEN_CHANNEL, url);
+  }
+}
 var App = class {
   window = null;
   async start() {
@@ -84,6 +99,7 @@ var App = class {
       import_electron2.app.dock.setIcon(import_node_path2.default.join(__dirname, "..", "assets", "icon.png"));
     }
     this.installMenu();
+    this.installWindowOpenHandler();
     import_electron2.ipcMain.handle(SET_CONNECTION_CHANNEL, async (_event, connection) => {
       saveConnection(connection);
       await this.loadRemote(connection);
@@ -114,6 +130,7 @@ var App = class {
     });
     this.window.webContents.on("will-attach-webview", (_event, webPreferences) => {
       webPreferences.preload = import_node_path2.default.join(__dirname, "webview-bridge-preload.cjs");
+      webPreferences.contextIsolation = false;
     });
     this.window.once("ready-to-show", () => this.window?.show());
     this.window.on("closed", () => {
@@ -139,6 +156,20 @@ var App = class {
     if (!this.window) return;
     await this.window.loadURL(buildRemoteURL(connection));
   }
+  installWindowOpenHandler() {
+    import_electron2.app.on("web-contents-created", (_event, contents) => {
+      contents.setWindowOpenHandler(({ url }) => {
+        if (isExternalOpenURL(url)) {
+          if (process.env.TV_TEST_MODE === "true") {
+            recordExternalOpenForTest(url);
+          } else {
+            void import_electron2.shell.openExternal(url);
+          }
+        }
+        return { action: "deny" };
+      });
+    });
+  }
   installMenu() {
     const isMac = process.platform === "darwin";
     const connectItem = {

package/dist/webview-bridge-preload.cjs

@@ -3,55 +3,76 @@
 // src/webview-bridge-preload.ts
 var import_electron = require("electron");
 var BRIDGE_CHANNEL = "television-artifact-bridge";
-var lastWheelClientX = 0;
-var lastWheelClientY = 0;
+var contentBridge = {
+  postToHost(message) {
+    import_electron.ipcRenderer.sendToHost(BRIDGE_CHANNEL, message);
+  },
+  onHostMessage(callback) {
+    const listener = (_event, message) => {
+      callback(message);
+    };
+    import_electron.ipcRenderer.on(BRIDGE_CHANNEL, listener);
+    return () => {
+      import_electron.ipcRenderer.removeListener(BRIDGE_CHANNEL, listener);
+    };
+  }
+};
+if (process.contextIsolated) {
+  import_electron.contextBridge.exposeInMainWorld("__televisionContentBridge", contentBridge);
+} else {
+  window.__televisionContentBridge = contentBridge;
+}
+function isTextEditingTarget(target) {
+  if (!(target instanceof Element)) {
+    return false;
+  }
+  const editable = target.closest(
+    "input, textarea, select, [contenteditable], [role='textbox'], [role='searchbox'], [role='combobox'], [role='spinbutton'], [role='slider']"
+  );
+  if (!editable) {
+    return false;
+  }
+  if (editable.hasAttribute("contenteditable")) {
+    return editable.getAttribute("contenteditable")?.toLowerCase() !== "false";
+  }
+  return true;
+}
+window.addEventListener(
+  "keydown",
+  (event) => {
+    if (event.key !== "ArrowLeft" && event.key !== "ArrowRight") {
+      return;
+    }
+    if (event.metaKey || event.ctrlKey || event.altKey || event.shiftKey) {
+      return;
+    }
+    if (isTextEditingTarget(event.target)) {
+      return;
+    }
+    event.preventDefault();
+    import_electron.ipcRenderer.sendToHost(BRIDGE_CHANNEL, {
+      type: "filmstrip-key",
+      direction: event.key === "ArrowRight" ? 1 : -1
+    });
+  },
+  { capture: true }
+);
 window.addEventListener(
   "wheel",
   (event) => {
-    lastWheelClientX = event.clientX;
-    lastWheelClientY = event.clientY;
+    const usingShiftFallback = event.shiftKey && event.deltaX === 0 && event.deltaY !== 0;
+    const horizontalDelta = usingShiftFallback ? event.deltaY : event.deltaX;
+    const horizontalMagnitude = Math.abs(horizontalDelta);
+    const verticalMagnitude = usingShiftFallback ? 0 : Math.abs(event.deltaY);
+    if (horizontalMagnitude <= verticalMagnitude) {
+      return;
+    }
     const payload = {
       type: "wheel",
-      deltaX: event.deltaX,
-      deltaY: event.deltaY,
+      deltaX: horizontalDelta,
       shiftKey: event.shiftKey
     };
     import_electron.ipcRenderer.sendToHost(BRIDGE_CHANNEL, payload);
-    event.preventDefault();
   },
   { passive: false }
 );
-import_electron.ipcRenderer.on(BRIDGE_CHANNEL, (_event, payload) => {
-  if (payload?.type !== "scroll") return;
-  const deltaX = payload.deltaX ?? 0;
-  const deltaY = payload.deltaY ?? 0;
-  const target = resolveScrollTarget(lastWheelClientX, lastWheelClientY, deltaX, deltaY);
-  target.scrollBy(deltaX, deltaY);
-});
-function resolveScrollTarget(x, y, deltaX, deltaY) {
-  const fallback = document.scrollingElement ?? document.documentElement;
-  if (typeof document.elementFromPoint !== "function") return fallback;
-  let node = document.elementFromPoint(x, y);
-  while (node && node !== document.documentElement) {
-    if (canScroll(node, deltaX, deltaY)) return node;
-    node = node.parentElement;
-  }
-  return fallback;
-}
-function canScroll(node, deltaX, deltaY) {
-  const style = getComputedStyle(node);
-  if (deltaY !== 0) {
-    if (isScrollableOverflow(style.overflowY) && node.scrollHeight > node.clientHeight) {
-      return true;
-    }
-  }
-  if (deltaX !== 0) {
-    if (isScrollableOverflow(style.overflowX) && node.scrollWidth > node.clientWidth) {
-      return true;
-    }
-  }
-  return false;
-}
-function isScrollableOverflow(value) {
-  return value === "auto" || value === "scroll" || value === "overlay";
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@telepath-computer/television-desktop",
   "productName": "Television",
-  "version": "0.1.112",
+  "version": "0.1.142",
   "type": "module",
   "main": "dist/electron.cjs",
   "bin": {
@@ -19,7 +19,9 @@
   "scripts": {
     "build": "node build.mjs",
     "prepublishOnly": "node build.mjs",
-    "type-check": "tsc -p tsconfig.json --noEmit"
+    "type-check": "tsc -p tsconfig.json --noEmit",
+    "test": "vitest run --config vitest.config.ts",
+    "test:e2e": "node ../../scripts/run-electron-e2e.mjs"
   },
   "dependencies": {
     "electron": "35.7.5"