@livequery/rpc 2.0.102 → 2.0.105

package/README.md

@@ -78,7 +78,12 @@ const linker = new ServiceLinker(channel)
 const counter = linker.linkService<WorkerService<CounterService>>("counter")
 ```
 
-`ExtensionChannel` is a transport for extension contexts such as a background service worker, popup, options page, or content script. Its current implementation listens on `chrome.runtime.onMessage` and sends messages with `chrome.runtime.sendMessage`.
+`ExtensionChannel` auto-detects its context at construction time:
+
+- **Background service worker** (`typeof window === 'undefined'`): listens on `chrome.runtime.onMessage` and routes responses back to the originating tab via `chrome.tabs.sendMessage`, or falls back to `chrome.runtime.sendMessage` when the message did not originate from a tab.
+- **Foreground context** (popup, options page, content script): listens on `chrome.runtime.onMessage` for responses arriving from the background and sends requests with `chrome.runtime.sendMessage`.
+
+If `chrome` is not available (e.g. during SSR), all operations silently no-op.
 
 ## When To Use This Package
 
@@ -306,6 +311,29 @@ const worker = new SharedWorker(new URL("./worker.ts", import.meta.url), { type:
 const channel = new SharedWorkerChannel(worker)
 ```
 
+### `ExtensionChannel`
+
+Concrete `RpcChannel` implementation for Chrome extension Manifest V3 messaging.
+
+Auto-detects its context at construction time — no argument is required.
+
+```ts
+const channel = new ExtensionChannel()
+```
+
+**Background service worker** (`typeof window === 'undefined'`):
+
+- listens on `chrome.runtime.onMessage`
+- responds to tab-originated messages via `chrome.tabs.sendMessage(tabId, …)`
+- responds to non-tab messages via `chrome.runtime.sendMessage(…)`
+
+**Foreground context** (popup, options page, content script):
+
+- listens on `chrome.runtime.onMessage` for responses from the background
+- sends requests with `chrome.runtime.sendMessage`
+
+If `chrome` is unavailable (e.g. during SSR), all operations silently no-op.
+
 ### `WorkerManager`
 
 Registers named services and routes incoming RPC requests.

package/dist/ExtensionChannel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionChannel.d.ts","sourceRoot":"","sources":["../src/ExtensionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AA4B7D,qBAAa,gBAAiB,SAAQ,UAAU;;;IAqB5C,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ExtensionChannel.d.ts","sourceRoot":"","sources":["../src/ExtensionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAyB7D,qBAAa,gBAAiB,SAAQ,UAAU;;;IAmD5C,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI;CAIlC"}

package/dist/ExtensionChannel.js

@@ -1,32 +1,62 @@
 import { RpcChannel } from "./RpcChannel.js";
-const runtime = (() => {
-    const runtime = globalThis.chrome?.runtime;
-    if (!runtime) {
-        throw new Error("chrome.runtime is not available");
-    }
-    return runtime;
-})();
+const chrome = globalThis.chrome;
 function isRpcMessage(value) {
     return !!value && typeof value === "object" && "id" in value;
 }
 export class ExtensionChannel extends RpcChannel {
     constructor() {
         super();
-        runtime.onMessage.addListener(this.#onMessage);
+        if (typeof window == 'undefined') {
+            this.#initBackground();
+        }
+        else {
+            this.#initForegound();
+        }
+    }
+    #initForegound() {
+        if (!chrome)
+            return;
+        const runtime = chrome.runtime;
+        runtime?.onMessage.addListener((message, sender, sendResponse) => {
+            if (!isRpcMessage(message))
+                return;
+            const respond = (response) => {
+                runtime?.sendMessage({
+                    id: message.id,
+                    response
+                });
+            };
+            this.next({ ...message, respond });
+        });
     }
-    #onMessage = (message) => {
-        if (!isRpcMessage(message))
+    #initBackground() {
+        if (!chrome)
             return;
-        const respond = (response) => {
-            runtime.sendMessage({
-                id: message.id,
-                response
-            });
-        };
-        this.next({ ...message, respond });
-    };
+        chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+            if (!isRpcMessage(message))
+                return;
+            const tabId = sender.tab?.id;
+            const respond = (response) => {
+                if (tabId) {
+                    chrome.tabs.sendMessage(tabId, {
+                        id: message.id,
+                        response
+                    });
+                }
+                else {
+                    chrome.runtime.sendMessage({
+                        id: message.id,
+                        response
+                    });
+                }
+            };
+            this.next({ ...message, respond });
+        });
+    }
     send(message) {
-        runtime.sendMessage(message);
+        if (!chrome)
+            return;
+        chrome.runtime.sendMessage(message);
     }
 }
 //# sourceMappingURL=ExtensionChannel.js.map

package/dist/ExtensionChannel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionChannel.js","sourceRoot":"","sources":["../src/ExtensionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAmB,MAAM,iBAAiB,CAAA;AAY7D,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;IAClB,MAAM,OAAO,GAAI,UAEf,CAAC,MAAM,EAAE,OAAO,CAAA;IAElB,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IACtD,CAAC;IAED,OAAO,OAAO,CAAA;AAClB,CAAC,CAAC,EAAE,CAAA;AAEJ,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAA;AAChE,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAE5C;QACI,KAAK,EAAE,CAAA;QAEP,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAClD,CAAC;IAED,UAAU,GAAG,CAAC,OAAgB,EAAE,EAAE;QAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YAAE,OAAM;QAElC,MAAM,OAAO,GAAG,CAAC,QAAgC,EAAE,EAAE;YACjD,OAAO,CAAC,WAAW,CAAC;gBAChB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,QAAQ;aACU,CAAC,CAAA;QAC3B,CAAC,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;IACtC,CAAC,CAAA;IAED,IAAI,CAAC,OAAmB;QACpB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;CACJ"}
+{"version":3,"file":"ExtensionChannel.js","sourceRoot":"","sources":["../src/ExtensionChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAmB,MAAM,iBAAiB,CAAA;AAY7D,MAAM,MAAM,GAAI,UAOd,CAAC,MAAM,CAAA;AAET,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAA;AAChE,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAI5C;QACI,KAAK,EAAE,CAAA;QACP,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,CAAC,eAAe,EAAE,CAAA;QAC1B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,EAAE,CAAA;QACzB,CAAC;IACL,CAAC;IAED,cAAc;QACV,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC9B,OAAO,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;YAC7D,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;gBAAE,OAAM;YAClC,MAAM,OAAO,GAAG,CAAC,QAAgC,EAAE,EAAE;gBACjD,OAAO,EAAE,WAAW,CAAC;oBACjB,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,QAAQ;iBACU,CAAC,CAAA;YAC3B,CAAC,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;QACtC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe;QACX,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;YACnE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;gBAAE,OAAM;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,CAAA;YAC5B,MAAM,OAAO,GAAG,CAAC,QAAgC,EAAE,EAAE;gBACjD,IAAI,KAAK,EAAE,CAAC;oBACR,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;wBAC3B,EAAE,EAAE,OAAO,CAAC,EAAE;wBACd,QAAQ;qBACU,CAAC,CAAA;gBAC3B,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;wBACvB,EAAE,EAAE,OAAO,CAAC,EAAE;wBACd,QAAQ;qBACU,CAAC,CAAA;gBAC3B,CAAC;YACL,CAAC,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;QACtC,CAAC,CAAC,CAAC;IACP,CAAC;IAGD,IAAI,CAAC,OAAmB;QACpB,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACvC,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livequery/rpc",
-  "version": "2.0.102",
+  "version": "2.0.105",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",