@webextkits/messages-center 0.2.2 → 1.0.1

package/dist/background.js

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

package/dist/contentScript.js

@@ -1,7 +1,7 @@
 function a(o, r) {
-  chrome.runtime.onMessage.addListener((e, s) => {
+  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 {
   a as useMessageBridgeContentScript

package/dist/hooks.js

@@ -1,36 +1,42 @@
-function l(s, i) {
-  if (s === "<all_urls>") return /^(https?|file):\/\//.test(i);
-  let e;
+function l(c, o) {
+  if (c === "<all_urls>") return /^(https?|file):\/\//.test(o);
+  let r;
   try {
-    e = new URL(i);
+    r = new URL(o);
   } catch {
     return !1;
   }
-  const c = s.match(/^([^:]+):\/\/([^\/]+)(\/.*)?$/);
-  if (!c) return !1;
-  const [, a, o, r = "/*"] = c;
+  const i = c.match(/^([^:]+):\/\/([^\/]+)(\/.*)?$/);
+  if (!i) return !1;
+  const [, a, u, n = "/*"] = i;
   if (a === "*") {
-    if (e.protocol !== "http:" && e.protocol !== "https:") return !1;
-  } else if (e.protocol !== `${a}:`) return !1;
-  return !!function(t, n) {
+    if (r.protocol !== "http:" && r.protocol !== "https:") return !1;
+  } else if (r.protocol !== `${a}:`) return !1;
+  return !!(function(t, e) {
     if (t === "*") return !0;
     if (t.startsWith("*.")) {
-      const u = t.slice(2);
-      return n === u || n.endsWith("." + u);
+      const s = t.slice(2);
+      return e === s || e.endsWith("." + s);
     }
-    return t === n;
-  }(o, e.hostname) && !!function(t, n) {
-    const u = t.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
-    return new RegExp(`^${u}$`, "i").test(n);
-  }(r, e.pathname);
+    return t === e;
+  })(u, r.hostname) && !!(function(t, e) {
+    const s = t.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+    return new RegExp(`^${s}$`, "i").test(e);
+  })(n, r.pathname);
 }
-function h(s) {
-  const { hostMatch: i, extensionId: e, isDev: c = !1 } = s;
-  chrome.tabs.onUpdated.addListener(async (a, o, r) => {
-    r && r.url && r && r.url && o && o.status === "loading" && i.some((t) => l(t, r.url)) && chrome.scripting.executeScript({ injectImmediately: !0, world: "MAIN", target: { tabId: a, allFrames: !0 }, func: (t) => {
+function h(c) {
+  const { hostMatch: o, extensionId: r, isDev: i = !1 } = c, a = { id: chrome.runtime.id, slug: r, isDev: i };
+  function u(n) {
+    chrome.scripting.executeScript({ injectImmediately: !0, world: "MAIN", target: { tabId: n, allFrames: !0 }, func: (t) => {
       window[t.slug] = t;
-    }, args: [{ id: chrome.runtime.id, slug: e, isDev: c }] });
-  });
+    }, args: [a] }).catch((() => {
+    }));
+  }
+  chrome.tabs.onUpdated.addListener((async (n, t, e) => {
+    e?.url && t?.status && (t.status !== "loading" && t.status !== "complete" || o.some(((s) => l(s, e.url))) && u(n));
+  })), chrome.tabs.query({}, ((n) => {
+    for (const t of n) t.id && t.url && o.some(((e) => l(e, t.url))) && u(t.id);
+  }));
 }
 export {
   h as injectExtensionData,

package/dist/inject.d.ts

@@ -3,11 +3,17 @@ export type MessageObj<T> = {
 };
 export type SendFn<T extends MessageObj<T>> = MessagesInstance<T, T>["send"];
 export type onFn<T extends MessageObj<T>> = MessagesInstance<T, T>["on"];
+export declare function waitForExtensionData(slug: string, timeoutMs?: number, intervalMs?: number): Promise<{
+    id: string;
+    slug: string;
+    isDev: boolean;
+}>;
 export declare class MessagesInstance<MessageType extends MessageObj<MessageType>, BackgroundMessageType extends MessageObj<BackgroundMessageType>> {
     id: string;
     listeners: Partial<Record<keyof BackgroundMessageType, any>>;
     slug: string;
     isDebugger: boolean;
+    private _ready;
     constructor(slug: string, isDebugger?: boolean);
     on<T extends keyof BackgroundMessageType>(action: T, fn: (...args: Parameters<BackgroundMessageType[T]>) => void): () => void;
     send<T extends keyof MessageType>(action: T, ...payload: Parameters<MessageType[T]>): Promise<Awaited<ReturnType<MessageType[T]>>>;

package/dist/inject.js

@@ -1,35 +1,48 @@
-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) {
-    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 r = this.listeners[e].indexOf(s);
-        this.listeners[e].splice(r, 1);
+function o(r, s = 5e3, t = 50) {
+  return new Promise(((i, a) => {
+    if (window[r]?.id) return void i(window[r]);
+    const n = Date.now(), e = setInterval((() => {
+      window[r]?.id ? (clearInterval(e), i(window[r])) : Date.now() - n > s && (clearInterval(e), a(new Error(`[MessagesInstance] 等待 window["${r}"] 超时 (${s}ms)，injectExtensionData 可能未正确配置`)));
+    }), t);
+  }));
+}
+class c {
+  id;
+  listeners = {};
+  slug;
+  isDebugger;
+  _ready;
+  constructor(s, t) {
+    this.slug = s, this.isDebugger = !!t, window[s]?.id ? (this.id = window[s].id, this._ready = Promise.resolve()) : (this.id = "", this._ready = o(s).then(((i) => {
+      this.id = i.id, this.isDebugger && console.log(`[MessagesInstance] 延迟获取到扩展 ID: ${this.id}`);
+    }))), this.bindEvent();
+  }
+  on(s, t) {
+    return this.listeners[s] = this.listeners[s] || [], this.listeners[s].push(t), () => {
+      if (this.listeners[s].includes(t)) {
+        const i = this.listeners[s].indexOf(t);
+        this.listeners[s].splice(i, 1);
       }
     };
   }
-  send(e, ...s) {
-    return new Promise(async (r, a) => {
-      let i = { action: e, payload: s };
-      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)));
-      });
-    });
+  send(s, ...t) {
+    return new Promise((async (i, a) => {
+      await this._ready;
+      let n = { action: s, payload: t };
+      this.isDebugger && console.log(`[${n.action}] - 发送`, n), chrome.runtime.sendMessage(this.id, n, {}, ((e) => {
+        this.isDebugger && (e?.status === "success" ? console.log(`[${n.action}] - 成功`, e?.result) : console.error(`[${n.action}] - 失败`, e?.errorMessage)), e?.status === "success" ? i(e?.result) : (console.error(e?.errorMessage), a(new Error(e?.errorMessage)));
+      }));
+    }));
   }
   connect() {
-    chrome.runtime.sendMessage(this.id, { action: "__connect" });
+    this._ready.then((() => {
+      chrome.runtime.sendMessage(this.id, { action: "__connect" });
+    }));
   }
   disconnect() {
-    chrome.runtime.sendMessage(this.id, { action: "__disconnect" });
+    this._ready.then((() => {
+      chrome.runtime.sendMessage(this.id, { action: "__disconnect" });
+    }));
   }
   bindEvent() {
     window.addEventListener("message", this._handleReceivingMessage.bind(this));
@@ -37,18 +50,19 @@ class h {
   destroy() {
     this.disconnect(), this.listeners = {}, window.removeEventListener("message", this._handleReceivingMessage.bind(this));
   }
-  async _handleReceivingMessage(e) {
-    if (e.data && e.data.from === this.slug && e.data.payload) {
-      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);
+  async _handleReceivingMessage(s) {
+    if (s.data && s.data.from === this.slug && s.data.payload) {
+      const { action: t, payload: i } = s.data.payload, { callbackId: a } = s.data;
+      if (this.isDebugger && console.log("收到消息", s.data), this.listeners[t]) for (let n of this.listeners[t]) try {
+        const e = await n(...i);
+        a && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "success", callbackId: a, result: e } });
+      } catch (e) {
+        a && chrome.runtime.sendMessage(this.id, { action: "__callback", payload: { status: "error", callbackId: a, errorMessage: e.toString(), result: void 0 } }), console.error(e);
       }
     }
   }
 }
 export {
-  h as MessagesInstance
+  c as MessagesInstance,
+  o as waitForExtensionData
 };

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@webextkits/messages-center",
   "private": false,
-  "version": "0.2.2",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/FrontEndSharedProject/webextkits.git",
+    "directory": "packages/messages"
+  },
+  "version": "1.0.1",
   "type": "module",
   "exports": {
     "./background": "./dist/background.js",
@@ -28,16 +33,16 @@
   "files": [
     "dist"
   ],
-  "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.4",
-    "@types/node": "^20.8.8",
-    "esno": "^0.17.0",
-    "glob": "^10.3.10",
-    "typescript": "^5.0.2",
-    "vite": "=5.4.10"
-  },
   "scripts": {
     "build": "esno ./scripts/build.ts && npm run build:type",
     "build:type": "tsc -p ./tsconfig.json -emitDeclarationOnly"
+  },
+  "devDependencies": {
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/node": "^24.10.0",
+    "esno": "^4.8.0",
+    "glob": "^11.0.3",
+    "typescript": "^5.9.3",
+    "vite": "^7.2.1"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) CarlJin <carljin.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.