@ohos-ports/serwist-window 9.5.12-beta.1 → 9.5.12-beta.2

package/dist/ohos-node-shim.mjs

@@ -84,11 +84,13 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 	//#region ServiceWorker
 	/**
 	 * A ServiceWorker handle whose message channel is a real
-	 * `worker_threads` MessagePort pair. `postMessage()` by the page goes out
-	 * on the worker side (`_channel.port2`), and messages
-	 * posted from the worker side surface as `message` events on the
-	 * containing ServiceWorkerContainer with `source` set to this instance,
-	 * matching the browser contract.
+	 * `worker_threads` MessagePort pair. The page side of the channel is
+	 * `port2`, the emulated SW side is `port1`: `postMessage()` by the page
+	 * is posted on `port2`, so it emerges on the `port1` listener installed
+	 * by `register()` and surfaces as a container-level `message` event
+	 * (with any transferred reply ports intact). Messages posted by the
+	 * emulated SW on the transferred reply port emerge on the page's own
+	 * channel, matching the browser contract.
 	 */
 	class ShimServiceWorker extends ShimEventTarget {
 		_channel;
@@ -104,8 +106,13 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 		}
 
 		postMessage(data, transfer) {
-			// Sent from the page, delivered on the worker side.
-			this._channel.port1.postMessage(data, transfer ?? []);
+			// Sent from the page, delivered on the worker (SW) side. In Node.js
+			// `worker_threads` semantics, `port2.postMessage()` delivers to the
+			// entangled peer `port1` — the port the registration listens on.
+			// (Posting on `port1` would deliver to `port2`, which has no
+			// listener, silently dropping the message and any transferred
+			// reply ports.)
+			this._channel.port2.postMessage(data, transfer ?? []);
 		}
 
 		_setState(state) {
@@ -172,9 +179,13 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 
 			const channel = new MessageChannel();
 			const sw = new ShimServiceWorker(resolvedURL, channel);
-			// Messages posted from the worker side emerge on port1 and surface
-			// as container-level `message` events with `source` set to the
-			// worker, matching the browser contract.
+			// The page posts messages on `port2` (see ShimServiceWorker
+			// .postMessage), so they emerge here on `port1` and surface as
+			// container-level `message` events with `source` set to the
+			// worker. Any transferred reply ports arrive via `event.ports`,
+			// so SW-side code (tests, message handlers) can reply through
+			// `event.ports[0].postMessage()` and reach the page's own
+			// `messageSW()` channel — matching the browser contract.
 			channel.port1.onmessage = (event) => {
 				this._dispatch("message", {
 					data: event.data,
@@ -199,6 +210,10 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 				registration.installing = null;
 				sw._setState("installed");
 
+				// Use a small observable delay between lifecycle phases so
+				// `registration.waiting` (like a real browser's waiting worker)
+				// stays observable to page-side polling before activation
+				// proceeds.
 				setTimeout(() => {
 					registration.waiting = null;
 					registration.active = sw;
@@ -208,8 +223,8 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 						this.#controller = sw;
 						sw._setState("activated");
 						this._dispatch("controllerchange", { target: this });
-					}, 0);
-				}, 0);
+					}, 25);
+				}, 25);
 			}, 0);
 
 			return registration;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/serwist-window",
-  "version": "9.5.12-beta.1",
+  "version": "9.5.12-beta.2",
   "type": "module",
   "description": "Simplifies communications with Serwist packages running in the service worker",
   "files": [

package/src/utils/ohosNodeShim.ts

@@ -82,11 +82,13 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 	//#region ServiceWorker
 	/**
 	 * A ServiceWorker handle whose message channel is a real
-	 * `worker_threads` MessagePort pair. `postMessage()` by the page goes out
-	 * on the worker side (`_channel.port2`), and messages posted from the
-	 * worker side surface as `message` events on the containing
-	 * ServiceWorkerContainer with `source` set to this instance, matching the
-	 * browser contract.
+	 * `worker_threads` MessagePort pair. The page side of the channel is
+	 * `port2`, the emulated SW side is `port1`: `postMessage()` by the page
+	 * is posted on `port2`, so it emerges on the `port1` listener installed
+	 * by `register()` and surfaces as a container-level `message` event
+	 * (with any transferred reply ports intact). Messages posted by the
+	 * emulated SW on the transferred reply port emerge on the page's own
+	 * channel, matching the browser contract.
 	 */
 	class ShimServiceWorker extends ShimEventTarget {
 		scriptURL: string;
@@ -103,8 +105,13 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 		}
 
 		postMessage(data: any, transfer?: any[]): void {
-			// Sent from the page, delivered on the worker side.
-			this._channel.port1.postMessage(data, transfer ?? []);
+			// Sent from the page, delivered on the worker (SW) side. In Node.js
+			// `worker_threads` semantics, `port2.postMessage()` delivers to the
+			// entangled peer `port1` — the port the registration listens on.
+			// (Posting on `port1` would deliver to `port2`, which has no
+			// listener, silently dropping the message and any transferred
+			// reply ports.)
+			this._channel.port2.postMessage(data, transfer ?? []);
 		}
 
 		_setState(state: string): void {
@@ -201,6 +208,10 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 				registration.installing = null;
 				sw._setState("installed");
 
+				// Use a small observable delay between lifecycle phases so
+				// `registration.waiting` (like a real browser's waiting worker)
+				// stays observable to page-side polling before activation
+				// proceeds.
 				setTimeout(() => {
 					registration.waiting = null;
 					registration.active = sw;
@@ -210,8 +221,8 @@ if (isNodeRuntime && !hasRealServiceWorkerContainer) {
 						this.#controller = sw;
 						sw._setState("activated");
 						this._dispatch("controllerchange", { target: this });
-					}, 0);
-				}, 0);
+					}, 25);
+				}, 25);
 			}, 0);
 
 			return registration;