@webextkits/messages-center 0.2.0 → 0.2.2

package/dist/background.d.ts

@@ -10,7 +10,7 @@ export declare class MessageInstance<MessageType extends MessageObj<MessageType>
     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>;
+    sendByTabId<T extends keyof BackgroundMessageType>(tabId: number, action: T, ...payload: Parameters<BackgroundMessageType[T]>): Promise<Awaited<ReturnType<BackgroundMessageType[T]>>>;
     bindMessage(): void;
     bindEvent(): void;
     deleteTabById(tabId: any): void;

package/dist/background.js

@@ -1,13 +1,13 @@
 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);
+var u = (r, s, t) => s in r ? g(r, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[s] = t;
+var c = (r, s, t) => u(r, 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());
+    c(this, "listeners", {});
+    c(this, "tabs", []);
+    c(this, "slug");
+    c(this, "isDebugger");
+    c(this, "callbackMap", /* @__PURE__ */ new Map());
     this.slug = s, this.isDebugger = !!t, this.bindMessage(), this.bindEvent();
   }
   on(s, t) {
@@ -19,47 +19,49 @@ class p {
   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);
+      const i = await chrome.tabs.get(e);
+      i && i.id ? chrome.tabs.sendMessage(i.id, { from: this.slug, payload: { action: s, payload: t } }) : this.deleteTabById(e);
+    } catch (i) {
+      console.log(i), this.deleteTabById(e);
     }
   }
   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);
+    const i = l();
+    this.callbackMap.set(i, t), this.isDebugger && console.log("发送消息", { action: s, payload: e, tabs: this.tabs });
+    for (let n of this.tabs) try {
+      const o = await chrome.tabs.get(n);
+      o && o.id ? chrome.tabs.sendMessage(o.id, { from: this.slug, payload: { action: s, payload: e }, callbackId: i }) : this.deleteTabById(n);
+    } catch (o) {
+      console.log(o), this.deleteTabById(n);
     }
   }
   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);
+    const i = l();
+    return new Promise((n, o) => {
+      this.callbackMap.set(i, function(a) {
+        n(a);
+      }), chrome.tabs.get(s).then((a) => {
+        a && a.id ? chrome.tabs.sendMessage(a.id, { from: this.slug, payload: { action: t, payload: e }, callbackId: i }) : this.deleteTabById(s);
+      }).catch((a) => {
+        console.log(a), this.deleteTabById(s);
       });
     });
   }
   bindMessage() {
     chrome.runtime.onMessageExternal.addListener((s, t, e) => {
-      var a, o, n;
-      if ((a = t == null ? void 0 : t.tab) != null && a.id) {
+      var i, n, o;
+      if ((i = t == null ? void 0 : t.tab) != null && i.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();
+          const { callbackId: a, result: d, errorMessage: b, status: h } = s.payload;
+          return h === "error" ? console.error(b) : this.callbackMap.has(a) && ((n = this.callbackMap.get(a)) == null || n(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);
+        if (this.listeners[s.action]) return (o = t == null ? void 0 : t.tab) != null && o.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((a) => {
+          this.isDebugger && console.log("send to callback from background", { request: s, sender: t, res: a }), e({ status: "success", result: a });
+        }).catch((a) => {
+          console.error(a), e({ status: "error", errorMessage: a.toString() });
         }), !0) : e();
       }
     });
@@ -76,7 +78,7 @@ class p {
     }
   }
 }
-function c() {
+function l() {
   return (/* @__PURE__ */ new Date()).getTime().toString() + Math.random().toString(36).substring(2, 15);
 }
 export {

package/dist/inject.js

@@ -1,27 +1,27 @@
-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);
+var c = Object.defineProperty;
+var l = (n, e, s) => e in n ? c(n, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[e] = s;
+var o = (n, e, s) => l(n, typeof e != "symbol" ? e + "" : e, s);
 class h {
   constructor(e, s) {
-    a(this, "id");
-    a(this, "listeners", {});
-    a(this, "slug");
-    a(this, "isDebugger");
+    o(this, "id");
+    o(this, "listeners", {});
+    o(this, "slug");
+    o(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);
+        const r = this.listeners[e].indexOf(s);
+        this.listeners[e].splice(r, 1);
       }
     };
   }
   send(e, ...s) {
-    return new Promise(async (n) => {
+    return new Promise(async (r, a) => {
       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);
+      this.isDebugger && console.log(`[${i.action}] - 发送`, i), chrome.runtime.sendMessage(this.id, i, {}, (t) => {
+        this.isDebugger && ((t == null ? void 0 : t.status) === "success" ? console.log(`[${i.action}] - 成功`, t == null ? void 0 : t.result) : console.error(`[${i.action}] - 失败`, t == null ? void 0 : t.errorMessage)), (t == null ? void 0 : t.status) === "success" ? r(t == null ? void 0 : t.result) : (console.error(t == null ? void 0 : t.errorMessage), a(new Error(t == null ? void 0 : t.errorMessage)));
       });
     });
   }
@@ -39,12 +39,12 @@ class h {
   }
   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);
+      const { action: s, payload: r } = e.data.payload, { callbackId: a } = e.data;
+      if (this.isDebugger && console.log("收到消息", e.data), this.listeners[s]) for (let i of this.listeners[s]) try {
+        const t = await i(...r);
+        a && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "success", callbackId: a, result: t } });
+      } catch (t) {
+        a && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "error", callbackId: a, errorMessage: t.toString(), result: void 0 } }), console.error(t);
       }
     }
   }

package/package.json

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