@webext-core/messaging 1.3.1 → 1.4.0

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.
@@ -2,10 +2,27 @@
2
2
  var webExtCoreMessaging = (() => {
3
3
  var __create = Object.create;
4
4
  var __defProp = Object.defineProperty;
5
+ var __defProps = Object.defineProperties;
5
6
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
7
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
6
8
  var __getOwnPropNames = Object.getOwnPropertyNames;
9
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
7
10
  var __getProtoOf = Object.getPrototypeOf;
8
11
  var __hasOwnProp = Object.prototype.hasOwnProperty;
12
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
13
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
14
+ var __spreadValues = (a, b) => {
15
+ for (var prop in b || (b = {}))
16
+ if (__hasOwnProp.call(b, prop))
17
+ __defNormalProp(a, prop, b[prop]);
18
+ if (__getOwnPropSymbols)
19
+ for (var prop of __getOwnPropSymbols(b)) {
20
+ if (__propIsEnum.call(b, prop))
21
+ __defNormalProp(a, prop, b[prop]);
22
+ }
23
+ return a;
24
+ };
25
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
9
26
  var __commonJS = (cb, mod) => function __require() {
10
27
  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
11
28
  };
@@ -26,6 +43,10 @@ var webExtCoreMessaging = (() => {
26
43
  mod
27
44
  ));
28
45
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
46
+ var __publicField = (obj, key, value) => {
47
+ __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
48
+ return value;
49
+ };
29
50
  var __async = (__this, __arguments, generator) => {
30
51
  return new Promise((resolve, reject) => {
31
52
  var fulfilled = (value) => {
@@ -1047,104 +1068,300 @@ var webExtCoreMessaging = (() => {
1047
1068
  __export(src_exports, {
1048
1069
  defineExtensionMessaging: () => defineExtensionMessaging
1049
1070
  });
1071
+
1072
+ // src/extension.ts
1050
1073
  var import_webextension_polyfill = __toESM(require_browser_polyfill(), 1);
1051
- function defineExtensionMessaging(config) {
1052
- let rootListener;
1074
+
1075
+ // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/error-constructors.js
1076
+ var list = [
1077
+ EvalError,
1078
+ RangeError,
1079
+ ReferenceError,
1080
+ SyntaxError,
1081
+ TypeError,
1082
+ URIError,
1083
+ globalThis.DOMException,
1084
+ globalThis.AssertionError,
1085
+ globalThis.SystemError
1086
+ ].filter(Boolean).map(
1087
+ (constructor) => [constructor.name, constructor]
1088
+ );
1089
+ var errorConstructors = new Map(list);
1090
+ var error_constructors_default = errorConstructors;
1091
+
1092
+ // ../../node_modules/.pnpm/serialize-error@11.0.0/node_modules/serialize-error/index.js
1093
+ var NonError = class extends Error {
1094
+ constructor(message) {
1095
+ super(NonError._prepareSuperMessage(message));
1096
+ __publicField(this, "name", "NonError");
1097
+ }
1098
+ static _prepareSuperMessage(message) {
1099
+ try {
1100
+ return JSON.stringify(message);
1101
+ } catch (e) {
1102
+ return String(message);
1103
+ }
1104
+ }
1105
+ };
1106
+ var commonProperties = [
1107
+ {
1108
+ property: "name",
1109
+ enumerable: false
1110
+ },
1111
+ {
1112
+ property: "message",
1113
+ enumerable: false
1114
+ },
1115
+ {
1116
+ property: "stack",
1117
+ enumerable: false
1118
+ },
1119
+ {
1120
+ property: "code",
1121
+ enumerable: true
1122
+ },
1123
+ {
1124
+ property: "cause",
1125
+ enumerable: false
1126
+ }
1127
+ ];
1128
+ var toJsonWasCalled = Symbol(".toJSON was called");
1129
+ var toJSON = (from) => {
1130
+ from[toJsonWasCalled] = true;
1131
+ const json = from.toJSON();
1132
+ delete from[toJsonWasCalled];
1133
+ return json;
1134
+ };
1135
+ var getErrorConstructor = (name) => {
1136
+ var _a;
1137
+ return (_a = error_constructors_default.get(name)) != null ? _a : Error;
1138
+ };
1139
+ var destroyCircular = ({
1140
+ from,
1141
+ seen,
1142
+ to,
1143
+ forceEnumerable,
1144
+ maxDepth,
1145
+ depth,
1146
+ useToJSON,
1147
+ serialize
1148
+ }) => {
1149
+ if (!to) {
1150
+ if (Array.isArray(from)) {
1151
+ to = [];
1152
+ } else if (!serialize && isErrorLike(from)) {
1153
+ const Error2 = getErrorConstructor(from.name);
1154
+ to = new Error2();
1155
+ } else {
1156
+ to = {};
1157
+ }
1158
+ }
1159
+ seen.push(from);
1160
+ if (depth >= maxDepth) {
1161
+ return to;
1162
+ }
1163
+ if (useToJSON && typeof from.toJSON === "function" && from[toJsonWasCalled] !== true) {
1164
+ return toJSON(from);
1165
+ }
1166
+ const continueDestroyCircular = (value) => destroyCircular({
1167
+ from: value,
1168
+ seen: [...seen],
1169
+ forceEnumerable,
1170
+ maxDepth,
1171
+ depth,
1172
+ useToJSON,
1173
+ serialize
1174
+ });
1175
+ for (const [key, value] of Object.entries(from)) {
1176
+ if (typeof Buffer === "function" && Buffer.isBuffer(value)) {
1177
+ to[key] = "[object Buffer]";
1178
+ continue;
1179
+ }
1180
+ if (value !== null && typeof value === "object" && typeof value.pipe === "function") {
1181
+ to[key] = "[object Stream]";
1182
+ continue;
1183
+ }
1184
+ if (typeof value === "function") {
1185
+ continue;
1186
+ }
1187
+ if (!value || typeof value !== "object") {
1188
+ to[key] = value;
1189
+ continue;
1190
+ }
1191
+ if (!seen.includes(from[key])) {
1192
+ depth++;
1193
+ to[key] = continueDestroyCircular(from[key]);
1194
+ continue;
1195
+ }
1196
+ to[key] = "[Circular]";
1197
+ }
1198
+ for (const { property, enumerable } of commonProperties) {
1199
+ if (typeof from[property] !== "undefined" && from[property] !== null) {
1200
+ Object.defineProperty(to, property, {
1201
+ value: isErrorLike(from[property]) ? continueDestroyCircular(from[property]) : from[property],
1202
+ enumerable: forceEnumerable ? true : enumerable,
1203
+ configurable: true,
1204
+ writable: true
1205
+ });
1206
+ }
1207
+ }
1208
+ return to;
1209
+ };
1210
+ function serializeError(value, options = {}) {
1211
+ var _a;
1212
+ const {
1213
+ maxDepth = Number.POSITIVE_INFINITY,
1214
+ useToJSON = true
1215
+ } = options;
1216
+ if (typeof value === "object" && value !== null) {
1217
+ return destroyCircular({
1218
+ from: value,
1219
+ seen: [],
1220
+ forceEnumerable: true,
1221
+ maxDepth,
1222
+ depth: 0,
1223
+ useToJSON,
1224
+ serialize: true
1225
+ });
1226
+ }
1227
+ if (typeof value === "function") {
1228
+ return `[Function: ${(_a = value.name) != null ? _a : "anonymous"}]`;
1229
+ }
1230
+ return value;
1231
+ }
1232
+ function deserializeError(value, options = {}) {
1233
+ const { maxDepth = Number.POSITIVE_INFINITY } = options;
1234
+ if (value instanceof Error) {
1235
+ return value;
1236
+ }
1237
+ if (isMinimumViableSerializedError(value)) {
1238
+ const Error2 = getErrorConstructor(value.name);
1239
+ return destroyCircular({
1240
+ from: value,
1241
+ seen: [],
1242
+ to: new Error2(),
1243
+ maxDepth,
1244
+ depth: 0,
1245
+ serialize: false
1246
+ });
1247
+ }
1248
+ return new NonError(value);
1249
+ }
1250
+ function isErrorLike(value) {
1251
+ return Boolean(value) && typeof value === "object" && "name" in value && "message" in value && "stack" in value;
1252
+ }
1253
+ function isMinimumViableSerializedError(value) {
1254
+ return Boolean(value) && typeof value === "object" && "message" in value && !Array.isArray(value);
1255
+ }
1256
+
1257
+ // src/generic.ts
1258
+ function defineGenericMessanging(config) {
1259
+ let removeRootListener;
1260
+ let perTypeListeners = {};
1053
1261
  function cleanupRootListener() {
1054
- if (Object.entries(keyListeners).length === 0) {
1055
- import_webextension_polyfill.default.runtime.onMessage.removeListener(rootListener);
1056
- rootListener = void 0;
1262
+ if (Object.entries(perTypeListeners).length === 0) {
1263
+ removeRootListener == null ? void 0 : removeRootListener();
1264
+ removeRootListener = void 0;
1057
1265
  }
1058
1266
  }
1059
- let keyListeners = {};
1060
1267
  let idSeq = Math.floor(Math.random() * 1e4);
1061
1268
  function getNextId() {
1062
1269
  return idSeq++;
1063
1270
  }
1064
- function onMessage(type, onReceived) {
1065
- var _a, _b, _c;
1066
- if (rootListener == null) {
1067
- (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(
1068
- `[messaging] ${type} initialized message listener for this context`
1069
- );
1070
- rootListener = (message, sender) => {
1071
- var _a2, _b2, _c2;
1072
- if (typeof message.type != "string" || typeof message.timestamp !== "number") {
1073
- const err = Error(
1074
- `[messaging] Unknown message format, must include the 'type' & 'timestamp' fields, received: ${JSON.stringify(
1075
- message
1076
- )}`
1077
- );
1078
- (_a2 = config == null ? void 0 : config.logger) == null ? void 0 : _a2.error(err);
1079
- throw err;
1080
- }
1081
- (_b2 = config == null ? void 0 : config.logger) == null ? void 0 : _b2.debug("[messaging] Received message", message, sender);
1082
- const entries = Object.entries(keyListeners);
1083
- for (const [type2, listener] of entries) {
1084
- if (message.type !== type2)
1085
- continue;
1086
- (_c2 = config == null ? void 0 : config.logger) == null ? void 0 : _c2.debug(`[messaging] onMessage {id=${message.id}} \u140A\u2500`, message);
1087
- const res = listener({
1088
- data: message.data,
1089
- sender,
1090
- timestamp: message.timestamp
1091
- });
1271
+ return {
1272
+ sendMessage(type, data, ...args) {
1273
+ return __async(this, null, function* () {
1274
+ var _a2, _b;
1275
+ const message = {
1276
+ id: getNextId(),
1277
+ type,
1278
+ data,
1279
+ timestamp: Date.now()
1280
+ };
1281
+ (_a2 = config.logger) == null ? void 0 : _a2.debug(`[messaging] sendMessage {id=${message.id}} \u2500\u1405`, message, ...args);
1282
+ const response = yield config.sendMessage(message, ...args);
1283
+ const { res, err } = response != null ? response : { err: new Error("No response") };
1284
+ (_b = config.logger) == null ? void 0 : _b.debug(`[messaging] sendMessage {id=${message.id}} \u140A\u2500`, { res, err });
1285
+ if (err != null)
1286
+ throw deserializeError(err);
1287
+ return res;
1288
+ });
1289
+ },
1290
+ onMessage(type, onReceived) {
1291
+ var _a2, _b, _c;
1292
+ if (removeRootListener == null) {
1293
+ (_a2 = config.logger) == null ? void 0 : _a2.debug(
1294
+ `[messaging] "${type}" initialized the message listener for this context`
1295
+ );
1296
+ removeRootListener = config.addRootListener((message) => {
1297
+ var _a3, _b2;
1298
+ if (typeof message.type != "string" || typeof message.timestamp !== "number") {
1299
+ const err = Error(
1300
+ `[messaging] Unknown message format, must include the 'type' & 'timestamp' fields, received: ${JSON.stringify(
1301
+ message
1302
+ )}`
1303
+ );
1304
+ (_a3 = config.logger) == null ? void 0 : _a3.error(err);
1305
+ throw err;
1306
+ }
1307
+ (_b2 = config == null ? void 0 : config.logger) == null ? void 0 : _b2.debug("[messaging] Received message", message);
1308
+ const listener = perTypeListeners[message.type];
1309
+ if (listener == null)
1310
+ return;
1311
+ const res = listener(message);
1092
1312
  return Promise.resolve(res).then((res2) => {
1093
- var _a3;
1094
- (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res: res2 });
1313
+ var _a4;
1314
+ (_a4 = config == null ? void 0 : config.logger) == null ? void 0 : _a4.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res: res2 });
1095
1315
  return { res: res2 };
1096
1316
  }).catch((err) => {
1097
- var _a3;
1098
- let errMessage;
1099
- if (err instanceof Error)
1100
- errMessage = err.message;
1101
- else
1102
- errMessage = String(err);
1103
- (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
1104
- return { err: errMessage };
1317
+ var _a4;
1318
+ (_a4 = config == null ? void 0 : config.logger) == null ? void 0 : _a4.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
1319
+ return { err: serializeError(err) };
1105
1320
  });
1106
- }
1321
+ });
1322
+ }
1323
+ if (perTypeListeners[type] != null) {
1324
+ const err = Error(
1325
+ `[messaging] In this JS context, only one listener can be setup for ${type}`
1326
+ );
1327
+ (_b = config.logger) == null ? void 0 : _b.error(err);
1328
+ throw err;
1329
+ }
1330
+ perTypeListeners[type] = onReceived;
1331
+ (_c = config.logger) == null ? void 0 : _c.log(`[messaging] Added listener for ${type}`);
1332
+ return () => {
1333
+ delete perTypeListeners[type];
1334
+ cleanupRootListener();
1107
1335
  };
1108
- import_webextension_polyfill.default.runtime.onMessage.addListener(rootListener);
1109
- }
1110
- if (keyListeners[type] != null) {
1111
- const err = Error(
1112
- `[messaging] In this JS context, only one listener can be setup for ${type}`
1113
- );
1114
- (_b = config == null ? void 0 : config.logger) == null ? void 0 : _b.error(err);
1115
- throw err;
1116
- }
1117
- keyListeners[type] = onReceived;
1118
- (_c = config == null ? void 0 : config.logger) == null ? void 0 : _c.log(`[messaging] Added listener for ${type}`);
1119
- return function removeListener() {
1120
- delete keyListeners[type];
1336
+ },
1337
+ removeAllListeners() {
1338
+ Object.keys(perTypeListeners).forEach((type) => {
1339
+ delete perTypeListeners[type];
1340
+ });
1121
1341
  cleanupRootListener();
1122
- };
1123
- }
1124
- function sendMessage(type, data, tabId) {
1125
- return __async(this, null, function* () {
1126
- var _a, _b;
1127
- const message = { id: getNextId(), type, data, timestamp: Date.now() };
1128
- (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(`[messaging] sendMessage {id=${message.id}} \u2500\u1405`, message);
1129
- let response;
1342
+ }
1343
+ };
1344
+ }
1345
+
1346
+ // src/extension.ts
1347
+ function defineExtensionMessaging(config) {
1348
+ return defineGenericMessanging(__spreadProps(__spreadValues({}, config), {
1349
+ sendMessage(message, tabId) {
1130
1350
  if (tabId == null)
1131
- response = yield import_webextension_polyfill.default.runtime.sendMessage(message);
1132
- else
1133
- response = yield import_webextension_polyfill.default.tabs.sendMessage(tabId, message);
1134
- const { res, err } = response != null ? response : { err: "No response" };
1135
- (_b = config == null ? void 0 : config.logger) == null ? void 0 : _b.debug(`[messaging] sendMessage {id=${message.id}} \u140A\u2500`, { res, err });
1136
- if (err != null)
1137
- throw Error(err);
1138
- return res;
1139
- });
1140
- }
1141
- function removeAllMessageListeners() {
1142
- Object.keys(keyListeners).forEach((type) => {
1143
- delete keyListeners[type];
1144
- });
1145
- cleanupRootListener();
1146
- }
1147
- return { onMessage, sendMessage, removeAllMessageListeners };
1351
+ return import_webextension_polyfill.default.runtime.sendMessage(message);
1352
+ return import_webextension_polyfill.default.tabs.sendMessage(tabId, message);
1353
+ },
1354
+ addRootListener(processMessage) {
1355
+ const listener = (message, sender) => {
1356
+ if (typeof message === "object")
1357
+ return processMessage(__spreadProps(__spreadValues({}, message), { sender }));
1358
+ else
1359
+ return processMessage(message);
1360
+ };
1361
+ import_webextension_polyfill.default.runtime.onMessage.addListener(listener);
1362
+ return () => import_webextension_polyfill.default.runtime.onMessage.removeListener(listener);
1363
+ }
1364
+ }));
1148
1365
  }
1149
1366
  return __toCommonJS(src_exports);
1150
1367
  })();
package/lib/index.js CHANGED
@@ -1,123 +1,29 @@
1
- var __async = (__this, __arguments, generator) => {
2
- return new Promise((resolve, reject) => {
3
- var fulfilled = (value) => {
4
- try {
5
- step(generator.next(value));
6
- } catch (e) {
7
- reject(e);
8
- }
9
- };
10
- var rejected = (value) => {
11
- try {
12
- step(generator.throw(value));
13
- } catch (e) {
14
- reject(e);
15
- }
16
- };
17
- var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
18
- step((generator = generator.apply(__this, __arguments)).next());
19
- });
20
- };
1
+ import {
2
+ __spreadProps,
3
+ __spreadValues,
4
+ defineGenericMessanging
5
+ } from "./chunk-ALTBYIMW.js";
21
6
 
22
- // src/index.ts
7
+ // src/extension.ts
23
8
  import Browser from "webextension-polyfill";
24
9
  function defineExtensionMessaging(config) {
25
- let rootListener;
26
- function cleanupRootListener() {
27
- if (Object.entries(keyListeners).length === 0) {
28
- Browser.runtime.onMessage.removeListener(rootListener);
29
- rootListener = void 0;
30
- }
31
- }
32
- let keyListeners = {};
33
- let idSeq = Math.floor(Math.random() * 1e4);
34
- function getNextId() {
35
- return idSeq++;
36
- }
37
- function onMessage(type, onReceived) {
38
- var _a, _b, _c;
39
- if (rootListener == null) {
40
- (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(
41
- `[messaging] ${type} initialized message listener for this context`
42
- );
43
- rootListener = (message, sender) => {
44
- var _a2, _b2, _c2;
45
- if (typeof message.type != "string" || typeof message.timestamp !== "number") {
46
- const err = Error(
47
- `[messaging] Unknown message format, must include the 'type' & 'timestamp' fields, received: ${JSON.stringify(
48
- message
49
- )}`
50
- );
51
- (_a2 = config == null ? void 0 : config.logger) == null ? void 0 : _a2.error(err);
52
- throw err;
53
- }
54
- (_b2 = config == null ? void 0 : config.logger) == null ? void 0 : _b2.debug("[messaging] Received message", message, sender);
55
- const entries = Object.entries(keyListeners);
56
- for (const [type2, listener] of entries) {
57
- if (message.type !== type2)
58
- continue;
59
- (_c2 = config == null ? void 0 : config.logger) == null ? void 0 : _c2.debug(`[messaging] onMessage {id=${message.id}} \u140A\u2500`, message);
60
- const res = listener({
61
- data: message.data,
62
- sender,
63
- timestamp: message.timestamp
64
- });
65
- return Promise.resolve(res).then((res2) => {
66
- var _a3;
67
- (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res: res2 });
68
- return { res: res2 };
69
- }).catch((err) => {
70
- var _a3;
71
- let errMessage;
72
- if (err instanceof Error)
73
- errMessage = err.message;
74
- else
75
- errMessage = String(err);
76
- (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
77
- return { err: errMessage };
78
- });
79
- }
10
+ return defineGenericMessanging(__spreadProps(__spreadValues({}, config), {
11
+ sendMessage(message, tabId) {
12
+ if (tabId == null)
13
+ return Browser.runtime.sendMessage(message);
14
+ return Browser.tabs.sendMessage(tabId, message);
15
+ },
16
+ addRootListener(processMessage) {
17
+ const listener = (message, sender) => {
18
+ if (typeof message === "object")
19
+ return processMessage(__spreadProps(__spreadValues({}, message), { sender }));
20
+ else
21
+ return processMessage(message);
80
22
  };
81
- Browser.runtime.onMessage.addListener(rootListener);
23
+ Browser.runtime.onMessage.addListener(listener);
24
+ return () => Browser.runtime.onMessage.removeListener(listener);
82
25
  }
83
- if (keyListeners[type] != null) {
84
- const err = Error(
85
- `[messaging] In this JS context, only one listener can be setup for ${type}`
86
- );
87
- (_b = config == null ? void 0 : config.logger) == null ? void 0 : _b.error(err);
88
- throw err;
89
- }
90
- keyListeners[type] = onReceived;
91
- (_c = config == null ? void 0 : config.logger) == null ? void 0 : _c.log(`[messaging] Added listener for ${type}`);
92
- return function removeListener() {
93
- delete keyListeners[type];
94
- cleanupRootListener();
95
- };
96
- }
97
- function sendMessage(type, data, tabId) {
98
- return __async(this, null, function* () {
99
- var _a, _b;
100
- const message = { id: getNextId(), type, data, timestamp: Date.now() };
101
- (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(`[messaging] sendMessage {id=${message.id}} \u2500\u1405`, message);
102
- let response;
103
- if (tabId == null)
104
- response = yield Browser.runtime.sendMessage(message);
105
- else
106
- response = yield Browser.tabs.sendMessage(tabId, message);
107
- const { res, err } = response != null ? response : { err: "No response" };
108
- (_b = config == null ? void 0 : config.logger) == null ? void 0 : _b.debug(`[messaging] sendMessage {id=${message.id}} \u140A\u2500`, { res, err });
109
- if (err != null)
110
- throw Error(err);
111
- return res;
112
- });
113
- }
114
- function removeAllMessageListeners() {
115
- Object.keys(keyListeners).forEach((type) => {
116
- delete keyListeners[type];
117
- });
118
- cleanupRootListener();
119
- }
120
- return { onMessage, sendMessage, removeAllMessageListeners };
26
+ }));
121
27
  }
122
28
  export {
123
29
  defineExtensionMessaging