roxxie-proxy-u-prod 0.2.2 → 0.2.3

package/source/packages/chrome/src/proxy/scramjet-config.ts

@@ -0,0 +1,26 @@
+import {
+	defaultConfig,
+	type ScramjetConfig,
+} from "@mercuryworkshop/scramjet/bundled-wasm";
+
+/**
+ * Configuration shared by the service-worker rewriter and every injected
+ * page/worker runtime. Keep this on the production defaults: the development
+ * preset deliberately turns parser recovery off and enables debug work that
+ * is both noisy and expensive on large production bundles.
+ */
+export function makeScramjetConfig(): ScramjetConfig {
+	return {
+		...defaultConfig,
+		flags: {
+			...defaultConfig.flags,
+			allowInvalidJs: true,
+			captureErrors: false,
+			debugSourceURL: false,
+			debugTrampolines: false,
+			rewriterLogs: false,
+			sourcemaps: false,
+		},
+		maskedfiles: ["inject.js", "scramjet.wasm.js"],
+	};
+}

package/source/packages/chrome/src/proxy/scramjet.ts

@@ -1,8 +1,5 @@
 import {
-	defaultConfig,
-	defaultConfigDev,
 	ScramjetFetchHandler,
-	type ScramjetConfig,
 	type ScramjetFetchRequest,
 	type ScramjetInterface,
 	unrewriteUrl,
@@ -17,21 +14,11 @@ import { RpcHelper } from "@mercuryworkshop/rpc";
 import scramjetWASM from "../../../scramjet/packages/core/dist/scramjet.wasm?url";
 import injectScript from "../../../inject/dist/inject.js?url";
 import { isIsolated } from ".";
+import { makeScramjetConfig } from "./scramjet-config";
 
 export const virtualWasmPath = "scramjet.wasm.js";
 export const virtualInjectPath = "inject.js";
 
-function makeConfig(): ScramjetConfig {
-	return {
-		...defaultConfig,
-		flags: {
-			...defaultConfigDev.flags,
-			captureErrors: false,
-		},
-		maskedfiles: ["inject.js", "scramjet.wasm.js"],
-	};
-}
-
 function base64Encode(str: string): string {
 	return btoa(
 		new Uint8Array(new TextEncoder().encode(str))
@@ -327,7 +314,7 @@ export function renderErrorPage(controller: Controller, error: Error): string {
 			$injectLoadError({
 				id: "${contextId}",
 				sequence: ${JSON.stringify(findSequence(top!, self)!)},
-				config: ${JSON.stringify(makeConfig())},
+				config: ${JSON.stringify(makeScramjetConfig())},
 				cookies: ${JSON.stringify(profileService.cookieJar.dump())},
 				codecEncode: ${codecEncode.toString()},
 				codecDecode: ${codecDecode.toString()},
@@ -361,7 +348,7 @@ export function createFetchHandler(controller: Controller) {
 			$injectLoad({
 				id: "${contextId}",
 				sequence: ${JSON.stringify(findSequence(top!, self)!)},
-				config: ${JSON.stringify(makeConfig())},
+				config: ${JSON.stringify(makeScramjetConfig())},
 				cookies: ${JSON.stringify(profileService.cookieJar.dump())},
 				codecEncode: ${codecEncode.toString()},
 				codecDecode: ${codecDecode.toString()},
@@ -391,7 +378,7 @@ export function createFetchHandler(controller: Controller) {
 		// workers don't have a document, so initHeaders/history are empty.
 		const injectLoad = `
 				$injectLoad({
-					config: ${JSON.stringify(makeConfig())},
+					config: ${JSON.stringify(makeScramjetConfig())},
 					cookies: null,
 					codecEncode: ${codecEncode.toString()},
 					codecDecode: ${codecDecode.toString()},
@@ -419,7 +406,7 @@ export function createFetchHandler(controller: Controller) {
 				codecDecode,
 			},
 			cookieJar: profileService.cookieJar,
-			config: makeConfig(),
+			config: makeScramjetConfig(),
 			prefix: controller.prefix,
 		},
 		async fetchDataUrl(dataUrl: string) {

package/source/packages/roxxie-transport/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "roxxie-transports",
-	"version": "6.0.1",
+	"version": "6.0.2",
 	"description": "Tracker-discovered WebRTC transport for Roxxie Proxy U",
 	"type": "module",
 	"sideEffects": false,

package/source/packages/roxxie-transport/src/connection.ts

@@ -534,7 +534,10 @@ export class RoxxieConnection {
 			else if (this.sockets.has(frame.sequence)) {
 				this.handleSocketFrame(frame.sequence, frame.operation, frame.payload);
 			} else if (this.ignoredHTTP.has(frame.sequence)) {
-				if (frame.operation === S2CRequestTypes.HTTPResponseEnd) {
+				if (
+					frame.operation === S2CRequestTypes.HTTPResponseEnd ||
+					frame.operation === S2CRequestTypes.HTTPResponseError
+				) {
 					this.ignoredHTTP.delete(frame.sequence);
 				} else if (
 					frame.operation !== S2CRequestTypes.HTTPResponseStart &&
@@ -618,6 +621,20 @@ export class RoxxieConnection {
 				pending.removeAbort?.();
 				this.http.delete(sequence);
 				break;
+			case S2CRequestTypes.HTTPResponseError:
+				if (!pending.responseStarted || pending.controller === undefined) {
+					throw new Error("Node failed HTTP response before response headers");
+				}
+				// The node could not deliver the whole body. Erroring the stream
+				// keeps the partial bytes from being parsed or cached as if they
+				// were a complete response. Only this request is affected, so the
+				// session stays up.
+				pending.controller.error(
+					new Error("Proxy node could not deliver the complete response body")
+				);
+				pending.removeAbort?.();
+				this.http.delete(sequence);
+				break;
 			default:
 				throw new Error(`Node sent invalid HTTP operation ${operation}`);
 		}

package/source/packages/scramjet/packages/core/src/fetch/fetch.ts

@@ -151,6 +151,13 @@ export async function doHandleFetch(
 	if (response.body && !isRedirect(response)) {
 		responseBody = await rewriteBody(handler, request, parsed, response);
 
+		// The service worker constructs a new Response around this body. HTML,
+		// JavaScript, CSS, and worker rewrites change its byte length, while even
+		// pass-through streams are no longer the native network response that
+		// supplied Content-Length. Firefox treats a mismatched retained length as
+		// corrupted content and can truncate modules/documents at that boundary.
+		responseHeaders.delete("content-length");
+
 		// After rewriting HTML, the body is a JS string which will be encoded as
 		// UTF-8 by the Response constructor. Normalize the Content-Type charset so
 		// the browser doesn't try to decode UTF-8 bytes with the original encoding.

package/source/packages/scramjet/packages/core/src/shared/rewriters/js.ts

@@ -146,8 +146,7 @@ export function rewriteJs(
 		dbg.warn(
 			"failed rewriting js for",
 			url || "(unknown)",
-			err.message,
-			typeof js !== "string" ? TextDecoder_decode(js) : js
+			err.message
 		);
 		if (flagEnabled("allowInvalidJs", context, meta.base)) {
 			return js;

package/source/packages/tracker-protocol/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "roxxie-transports-tracker-protocol",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "Browser-safe control-plane contracts for the Roxxie tracker, nodes, and browsers",
 	"type": "module",
 	"sideEffects": false,
@@ -18,7 +18,7 @@
 		"test": "npm run build && node --test dist/test/*.test.js"
 	},
 	"engines": {
-		"node": ">=20"
+		"node": ">=18"
 	},
 	"publishConfig": {
 		"access": "public"

package/source/pnpm-lock.yaml

@@ -338,10 +338,10 @@ importers:
         specifier: 2.4.0
         version: 2.4.0
       roxxie-transports-adrift-protocol:
-        specifier: 6.0.0
+        specifier: 6.0.1
         version: link:../adrift-protocol
       roxxie-transports-tracker-protocol:
-        specifier: 1.2.0
+        specifier: 1.2.1
         version: link:../tracker-protocol
       ws:
         specifier: 8.21.1

package/standalone.html

@@ -18,8 +18,8 @@
 		<div id="roxxie-browser"></div>
 		<script
 			defer
-			src="https://cdn.jsdelivr.net/npm/roxxie-proxy-u-prod@0.2.2/embed.js"
-			integrity="sha384-3QVF5CQiWk0SKqCDSEAoupN0KXK0bxo9qaZeS5Tj8/8mO8J719dv+fvmrqmdthH2"
+			src="https://cdn.jsdelivr.net/npm/roxxie-proxy-u-prod@0.2.3/embed.js"
+			integrity="sha384-yu0TlvCJ9LcKoOG66anQWT/iHEz3uC7rUGLmaDZV9otcFcWsQ6EvX8y2GPuxFsOH"
 			crossorigin="anonymous"
 			data-roxxie-target="#roxxie-browser"
 		></script>