@statewalker/webrun-http-browser 0.6.4 → 0.6.5

package/README.md

@@ -191,9 +191,11 @@ declare const self: ServiceWorkerGlobalScope & { RELAY_OPTIONS?: RelayServiceWor
 </script>
 ```
 
-Pass `swUrl` explicitly. Its default is `index-sw.js` next to the module, a
-file the build does not produce. `timeout` bounds the wait for the worker to
-activate. If the worker cannot start, every call the parent makes on the port
+Without `swUrl` the handler registers the bundle's own `dist/relay-sw.js`,
+and without `scopeUrl` the scope is that worker's directory, `dist/`: the
+widest scope a script there may claim without a `Service-Worker-Allowed`
+header. A relay page that serves services anywhere else passes both, as above.
+`timeout` bounds the wait for the worker to activate. If the worker cannot start, every call the parent makes on the port
 is answered with that error, so the parent's `initHttpService` /
 `callHttpService` reject instead of hanging.
 
@@ -229,7 +231,7 @@ importScripts("/path/to/@statewalker/webrun-http-browser/dist/sw-worker.js");
 | Option | Default | Meaning |
 | --- | --- | --- |
 | `key` | required | First URL segment under the scope that the worker routes to this page. |
-| `serviceWorkerUrl` | none; pass it | Resolved against `location.href`. An unresolvable value throws `Invalid serviceWorkerUrl: "<value>" (relative to <href>)`. |
+| `serviceWorkerUrl` | `sw-worker.js` at the scope | Resolved against `location.href`. An unresolvable value throws `Invalid serviceWorkerUrl: "<value>" (relative to <href>)`. |
 | `scope` | directory of `serviceWorkerUrl` | Registration scope. |
 | `timeout` | `30_000` | Upper bound, in ms, for activation, control and the adapter's handshake. Past it `start()` rejects with a `ServiceWorkerControlError`. |
 | `reloadIfUncontrolled` | `false` | Reload the page once instead of rejecting when it stays uncontrolled. |
@@ -392,8 +394,9 @@ The worker keeps the claimed keys and client ids in IndexedDB (`claimedKeys`,
 relay keeps its registry under `clientsIds` as `{ clientId, path }` entries and
 still reads the older bare-client-id shape.
 
-`SwPortHandler.stop()` unregisters every ServiceWorker registration of the
-origin, not only its own.
+`SwPortHandler.stop()` unregisters only the registration its own `start()`
+made; other workers on the origin stay registered. After a `start()` that
+rejected, `stop()` unregisters nothing, since that attempt kept the worker.
 
 ### A page can load uncontrolled although its worker is active
 
@@ -439,11 +442,12 @@ message size limit. `sendHttpRequest` and `handleHttpRequests` are marked
 this package still use the deprecated pair internally. A caller that stops
 reading early does tell the peer to stop producing.
 
-### Defaults that point at a file the build does not produce
+### The adapter's default worker url follows the scope
 
-`getRelayWindowMessageHandler`'s default `swUrl` and `SwPortHandler`'s default
-worker URL both resolve to `index-sw.js` next to the module. No such file is
-built. Pass `swUrl` / `serviceWorkerUrl` explicitly. Constructing a
+Without `serviceWorkerUrl`, `SwPortHandler` (and so `SwHttpAdapter`) uses
+`sw-worker.js` at its scope, the scope resolved against the bundle's url. With
+`scope: "/dist/"` that is the shipped `dist/sw-worker.js`; with `scope: "/"` it
+is `/sw-worker.js`, a loader the host must serve there. Constructing a
 `SwHttpAdapter` with neither `serviceWorkerUrl` nor `scope` fails with
 `RangeError: Maximum call stack size exceeded`, because each default is
 computed from the other.

package/dist/index.js

@@ -2794,7 +2794,7 @@ async function callHttpService(request, { key, port }) {
 * call the parent makes on that port is answered with the error, so the
 * parent's `initHttpService` / `callHttpService` reject instead of waiting.
 */
-function getRelayWindowMessageHandler({ swUrl = `${new URL("./index-sw.js", moduleUrl)}`, scopeUrl = `${new URL("../", moduleUrl)}`, timeout } = {}) {
+function getRelayWindowMessageHandler({ swUrl = `${new URL("./relay-sw.js", moduleUrl)}`, scopeUrl = `${new URL("./", moduleUrl)}`, timeout } = {}) {
 	let externalPort;
 	return async (ev) => {
 		if (ev.data?.type !== "CONNECT") return;

package/dist/relay/index.d.ts.map

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

package/dist/sw/sw-dispatcher.d.ts

@@ -31,6 +31,7 @@ export declare class SwPortHandler {
     private _serviceWorkerUrl?;
     private _serviceWorker?;
     private _registrationPromise?;
+    private _registration?;
     private _cleanupRegistrations?;
     constructor(options: SwPortHandlerOptions);
     get key(): string;
@@ -40,7 +41,7 @@ export declare class SwPortHandler {
      * own url when one is given, not against this module's: a bundle that is
      * not an ES module (an IIFE, Theia's frontend) has no `import.meta.url`, and
      * `new URL(scope, undefined)` threw `Invalid URL` there. Only without a
-     * worker url does the module's location decide (its default `index-sw.js`
+     * worker url does the module's location decide (its default `sw-worker.js`
      * sits next to it).
      */
     get rootUrl(): URL;

package/dist/sw/sw-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sw-dispatcher.d.ts","sourceRoot":"","sources":["../../src/sw/sw-dispatcher.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,aAAa;IACxB,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,oBAAoB,CAAC,CAAgB;IAC7C,OAAO,CAAC,qBAAqB,CAAC,CAAa;IAE3C,YAAY,OAAO,EAAE,oBAAoB,EAIxC;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,GAAG,CAGjB;IAED,IAAI,gBAAgB,IAAI,MAAM,CAa7B;IAED,UAAgB,wBAAwB,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAG9E;IAED,UAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;IAED,UAAgB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAU3D;IAED,SAAS,CAAC,oBAAoB,IAAI,WAAW,CAE5C;IAED;;;;;;;;OAQG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAsD3B;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAU1B;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACpC;AAED;;;GAGG;AACH,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC3C,QAAQ,CAAC,aAAa,2BAAkC;IACxD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,cAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAa;IAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAgB;IAE3C,YAAY,EAAE,IAAI,EAAE,GAAc,EAAE,EAAE,uBAAuB,EAG5D;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAgBnE;IAED,yDAAyD;IACzD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjC;IAED,KAAK,IAAI,IAAI,CAgCZ;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAK1B;IAED,OAAO,CAAC,gBAAgB;YAOV,SAAS;YAgBT,kBAAkB;YAWlB,cAAc;YAOd,gBAAgB;CAY/B"}
+{"version":3,"file":"sw-dispatcher.d.ts","sourceRoot":"","sources":["../../src/sw/sw-dispatcher.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,aAAa;IACxB,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,oBAAoB,CAAC,CAAgB;IAC7C,OAAO,CAAC,aAAa,CAAC,CAA4B;IAClD,OAAO,CAAC,qBAAqB,CAAC,CAAa;IAE3C,YAAY,OAAO,EAAE,oBAAoB,EAIxC;IAED,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,GAAG,CAGjB;IAED,IAAI,gBAAgB,IAAI,MAAM,CAa7B;IAED,UAAgB,wBAAwB,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAG9E;IAED,UAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;IAED,UAAgB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAU3D;IAED,SAAS,CAAC,oBAAoB,IAAI,WAAW,CAE5C;IAED;;;;;;;;OAQG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAuD3B;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAS1B;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACpC;AAED;;;GAGG;AACH,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC3C,QAAQ,CAAC,aAAa,2BAAkC;IACxD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,cAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAa;IAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAgB;IAE3C,YAAY,EAAE,IAAI,EAAE,GAAc,EAAE,EAAE,uBAAuB,EAG5D;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;OAIG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAgBnE;IAED,yDAAyD;IACzD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjC;IAED,KAAK,IAAI,IAAI,CAgCZ;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAK1B;IAED,OAAO,CAAC,gBAAgB;YAOV,SAAS;YAgBT,kBAAkB;YAWlB,cAAc;YAOd,gBAAgB;CAY/B"}

package/dist/sw.js

@@ -1753,6 +1753,7 @@ var SwPortHandler = class {
 	_serviceWorkerUrl;
 	_serviceWorker;
 	_registrationPromise;
+	_registration;
 	_cleanupRegistrations;
 	constructor(options) {
 		this.options = options;
@@ -1770,7 +1771,7 @@ var SwPortHandler = class {
 	* own url when one is given, not against this module's: a bundle that is
 	* not an ES module (an IIFE, Theia's frontend) has no `import.meta.url`, and
 	* `new URL(scope, undefined)` threw `Invalid URL` there. Only without a
-	* worker url does the module's location decide (its default `index-sw.js`
+	* worker url does the module's location decide (its default `sw-worker.js`
 	* sits next to it).
 	*/
 	get rootUrl() {
@@ -1779,7 +1780,7 @@ var SwPortHandler = class {
 	}
 	get serviceWorkerUrl() {
 		if (!this._serviceWorkerUrl) {
-			const url = this.options.serviceWorkerUrl ? resolveWorkerUrl(this.options.serviceWorkerUrl) : new URL("./index-sw.js", this.rootUrl);
+			const url = this.options.serviceWorkerUrl ? resolveWorkerUrl(this.options.serviceWorkerUrl) : new URL("./sw-worker.js", this.rootUrl);
 			this._serviceWorkerUrl = `${url}`;
 		}
 		return this._serviceWorkerUrl;
@@ -1817,7 +1818,7 @@ var SwPortHandler = class {
 				this._cleanupRegistrations = void 0;
 			});
 			const registration = await navigator.serviceWorker.register(this.serviceWorkerUrl, { scope: this.scope });
-			register(() => registration.unregister());
+			this._registration = registration;
 			const stopListening = handleChannelCalls(navigator.serviceWorker, "UPDATE_COMMUNICATION_PORT", async (_event, _params, port) => {
 				await this._setCommunicationPort(port);
 				return this._getRegistrationInfo();
@@ -1834,6 +1835,7 @@ var SwPortHandler = class {
 			} catch (error) {
 				stopListening();
 				this._cleanupRegistrations = void 0;
+				this._registration = void 0;
 				this._registrationPromise = void 0;
 				throw error;
 			}
@@ -1842,11 +1844,12 @@ var SwPortHandler = class {
 	}
 	async stop() {
 		this._cleanupRegistrations?.();
-		const registrations = await navigator.serviceWorker.getRegistrations();
-		for (const registration of registrations) try {
-			await registration.unregister();
+		const registration = this._registration;
+		this._registration = void 0;
+		try {
+			await registration?.unregister();
 		} catch (error) {
-			console.log("Service Worker registration failed: ", error);
+			console.log("Service Worker unregistration failed: ", error);
 		}
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/webrun-http-browser",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "private": false,
   "type": "module",
   "description": "ServiceWorker-based HTTP server for browsers, with relay and same-origin dispatch modes",
@@ -53,9 +53,9 @@
   ],
   "dependencies": {
     "idb-keyval": "^6.3.0",
-    "@statewalker/webrun-rpc": "^0.4.3",
+    "@statewalker/webrun-http-streams": "^0.2.5",
     "@statewalker/webrun-streams": "^0.2.2",
-    "@statewalker/webrun-http-streams": "^0.2.5"
+    "@statewalker/webrun-rpc": "^0.4.3"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.15",

package/src/relay/index.ts

@@ -135,8 +135,8 @@ export interface RelayWindowHandlerOptions {
  * parent's `initHttpService` / `callHttpService` reject instead of waiting.
  */
 export function getRelayWindowMessageHandler({
-  swUrl = `${new URL("./index-sw.js", moduleUrl)}`,
-  scopeUrl = `${new URL("../", moduleUrl)}`,
+  swUrl = `${new URL("./relay-sw.js", moduleUrl)}`,
+  scopeUrl = `${new URL("./", moduleUrl)}`,
   timeout,
 }: RelayWindowHandlerOptions = {}): (ev: MessageEvent) => Promise<void> {
   let externalPort: MessagePort | undefined;

package/src/sw/sw-dispatcher.ts

@@ -44,6 +44,7 @@ export class SwPortHandler {
   private _serviceWorkerUrl?: string;
   private _serviceWorker?: ServiceWorker;
   private _registrationPromise?: Promise<void>;
+  private _registration?: ServiceWorkerRegistration;
   private _cleanupRegistrations?: () => void;
 
   constructor(options: SwPortHandlerOptions) {
@@ -65,7 +66,7 @@ export class SwPortHandler {
    * own url when one is given, not against this module's: a bundle that is
    * not an ES module (an IIFE, Theia's frontend) has no `import.meta.url`, and
    * `new URL(scope, undefined)` threw `Invalid URL` there. Only without a
-   * worker url does the module's location decide (its default `index-sw.js`
+   * worker url does the module's location decide (its default `sw-worker.js`
    * sits next to it).
    */
   get rootUrl(): URL {
@@ -82,7 +83,7 @@ export class SwPortHandler {
           // use — `"/sw-worker.js"` — threw a bare `Invalid URL` naming
           // neither the option nor the value.
           resolveWorkerUrl(this.options.serviceWorkerUrl)
-        : new URL("./index-sw.js", this.rootUrl);
+        : new URL("./sw-worker.js", this.rootUrl);
       this._serviceWorkerUrl = `${url}`;
     }
     return this._serviceWorkerUrl;
@@ -133,7 +134,7 @@ export class SwPortHandler {
         const registration = await navigator.serviceWorker.register(this.serviceWorkerUrl, {
           scope: this.scope,
         });
-        register(() => registration.unregister());
+        this._registration = registration;
 
         const stopListening = handleChannelCalls(
           navigator.serviceWorker,
@@ -170,6 +171,7 @@ export class SwPortHandler {
           // that is not controlled, and other pages may be using the worker.
           stopListening();
           this._cleanupRegistrations = undefined;
+          this._registration = undefined;
           this._registrationPromise = undefined;
           throw error;
         }
@@ -180,13 +182,12 @@ export class SwPortHandler {
 
   async stop(): Promise<void> {
     this._cleanupRegistrations?.();
-    const registrations = await navigator.serviceWorker.getRegistrations();
-    for (const registration of registrations) {
-      try {
-        await registration.unregister();
-      } catch (error) {
-        console.log("Service Worker registration failed: ", error);
-      }
+    const registration = this._registration;
+    this._registration = undefined;
+    try {
+      await registration?.unregister();
+    } catch (error) {
+      console.log("Service Worker unregistration failed: ", error);
     }
   }
 }