@webext-core/messaging 3.0.2 → 3.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/page.cjs +10 -2
- package/lib/page.global.js +1 -1
- package/lib/page.mjs +10 -2
- package/package.json +1 -1
package/lib/page.cjs
CHANGED
|
@@ -134,11 +134,19 @@ function defineCustomEventMessaging(config) {
|
|
|
134
134
|
const instanceId = createId();
|
|
135
135
|
const removeAdditionalListeners = [];
|
|
136
136
|
const sendCustomMessage = (requestEvent) => new Promise((res) => {
|
|
137
|
+
const cleanup = () => {
|
|
138
|
+
window.removeEventListener(RESPONSE_EVENT, responseListener);
|
|
139
|
+
const index = removeAdditionalListeners.indexOf(cleanup);
|
|
140
|
+
if (index !== -1) removeAdditionalListeners.splice(index, 1);
|
|
141
|
+
};
|
|
137
142
|
const responseListener = (e) => {
|
|
138
143
|
const { detail } = e;
|
|
139
|
-
if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type && detail.message.id === requestEvent.detail.message.id)
|
|
144
|
+
if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type && detail.message.id === requestEvent.detail.message.id) {
|
|
145
|
+
res(detail.response);
|
|
146
|
+
cleanup();
|
|
147
|
+
}
|
|
140
148
|
};
|
|
141
|
-
removeAdditionalListeners.push(
|
|
149
|
+
removeAdditionalListeners.push(cleanup);
|
|
142
150
|
window.addEventListener(RESPONSE_EVENT, responseListener);
|
|
143
151
|
window.dispatchEvent(requestEvent);
|
|
144
152
|
});
|
package/lib/page.global.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var webExtCorePageMessaging=(function(e){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});let t=`string`,n=`object`;function r(e){return e!=null&&typeof e==n&&typeof e.name==t&&typeof e.message==t&&typeof e.stack==t}function i(e){if(typeof e!=n||e==null)return e;if(e instanceof Error)return{name:e.name,message:e.message,stack:e.stack??``,...e.cause?{cause:i(e.cause)}:{},...i({...e})};if(Array.isArray(e)){let t=[];for(let n of e)t.push(i(n));return t}let t=Object.create(null);for(let[n,r]of Object.entries(e))t[n]=i(r);return t}function a(e){if(r(e)){let t=Error(e.message,e.cause?{cause:a(e.cause)}:void 0);t.name=e.name,t.stack=e.stack;for(let[n,r]of Object.entries(e))n!==`name`&&n!==`message`&&n!==`stack`&&n!==`cause`&&(t[n]=r);return t}if(e==null||typeof e!=n)return e;if(Array.isArray(e)){let t=[];for(let n of e)t.push(a(n));return t}let t=Object.create(null);for(let[n,r]of Object.entries(e))t[n]=a(r);return t}function o(e){let t,n={};function r(){Object.entries(n).length===0&&(t?.(),t=void 0)}let o=Math.floor(Math.random()*1e4);function s(){return o++}return{async sendMessage(t,n,...r){let i={id:s(),type:t,data:n,timestamp:Date.now()},o=await e.verifyMessageData?.(i)??i;e.logger?.debug(`[messaging] sendMessage {id=${o.id}} ─ᐅ`,o,...r);let{res:c,err:l}=await e.sendMessage(o,...r)??{err:Error(`No response`)};if(e.logger?.debug(`[messaging] sendMessage {id=${o.id}} ᐊ─`,{res:c,err:l}),l!=null)throw a(l);return c},onMessage(a,o){if(t??=(e.logger?.debug(`[messaging] "${a}" initialized the message listener for this context`),e.addRootListener(t=>{if(typeof t.type!=`string`||typeof t.timestamp!=`number`)if(e.throwOnUnknownMessageFormat){let n=Error(`[messaging] Unknown message format, must include the 'type' & 'timestamp' fields, received: ${JSON.stringify(t)}`);throw e.logger?.error(n),n}else return;e?.logger?.debug(`[messaging] Received message`,t);let r=n[t.type];if(r==null)return;let a=r(t);return Promise.resolve(a).then(t=>e.verifyMessageData?.(t)??t).then(n=>(e?.logger?.debug(`[messaging] onMessage {id=${t.id}} ─ᐅ`,{res:n}),{res:n})).catch(n=>(e?.logger?.debug(`[messaging] onMessage {id=${t.id}} ─ᐅ`,{err:n}),{err:i(n)}))})),n[a]!=null){let t=Error(`[messaging] In this JS context, only one listener can be setup for ${a}`);throw e.logger?.error(t),t}return n[a]=o,e.logger?.log(`[messaging] Added listener for ${a}`),()=>{delete n[a],r()}},removeAllListeners(){Object.keys(n).forEach(e=>{delete n[e]}),r()}}}function s(e,t={targetScope:window??void 0}){return typeof cloneInto<`u`?cloneInto(e,t.targetScope):e}function c(){return Math.random().toString(36).substring(2,10)}let l=`@webext-core/messaging/window`,u=`@webext-core/messaging/window/response`;function d(e){let t=e.namespace,n=c(),r=[],i=(e,i,a)=>new Promise(o=>{let s=r=>{r.data.type===u&&r.data.namespace===t&&r.data.instanceId!==n&&r.data.message.type===e.type&&r.data.message.id===e.id&&(o(r.data.response),c())},c=()=>window.removeEventListener(`message`,s);r.push(c),window.addEventListener(`message`,s),(a??window).postMessage({type:l,message:e,senderOrigin:location.origin,namespace:t,instanceId:n},i??`*`)}),a=o({...e,sendMessage(e,t,n){return i(e,t,n)},addRootListener(e){let r=async r=>{if(r.data.type!==l||r.data.namespace!==t||r.data.instanceId===n)return;let i=await e(r.data.message);window.postMessage({type:u,response:i,instanceId:n,message:r.data.message,namespace:t},r.data.senderOrigin)};return window.addEventListener(`message`,r),()=>window.removeEventListener(`message`,r)},verifyMessageData(e){return structuredClone(e)}});return{...a,removeAllListeners(){a.removeAllListeners(),r.forEach(e=>e()),r=[]}}}let f=`@webext-core/messaging/custom-events`,p=`@webext-core/messaging/custom-events/response`;function m(e){let t=e.namespace,n=c(),r=[],i=e=>new Promise(i=>{let a=r=>{let{detail:
|
|
1
|
+
var webExtCorePageMessaging=(function(e){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});let t=`string`,n=`object`;function r(e){return e!=null&&typeof e==n&&typeof e.name==t&&typeof e.message==t&&typeof e.stack==t}function i(e){if(typeof e!=n||e==null)return e;if(e instanceof Error)return{name:e.name,message:e.message,stack:e.stack??``,...e.cause?{cause:i(e.cause)}:{},...i({...e})};if(Array.isArray(e)){let t=[];for(let n of e)t.push(i(n));return t}let t=Object.create(null);for(let[n,r]of Object.entries(e))t[n]=i(r);return t}function a(e){if(r(e)){let t=Error(e.message,e.cause?{cause:a(e.cause)}:void 0);t.name=e.name,t.stack=e.stack;for(let[n,r]of Object.entries(e))n!==`name`&&n!==`message`&&n!==`stack`&&n!==`cause`&&(t[n]=r);return t}if(e==null||typeof e!=n)return e;if(Array.isArray(e)){let t=[];for(let n of e)t.push(a(n));return t}let t=Object.create(null);for(let[n,r]of Object.entries(e))t[n]=a(r);return t}function o(e){let t,n={};function r(){Object.entries(n).length===0&&(t?.(),t=void 0)}let o=Math.floor(Math.random()*1e4);function s(){return o++}return{async sendMessage(t,n,...r){let i={id:s(),type:t,data:n,timestamp:Date.now()},o=await e.verifyMessageData?.(i)??i;e.logger?.debug(`[messaging] sendMessage {id=${o.id}} ─ᐅ`,o,...r);let{res:c,err:l}=await e.sendMessage(o,...r)??{err:Error(`No response`)};if(e.logger?.debug(`[messaging] sendMessage {id=${o.id}} ᐊ─`,{res:c,err:l}),l!=null)throw a(l);return c},onMessage(a,o){if(t??=(e.logger?.debug(`[messaging] "${a}" initialized the message listener for this context`),e.addRootListener(t=>{if(typeof t.type!=`string`||typeof t.timestamp!=`number`)if(e.throwOnUnknownMessageFormat){let n=Error(`[messaging] Unknown message format, must include the 'type' & 'timestamp' fields, received: ${JSON.stringify(t)}`);throw e.logger?.error(n),n}else return;e?.logger?.debug(`[messaging] Received message`,t);let r=n[t.type];if(r==null)return;let a=r(t);return Promise.resolve(a).then(t=>e.verifyMessageData?.(t)??t).then(n=>(e?.logger?.debug(`[messaging] onMessage {id=${t.id}} ─ᐅ`,{res:n}),{res:n})).catch(n=>(e?.logger?.debug(`[messaging] onMessage {id=${t.id}} ─ᐅ`,{err:n}),{err:i(n)}))})),n[a]!=null){let t=Error(`[messaging] In this JS context, only one listener can be setup for ${a}`);throw e.logger?.error(t),t}return n[a]=o,e.logger?.log(`[messaging] Added listener for ${a}`),()=>{delete n[a],r()}},removeAllListeners(){Object.keys(n).forEach(e=>{delete n[e]}),r()}}}function s(e,t={targetScope:window??void 0}){return typeof cloneInto<`u`?cloneInto(e,t.targetScope):e}function c(){return Math.random().toString(36).substring(2,10)}let l=`@webext-core/messaging/window`,u=`@webext-core/messaging/window/response`;function d(e){let t=e.namespace,n=c(),r=[],i=(e,i,a)=>new Promise(o=>{let s=r=>{r.data.type===u&&r.data.namespace===t&&r.data.instanceId!==n&&r.data.message.type===e.type&&r.data.message.id===e.id&&(o(r.data.response),c())},c=()=>window.removeEventListener(`message`,s);r.push(c),window.addEventListener(`message`,s),(a??window).postMessage({type:l,message:e,senderOrigin:location.origin,namespace:t,instanceId:n},i??`*`)}),a=o({...e,sendMessage(e,t,n){return i(e,t,n)},addRootListener(e){let r=async r=>{if(r.data.type!==l||r.data.namespace!==t||r.data.instanceId===n)return;let i=await e(r.data.message);window.postMessage({type:u,response:i,instanceId:n,message:r.data.message,namespace:t},r.data.senderOrigin)};return window.addEventListener(`message`,r),()=>window.removeEventListener(`message`,r)},verifyMessageData(e){return structuredClone(e)}});return{...a,removeAllListeners(){a.removeAllListeners(),r.forEach(e=>e()),r=[]}}}let f=`@webext-core/messaging/custom-events`,p=`@webext-core/messaging/custom-events/response`;function m(e){let t=e.namespace,n=c(),r=[],i=e=>new Promise(i=>{let a=()=>{window.removeEventListener(p,o);let e=r.indexOf(a);e!==-1&&r.splice(e,1)},o=r=>{let{detail:o}=r;o.namespace===t&&o.instanceId!==n&&o.message.type===e.detail.message.type&&o.message.id===e.detail.message.id&&(i(o.response),a())};r.push(a),window.addEventListener(p,o),window.dispatchEvent(e)}),a=o({...e,sendMessage(e){return i(new CustomEvent(f,{detail:s({message:e,namespace:t,instanceId:n})}))},addRootListener(e){let r=async r=>{let{detail:i,...a}=r;if(i.namespace!==t||i.instanceId===n)return;let o={...i.message,event:a},c={response:await e(o),message:o,instanceId:n,namespace:t},l=new CustomEvent(p,{detail:s(c)});window.dispatchEvent(l)};return window.addEventListener(f,r),()=>window.removeEventListener(f,r)},verifyMessageData(e){return structuredClone(e)}});return{...a,removeAllListeners(){a.removeAllListeners(),r.forEach(e=>e())}}}return e.defineCustomEventMessaging=m,e.defineWindowMessaging=d,e})({});
|
package/lib/page.mjs
CHANGED
|
@@ -133,11 +133,19 @@ function defineCustomEventMessaging(config) {
|
|
|
133
133
|
const instanceId = createId();
|
|
134
134
|
const removeAdditionalListeners = [];
|
|
135
135
|
const sendCustomMessage = (requestEvent) => new Promise((res) => {
|
|
136
|
+
const cleanup = () => {
|
|
137
|
+
window.removeEventListener(RESPONSE_EVENT, responseListener);
|
|
138
|
+
const index = removeAdditionalListeners.indexOf(cleanup);
|
|
139
|
+
if (index !== -1) removeAdditionalListeners.splice(index, 1);
|
|
140
|
+
};
|
|
136
141
|
const responseListener = (e) => {
|
|
137
142
|
const { detail } = e;
|
|
138
|
-
if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type && detail.message.id === requestEvent.detail.message.id)
|
|
143
|
+
if (detail.namespace === namespace && detail.instanceId !== instanceId && detail.message.type === requestEvent.detail.message.type && detail.message.id === requestEvent.detail.message.id) {
|
|
144
|
+
res(detail.response);
|
|
145
|
+
cleanup();
|
|
146
|
+
}
|
|
139
147
|
};
|
|
140
|
-
removeAdditionalListeners.push(
|
|
148
|
+
removeAdditionalListeners.push(cleanup);
|
|
141
149
|
window.addEventListener(RESPONSE_EVENT, responseListener);
|
|
142
150
|
window.dispatchEvent(requestEvent);
|
|
143
151
|
});
|
package/package.json
CHANGED