promise-worker-bi 6.0.0 → 6.0.2

package/README.md

@@ -85,7 +85,7 @@ The registered handler can return either a Promise or a normal value:
 
 ```js
 promiseWorker.register(async () => {
-	"much async, very promise";
+	return "much async, very promise";
 });
 ```
 
@@ -126,6 +126,8 @@ promiseWorker.addEventListener("error", (errorError) => {
 
 That will work if `worker` is a Web Worker or a Shared Worker, but there is one important difference. For a Shared Worker, it will only fire in the first host, to prevent duplicate errors from reaching an error log (assuming you're logging these errors somewhere).
 
+This also includes unhandled promise rejections inside the worker, which browsers otherwise only report in the worker's own console.
+
 #### Source maps
 
 If you use a source map for your worker script, this will not be reflected in the stack traces from promise-worker-bi (either in `promiseWorker.registerError` in response to `promiseWorker.postMessage`). However, you can still use your source map to translate the file/line/column numbers. Clever third-party error reporting services like [Bugsnag](https://www.bugsnag.com/) do this automatically!
@@ -287,7 +289,7 @@ Create a new instance of `PWBHost`, using the given worker.
 
 #### `promiseWorker.addEventListener("error", (event: ErrorEvent) => void)`
 
-When an error in your web/shared worker process occurs that is _not_ directly in response to a `promiseWorker.postMessage` call, you can see it by listening to the "error" event here.
+When an error in your web/shared worker process occurs that is _not_ directly in response to a `promiseWorker.postMessage` call, you can see it by listening to the "error" event here. This includes both uncaught errors and unhandled promise rejections.
 
 `promiseWorker` is EventTarget so you can use `addEventListener`, `removeEventListener`, and all their normal options.
 
@@ -309,7 +311,9 @@ Create a new instance of `PWBWorker`.
 
 Register a message handler wherever you will be receiving messages: in the worker, in the browser, or both. Your handler consumes a message and returns a promise or value.
 
-The `hostID` parameter is only defined inside a shared worker, in which case it is a unique number identifying the host that the message came from.
+If a message arrives and no handler has been registered, the sender's `postMessage` promise rejects with a "No handler registered" error.
+
+The `hostID` parameter is only meaningful inside a shared worker, in which case it is a unique number identifying the host that the message came from.
 
 The return value of the callback function (shown above as `unknown`) must resolve to something [structured cloneable](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm).
 

package/dist/index.d.ts

@@ -18,7 +18,7 @@ type QueryCallback = (a: unknown, b: number | undefined) => unknown;
 type EventMap = Record<string, Event>;
 declare abstract class PWBBase<Events extends EventMap> extends EventTarget {
   protected _callbacks: Map<number, (a: Error | null, b: unknown) => void>;
-  protected _queryCallback: QueryCallback;
+  protected _queryCallback: QueryCallback | undefined;
   constructor();
   addEventListener<K extends keyof Events>(type: K, listener: ((event: Events[K]) => void) | {
     handleEvent(object: Events[K]): void;
@@ -45,19 +45,20 @@ export declare class PWBHost extends PWBBase<HostEvents> {
   private _worker;
   constructor(worker: SharedWorker | Worker);
   protected _postMessage(obj: QueryMessage | ResponseMessage | HostLockMessage, _hostID?: unknown, transfer?: Transferable[] | undefined): void;
-  postMessage(userMessage: unknown, _hostID?: undefined, transfer?: Transferable[] | undefined): Promise<any>;
+  postMessage(userMessage: unknown, _hostID?: undefined, transfer?: Transferable[] | undefined): Promise<unknown>;
   private handleWorkerLock;
   private _onMessage;
 }
 //#endregion
 //#region src/PWBWorker.d.ts
-type WorkerEvents = Record<string, Event>;
+type WorkerEvents = Record<never, never>;
 export declare class PWBWorker extends PWBBase<WorkerEvents> {
   private _hosts;
   private _maxHostID;
   private _sharedWorker;
   private _workerLockAcquired;
   constructor();
+  private _postWorkerError;
   protected _postMessage(message: QueryMessage | ResponseMessage | HostIdMessage | WorkerLockMessage | WorkerErrorMessage, targetHostID?: number | undefined, transfer?: Transferable[] | undefined): void;
   postMessage(userMessage: unknown, targetHostID?: number | undefined, transfer?: Transferable[] | undefined): Promise<unknown>;
   private _onMessage;

package/dist/index.js

@@ -51,7 +51,6 @@ var PWBBase = class extends EventTarget {
 	constructor() {
 		super();
 		this._callbacks = /* @__PURE__ */ new Map();
-		this._queryCallback = () => {};
 		this._onMessage = this._onMessage.bind(this);
 	}
 	addEventListener(type, listener, options) {
@@ -91,6 +90,10 @@ var PWBBase = class extends EventTarget {
 		const messageID = message[1];
 		const query = message[2];
 		const hostID = message[3];
+		if (this._queryCallback === void 0) {
+			this._postResponse(messageID, /* @__PURE__ */ new Error("No handler registered to receive this message"), void 0, hostID);
+			return;
+		}
 		try {
 			const result = this._queryCallback(query, hostID);
 			if (!isPromise(result)) this._postResponse(messageID, null, result, hostID);
@@ -100,7 +103,7 @@ var PWBBase = class extends EventTarget {
 				this._postResponse(messageID, finalError, void 0, hostID);
 			});
 		} catch (err) {
-			this._postResponse(messageID, err);
+			this._postResponse(messageID, err, void 0, hostID);
 		}
 	}
 	_onMessageCommon(e) {
@@ -170,7 +173,7 @@ var PWBHost = class extends PWBBase {
 		});
 	}
 	handleWorkerLock(workerLockId) {
-		navigator.locks.request(workerLockId, { mode: "shared" }, async () => {
+		navigator.locks?.request(workerLockId, { mode: "shared" }, async () => {
 			this.dispatchEvent(new Event("close"));
 		});
 	}
@@ -189,7 +192,7 @@ var PWBHost = class extends PWBBase {
 			}
 			if (message[2] !== void 0) this.handleWorkerLock(message[2]);
 			const hostLockId = `pwb-host-${Math.random()}`;
-			navigator.locks.request(hostLockId, async () => {
+			navigator.locks?.request(hostLockId, async () => {
 				this._postMessage([
 					3,
 					hostID,
@@ -206,6 +209,17 @@ var PWBHost = class extends PWBBase {
 //#endregion
 //#region src/PWBWorker.ts
 let nextMessageID = 0;
+const toError = (value) => {
+	if (Error.isError ? Error.isError(value) : value instanceof Error) return value;
+	let message;
+	if (typeof value === "string") message = value;
+	else try {
+		message = JSON.stringify(value) ?? String(value);
+	} catch {
+		message = String(value);
+	}
+	return new Error(message);
+};
 var PWBWorker = class extends PWBBase {
 	_hosts = /* @__PURE__ */ new Map();
 	_maxHostID = -1;
@@ -214,15 +228,14 @@ var PWBWorker = class extends PWBBase {
 	constructor() {
 		super();
 		const workerLockId = `pwb-worker-${Math.random()}`;
-		navigator.locks.request(workerLockId, async () => {
+		navigator.locks?.request(workerLockId, async () => {
 			this._workerLockAcquired = true;
 			this._postMessage([4, workerLockId]);
 			return new Promise(() => {});
 		});
 		if (typeof SharedWorkerGlobalScope !== "undefined" && self instanceof SharedWorkerGlobalScope) {
 			this._sharedWorker = true;
-			const _self = self;
-			_self.addEventListener("connect", (e) => {
+			self.addEventListener("connect", (e) => {
 				const port = e.ports[0];
 				port.addEventListener("message", (e2) => this._onMessage(e2));
 				port.start();
@@ -238,23 +251,24 @@ var PWBWorker = class extends PWBBase {
 				else message = [2, hostID];
 				this._postMessage(message, hostID);
 			});
-			_self.addEventListener("error", (e) => {
-				logError(e.error);
-				e.preventDefault();
-				const hostID = this._hosts.keys().next().value;
-				if (hostID !== void 0) this._postMessage([5, e.error], hostID);
-			});
 		} else {
 			this._sharedWorker = false;
-			const _self = self;
-			_self.addEventListener("message", this._onMessage);
+			self.addEventListener("message", this._onMessage);
 			this._postMessage([2, 0], 0);
-			_self.addEventListener("error", (e) => {
-				logError(e.error);
-				e.preventDefault();
-				this._postMessage([5, e.error]);
-			});
 		}
+		self.addEventListener("error", (e) => {
+			logError(e.error);
+			e.preventDefault();
+			this._postWorkerError(e.error ?? e.message);
+		});
+		self.addEventListener("unhandledrejection", (e) => {
+			this._postWorkerError(e.reason);
+		});
+	}
+	_postWorkerError(value) {
+		const hostID = this._sharedWorker ? this._hosts.keys().next().value : void 0;
+		if (this._sharedWorker && hostID === void 0) return;
+		this._postMessage([5, toError(value)], hostID);
 	}
 	_postMessage(message, targetHostID, transfer) {
 		if (this._sharedWorker) {
@@ -290,7 +304,7 @@ var PWBWorker = class extends PWBBase {
 	_onMessage(e) {
 		const message = this._onMessageCommon(e);
 		if (!message) return;
-		if (message[0] === 3) navigator.locks.request(message[2], () => {
+		if (message[0] === 3) navigator.locks?.request(message[2], () => {
 			if (this._hosts.size > 1) this._hosts.delete(message[1]);
 		});
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "promise-worker-bi",
-	"version": "6.0.0",
+	"version": "6.0.2",
 	"description": "Promise-based messaging for Web Workers and Shared Workers",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",