@webext-core/messaging 1.4.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,7 +11,7 @@ interface Logger {
11
11
  * Either a Promise of a type, or that type directly. Used to indicate that a method can by sync or
12
12
  * async.
13
13
  */
14
- declare type MaybePromise<T> = Promise<T> | T;
14
+ type MaybePromise<T> = Promise<T> | T;
15
15
  /**
16
16
  * Used to add a return type to a message in the protocol map.
17
17
  *
@@ -40,17 +40,17 @@ interface ProtocolWithReturn<TData, TReturn> {
40
40
  /**
41
41
  * Given a function declaration, `ProtocolWithReturn`, or a value, return the message's data type.
42
42
  */
43
- declare type GetDataType<T> = T extends (...args: infer Args) => any ? Args['length'] extends 0 | 1 ? Args[0] : never : T extends ProtocolWithReturn<any, any> ? T['BtVgCTPYZu'] : T;
43
+ type GetDataType<T> = T extends (...args: infer Args) => any ? Args['length'] extends 0 | 1 ? Args[0] : never : T extends ProtocolWithReturn<any, any> ? T['BtVgCTPYZu'] : T;
44
44
  /**
45
45
  * Given a function declaration, `ProtocolWithReturn`, or a value, return the message's return type.
46
46
  */
47
- declare type GetReturnType<T> = T extends (...args: any[]) => infer R ? R : T extends ProtocolWithReturn<any, any> ? T['RrhVseLgZW'] : void;
47
+ type GetReturnType<T> = T extends (...args: any[]) => infer R ? R : T extends ProtocolWithReturn<any, any> ? T['RrhVseLgZW'] : void;
48
48
  /**
49
49
  * Call to ensure an active listener has been removed.
50
50
  *
51
51
  * If the listener has already been removed with `Messenger.removeAllListeners`, this is a noop.
52
52
  */
53
- declare type RemoveListenerCallback = () => void;
53
+ type RemoveListenerCallback = () => void;
54
54
  /**
55
55
  * Shared configuration between all the different messengers.
56
56
  */
package/lib/index.cjs CHANGED
@@ -35,6 +35,10 @@ var __copyProps = (to, from, except, desc) => {
35
35
  return to;
36
36
  };
37
37
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
38
+ // If the importer is in node compatibility mode or this is not an ESM
39
+ // file that has been converted to a CommonJS file using a Babel-
40
+ // compatible transform (i.e. "__esModule" has not been set), then set
41
+ // "default" to the CommonJS "module.exports" for node compatibility.
38
42
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
39
43
  mod
40
44
  ));
package/lib/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { B as BaseMessagingConfig, G as GenericMessenger } from './generic-e806d3a5.js';
2
- export { B as BaseMessagingConfig, a as GetDataType, b as GetReturnType, L as Logger, M as MaybePromise, c as Message, N as NamespaceMessagingConfig, P as ProtocolWithReturn, R as RemoveListenerCallback } from './generic-e806d3a5.js';
1
+ import { B as BaseMessagingConfig, G as GenericMessenger } from './generic-77a327a6.js';
2
+ export { a as GetDataType, b as GetReturnType, L as Logger, M as MaybePromise, c as Message, N as NamespaceMessagingConfig, P as ProtocolWithReturn, R as RemoveListenerCallback } from './generic-77a327a6.js';
3
3
  import { Runtime } from 'webextension-polyfill';
4
4
 
5
5
  /**
@@ -23,7 +23,7 @@ interface ExtensionMessage {
23
23
  *
24
24
  * You cannot message between tabs directly. It must go through the background script.
25
25
  */
26
- declare type ExtensionSendMessageArgs = [
26
+ type ExtensionSendMessageArgs = [
27
27
  /**
28
28
  * The tab to send a message to.
29
29
  */
@@ -32,7 +32,7 @@ declare type ExtensionSendMessageArgs = [
32
32
  /**
33
33
  * Messenger returned by `defineExtensionMessaging`.
34
34
  */
35
- declare type ExtensionMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, ExtensionMessage, ExtensionSendMessageArgs>;
35
+ type ExtensionMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, ExtensionMessage, ExtensionSendMessageArgs>;
36
36
  /**
37
37
  * Returns an `ExtensionMessenger` that is backed by the `browser.runtime.sendMessage` and
38
38
  * `browser.tabs.sendMessage` APIs.
@@ -41,4 +41,4 @@ declare type ExtensionMessenger<TProtocolMap extends Record<string, any>> = Gene
41
41
  */
42
42
  declare function defineExtensionMessaging<TProtocolMap extends Record<string, any> = Record<string, any>>(config?: ExtensionMessagingConfig): ExtensionMessenger<TProtocolMap>;
43
43
 
44
- export { ExtensionMessage, ExtensionMessagingConfig, ExtensionMessenger, ExtensionSendMessageArgs, defineExtensionMessaging };
44
+ export { BaseMessagingConfig, ExtensionMessage, ExtensionMessagingConfig, ExtensionMessenger, ExtensionSendMessageArgs, defineExtensionMessaging };
@@ -39,6 +39,10 @@ var webExtCoreMessaging = (() => {
39
39
  return to;
40
40
  };
41
41
  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
42
+ // If the importer is in node compatibility mode or this is not an ESM
43
+ // file that has been converted to a CommonJS file using a Babel-
44
+ // compatible transform (i.e. "__esModule" has not been set), then set
45
+ // "default" to the CommonJS "module.exports" for node compatibility.
42
46
  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
43
47
  mod
44
48
  ));
@@ -68,9 +72,9 @@ var webExtCoreMessaging = (() => {
68
72
  });
69
73
  };
70
74
 
71
- // ../../node_modules/.pnpm/webextension-polyfill@0.10.0/node_modules/webextension-polyfill/dist/browser-polyfill.js
75
+ // ../../node_modules/webextension-polyfill/dist/browser-polyfill.js
72
76
  var require_browser_polyfill = __commonJS({
73
- "../../node_modules/.pnpm/webextension-polyfill@0.10.0/node_modules/webextension-polyfill/dist/browser-polyfill.js"(exports, module) {
77
+ "../../node_modules/webextension-polyfill/dist/browser-polyfill.js"(exports, module) {
74
78
  (function(global, factory) {
75
79
  if (typeof define === "function" && define.amd) {
76
80
  define("webextension-polyfill", ["module"], factory);
@@ -1072,15 +1076,19 @@ var webExtCoreMessaging = (() => {
1072
1076
  // src/extension.ts
1073
1077
  var import_webextension_polyfill = __toESM(require_browser_polyfill(), 1);
1074
1078
 
1075
- // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/error-constructors.js
1079
+ // ../../node_modules/serialize-error/error-constructors.js
1076
1080
  var list = [
1081
+ // Native ES errors https://262.ecma-international.org/12.0/#sec-well-known-intrinsic-objects
1077
1082
  EvalError,
1078
1083
  RangeError,
1079
1084
  ReferenceError,
1080
1085
  SyntaxError,
1081
1086
  TypeError,
1082
1087
  URIError,
1088
+ // Built-in errors
1083
1089
  globalThis.DOMException,
1090
+ // Node-specific errors
1091
+ // https://nodejs.org/api/errors.html
1084
1092
  globalThis.AssertionError,
1085
1093
  globalThis.SystemError
1086
1094
  ].filter(Boolean).map(
@@ -1089,7 +1097,7 @@ var webExtCoreMessaging = (() => {
1089
1097
  var errorConstructors = new Map(list);
1090
1098
  var error_constructors_default = errorConstructors;
1091
1099
 
1092
- // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/index.js
1100
+ // ../../node_modules/serialize-error/index.js
1093
1101
  var NonError = class extends Error {
1094
1102
  constructor(message) {
1095
1103
  super(NonError._prepareSuperMessage(message));
@@ -1125,11 +1133,11 @@ var webExtCoreMessaging = (() => {
1125
1133
  enumerable: false
1126
1134
  }
1127
1135
  ];
1128
- var toJsonWasCalled = Symbol(".toJSON was called");
1136
+ var toJsonWasCalled = /* @__PURE__ */ new WeakSet();
1129
1137
  var toJSON = (from) => {
1130
- from[toJsonWasCalled] = true;
1138
+ toJsonWasCalled.add(from);
1131
1139
  const json = from.toJSON();
1132
- delete from[toJsonWasCalled];
1140
+ toJsonWasCalled.delete(from);
1133
1141
  return json;
1134
1142
  };
1135
1143
  var getErrorConstructor = (name) => {
@@ -1160,7 +1168,7 @@ var webExtCoreMessaging = (() => {
1160
1168
  if (depth >= maxDepth) {
1161
1169
  return to;
1162
1170
  }
1163
- if (useToJSON && typeof from.toJSON === "function" && from[toJsonWasCalled] !== true) {
1171
+ if (useToJSON && typeof from.toJSON === "function" && !toJsonWasCalled.has(from)) {
1164
1172
  return toJSON(from);
1165
1173
  }
1166
1174
  const continueDestroyCircular = (value) => destroyCircular({
@@ -1173,7 +1181,7 @@ var webExtCoreMessaging = (() => {
1173
1181
  serialize
1174
1182
  });
1175
1183
  for (const [key, value] of Object.entries(from)) {
1176
- if (typeof Buffer === "function" && Buffer.isBuffer(value)) {
1184
+ if (value && value instanceof Uint8Array && value.constructor.name === "Buffer") {
1177
1185
  to[key] = "[object Buffer]";
1178
1186
  continue;
1179
1187
  }
@@ -1185,7 +1193,10 @@ var webExtCoreMessaging = (() => {
1185
1193
  continue;
1186
1194
  }
1187
1195
  if (!value || typeof value !== "object") {
1188
- to[key] = value;
1196
+ try {
1197
+ to[key] = value;
1198
+ } catch (e) {
1199
+ }
1189
1200
  continue;
1190
1201
  }
1191
1202
  if (!seen.includes(from[key])) {
@@ -1208,7 +1219,6 @@ var webExtCoreMessaging = (() => {
1208
1219
  return to;
1209
1220
  };
1210
1221
  function serializeError(value, options = {}) {
1211
- var _a;
1212
1222
  const {
1213
1223
  maxDepth = Number.POSITIVE_INFINITY,
1214
1224
  useToJSON = true
@@ -1225,7 +1235,7 @@ var webExtCoreMessaging = (() => {
1225
1235
  });
1226
1236
  }
1227
1237
  if (typeof value === "function") {
1228
- return `[Function: ${(_a = value.name) != null ? _a : "anonymous"}]`;
1238
+ return `[Function: ${value.name || "anonymous"}]`;
1229
1239
  }
1230
1240
  return value;
1231
1241
  }
package/lib/page.cjs CHANGED
@@ -74,6 +74,9 @@ __export(page_exports, {
74
74
  });
75
75
  module.exports = __toCommonJS(page_exports);
76
76
 
77
+ // src/window.ts
78
+ var import_uid = require("uid");
79
+
77
80
  // src/generic.ts
78
81
  var import_serialize_error = require("serialize-error");
79
82
  function defineGenericMessanging(config) {
@@ -169,10 +172,11 @@ var REQUEST_TYPE = "@webext-core/messaging/window";
169
172
  var RESPONSE_TYPE = "@webext-core/messaging/window/response";
170
173
  function defineWindowMessaging(config) {
171
174
  const namespace = config.namespace;
175
+ const instanceId = (0, import_uid.uid)();
172
176
  let removeAdditionalListeners = [];
173
177
  const sendWindowMessage = (message, targetOrigin) => new Promise((res) => {
174
178
  const responseListener = (event) => {
175
- if (event.data.type === RESPONSE_TYPE) {
179
+ if (event.data.type === RESPONSE_TYPE && event.data.namespace === namespace && event.data.instanceId !== instanceId && event.data.message.type === message.type) {
176
180
  res(event.data.response);
177
181
  removeResponseListener();
178
182
  }
@@ -181,7 +185,7 @@ function defineWindowMessaging(config) {
181
185
  removeAdditionalListeners.push(removeResponseListener);
182
186
  window.addEventListener("message", responseListener);
183
187
  window.postMessage(
184
- { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace },
188
+ { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace, instanceId },
185
189
  targetOrigin != null ? targetOrigin : "*"
186
190
  );
187
191
  });
@@ -191,10 +195,13 @@ function defineWindowMessaging(config) {
191
195
  },
192
196
  addRootListener(processMessage) {
193
197
  const listener = (event) => __async(this, null, function* () {
194
- if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace)
198
+ if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace || event.data.instanceId === instanceId)
195
199
  return;
196
200
  const response = yield processMessage(event.data.message);
197
- window.postMessage({ type: RESPONSE_TYPE, response }, event.data.senderOrigin);
201
+ window.postMessage(
202
+ { type: RESPONSE_TYPE, response, instanceId, message: event.data.message, namespace },
203
+ event.data.senderOrigin
204
+ );
198
205
  });
199
206
  window.addEventListener("message", listener);
200
207
  return () => window.removeEventListener("message", listener);
@@ -210,39 +217,51 @@ function defineWindowMessaging(config) {
210
217
  }
211
218
 
212
219
  // src/custom-event.ts
220
+ var import_uid2 = require("uid");
213
221
  var REQUEST_EVENT = "@webext-core/messaging/custom-events";
214
222
  var RESPONSE_EVENT = "@webext-core/messaging/custom-events/response";
215
223
  function defineCustomEventMessaging(config) {
216
224
  const namespace = config.namespace;
225
+ const instanceId = (0, import_uid2.uid)();
217
226
  const removeAdditionalListeners = [];
218
- const sendCustomMessage = (event) => new Promise((res) => {
227
+ const sendCustomMessage = (requestEvent) => new Promise((res) => {
219
228
  const responseListener = (e) => {
220
229
  const { detail } = e;
221
- res(detail);
230
+ if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type) {
231
+ res(detail.response);
232
+ }
222
233
  };
223
234
  removeAdditionalListeners.push(
224
235
  () => window.removeEventListener(RESPONSE_EVENT, responseListener)
225
236
  );
226
- window.addEventListener(RESPONSE_EVENT, responseListener, { once: true });
227
- window.dispatchEvent(event);
237
+ window.addEventListener(RESPONSE_EVENT, responseListener);
238
+ window.dispatchEvent(requestEvent);
228
239
  });
229
240
  const messenger = defineGenericMessanging(__spreadProps(__spreadValues({}, config), {
230
241
  sendMessage(message) {
231
- const event = new CustomEvent(REQUEST_EVENT, { detail: { message, namespace } });
232
- return sendCustomMessage(event);
242
+ const reqDetail = { message, namespace, instanceId };
243
+ const requestEvent = new CustomEvent(REQUEST_EVENT, {
244
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
245
+ detail: typeof cloneInto !== "undefined" ? cloneInto(reqDetail, window) : reqDetail
246
+ });
247
+ return sendCustomMessage(requestEvent);
233
248
  },
234
249
  addRootListener(processMessage) {
235
- const listener = (e) => __async(this, null, function* () {
250
+ const requestListener = (e) => __async(this, null, function* () {
236
251
  const _a = e, { detail } = _a, event = __objRest(_a, ["detail"]);
237
- if (detail.namespace !== namespace)
252
+ if (detail.namespace !== namespace || detail.instanceId === instanceId)
238
253
  return;
239
254
  const message = __spreadProps(__spreadValues({}, detail.message), { event });
240
255
  const response = yield processMessage(message);
241
- const responseEvent = new CustomEvent(RESPONSE_EVENT, { detail: response });
256
+ const resDetail = { response, message, instanceId, namespace };
257
+ const responseEvent = new CustomEvent(RESPONSE_EVENT, {
258
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
259
+ detail: typeof cloneInto !== "undefined" ? cloneInto(resDetail, window) : resDetail
260
+ });
242
261
  window.dispatchEvent(responseEvent);
243
262
  });
244
- window.addEventListener(REQUEST_EVENT, listener);
245
- return () => window.removeEventListener(REQUEST_EVENT, listener);
263
+ window.addEventListener(REQUEST_EVENT, requestListener);
264
+ return () => window.removeEventListener(REQUEST_EVENT, requestListener);
246
265
  }
247
266
  }));
248
267
  return __spreadProps(__spreadValues({}, messenger), {
package/lib/page.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { N as NamespaceMessagingConfig, G as GenericMessenger } from './generic-e806d3a5.js';
1
+ import { N as NamespaceMessagingConfig, G as GenericMessenger } from './generic-77a327a6.js';
2
2
 
3
3
  /**
4
4
  * Configuration passed into `defineWindowMessaging`.
@@ -12,8 +12,8 @@ interface WindowMessagingConfig extends NamespaceMessagingConfig {
12
12
  * > See <https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage#targetorigin> for more
13
13
  * details.
14
14
  */
15
- declare type WindowSendMessageArgs = [targetOrigin?: string];
16
- declare type WindowMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, {}, WindowSendMessageArgs>;
15
+ type WindowSendMessageArgs = [targetOrigin?: string];
16
+ type WindowMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, {}, WindowSendMessageArgs>;
17
17
  /**
18
18
  * Returns a `WindowMessenger`. It is backed by the `window.postMessage` API. It can be used to
19
19
  * communicate between:
@@ -35,6 +35,9 @@ declare type WindowMessenger<TProtocolMap extends Record<string, any>> = Generic
35
35
  * websiteMessenger.onMessage("initInjectedScript", (...) => {
36
36
  * // ...
37
37
  * })
38
+ *
39
+ * @link Spec diagrams
40
+ * https://mermaid.live/edit#pako:eNqVlG9v2jAQxr-KZamvGv7YyYBYVSTGWgmpwAs6VZqQJpMc1BOxM8fZoIjvPieBACUVLC8SO3ru7vc4l9viUEWAGU7hdwYyhG-CLzWPZxLZa67WaKCkAWka01CLxDzMdSsobkKmhtsAUuy2SPIY0oSHwNBCKbQrMyRcGxGKhEuDbAT5qSTiKVJyBGnKl_CJKgUZ5br8eaa0-yPaUP6C0EDUeoX5VBi4hKP_A0dvgqM3wvWlMm-gi-Nb15ybe4k25_oTNPcmNPcKWrm8uzvWRF_Ld2NlAKk_oA_FnCodQ4PJaPR9PBz0X4aTMXp6nrwW6NP-6BH1p-j58enlkNsCoXKVX9WnbATB_f6AWcHWMpsE2AwnQi7JDNeFNNb7fmFILKXSlu-vLILP1HnOUkv3uCdqDemlOAgaVRWWS2phqjoXluipJVJriX6wRE8s0auWSGWJXLdEjpZovSV6ZqlcHjtBoVDFcSZFyG0LrIQ85D9rCfqhJcbnYUIWHRGJxQK0HRbHBrPJsINj0DEXkR0z2zz5DNs_I4YZZnYZwYJnK5ND7qyUZ0ZNNzLEzOgMHKxVtnzDbMFXqd1lSWTr7WdU9db2P2ZbvMasQYjX9AnteaRN3HbP7XgO3mBG3U6z533p-W637bue5-4c_K6UTUGbpOtT36edLvXaLu06GCJhlB6Vc7EYj0WJH4U-p9r9Aynbsqc
38
41
  */
39
42
  declare function defineWindowMessaging<TProtocolMap extends Record<string, any> = Record<string, any>>(config: WindowMessagingConfig): WindowMessenger<TProtocolMap>;
40
43
 
@@ -55,7 +58,7 @@ interface CustomEventMessage {
55
58
  /**
56
59
  * Messenger returned by `defineCustomEventMessenger`.
57
60
  */
58
- declare type CustomEventMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, CustomEventMessage, [
61
+ type CustomEventMessenger<TProtocolMap extends Record<string, any>> = GenericMessenger<TProtocolMap, CustomEventMessage, [
59
62
  ]>;
60
63
  /**
61
64
  * Creates a `CustomEventMessenger`. This messenger is backed by the `CustomEvent` APIs. It can be
@@ -80,6 +83,9 @@ declare type CustomEventMessenger<TProtocolMap extends Record<string, any>> = Ge
80
83
  * websiteMessenger.onMessage("initInjectedScript", (...) => {
81
84
  * // ...
82
85
  * })
86
+ *
87
+ * * @link Spec diagrams
88
+ * https://mermaid.live/edit#pako:eNqVlG9v2jAQxr-KZamvGv7YyYBYVSTGWgmpwAs6VZqQJpMc1BOxM8fZoIjvPieBACUVLC8SO3ru7vc4l9viUEWAGU7hdwYyhG-CLzWPZxLZa67WaKCkAWka01CLxDzMdSsobkKmhtsAUuy2SPIY0oSHwNBCKbQrMyRcGxGKhEuDbAT5qSTiKVJyBGnKl_CJKgUZ5br8eaa0-yPaUP6C0EDUeoX5VBi4hKP_A0dvgqM3wvWlMm-gi-Nb15ybe4k25_oTNPcmNPcKWrm8uzvWRF_Ld2NlAKk_oA_FnCodQ4PJaPR9PBz0X4aTMXp6nrwW6NP-6BH1p-j58enlkNsCoXKVX9WnbATB_f6AWcHWMpsE2AwnQi7JDNeFNNb7fmFILKXSlu-vLILP1HnOUkv3uCdqDemlOAgaVRWWS2phqjoXluipJVJriX6wRE8s0auWSGWJXLdEjpZovSV6ZqlcHjtBoVDFcSZFyG0LrIQ85D9rCfqhJcbnYUIWHRGJxQK0HRbHBrPJsINj0DEXkR0z2zz5DNs_I4YZZnYZwYJnK5ND7qyUZ0ZNNzLEzOgMHKxVtnzDbMFXqd1lSWTr7WdU9db2P2ZbvMasQYjX9AnteaRN3HbP7XgO3mBG3U6z533p-W637bue5-4c_K6UTUGbpOtT36edLvXaLu06GCJhlB6Vc7EYj0WJH4U-p9r9Aynbsqc
83
89
  */
84
90
  declare function defineCustomEventMessaging<TProtocolMap extends Record<string, any> = Record<string, any>>(config: CustomEventMessagingConfig): CustomEventMessenger<TProtocolMap>;
85
91
 
@@ -78,15 +78,36 @@ var webExtCoreMessaging = (() => {
78
78
  defineWindowMessaging: () => defineWindowMessaging
79
79
  });
80
80
 
81
- // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/error-constructors.js
81
+ // ../../node_modules/uid/dist/index.mjs
82
+ var IDX = 256;
83
+ var HEX = [];
84
+ var SIZE = 256;
85
+ var BUFFER;
86
+ while (IDX--)
87
+ HEX[IDX] = (IDX + 256).toString(16).substring(1);
88
+ function uid(len) {
89
+ var i = 0, tmp = len || 11;
90
+ if (!BUFFER || IDX + tmp > SIZE * 2) {
91
+ for (BUFFER = "", IDX = 0; i < SIZE; i++) {
92
+ BUFFER += HEX[Math.random() * 256 | 0];
93
+ }
94
+ }
95
+ return BUFFER.substring(IDX, IDX++ + tmp);
96
+ }
97
+
98
+ // ../../node_modules/serialize-error/error-constructors.js
82
99
  var list = [
100
+ // Native ES errors https://262.ecma-international.org/12.0/#sec-well-known-intrinsic-objects
83
101
  EvalError,
84
102
  RangeError,
85
103
  ReferenceError,
86
104
  SyntaxError,
87
105
  TypeError,
88
106
  URIError,
107
+ // Built-in errors
89
108
  globalThis.DOMException,
109
+ // Node-specific errors
110
+ // https://nodejs.org/api/errors.html
90
111
  globalThis.AssertionError,
91
112
  globalThis.SystemError
92
113
  ].filter(Boolean).map(
@@ -95,7 +116,7 @@ var webExtCoreMessaging = (() => {
95
116
  var errorConstructors = new Map(list);
96
117
  var error_constructors_default = errorConstructors;
97
118
 
98
- // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/index.js
119
+ // ../../node_modules/serialize-error/index.js
99
120
  var NonError = class extends Error {
100
121
  constructor(message) {
101
122
  super(NonError._prepareSuperMessage(message));
@@ -131,11 +152,11 @@ var webExtCoreMessaging = (() => {
131
152
  enumerable: false
132
153
  }
133
154
  ];
134
- var toJsonWasCalled = Symbol(".toJSON was called");
155
+ var toJsonWasCalled = /* @__PURE__ */ new WeakSet();
135
156
  var toJSON = (from) => {
136
- from[toJsonWasCalled] = true;
157
+ toJsonWasCalled.add(from);
137
158
  const json = from.toJSON();
138
- delete from[toJsonWasCalled];
159
+ toJsonWasCalled.delete(from);
139
160
  return json;
140
161
  };
141
162
  var getErrorConstructor = (name) => {
@@ -166,7 +187,7 @@ var webExtCoreMessaging = (() => {
166
187
  if (depth >= maxDepth) {
167
188
  return to;
168
189
  }
169
- if (useToJSON && typeof from.toJSON === "function" && from[toJsonWasCalled] !== true) {
190
+ if (useToJSON && typeof from.toJSON === "function" && !toJsonWasCalled.has(from)) {
170
191
  return toJSON(from);
171
192
  }
172
193
  const continueDestroyCircular = (value) => destroyCircular({
@@ -179,7 +200,7 @@ var webExtCoreMessaging = (() => {
179
200
  serialize
180
201
  });
181
202
  for (const [key, value] of Object.entries(from)) {
182
- if (typeof Buffer === "function" && Buffer.isBuffer(value)) {
203
+ if (value && value instanceof Uint8Array && value.constructor.name === "Buffer") {
183
204
  to[key] = "[object Buffer]";
184
205
  continue;
185
206
  }
@@ -191,7 +212,10 @@ var webExtCoreMessaging = (() => {
191
212
  continue;
192
213
  }
193
214
  if (!value || typeof value !== "object") {
194
- to[key] = value;
215
+ try {
216
+ to[key] = value;
217
+ } catch (e) {
218
+ }
195
219
  continue;
196
220
  }
197
221
  if (!seen.includes(from[key])) {
@@ -214,7 +238,6 @@ var webExtCoreMessaging = (() => {
214
238
  return to;
215
239
  };
216
240
  function serializeError(value, options = {}) {
217
- var _a;
218
241
  const {
219
242
  maxDepth = Number.POSITIVE_INFINITY,
220
243
  useToJSON = true
@@ -231,7 +254,7 @@ var webExtCoreMessaging = (() => {
231
254
  });
232
255
  }
233
256
  if (typeof value === "function") {
234
- return `[Function: ${(_a = value.name) != null ? _a : "anonymous"}]`;
257
+ return `[Function: ${value.name || "anonymous"}]`;
235
258
  }
236
259
  return value;
237
260
  }
@@ -354,10 +377,11 @@ var webExtCoreMessaging = (() => {
354
377
  var RESPONSE_TYPE = "@webext-core/messaging/window/response";
355
378
  function defineWindowMessaging(config) {
356
379
  const namespace = config.namespace;
380
+ const instanceId = uid();
357
381
  let removeAdditionalListeners = [];
358
382
  const sendWindowMessage = (message, targetOrigin) => new Promise((res) => {
359
383
  const responseListener = (event) => {
360
- if (event.data.type === RESPONSE_TYPE) {
384
+ if (event.data.type === RESPONSE_TYPE && event.data.namespace === namespace && event.data.instanceId !== instanceId && event.data.message.type === message.type) {
361
385
  res(event.data.response);
362
386
  removeResponseListener();
363
387
  }
@@ -366,7 +390,7 @@ var webExtCoreMessaging = (() => {
366
390
  removeAdditionalListeners.push(removeResponseListener);
367
391
  window.addEventListener("message", responseListener);
368
392
  window.postMessage(
369
- { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace },
393
+ { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace, instanceId },
370
394
  targetOrigin != null ? targetOrigin : "*"
371
395
  );
372
396
  });
@@ -376,10 +400,13 @@ var webExtCoreMessaging = (() => {
376
400
  },
377
401
  addRootListener(processMessage) {
378
402
  const listener = (event) => __async(this, null, function* () {
379
- if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace)
403
+ if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace || event.data.instanceId === instanceId)
380
404
  return;
381
405
  const response = yield processMessage(event.data.message);
382
- window.postMessage({ type: RESPONSE_TYPE, response }, event.data.senderOrigin);
406
+ window.postMessage(
407
+ { type: RESPONSE_TYPE, response, instanceId, message: event.data.message, namespace },
408
+ event.data.senderOrigin
409
+ );
383
410
  });
384
411
  window.addEventListener("message", listener);
385
412
  return () => window.removeEventListener("message", listener);
@@ -399,35 +426,46 @@ var webExtCoreMessaging = (() => {
399
426
  var RESPONSE_EVENT = "@webext-core/messaging/custom-events/response";
400
427
  function defineCustomEventMessaging(config) {
401
428
  const namespace = config.namespace;
429
+ const instanceId = uid();
402
430
  const removeAdditionalListeners = [];
403
- const sendCustomMessage = (event) => new Promise((res) => {
431
+ const sendCustomMessage = (requestEvent) => new Promise((res) => {
404
432
  const responseListener = (e) => {
405
433
  const { detail } = e;
406
- res(detail);
434
+ if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type) {
435
+ res(detail.response);
436
+ }
407
437
  };
408
438
  removeAdditionalListeners.push(
409
439
  () => window.removeEventListener(RESPONSE_EVENT, responseListener)
410
440
  );
411
- window.addEventListener(RESPONSE_EVENT, responseListener, { once: true });
412
- window.dispatchEvent(event);
441
+ window.addEventListener(RESPONSE_EVENT, responseListener);
442
+ window.dispatchEvent(requestEvent);
413
443
  });
414
444
  const messenger = defineGenericMessanging(__spreadProps(__spreadValues({}, config), {
415
445
  sendMessage(message) {
416
- const event = new CustomEvent(REQUEST_EVENT, { detail: { message, namespace } });
417
- return sendCustomMessage(event);
446
+ const reqDetail = { message, namespace, instanceId };
447
+ const requestEvent = new CustomEvent(REQUEST_EVENT, {
448
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
449
+ detail: typeof cloneInto !== "undefined" ? cloneInto(reqDetail, window) : reqDetail
450
+ });
451
+ return sendCustomMessage(requestEvent);
418
452
  },
419
453
  addRootListener(processMessage) {
420
- const listener = (e) => __async(this, null, function* () {
454
+ const requestListener = (e) => __async(this, null, function* () {
421
455
  const _a = e, { detail } = _a, event = __objRest(_a, ["detail"]);
422
- if (detail.namespace !== namespace)
456
+ if (detail.namespace !== namespace || detail.instanceId === instanceId)
423
457
  return;
424
458
  const message = __spreadProps(__spreadValues({}, detail.message), { event });
425
459
  const response = yield processMessage(message);
426
- const responseEvent = new CustomEvent(RESPONSE_EVENT, { detail: response });
460
+ const resDetail = { response, message, instanceId, namespace };
461
+ const responseEvent = new CustomEvent(RESPONSE_EVENT, {
462
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
463
+ detail: typeof cloneInto !== "undefined" ? cloneInto(resDetail, window) : resDetail
464
+ });
427
465
  window.dispatchEvent(responseEvent);
428
466
  });
429
- window.addEventListener(REQUEST_EVENT, listener);
430
- return () => window.removeEventListener(REQUEST_EVENT, listener);
467
+ window.addEventListener(REQUEST_EVENT, requestListener);
468
+ return () => window.removeEventListener(REQUEST_EVENT, requestListener);
431
469
  }
432
470
  }));
433
471
  return __spreadProps(__spreadValues({}, messenger), {
package/lib/page.js CHANGED
@@ -7,14 +7,16 @@ import {
7
7
  } from "./chunk-ALTBYIMW.js";
8
8
 
9
9
  // src/window.ts
10
+ import { uid } from "uid";
10
11
  var REQUEST_TYPE = "@webext-core/messaging/window";
11
12
  var RESPONSE_TYPE = "@webext-core/messaging/window/response";
12
13
  function defineWindowMessaging(config) {
13
14
  const namespace = config.namespace;
15
+ const instanceId = uid();
14
16
  let removeAdditionalListeners = [];
15
17
  const sendWindowMessage = (message, targetOrigin) => new Promise((res) => {
16
18
  const responseListener = (event) => {
17
- if (event.data.type === RESPONSE_TYPE) {
19
+ if (event.data.type === RESPONSE_TYPE && event.data.namespace === namespace && event.data.instanceId !== instanceId && event.data.message.type === message.type) {
18
20
  res(event.data.response);
19
21
  removeResponseListener();
20
22
  }
@@ -23,7 +25,7 @@ function defineWindowMessaging(config) {
23
25
  removeAdditionalListeners.push(removeResponseListener);
24
26
  window.addEventListener("message", responseListener);
25
27
  window.postMessage(
26
- { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace },
28
+ { type: REQUEST_TYPE, message, senderOrigin: location.origin, namespace, instanceId },
27
29
  targetOrigin != null ? targetOrigin : "*"
28
30
  );
29
31
  });
@@ -33,10 +35,13 @@ function defineWindowMessaging(config) {
33
35
  },
34
36
  addRootListener(processMessage) {
35
37
  const listener = (event) => __async(this, null, function* () {
36
- if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace)
38
+ if (event.data.type !== REQUEST_TYPE || event.data.namespace !== namespace || event.data.instanceId === instanceId)
37
39
  return;
38
40
  const response = yield processMessage(event.data.message);
39
- window.postMessage({ type: RESPONSE_TYPE, response }, event.data.senderOrigin);
41
+ window.postMessage(
42
+ { type: RESPONSE_TYPE, response, instanceId, message: event.data.message, namespace },
43
+ event.data.senderOrigin
44
+ );
40
45
  });
41
46
  window.addEventListener("message", listener);
42
47
  return () => window.removeEventListener("message", listener);
@@ -52,39 +57,51 @@ function defineWindowMessaging(config) {
52
57
  }
53
58
 
54
59
  // src/custom-event.ts
60
+ import { uid as uid2 } from "uid";
55
61
  var REQUEST_EVENT = "@webext-core/messaging/custom-events";
56
62
  var RESPONSE_EVENT = "@webext-core/messaging/custom-events/response";
57
63
  function defineCustomEventMessaging(config) {
58
64
  const namespace = config.namespace;
65
+ const instanceId = uid2();
59
66
  const removeAdditionalListeners = [];
60
- const sendCustomMessage = (event) => new Promise((res) => {
67
+ const sendCustomMessage = (requestEvent) => new Promise((res) => {
61
68
  const responseListener = (e) => {
62
69
  const { detail } = e;
63
- res(detail);
70
+ if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type) {
71
+ res(detail.response);
72
+ }
64
73
  };
65
74
  removeAdditionalListeners.push(
66
75
  () => window.removeEventListener(RESPONSE_EVENT, responseListener)
67
76
  );
68
- window.addEventListener(RESPONSE_EVENT, responseListener, { once: true });
69
- window.dispatchEvent(event);
77
+ window.addEventListener(RESPONSE_EVENT, responseListener);
78
+ window.dispatchEvent(requestEvent);
70
79
  });
71
80
  const messenger = defineGenericMessanging(__spreadProps(__spreadValues({}, config), {
72
81
  sendMessage(message) {
73
- const event = new CustomEvent(REQUEST_EVENT, { detail: { message, namespace } });
74
- return sendCustomMessage(event);
82
+ const reqDetail = { message, namespace, instanceId };
83
+ const requestEvent = new CustomEvent(REQUEST_EVENT, {
84
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
85
+ detail: typeof cloneInto !== "undefined" ? cloneInto(reqDetail, window) : reqDetail
86
+ });
87
+ return sendCustomMessage(requestEvent);
75
88
  },
76
89
  addRootListener(processMessage) {
77
- const listener = (e) => __async(this, null, function* () {
90
+ const requestListener = (e) => __async(this, null, function* () {
78
91
  const _a = e, { detail } = _a, event = __objRest(_a, ["detail"]);
79
- if (detail.namespace !== namespace)
92
+ if (detail.namespace !== namespace || detail.instanceId === instanceId)
80
93
  return;
81
94
  const message = __spreadProps(__spreadValues({}, detail.message), { event });
82
95
  const response = yield processMessage(message);
83
- const responseEvent = new CustomEvent(RESPONSE_EVENT, { detail: response });
96
+ const resDetail = { response, message, instanceId, namespace };
97
+ const responseEvent = new CustomEvent(RESPONSE_EVENT, {
98
+ // @ts-expect-error not exist cloneInto types because implemented only in Firefox.
99
+ detail: typeof cloneInto !== "undefined" ? cloneInto(resDetail, window) : resDetail
100
+ });
84
101
  window.dispatchEvent(responseEvent);
85
102
  });
86
- window.addEventListener(REQUEST_EVENT, listener);
87
- return () => window.removeEventListener(REQUEST_EVENT, listener);
103
+ window.addEventListener(REQUEST_EVENT, requestListener);
104
+ return () => window.removeEventListener(REQUEST_EVENT, requestListener);
88
105
  }
89
106
  }));
90
107
  return __spreadProps(__spreadValues({}, messenger), {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webext-core/messaging",
3
- "version": "1.4.0",
3
+ "version": "2.0.1",
4
4
  "description": "Light weight, type-safe wrapper around the web extension messaging APIs. Supports all browsers (Chrome, Firefox, Safari)",
5
5
  "license": "MIT",
6
6
  "keywords": [
@@ -45,24 +45,25 @@
45
45
  "types": "./lib/page.d.ts"
46
46
  }
47
47
  },
48
+ "scripts": {
49
+ "build": "buildc -- tsup src/index.ts src/page.ts --clean --out-dir lib --dts --format esm,cjs,iife --global-name webExtCoreMessaging",
50
+ "test": "buildc --deps-only -- bun run test:node && bun run test:browser",
51
+ "test:node": "buildc --deps-only -- vitest -r src --config ../vitest.config.node.ts",
52
+ "test:browser": "buildc --deps-only -- vitest -r src --config ../vitest.config.browser.ts",
53
+ "test:coverage": "buildc --deps-only -- bun run test:node --coverage && bun run test:browser --coverage",
54
+ "check": "buildc --deps-only -- tsc --noEmit"
55
+ },
48
56
  "dependencies": {
49
- "webextension-polyfill": "^0.10.0",
50
- "serialize-error": "^11.0.0"
57
+ "serialize-error": "^11.0.0",
58
+ "uid": "^2.0.2",
59
+ "webextension-polyfill": "^0.10.0"
51
60
  },
52
61
  "devDependencies": {
53
62
  "@types/webextension-polyfill": "^0.9.1",
54
- "@vitest/coverage-c8": "^0.24.5",
55
- "tsup": "^6.4.0",
56
- "typescript": "^4.8.4",
57
- "vitest": "^0.28.5",
58
- "@webext-core/fake-browser": "1.2.2",
63
+ "@webext-core/fake-browser": "1.3.1",
59
64
  "tsconfig": "0.0.0"
60
65
  },
61
- "scripts": {
62
- "build": "tsup src/index.ts src/page.ts --clean --out-dir lib --dts --format esm,cjs,iife --global-name webExtCoreMessaging",
63
- "build:dependencies": "cd ../.. && turbo run build --filter=@webext-core/messaging^...",
64
- "test": "vitest -r src",
65
- "test:coverage": "vitest run -r src --coverage",
66
- "compile": "vitest typecheck"
66
+ "buildc": {
67
+ "outDir": "lib"
67
68
  }
68
- }
69
+ }
package/LICENSE DELETED
@@ -1,21 +0,0 @@
1
- MIT License
2
-
3
- Copyright (c) 2022 Aaron
4
-
5
- Permission is hereby granted, free of charge, to any person obtaining a copy
6
- of this software and associated documentation files (the "Software"), to deal
7
- in the Software without restriction, including without limitation the rights
8
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
- copies of the Software, and to permit persons to whom the Software is
10
- furnished to do so, subject to the following conditions:
11
-
12
- The above copyright notice and this permission notice shall be included in all
13
- copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
- SOFTWARE.