webext-messenger 0.7.0 → 0.7.1

package/distribution/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="firefox-webext-browser" />
+import { Asyncify } from "type-fest";
 declare global {
     interface MessengerMethods {
         _: Method;
@@ -17,11 +18,11 @@ declare type WithTarget<TMethod> = TMethod extends (...args: infer PreviousArgum
  * Replicates the original method, including its types.
  * To be called in the sender’s end.
  */
-export declare function getContentScriptMethod<TType extends keyof MessengerMethods, TMethod extends MessengerMethods[TType], PublicMethod extends WithTarget<ActuallyOmitThisParameter<TMethod>>>(type: TType): PublicMethod;
+export declare function getContentScriptMethod<TType extends keyof MessengerMethods, TMethod extends MessengerMethods[TType], PublicMethod extends WithTarget<Asyncify<ActuallyOmitThisParameter<TMethod>>>>(type: TType): PublicMethod;
 /**
  * Replicates the original method, including its types.
  * To be called in the sender’s end.
  */
-export declare function getMethod<TType extends keyof MessengerMethods, TMethod extends MessengerMethods[TType], PublicMethod extends ActuallyOmitThisParameter<TMethod>>(type: TType): PublicMethod;
+export declare function getMethod<TType extends keyof MessengerMethods, TMethod extends MessengerMethods[TType], PublicMethod extends Asyncify<ActuallyOmitThisParameter<TMethod>>>(type: TType): PublicMethod;
 export declare function registerMethods(methods: Partial<MessengerMethods>): void;
 export {};

package/distribution/index.js

@@ -19,7 +19,8 @@ async function handleMessage(message, sender) {
         throw new Error("No handler registered for " + message.type);
     }
     console.debug(`Messenger:`, message.type, message.args, "from", { sender });
-    const response = await handler.call(sender, ...message.args).then((value) => ({ value }), (error) => ({
+    // The handler could actually be a synchronous function
+    const response = await Promise.resolve(handler.call(sender, ...message.args)).then((value) => ({ value }), (error) => ({
         // Errors must be serialized because the stacktraces are currently lost on Chrome and
         // https://github.com/mozilla/webextension-polyfill/issues/210
         error: serializeError(error),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webext-messenger",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Browser Extension component messaging framework",
   "keywords": [],
   "repository": "pixiebrix/extension-messaging",
@@ -69,6 +69,7 @@
   },
   "dependencies": {
     "serialize-error": "^8.1.0",
+    "type-fest": "^2.3.4",
     "webext-detect-page": "^3.0.2",
     "webextension-polyfill": "^0.8.0"
   },