crx-rpc 1.0.3 → 1.0.5

package/dist/background.js

@@ -7,7 +7,11 @@ export class BackgroundRPC extends Disposable {
         const handler = ((msg, sender) => {
             if (msg.type !== RPC_EVENT_NAME)
                 return;
-            const senderId = sender.tab.id;
+            const senderId = sender.tab?.id;
+            if (!senderId) {
+                console.warn('Received RPC request from unknown sender, ignoring.', msg);
+                return;
+            }
             const sendResponse = (response) => {
                 chrome.tabs.sendMessage(senderId, {
                     ...response,
@@ -115,9 +119,11 @@ export class RemoteSubjectManager extends Disposable {
     constructor() {
         super();
         const handleMessage = (msg, sender) => {
-            const senderId = sender.tab.id;
-            if (!senderId)
+            const senderId = sender.tab?.id;
+            if (!senderId) {
+                console.warn('Received RPC request from unknown sender, ignoring.', msg);
                 return;
+            }
             if (msg.type === SUBSCRIBABLE_OBSERVABLE) {
                 const { key } = msg;
                 this.handleSubscription(key, senderId);

package/dist/id.js

@@ -1,11 +1,9 @@
-// shared/utils/identifier.ts
-import { randomId } from "./tool";
 /**
  * 创建一个 Identifier。
  * @param key 唯一字符串标识
  */
 export function createIdentifier(key) {
     return {
-        key: key + '__' + randomId(),
+        key,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "crx-rpc",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "A lightweight RPC framework for Chrome Extension (background <-> content <-> web)",
     "repository": {
         "type": "git",

package/src/background.ts

@@ -10,7 +10,11 @@ export class BackgroundRPC extends Disposable {
         super();
         const handler = ((msg: RpcRequest & { type?: string }, sender: chrome.runtime.MessageSender) => {
             if (msg.type !== RPC_EVENT_NAME) return;
-            const senderId = sender.tab!.id!;
+            const senderId = sender.tab?.id;
+            if (!senderId) {
+                console.warn('Received RPC request from unknown sender, ignoring.', msg);
+                return;
+            }
             const sendResponse = (response: RpcResponse) => {
                 chrome.tabs.sendMessage(senderId, {
                     ...response,
@@ -130,8 +134,11 @@ export class RemoteSubjectManager extends Disposable {
         super();
 
         const handleMessage = (msg: RpcObservableSubscribeMessage, sender: chrome.runtime.MessageSender) => {
-            const senderId = sender.tab!.id!;
-            if (!senderId) return;
+            const senderId = sender.tab?.id;
+            if (!senderId) {
+                console.warn('Received RPC request from unknown sender, ignoring.', msg);
+                return;
+            }
 
             if (msg.type === SUBSCRIBABLE_OBSERVABLE) {
                 const { key } = msg;

package/src/id.ts

@@ -1,7 +1,3 @@
-// shared/utils/identifier.ts
-
-import { randomId } from "./tool";
-
 /**
  * Identifier 类型，既携带类型信息，又在运行时能唯一标识。
  */
@@ -16,6 +12,6 @@ export interface Identifier<T> {
  */
 export function createIdentifier<T>(key: string): Identifier<T> {
     return {
-        key: key + '__' + randomId(),
+        key,
     } as Identifier<T>;
 }