@swf2es/desktop 0.1.16 → 0.1.17

package/dist/main/websocket-connections.js

@@ -1,3 +1,10 @@
+// One page's air.net.WebSocket connections, made with the WHATWG WebSocket
+// of Electron's Node: what the WebSocket bridge (websockets.ts) holds for
+// each page, apart from Electron so that node runs it in the tests
+// (tests/desktop/websocket-connections.test.ts).
+import { isIP } from "node:net";
+import * as tls from "node:tls";
+import { connectThrough } from "./proxy.js";
 /** As many as a page may hold open at once; past it a connection is refused. */
 const MAX_OPEN = 64;
 /** The longest URL, and the most and longest subprotocols, a page may ask for. */
@@ -25,25 +32,86 @@ export function hasWebSocket() {
  * made from the class of the dispatcher undici keeps for everything else.
  */
 export function unverifiedDispatcher() {
+    const Agent = agentClass();
+    if (!Agent) {
+        return null;
+    }
+    try {
+        const agent = new Agent({
+            connect: { rejectUnauthorized: false },
+        });
+        return typeof agent.dispatch === "function" ? agent : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** undici's Agent, the class of the dispatcher it keeps for everything else; null where none. */
+function agentClass() {
     // Naming the global loads undici, which then sets its dispatcher.
     if (!hasWebSocket()) {
         return null;
     }
     const shared = globalThis[Symbol.for("undici.globalDispatcher.1")];
     const Agent = shared?.constructor;
-    if (typeof Agent !== "function" || Agent.name !== "Agent") {
+    return typeof Agent === "function" && Agent.name === "Agent"
+        ? Agent
+        : null;
+}
+/**
+ * What sends every client's requests through `proxy` (--proxy): a tunnel to
+ * the URL's host, by name for the proxy to resolve, and TLS over it for
+ * wss:, its certificate unverified where `unverified` says so of its host.
+ * `warn` is told why a proxy did not make one. Null where this Node gives
+ * no way to make one, as unverifiedDispatcher.
+ */
+export function proxiedDispatcher(proxy, unverified, warn = () => { }) {
+    const Agent = agentClass();
+    if (!Agent) {
         return null;
     }
-    try {
-        const agent = new Agent({
-            connect: { rejectUnauthorized: false },
+    // undici's connector: its options name the target, and its callback takes the socket made.
+    const connect = (options, done) => {
+        const host = options.hostname.replace(/^\[(.*)\]$/, "$1").toLowerCase();
+        const https = options.protocol === "https:";
+        const port = Number(options.port) || (https ? 443 : 80);
+        connectThrough(proxy, host, port).then((tunnel) => {
+            if (!https) {
+                done(null, tunnel);
+                return;
+            }
+            const secure = tls.connect({
+                socket: tunnel,
+                servername: isIP(host) ? undefined : (options.servername ?? host),
+                ALPNProtocols: ["http/1.1"],
+                ...(unverified(host) ? { rejectUnauthorized: false } : {}),
+            });
+            const failed = (error) => done(error, null);
+            secure.once("error", failed);
+            secure.once("secureConnect", () => {
+                secure.removeListener("error", failed);
+                done(null, secure);
+            });
+        }, (error) => {
+            warn(`no WebSocket to ${host}:${port}: ${error.message}`);
+            done(error, null);
         });
+    };
+    try {
+        const agent = new Agent({ connect });
         return typeof agent.dispatch === "function" ? agent : null;
     }
     catch {
         return null;
     }
 }
+/** An opener whose every connection is `dispatcher`'s: proxiedDispatcher's. */
+export function dispatchedOpener(dispatcher) {
+    return (url, protocols) => {
+        const Client = globalClient();
+        return new Client(url, { protocols, dispatcher });
+    };
+}
 /**
  * An opener that leaves a wss: server's certificate unverified where
  * `unverified` says so of its host, through `dispatcher`

package/dist/main/websocket-connections.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-connections.js","sourceRoot":"","sources":["../../src/main/websocket-connections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websocket-connections.js","sourceRoot":"","sources":["../../src/main/websocket-connections.ts"],"names":[],"mappings":"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"}

package/dist/main/websockets.d.ts

@@ -5,7 +5,8 @@ import { type Opener } from "./websocket-connections.ts";
  * connection made only where `permit` allows its URL, with `open` if
  * given. `log`, where given, is told each connection asked for, opened,
  * refused, failed and closed (--log-network), and with `data` what each
- * sends and receives too (--log-sockets).
+ * sends and receives too (--log-sockets), the connections' lines ending
+ * in `via`.
  */
-export declare function bridgeWebSockets(trusted: (event: IpcMainEvent) => boolean, permit: (url: string) => boolean, open: Opener | undefined, log?: ((line: string) => void) | null, data?: boolean): void;
+export declare function bridgeWebSockets(trusted: (event: IpcMainEvent) => boolean, permit: (url: string) => boolean, open: Opener | undefined, log?: ((line: string) => void) | null, data?: boolean, via?: string): void;
 //# sourceMappingURL=websockets.d.ts.map

package/dist/main/websockets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websockets.d.ts","sourceRoot":"","sources":["../../src/main/websockets.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,YAAY,EAA6B,MAAM,UAAU,CAAC;AAExE,OAAO,EACL,KAAK,MAAM,EAIZ,MAAM,4BAA4B,CAAC;AAEpC;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,EACzC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,EAChC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,GAAG,GAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAW,EAC3C,IAAI,UAAQ,GACX,IAAI,CAwFN"}
+{"version":3,"file":"websockets.d.ts","sourceRoot":"","sources":["../../src/main/websockets.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,YAAY,EAA6B,MAAM,UAAU,CAAC;AAExE,OAAO,EACL,KAAK,MAAM,EAIZ,MAAM,4BAA4B,CAAC;AAEpC;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,EACzC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,EAChC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,GAAG,GAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAW,EAC3C,IAAI,UAAQ,EACZ,GAAG,SAAK,GACP,IAAI,CAwFN"}

package/dist/main/websockets.js

@@ -10,9 +10,10 @@ import { validProtocols, validWebSocketUrl, WebSocketConnections, } from "./webs
  * connection made only where `permit` allows its URL, with `open` if
  * given. `log`, where given, is told each connection asked for, opened,
  * refused, failed and closed (--log-network), and with `data` what each
- * sends and receives too (--log-sockets).
+ * sends and receives too (--log-sockets), the connections' lines ending
+ * in `via`.
  */
-export function bridgeWebSockets(trusted, permit, open, log = null, data = false) {
+export function bridgeWebSockets(trusted, permit, open, log = null, data = false, via = "") {
     const pages = new Map();
     const connectionsOf = (contents) => {
         const known = pages.get(contents);
@@ -66,7 +67,7 @@ export function bridgeWebSockets(trusted, permit, open, log = null, data = false
         // As the client will read it: what is said of it has nothing a terminal would act on.
         const href = new URL(url).href;
         const allowed = permit(href);
-        log?.(webSocketLine(id, `${allowed ? "connecting to" : "refused"} ${href}`));
+        log?.(webSocketLine(id, `${allowed ? `connecting to ${href}${via}` : `refused ${href}`}`));
         if (allowed) {
             connections.connect(id, href, protocols);
         }

package/dist/main/websockets.js.map

@@ -1 +1 @@
-{"version":3,"file":"websockets.js","sourceRoot":"","sources":["../../src/main/websockets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"websockets.js","sourceRoot":"","sources":["../../src/main/websockets.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swf2es/desktop",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "swf2es's desktop app: local and remote SWFs, and AIR applications, in an Electron window",
   "keywords": [
     "swf",
@@ -35,12 +35,12 @@
   ],
   "dependencies": {
     "electron": "44.10.2",
-    "@swf2es/context3d": "0.1.16",
-    "@swf2es/format": "0.1.16",
-    "@swf2es/codegen": "0.1.16",
-    "@swf2es/player": "0.1.16",
-    "@swf2es/web": "0.1.16",
-    "@swf2es/player-hosts": "0.1.16"
+    "@swf2es/codegen": "0.1.17",
+    "@swf2es/format": "0.1.17",
+    "@swf2es/player": "0.1.17",
+    "@swf2es/web": "0.1.17",
+    "@swf2es/player-hosts": "0.1.17",
+    "@swf2es/context3d": "0.1.17"
   },
   "scripts": {
     "fetch-electron": "node node_modules/electron/install.js",

package/src/main/air.ts

@@ -22,6 +22,7 @@ import { homedir } from "node:os";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { readAirDescriptor } from "@swf2es/format";
 import type { AirFileStat, AirLaunch } from "../shared/api.js";
+import { resolveCase } from "./case-paths.ts";
 
 /** What the command line asks adl's way: the descriptor, the application's directory, the arguments. */
 export interface AirCommand {
@@ -78,7 +79,7 @@ export function airLaunch(
   );
   mkdirSync(applicationStorage, { recursive: true });
   return {
-    content: resolve(application, ...descriptor.content.split("/")),
+    content: resolveCase(resolve(application, ...descriptor.content.split("/"))),
     relative: descriptor.content,
     launch: {
       descriptor: xml,
@@ -95,7 +96,8 @@ export function airLaunch(
 }
 
 /** What is at `path`, as File reads it; null where nothing is. */
-export function statOf(path: string): AirFileStat | null {
+export function statOf(asked: string): AirFileStat | null {
+  const path = resolveCase(asked);
   try {
     const s = statSync(path);
     const link = lstatSync(path).isSymbolicLink();
@@ -116,7 +118,7 @@ export function statOf(path: string): AirFileStat | null {
 /** The names in the directory at `path`; null where it is none. */
 export function listOf(path: string): string[] | null {
   try {
-    return readdirSync(path);
+    return readdirSync(resolveCase(path));
   } catch {
     return null;
   }
@@ -125,7 +127,7 @@ export function listOf(path: string): string[] | null {
 /** The bytes of the file at `path`, as FileStream's open reads them at once; null where none can be read. */
 export function readOf(path: string): Uint8Array | null {
   try {
-    return new Uint8Array(readFileSync(path));
+    return new Uint8Array(readFileSync(resolveCase(path)));
   } catch {
     return null;
   }
@@ -222,7 +224,8 @@ export class EncryptedItems {
  * `length` long, made with its directories where it is not: FileStream's
  * writes. False where it cannot be written.
  */
-export function writeOf(path: string, bytes: Uint8Array, offset: number, length: number): boolean {
+export function writeOf(asked: string, bytes: Uint8Array, offset: number, length: number): boolean {
+  const path = resolveCase(asked);
   return attempt(() => {
     mkdirSync(dirname(path), { recursive: true });
     // "a+" would only append; "r+" needs the file there, which "a" makes without emptying it.
@@ -239,16 +242,23 @@ export function writeOf(path: string, bytes: Uint8Array, offset: number, length:
 
 /** Makes the directory at `path` and those it is in; false where it cannot. */
 export function createDirectoryOf(path: string): boolean {
-  return attempt(() => mkdirSync(path, { recursive: true }));
+  return attempt(() => mkdirSync(resolveCase(path), { recursive: true }));
 }
 
 /** Removes the file or directory at `path`, with all in it; false where it cannot. */
 export function removeOf(path: string): boolean {
-  return attempt(() => rmSync(path, { recursive: true }));
+  return attempt(() => rmSync(resolveCase(path), { recursive: true }));
 }
 
 /** Moves what is at `from` to `to`, its directories made; false where it cannot. */
-export function moveOf(from: string, to: string): boolean {
+export function moveOf(askedFrom: string, askedTo: string): boolean {
+  const from = resolveCase(askedFrom);
+  let to = resolveCase(askedTo);
+  // A rename of its case alone, which Windows makes: the name as given, in its directory as found.
+  if (to === from) {
+    to = join(resolveCase(dirname(askedTo)), basename(askedTo));
+  }
+
   return attempt(() => {
     mkdirSync(dirname(to), { recursive: true });
     try {

package/src/main/case-paths.ts

@@ -0,0 +1,97 @@
+// Local paths as a case-insensitive file system finds them. AIR runs on
+// Windows and macOS, whose file systems ignore case, so an AIR application
+// or a SWF made there may name a file in any case: maps/Town.swf for
+// maps/town.swf. On Linux such a path finds nothing, so where the exact
+// path is missing each missing segment is taken as the one entry of its
+// directory equal to it ignoring case. Names are compared as NFC,
+// lowercased by toLowerCase(): close enough to how NTFS and APFS fold
+// case, and APFS keeps a name's normalization, as NFC compares it.
+// Apart from Electron, so that node tests it (tests/desktop/case-paths.test.ts).
+import { lstatSync, readdirSync } from "node:fs";
+import { isAbsolute, parse, sep } from "node:path";
+
+/** Whether this system's file system tells names apart by case: Linux's do; Windows' and macOS's do not. */
+const CASE_SENSITIVE = process.platform === "linux";
+
+/** The directories already said, on stderr, to hold names that differ only in case. */
+const told = new Set<string>();
+
+const fold = (name: string) => name.normalize("NFC").toLowerCase();
+
+function exists(path: string): boolean {
+  try {
+    lstatSync(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * `path`, absolute, as Windows would find it: unchanged where it is there
+ * exactly; otherwise from the deepest ancestor that is there, each missing
+ * segment taken as the entry of its directory equal to it ignoring case,
+ * until one has none, which is kept as given with all after it (a file to
+ * be made keeps its name). Where two entries or more are equal ignoring
+ * case, which one is meant is not guessed: `path` comes back unchanged.
+ * Each call lists the directories it needs afresh, as they change; one
+ * whose path is there costs one lstat.
+ */
+export function resolveCase(path: string, caseSensitive = CASE_SENSITIVE): string {
+  if (!caseSensitive || !isAbsolute(path) || exists(path)) {
+    return path;
+  }
+
+  const root = parse(path).root;
+  const segments = path.slice(root.length).split(sep);
+  // Joined as given, not normalized: ".." is the file system's to follow, through links as today.
+  const at = (count: number, from: string[]) => root + from.slice(0, count).join(sep);
+  let found = segments.length - 1;
+  while (found > 0 && !exists(at(found, segments))) {
+    found--;
+  }
+
+  const resolved = segments.slice();
+  for (let i = found; i < segments.length; i++) {
+    const segment = segments[i];
+    if (segment === "" || segment === "." || segment === "..") {
+      continue;
+    }
+
+    const directory = at(i, resolved);
+    let names: string[];
+    try {
+      names = readdirSync(directory);
+    } catch {
+      break;
+    }
+
+    // In a directory resolved by case, a segment after it may be there exactly.
+    if (names.includes(segment)) {
+      continue;
+    }
+
+    const wanted = fold(segment);
+    const matches = names.filter((name) => fold(name) === wanted);
+    if (matches.length === 0) {
+      break;
+    }
+
+    if (matches.length > 1) {
+      const key = `${directory}${sep}${wanted}`;
+      if (!told.has(key)) {
+        told.add(key);
+        console.error(
+          `swf2es: ${directory} holds ${matches.join(", ")}, which differ only in case; ` +
+            `${segment} is taken as named, not as any of them.`,
+        );
+      }
+
+      return path;
+    }
+
+    resolved[i] = matches[0];
+  }
+
+  return root + resolved.join(sep);
+}

package/src/main/connections.ts

@@ -1,8 +1,10 @@
-// One page's flash.net.Socket connections, made with node:net: what the
-// socket bridge (sockets.ts) holds for each page, apart from Electron so
-// that node runs it in the tests (tests/desktop/connections.test.ts).
+// One page's flash.net.Socket connections, made with node:net, or through
+// the proxy (--proxy, proxy.ts): what the socket bridge (sockets.ts) holds
+// for each page, apart from Electron so that node runs it in the tests
+// (tests/desktop/connections.test.ts).
 import { connect, type Socket } from "node:net";
 import type { SocketEvent } from "../shared/api.js";
+import { connectThrough, type ProxyConfig, type ProxyError } from "./proxy.ts";
 
 /** As many as a page may hold open at once; past it a connection is refused. */
 const MAX_OPEN = 64;
@@ -30,17 +32,30 @@ export function validEndpoint(host: unknown, port: unknown): host is string {
   );
 }
 
+export interface ConnectionOptions {
+  /** What every connection goes through; none by default. */
+  proxy?: ProxyConfig | null;
+  /** Told why a connection through the proxy did not come about, for stderr. */
+  warn?: (message: string) => void;
+}
+
 export class Connections {
   private readonly sockets = new Map<number, Socket>();
+  /** Connections still being made through the proxy, each stopped by its controller. */
+  private readonly opening = new Map<number, AbortController>();
   private readonly tell: (id: number, event: SocketEvent) => void;
+  private readonly proxy: ProxyConfig | null;
+  private readonly warn: (message: string) => void;
 
   /** `tell` carries each connection's events to its page. */
-  constructor(tell: (id: number, event: SocketEvent) => void) {
+  constructor(tell: (id: number, event: SocketEvent) => void, options: ConnectionOptions = {}) {
     this.tell = tell;
+    this.proxy = options.proxy ?? null;
+    this.warn = options.warn ?? (() => {});
   }
 
   get size(): number {
-    return this.sockets.size;
+    return this.sockets.size + this.opening.size;
   }
 
   /** Counts closeAll's: a connection decided on before one belongs to a page that is gone. */
@@ -51,13 +66,23 @@ export class Connections {
    * was pinned (a remote SWF's socket policy came from there); a refusal is an error, then a close.
    */
   connect(id: number, host: unknown, port: unknown, address?: string): void {
-    if (!validEndpoint(host, port) || this.sockets.has(id) || this.sockets.size >= MAX_OPEN) {
+    if (
+      !validEndpoint(host, port) ||
+      this.sockets.has(id) ||
+      this.opening.has(id) ||
+      this.size >= MAX_OPEN
+    ) {
       this.refuse(id);
       return;
     }
 
-    const socket = connect({ host: address ?? host, port: port as number });
-    this.sockets.set(id, socket);
+    const target = address ?? host;
+    if (this.proxy) {
+      this.connectThrough(this.proxy, id, target, port as number);
+      return;
+    }
+
+    const socket = connect({ host: target, port: port as number });
     socket.on("connect", () =>
       this.tell(id, {
         type: "open",
@@ -67,6 +92,49 @@ export class Connections {
         remotePort: socket.remotePort ?? 0,
       }),
     );
+    this.attach(id, socket);
+  }
+
+  /**
+   * Connect `id` through `proxy`, by the address where one was pinned, else
+   * by name for the proxy to resolve. Its peer is the target: the proxy's
+   * address is no business of the SWF's. A proxy that fails is a refusal,
+   * said with why.
+   */
+  private connectThrough(proxy: ProxyConfig, id: number, target: string, port: number): void {
+    const opening = new AbortController();
+    this.opening.set(id, opening);
+    connectThrough(proxy, target, port, { signal: opening.signal }).then(
+      (socket) => {
+        if (this.opening.get(id) !== opening) {
+          socket.destroy();
+          return;
+        }
+
+        this.opening.delete(id);
+        this.attach(id, socket);
+        this.tell(id, {
+          type: "open",
+          localAddress: socket.localAddress ?? "",
+          localPort: socket.localPort ?? 0,
+          remoteAddress: target,
+          remotePort: port,
+        });
+      },
+      (error: ProxyError) => {
+        if (this.opening.get(id) !== opening) {
+          return;
+        }
+
+        this.opening.delete(id);
+        this.warn(`no socket to ${target}:${port}: ${error.message}`);
+        this.refuse(id);
+      },
+    );
+  }
+
+  private attach(id: number, socket: Socket): void {
+    this.sockets.set(id, socket);
     socket.on("data", (bytes) => this.tell(id, { type: "data", bytes: new Uint8Array(bytes) }));
     socket.on("error", () => this.tell(id, { type: "error", message: SOCKET_ERROR }));
     socket.on("close", () => {
@@ -105,6 +173,15 @@ export class Connections {
   }
 
   close(id: number): void {
+    const opening = this.opening.get(id);
+    if (opening) {
+      // Closed before the proxy made it: closed, as a socket destroyed before it connects.
+      this.opening.delete(id);
+      opening.abort();
+      this.tell(id, { type: "close" });
+      return;
+    }
+
     this.sockets.get(id)?.destroy();
   }
 
@@ -119,7 +196,12 @@ export class Connections {
       socket.destroy();
     }
 
+    for (const opening of this.opening.values()) {
+      opening.abort();
+    }
+
     this.sockets.clear();
+    this.opening.clear();
     this.generation++;
   }
 }