@webextkits/messages-center 0.1.8 → 0.2.0

package/dist/background.d.ts

@@ -1,14 +1,18 @@
 import type { MessageObj } from "./inject";
+type CallbackId = string;
 export declare class MessageInstance<MessageType extends MessageObj<MessageType>, BackgroundMessageType extends MessageObj<BackgroundMessageType>> {
     listeners: Partial<Record<keyof MessageType, any>>;
     tabs: number[];
     slug: string;
     isDebugger: boolean;
+    callbackMap: Map<CallbackId, (result: any, sender: chrome.runtime.MessageSender) => void>;
     constructor(slug: string, isDebugger?: boolean);
     on<T extends keyof MessageType>(action: T, fn: (...args: Parameters<MessageType[T]>) => ReturnType<MessageType[T]>): () => void;
     send<T extends keyof BackgroundMessageType>(action: T, ...payload: Parameters<BackgroundMessageType[T]>): Promise<void>;
+    sendWithCallback<T extends keyof BackgroundMessageType>(action: T, callback: (result: Awaited<ReturnType<BackgroundMessageType[T]>>, sender: chrome.runtime.MessageSender) => void, ...payload: Parameters<BackgroundMessageType[T]>): Promise<void>;
     sendByTabId<T extends keyof BackgroundMessageType>(tabId: number, action: T, ...payload: Parameters<BackgroundMessageType[T]>): Promise<void>;
     bindMessage(): void;
     bindEvent(): void;
     deleteTabById(tabId: any): void;
 }
+export {};

package/dist/background.js

@@ -1,62 +1,84 @@
-var r = Object.defineProperty;
-var l = (a, t, e) => t in a ? r(a, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[t] = e;
-var n = (a, t, e) => l(a, typeof t != "symbol" ? t + "" : t, e);
-class c {
-  constructor(t, e) {
-    n(this, "listeners", {});
-    n(this, "tabs", []);
-    n(this, "slug");
-    n(this, "isDebugger");
-    this.slug = t, this.isDebugger = !!e, this.bindMessage(), this.bindEvent();
-  }
-  on(t, e) {
-    if (this.listeners[t]) throw new Error(`event listener ${String(t)} already exist!`);
-    return this.listeners[t] = e, () => {
-      delete this.listeners[t];
+var g = Object.defineProperty;
+var u = (l, s, t) => s in l ? g(l, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[s] = t;
+var r = (l, s, t) => u(l, typeof s != "symbol" ? s + "" : s, t);
+class p {
+  constructor(s, t) {
+    r(this, "listeners", {});
+    r(this, "tabs", []);
+    r(this, "slug");
+    r(this, "isDebugger");
+    r(this, "callbackMap", /* @__PURE__ */ new Map());
+    this.slug = s, this.isDebugger = !!t, this.bindMessage(), this.bindEvent();
+  }
+  on(s, t) {
+    if (this.listeners[s]) throw new Error(`event listener ${String(s)} already exist!`);
+    return this.listeners[s] = t, () => {
+      delete this.listeners[s];
     };
   }
-  async send(t, ...e) {
-    this.isDebugger && console.log("发送消息", { action: t, payload: e, tabs: this.tabs });
-    for (let i of this.tabs) try {
-      const s = await chrome.tabs.get(i);
-      s && s.id ? chrome.tabs.sendMessage(s.id, { from: this.slug, payload: { action: t, payload: e } }) : this.deleteTabById(i);
-    } catch (s) {
-      console.log(s), this.deleteTabById(i);
+  async send(s, ...t) {
+    this.isDebugger && console.log("发送消息", { action: s, payload: t, tabs: this.tabs });
+    for (let e of this.tabs) try {
+      const a = await chrome.tabs.get(e);
+      a && a.id ? chrome.tabs.sendMessage(a.id, { from: this.slug, payload: { action: s, payload: t } }) : this.deleteTabById(e);
+    } catch (a) {
+      console.log(a), this.deleteTabById(e);
     }
   }
-  async sendByTabId(t, e, ...i) {
-    this.isDebugger && console.log("发送消息（指定 tabId）", { tabId: t, action: e, payload: i });
-    try {
-      const s = await chrome.tabs.get(t);
-      s && s.id ? chrome.tabs.sendMessage(s.id, { from: this.slug, payload: { action: e, payload: i } }) : this.deleteTabById(t);
-    } catch (s) {
-      console.log(s), this.deleteTabById(t);
+  async sendWithCallback(s, t, ...e) {
+    const a = c();
+    this.callbackMap.set(a, t), this.isDebugger && console.log("发送消息", { action: s, payload: e, tabs: this.tabs });
+    for (let o of this.tabs) try {
+      const n = await chrome.tabs.get(o);
+      n && n.id ? chrome.tabs.sendMessage(n.id, { from: this.slug, payload: { action: s, payload: e }, callbackId: a }) : this.deleteTabById(o);
+    } catch (n) {
+      console.log(n), this.deleteTabById(o);
     }
   }
+  async sendByTabId(s, t, ...e) {
+    this.isDebugger && console.log("发送消息（指定 tabId）", { tabId: s, action: t, payload: e });
+    const a = c();
+    return new Promise((o, n) => {
+      this.callbackMap.set(a, function(i) {
+        o(i);
+      }), chrome.tabs.get(s).then((i) => {
+        i && i.id ? chrome.tabs.sendMessage(i.id, { from: this.slug, payload: { action: t, payload: e }, callbackId: a }) : this.deleteTabById(s);
+      }).catch((i) => {
+        console.log(i), this.deleteTabById(s);
+      });
+    });
+  }
   bindMessage() {
-    chrome.runtime.onMessageExternal.addListener((t, e, i) => {
-      var s, d;
-      if ((s = e == null ? void 0 : e.tab) != null && s.id) {
-        if (this.isDebugger && console.log("收到消息", { request: t, sender: e }), t.action === "__connect") return this.tabs.includes(e.tab.id) || this.tabs.push(e.tab.id), i();
-        if (t.action === "__disconnect") return this.deleteTabById(e.tab.id), i();
-        if (this.listeners[t.action]) return (d = e == null ? void 0 : e.tab) != null && d.id ? (this.tabs.includes(e.tab.id) || this.tabs.push(e.tab.id), this.listeners[t.action].bind({ request: t, sender: e })(...t.payload).then((o) => {
-          this.isDebugger && console.log("send to callback from background", { request: t, sender: e, res: o }), i(o);
-        }), !0) : i();
+    chrome.runtime.onMessageExternal.addListener((s, t, e) => {
+      var a, o, n;
+      if ((a = t == null ? void 0 : t.tab) != null && a.id) {
+        if (this.isDebugger && console.log("收到消息", { request: s, sender: t }), s.action === "__connect") return this.tabs.includes(t.tab.id) || this.tabs.push(t.tab.id), e();
+        if (s.action === "__disconnect") return this.deleteTabById(t.tab.id), e();
+        if (s.action === "__callback") {
+          const { callbackId: i, result: d, errorMessage: b, status: h } = s.payload;
+          return h === "error" ? console.error(b) : this.callbackMap.has(i) && ((o = this.callbackMap.get(i)) == null || o(d, t)), e();
+        }
+        if (this.listeners[s.action]) return (n = t == null ? void 0 : t.tab) != null && n.id ? (this.tabs.includes(t.tab.id) || this.tabs.push(t.tab.id), this.listeners[s.action].bind({ request: s, sender: t })(...s.payload).then((i) => {
+          this.isDebugger && console.log("send to callback from background", { request: s, sender: t, res: i }), e(i);
+        }), !0) : e();
       }
     });
   }
   bindEvent() {
-    chrome.tabs.onRemoved.addListener((t) => {
-      this.deleteTabById(t);
+    chrome.tabs.onRemoved.addListener((s) => {
+      this.deleteTabById(s);
     });
   }
-  deleteTabById(t) {
-    if (this.tabs.includes(t)) {
-      const e = this.tabs.indexOf(t);
-      this.tabs.splice(e, 1);
+  deleteTabById(s) {
+    if (this.tabs.includes(s)) {
+      const t = this.tabs.indexOf(s);
+      this.tabs.splice(t, 1);
     }
   }
 }
+function c() {
+  return (/* @__PURE__ */ new Date()).getTime().toString() + Math.random().toString(36).substring(2, 15);
+}
 export {
-  c as MessageInstance
+  p as MessageInstance
 };

package/dist/contentScript.js

@@ -1,8 +1,8 @@
-function n(o, s) {
-  chrome.runtime.onMessage.addListener((e, a) => {
-    e.from === o && (s && console.log("received message from background script", e), window.postMessage({ from: e.from, payload: e.payload }));
+function a(o, r) {
+  chrome.runtime.onMessage.addListener((e, s) => {
+    e.from === o && (r && console.log("received message from background script", e), window.postMessage({ from: e.from, payload: e.payload, callbackId: e.callbackId }));
   });
 }
 export {
-  n as useMessageBridgeContentScript
+  a as useMessageBridgeContentScript
 };

package/dist/inject.d.ts

@@ -15,5 +15,5 @@ export declare class MessagesInstance<MessageType extends MessageObj<MessageType
     disconnect(): void;
     bindEvent(): void;
     destroy(): void;
-    _handleReceivingMessage(event: any): void;
+    _handleReceivingMessage(event: any): Promise<void>;
 }

package/dist/inject.js

@@ -1,27 +1,27 @@
-var d = Object.defineProperty;
-var r = (i, s, e) => s in i ? d(i, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[s] = e;
-var n = (i, s, e) => r(i, typeof s != "symbol" ? s + "" : s, e);
+var r = Object.defineProperty;
+var d = (t, e, s) => e in t ? r(t, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : t[e] = s;
+var a = (t, e, s) => d(t, typeof e != "symbol" ? e + "" : e, s);
 class h {
-  constructor(s, e) {
-    n(this, "id");
-    n(this, "listeners", {});
-    n(this, "slug");
-    n(this, "isDebugger");
-    this.slug = s, this.isDebugger = !!e, this.id = window[s].id, this.bindEvent();
-  }
-  on(s, e) {
-    return this.listeners[s] = this.listeners[s] || [], this.listeners[s].push(e), () => {
-      if (this.listeners[s].includes(e)) {
-        const t = this.listeners[s].indexOf(e);
-        this.listeners[s].splice(t, 1);
+  constructor(e, s) {
+    a(this, "id");
+    a(this, "listeners", {});
+    a(this, "slug");
+    a(this, "isDebugger");
+    this.slug = e, this.isDebugger = !!s, this.id = window[e].id, this.bindEvent();
+  }
+  on(e, s) {
+    return this.listeners[e] = this.listeners[e] || [], this.listeners[e].push(s), () => {
+      if (this.listeners[e].includes(s)) {
+        const n = this.listeners[e].indexOf(s);
+        this.listeners[e].splice(n, 1);
       }
     };
   }
-  send(s, ...e) {
-    return new Promise(async (t) => {
-      let o = { action: s, payload: e };
-      this.isDebugger && console.log("发送消息", o), chrome.runtime.sendMessage(this.id, o, {}, (a) => {
-        this.isDebugger && console.log("收到消息", a), t(a);
+  send(e, ...s) {
+    return new Promise(async (n) => {
+      let i = { action: e, payload: s };
+      this.isDebugger && console.log("发送消息", i), chrome.runtime.sendMessage(this.id, i, {}, (o) => {
+        this.isDebugger && console.log("收到消息", o), n(o);
       });
     });
   }
@@ -37,10 +37,15 @@ class h {
   destroy() {
     this.disconnect(), this.listeners = {}, window.removeEventListener("message", this._handleReceivingMessage.bind(this));
   }
-  _handleReceivingMessage(s) {
-    if (s.data && s.data.from === this.slug && s.data.payload) {
-      const { action: e, payload: t } = s.data.payload;
-      if (this.isDebugger && console.log("收到消息", s.data), this.listeners[e]) for (let o of this.listeners[e]) o(...t);
+  async _handleReceivingMessage(e) {
+    if (e.data && e.data.from === this.slug && e.data.payload) {
+      const { action: s, payload: n } = e.data.payload, { callbackId: i } = e.data;
+      if (this.isDebugger && console.log("收到消息", e.data), this.listeners[s]) for (let o of this.listeners[s]) try {
+        const c = await o(...n);
+        i && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "success", callbackId: i, result: c } });
+      } catch (c) {
+        i && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "error", callbackId: i, errorMessage: c.toString(), result: void 0 } }), console.error(c);
+      }
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@webextkits/messages-center",
   "private": false,
-  "version": "0.1.8",
+  "version": "0.2.0",
   "type": "module",
   "exports": {
     "./background": "./dist/background.js",