@webext-core/messaging 1.0.1 → 1.0.3

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.
package/lib/index.cjs CHANGED
@@ -55,7 +55,7 @@ function defineExtensionMessaging(config) {
55
55
  let keyListeners = {};
56
56
  let idSeq = Math.floor(Math.random() * 1e4);
57
57
  function getNextId() {
58
- return idSeq + 1;
58
+ return idSeq++;
59
59
  }
60
60
  function onMessage(key, onReceived) {
61
61
  var _a, _b, _c;
@@ -63,8 +63,8 @@ function defineExtensionMessaging(config) {
63
63
  (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(
64
64
  `[messaging] ${key} initialized message listener for this context`
65
65
  );
66
- rootListener = (message, sender) => __async(this, null, function* () {
67
- var _a2, _b2, _c2, _d, _e;
66
+ rootListener = (message, sender) => {
67
+ var _a2, _b2, _c2;
68
68
  if (typeof message.key != "string" || typeof message.timestamp !== "number") {
69
69
  const err = Error(
70
70
  `[messaging] Unknown message format, must include the 'key' & 'timestamp' fields, received: ${JSON.stringify(
@@ -80,27 +80,27 @@ function defineExtensionMessaging(config) {
80
80
  if (message.key !== key2)
81
81
  continue;
82
82
  (_c2 = config == null ? void 0 : config.logger) == null ? void 0 : _c2.debug(`[messaging] onMessage {id=${message.id}} \u140A\u2500`, message);
83
- try {
84
- const res = yield listener({
85
- data: message.data,
86
- sender,
87
- timestamp: message.timestamp
88
- });
89
- (_d = config == null ? void 0 : config.logger) == null ? void 0 : _d.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res });
90
- return { res };
91
- } catch (err) {
83
+ const res = listener({
84
+ data: message.data,
85
+ sender,
86
+ timestamp: message.timestamp
87
+ });
88
+ return Promise.resolve(res).then((res2) => {
89
+ var _a3;
90
+ (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res: res2 });
91
+ return { res: res2 };
92
+ }).catch((err) => {
93
+ var _a3;
92
94
  let errMessage;
93
95
  if (err instanceof Error)
94
96
  errMessage = err.message;
95
97
  else
96
98
  errMessage = String(err);
97
- (_e = config == null ? void 0 : config.logger) == null ? void 0 : _e.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
99
+ (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
98
100
  return { err: errMessage };
99
- }
101
+ });
100
102
  }
101
- yield new Promise(() => {
102
- });
103
- });
103
+ };
104
104
  import_webextension_polyfill.default.runtime.onMessage.addListener(rootListener);
105
105
  }
106
106
  if (keyListeners[key] != null) {
package/lib/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Runtime } from 'webextension-polyfill';
2
2
 
3
- interface Config {
3
+ interface ExtensionMessagingConfig {
4
4
  logger?: {
5
5
  debug(...args: any[]): void;
6
6
  log(...args: any[]): void;
@@ -22,9 +22,9 @@ interface Message<TProtocolMap, TKey extends keyof TProtocolMap> {
22
22
  }
23
23
  declare type MaybePromise<T> = Promise<T> | T;
24
24
  declare type OnMessageReceived<TProtocolMap, TKey extends keyof TProtocolMap> = (message: Message<TProtocolMap, TKey>) => MaybePromise<GetResponse<TProtocolMap[TKey]>>;
25
- declare function defineExtensionMessaging<TProtocolMap>(config?: Config): {
25
+ declare function defineExtensionMessaging<TProtocolMap>(config?: ExtensionMessagingConfig): {
26
26
  onMessage: <TKey extends keyof TProtocolMap>(key: TKey, onReceived: OnMessageReceived<TProtocolMap, TKey>) => void;
27
27
  sendMessage: <TKey_1 extends keyof TProtocolMap>(key: TKey_1, data: GetData<TProtocolMap[TKey_1]>, tabId?: number) => Promise<GetResponse<TProtocolMap[TKey_1]>>;
28
28
  };
29
29
 
30
- export { ProtocolWithReturn, defineExtensionMessaging };
30
+ export { ExtensionMessagingConfig, ProtocolWithReturn, defineExtensionMessaging };
package/lib/index.js CHANGED
@@ -26,7 +26,7 @@ function defineExtensionMessaging(config) {
26
26
  let keyListeners = {};
27
27
  let idSeq = Math.floor(Math.random() * 1e4);
28
28
  function getNextId() {
29
- return idSeq + 1;
29
+ return idSeq++;
30
30
  }
31
31
  function onMessage(key, onReceived) {
32
32
  var _a, _b, _c;
@@ -34,8 +34,8 @@ function defineExtensionMessaging(config) {
34
34
  (_a = config == null ? void 0 : config.logger) == null ? void 0 : _a.debug(
35
35
  `[messaging] ${key} initialized message listener for this context`
36
36
  );
37
- rootListener = (message, sender) => __async(this, null, function* () {
38
- var _a2, _b2, _c2, _d, _e;
37
+ rootListener = (message, sender) => {
38
+ var _a2, _b2, _c2;
39
39
  if (typeof message.key != "string" || typeof message.timestamp !== "number") {
40
40
  const err = Error(
41
41
  `[messaging] Unknown message format, must include the 'key' & 'timestamp' fields, received: ${JSON.stringify(
@@ -51,27 +51,27 @@ function defineExtensionMessaging(config) {
51
51
  if (message.key !== key2)
52
52
  continue;
53
53
  (_c2 = config == null ? void 0 : config.logger) == null ? void 0 : _c2.debug(`[messaging] onMessage {id=${message.id}} \u140A\u2500`, message);
54
- try {
55
- const res = yield listener({
56
- data: message.data,
57
- sender,
58
- timestamp: message.timestamp
59
- });
60
- (_d = config == null ? void 0 : config.logger) == null ? void 0 : _d.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res });
61
- return { res };
62
- } catch (err) {
54
+ const res = listener({
55
+ data: message.data,
56
+ sender,
57
+ timestamp: message.timestamp
58
+ });
59
+ return Promise.resolve(res).then((res2) => {
60
+ var _a3;
61
+ (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { res: res2 });
62
+ return { res: res2 };
63
+ }).catch((err) => {
64
+ var _a3;
63
65
  let errMessage;
64
66
  if (err instanceof Error)
65
67
  errMessage = err.message;
66
68
  else
67
69
  errMessage = String(err);
68
- (_e = config == null ? void 0 : config.logger) == null ? void 0 : _e.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
70
+ (_a3 = config == null ? void 0 : config.logger) == null ? void 0 : _a3.debug(`[messaging] onMessage {id=${message.id}} \u2500\u1405`, { err });
69
71
  return { err: errMessage };
70
- }
72
+ });
71
73
  }
72
- yield new Promise(() => {
73
- });
74
- });
74
+ };
75
75
  Browser.runtime.onMessage.addListener(rootListener);
76
76
  }
77
77
  if (keyListeners[key] != null) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webext-core/messaging",
3
- "version": "1.0.1",
3
+ "version": "1.0.3",
4
4
  "description": "Light weight, type-safe wrapper around the extension messaging APIs",
5
5
  "license": "MIT",
6
6
  "keywords": [