@cowprotocol/iframe-transport 2.2.3 → 2.2.4

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.
@@ -1,4 +1,23 @@
1
1
  import { EthereumProvider, JsonRpcRequestMessage } from '../types';
2
+ /**
3
+ * An {@link EthereumProvider} that may also expose `removeListener` for
4
+ * subscription cleanup.
5
+ *
6
+ * EIP-1193 standardizes `on(event, handler)` for subscribing to provider
7
+ * events but does not formally specify the removal counterpart. Most wallet
8
+ * providers (MetaMask, Rabby, Coinbase Wallet, WalletConnect) implement
9
+ * `removeListener` to match Node's `EventEmitter` API, but it is not
10
+ * guaranteed. Use this type — or a `typeof provider.removeListener ===
11
+ * 'function'` runtime check — to narrow before calling it.
12
+ *
13
+ * Within this library it is used by {@link IframeRpcProviderBridge.disconnect}
14
+ * to detach the forwarded `connect` / `disconnect` / `chainChanged` /
15
+ * `accountsChanged` listeners before dropping the provider reference,
16
+ * preventing stale handlers from firing against the parent dapp.
17
+ */
18
+ export type EthereumProviderWithRemoveListener = EthereumProvider & {
19
+ removeListener?(event: string, handler: (...args: unknown[]) => void): void;
20
+ };
2
21
  /**
3
22
  * Handles JSON-RPC request coming from an iFrame by delegating to a given Ethereum provider.
4
23
  * The result will be passed back to the iFrame.
@@ -15,6 +34,8 @@ export declare class IframeRpcProviderBridge {
15
34
  private ethereumProvider;
16
35
  /** Stored JSON-RPC requests, to queue them when disconnected. */
17
36
  private requestWaitingForConnection;
37
+ /** Bound event-forwarding listeners so they can be removed on disconnect. */
38
+ private providerEventListeners;
18
39
  /**
19
40
  * Creates an instance of IframeRpcProviderBridge.
20
41
  * @param iframeWindow - The iFrame window that will post up general RPC messages and to which the IframeRpcProviderBridge will forward the RPC result.
package/index.cjs CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("eventemitter3"),g="https://swap.cow.fi";function h(...i){process.env.NODE_ENV!=="test"&&console.debug("%c [COW][Widget]","font-weight: bold; color: #ff0000",...i)}function m(i){try{const{hostname:e}=new URL(i);return e==="localhost"||e==="127.0.0.1"||e==="::1"||e==="[::1]"}catch{return!1}}class l{constructor(e){this.key=e}postMessageToWindow(e,t,r,c=g){const n=typeof r=="object"?r:{},d={key:this.key,method:t,...n};e.postMessage(d,c)}listenToMessageFromWindow(e,t,r,c,n=g){const d=o=>{if(!(!p(o.data)||o.data.key!==this.key||o.data.method!==r)){if(!o.source||o.source!==t){if(!(m(o.origin)||m(n))){h("Rejected message due to source mismatch",{key:this.key,method:r,actualSource:o.source,expectedSource:t});return}h("Non-matching or missing message source. Continuing due to local env.",{key:this.key,method:r,actualSource:o.source,expectedSource:t})}if(o.origin!==n){h("Rejected message due to origin mismatch",{key:this.key,method:r,actualOrigin:o.origin,trustedOrigin:n});return}c(o.data)}};return e.addEventListener("message",d),d}stopListeningToMessageFromWindow(e,t,r){e.removeEventListener("message",r)}stopListeningWindowListener(e,t){e.removeEventListener("message",t)}}function p(i){return typeof i=="object"&&i!==null&&"key"in i&&"method"in i&&typeof i.key=="string"&&typeof i.method=="string"}var s=(i=>(i.PROVIDER_RPC_REQUEST="PROVIDER_RPC_REQUEST",i.PROVIDER_RPC_RESPONSE="PROVIDER_RPC_RESPONSE",i.PROVIDER_ON_EVENT="PROVIDER_ON_EVENT",i.SEND_PROVIDER_META_INFO="SEND_PROVIDER_META_INFO",i.REQUEST_PROVIDER_META_INFO="REQUEST_PROVIDER_META_INFO",i))(s||{});const a=new l("cowSwapIframeRpcProviderTransport");function w(i){if(i.isWalletConnect)return i?.session?.peer?.metadata}function P(i,e){return e.find(t=>t.provider===i)?.info}const v=["connect","disconnect","close","chainChanged","accountsChanged"],f=[];typeof window<"u"&&window.addEventListener("eip6963:announceProvider",i=>{const e=i;f.push(e.detail)});class O{constructor(e,t){this.iframeWindow=e,this.iframeOrigin=t}ethereumProvider=null;requestWaitingForConnection={};disconnect(){typeof window>"u"||(this.ethereumProvider=null,a.stopListeningToMessageFromWindow(window,s.PROVIDER_RPC_REQUEST,this.processRpcCallFromWindow),a.stopListeningToMessageFromWindow(window,s.REQUEST_PROVIDER_META_INFO,this.processProviderMetaInfoRequest))}onConnect(e){typeof window>"u"||(this.ethereumProvider?this.disconnect():a.listenToMessageFromWindow(window,this.iframeWindow,s.PROVIDER_RPC_REQUEST,this.processRpcCallFromWindow,this.iframeOrigin),this.ethereumProvider=e,this.processPendingRequests(),v.forEach(t=>{e.on(t,r=>this.onProviderEvent(t,r))}),a.listenToMessageFromWindow(window,this.iframeWindow,s.REQUEST_PROVIDER_META_INFO,this.processProviderMetaInfoRequest,this.iframeOrigin))}processPendingRequests(){Object.keys(this.requestWaitingForConnection).forEach(e=>{this.processRpcRequest(this.requestWaitingForConnection[e])}),this.requestWaitingForConnection={}}processRpcRequest(e){const{id:t,jsonrpc:r,method:c}=e;if(!this.ethereumProvider||!t)return;(c==="enable"?this.ethereumProvider.request({method:"eth_requestAccounts",id:t}):this.ethereumProvider.request({...e,id:t})).then(d=>this.forwardRpcResponseToIframe({rpcResponse:{jsonrpc:r,id:t,result:d}})).catch(d=>this.forwardRpcResponseToIframe({rpcResponse:{jsonrpc:r,id:t,error:d}}))}processRpcCallFromWindow=({rpcRequest:e})=>{if(!this.ethereumProvider){e.id&&(this.requestWaitingForConnection[e.id]=e);return}this.processRpcRequest(e)};processProviderMetaInfoRequest=()=>{if(!this.ethereumProvider)return;const e=P(this.ethereumProvider,f),t=w(this.ethereumProvider);a.postMessageToWindow(this.iframeWindow,s.SEND_PROVIDER_META_INFO,{providerEip6963Info:e,providerWcMetadata:t},this.iframeOrigin)};onProviderEvent(e,t){a.postMessageToWindow(this.iframeWindow,s.PROVIDER_ON_EVENT,{event:e,params:t},this.iframeOrigin)}forwardRpcResponseToIframe(e){a.postMessageToWindow(this.iframeWindow,s.PROVIDER_RPC_RESPONSE,e,this.iframeOrigin)}}function E(){const i=u(_())||u(T())||u(I());if(i)try{return new URL(i).origin}catch(e){console.error("[getParentOrigin] origin is invalid",e,{origin:i});return}}function u(i){return i&&i!=="null"?i:void 0}function _(){if(typeof window>"u")return;const i=window.location.ancestorOrigins;if(!(!i||i.length===0))return i[0]}function T(){if(!(typeof document>"u"||!document.referrer))try{return new URL(document.referrer).origin}catch{return}}function I(){if(!(typeof window>"u"||!window.parent||window.parent===window))try{return window.parent.location.origin}catch{return}}const M=6e5,C="2.0",y="https://swap.cow.fi";class N extends Error{isRpcError=!0;code;reason;constructor(e,t){super(`${e}: ${t}`),this.code=e,this.reason=t}}class S extends R{request({method:e,params:t}){return this.send(e,t)}isConnected(){return!0}get isIFrame(){return!0}get currentProvider(){return this}enabled=null;timeoutMilliseconds;eventSource;eventTarget;targetOrigin;completers={};providerMetaInfo=null;providerMetaInfoCallback;constructor({targetOrigin:e,timeoutMilliseconds:t=M,eventSource:r=window,eventTarget:c=window.parent}={}){super(),this.timeoutMilliseconds=t,this.eventSource=r,this.eventTarget=c,this.targetOrigin=e||E()||y,a.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.PROVIDER_RPC_RESPONSE,n=>{this.handleRpcRequests(n)},this.targetOrigin),a.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.PROVIDER_ON_EVENT,n=>{this.handleOnEvent(n)},this.targetOrigin),a.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.SEND_PROVIDER_META_INFO,n=>{this.providerMetaInfo=n,this.providerMetaInfoCallback&&this.providerMetaInfoCallback(this.providerMetaInfo)},this.targetOrigin)}async execute(e,t){const r=W(),c={jsonrpc:C,id:r,method:e,params:t},n=new Promise((d,o)=>this.completers[r]={resolve:d,reject:o});return a.postMessageToWindow(this.eventTarget,s.PROVIDER_RPC_REQUEST,{rpcRequest:c},this.targetOrigin),setTimeout(()=>{this.completers[r]&&(this.completers[r].reject(new Error("Request timed out. Please try again and submit it faster.")),delete this.completers[r])},this.timeoutMilliseconds),n}async send(e,t){const{method:r,params:c}=typeof e=="string"?{method:e,params:t}:{method:e.method,params:e.params},n=await this.execute(r,c);if("error"in n)throw new N(n.error.code,n.error.message);return n.result}async enable(){if(this.enabled===null){const e=this.enabled=this.send("eth_requestAccounts",[]).catch(t=>{throw this.enabled===e&&(this.enabled=null),t})}return this.enabled}async sendAsync(e,t){try{const r=await this.execute(e.method,e.params);t(null,r)}catch(r){t(D(r),null)}}onProviderMetaInfo(e){this.providerMetaInfo?e(this.providerMetaInfo):(this.providerMetaInfoCallback=e,a.postMessageToWindow(this.eventTarget,s.REQUEST_PROVIDER_META_INFO,null,this.targetOrigin))}handleRpcRequests=({rpcResponse:e})=>{if(e.id===void 0||e.id===null)return;const t=this.completers[""+e.id];t&&("error"in e||"result"in e?t.resolve(e):t.reject(new Error("Response from provider did not have error or result key")),delete this.completers[e.id])};handleOnEvent(e){const t=e.params;switch(e.event){case"notification":this.emitNotification(t);break;case"connect":this.emitConnect(t);break;case"disconnect":this.emitDisconnect(t);break;case"chainChanged":this.emitChainChanged(t);break;case"accountsChanged":this.emitAccountsChanged(t);break;case"message":this.emitMessage(t);break;case"networkChanged":this.emitNetworkChanged(t);break;case"close":this.emitClose(t);break;default:console.warn(`[WidgetEthereumProvider] Unknown event type: ${e.event}`);break}}emitNotification(e){this.emit("notification",e)}emitConnect(e){this.enabled===null&&(this.enabled=Promise.resolve([])),this.emit("connect",e)}emitClose(e){Array.isArray(e)&&e.length===2?this.emit("close",e[0],e[1]):this.emit("close")}emitDisconnect(e){this.emit("disconnect",e)}emitChainChanged(e){this.emit("chainChanged",e)}emitNetworkChanged(e){this.emit("networkChanged",e)}emitAccountsChanged(e){this.enabled=Promise.resolve(e),this.emit("accountsChanged",e)}emitMessage(e){this.emit("message",e)}}function W(){return Math.floor(Math.random()*Number.MAX_SAFE_INTEGER)}function D(i){if(!i)return null;if(typeof i=="string")return i;if(i instanceof Error||i.message)return i.message;try{return JSON.stringify(i)}catch{const e="Unknown WidgetEthereumProvider error";return console.error(e,i),e}}exports.IframeRpcProviderBridge=O;exports.IframeRpcProviderEvents=s;exports.IframeTransport=l;exports.WidgetEthereumProvider=S;exports.getParentOrigin=E;exports.iframeRpcProviderTransport=a;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("eventemitter3"),l="https://swap.cow.fi";function h(...i){process.env.NODE_ENV!=="test"&&console.debug("%c [COW][Widget]","font-weight: bold; color: #ff0000",...i)}function m(i){try{const{hostname:e}=new URL(i);return e==="localhost"||e==="127.0.0.1"||e==="::1"||e==="[::1]"}catch{return!1}}class f{constructor(e){this.key=e}postMessageToWindow(e,t,r,o=l){const n=typeof r=="object"?r:{},d={key:this.key,method:t,...n};e.postMessage(d,o)}listenToMessageFromWindow(e,t,r,o,n=l){const d=a=>{if(!(!R(a.data)||a.data.key!==this.key||a.data.method!==r)){if(!a.source||a.source!==t){if(!(m(a.origin)||m(n))){h("Rejected message due to source mismatch",{key:this.key,method:r,actualSource:a.source,expectedSource:t});return}h("Non-matching or missing message source. Continuing due to local env.",{key:this.key,method:r,actualSource:a.source,expectedSource:t})}if(a.origin!==n){h("Rejected message due to origin mismatch",{key:this.key,method:r,actualOrigin:a.origin,trustedOrigin:n});return}o(a.data)}};return e.addEventListener("message",d),d}stopListeningToMessageFromWindow(e,t,r){e.removeEventListener("message",r)}stopListeningWindowListener(e,t){e.removeEventListener("message",t)}}function R(i){return typeof i=="object"&&i!==null&&"key"in i&&"method"in i&&typeof i.key=="string"&&typeof i.method=="string"}var s=(i=>(i.PROVIDER_RPC_REQUEST="PROVIDER_RPC_REQUEST",i.PROVIDER_RPC_RESPONSE="PROVIDER_RPC_RESPONSE",i.PROVIDER_ON_EVENT="PROVIDER_ON_EVENT",i.SEND_PROVIDER_META_INFO="SEND_PROVIDER_META_INFO",i.REQUEST_PROVIDER_META_INFO="REQUEST_PROVIDER_META_INFO",i))(s||{});const c=new f("cowSwapIframeRpcProviderTransport");function v(i){if(i.isWalletConnect)return i?.session?.peer?.metadata}function w(i,e){return e.find(t=>t.provider===i)?.info}const P=["connect","disconnect","close","chainChanged","accountsChanged"],g=[];typeof window<"u"&&window.addEventListener("eip6963:announceProvider",i=>{const e=i;g.push(e.detail)});class O{constructor(e,t){this.iframeWindow=e,this.iframeOrigin=t}ethereumProvider=null;requestWaitingForConnection={};providerEventListeners=[];disconnect(){if(!(typeof window>"u")){if(this.ethereumProvider){const e=this.ethereumProvider;if(typeof e.removeListener=="function")for(const{event:t,handler:r}of this.providerEventListeners)e.removeListener(t,r)}this.providerEventListeners=[],this.ethereumProvider=null,c.stopListeningToMessageFromWindow(window,s.PROVIDER_RPC_REQUEST,this.processRpcCallFromWindow),c.stopListeningToMessageFromWindow(window,s.REQUEST_PROVIDER_META_INFO,this.processProviderMetaInfoRequest)}}onConnect(e){typeof window>"u"||(this.ethereumProvider?this.disconnect():c.listenToMessageFromWindow(window,this.iframeWindow,s.PROVIDER_RPC_REQUEST,this.processRpcCallFromWindow,this.iframeOrigin),this.ethereumProvider=e,this.processPendingRequests(),P.forEach(t=>{const r=o=>this.onProviderEvent(t,o);this.providerEventListeners.push({event:t,handler:r}),e.on(t,r)}),c.listenToMessageFromWindow(window,this.iframeWindow,s.REQUEST_PROVIDER_META_INFO,this.processProviderMetaInfoRequest,this.iframeOrigin))}processPendingRequests(){Object.keys(this.requestWaitingForConnection).forEach(e=>{this.processRpcRequest(this.requestWaitingForConnection[e])}),this.requestWaitingForConnection={}}processRpcRequest(e){const{id:t,jsonrpc:r,method:o}=e;if(!this.ethereumProvider||!t)return;(o==="enable"?this.ethereumProvider.request({method:"eth_requestAccounts",id:t}):this.ethereumProvider.request({...e,id:t})).then(d=>this.forwardRpcResponseToIframe({rpcResponse:{jsonrpc:r,id:t,result:d}})).catch(d=>this.forwardRpcResponseToIframe({rpcResponse:{jsonrpc:r,id:t,error:d}}))}processRpcCallFromWindow=({rpcRequest:e})=>{if(!this.ethereumProvider){e.id&&(this.requestWaitingForConnection[e.id]=e);return}this.processRpcRequest(e)};processProviderMetaInfoRequest=()=>{if(!this.ethereumProvider)return;const e=w(this.ethereumProvider,g),t=v(this.ethereumProvider);c.postMessageToWindow(this.iframeWindow,s.SEND_PROVIDER_META_INFO,{providerEip6963Info:e,providerWcMetadata:t},this.iframeOrigin)};onProviderEvent(e,t){c.postMessageToWindow(this.iframeWindow,s.PROVIDER_ON_EVENT,{event:e,params:t},this.iframeOrigin)}forwardRpcResponseToIframe(e){c.postMessageToWindow(this.iframeWindow,s.PROVIDER_RPC_RESPONSE,e,this.iframeOrigin)}}function E(){const i=u(_())||u(T())||u(I());if(i)try{return new URL(i).origin}catch(e){console.error("[getParentOrigin] origin is invalid",e,{origin:i});return}}function u(i){return i&&i!=="null"?i:void 0}function _(){if(typeof window>"u")return;const i=window.location.ancestorOrigins;if(!(!i||i.length===0))return i[0]}function T(){if(!(typeof document>"u"||!document.referrer))try{return new URL(document.referrer).origin}catch{return}}function I(){if(!(typeof window>"u"||!window.parent||window.parent===window))try{return window.parent.location.origin}catch{return}}const M=6e5,C="2.0",y="https://swap.cow.fi";class N extends Error{isRpcError=!0;code;reason;constructor(e,t){super(`${e}: ${t}`),this.code=e,this.reason=t}}class S extends p{request({method:e,params:t}){return e==="wallet_revokePermissions"?Promise.resolve(null):this.send(e,t)}isConnected(){return!0}get isIFrame(){return!0}get currentProvider(){return this}enabled=null;timeoutMilliseconds;eventSource;eventTarget;targetOrigin;completers={};providerMetaInfo=null;providerMetaInfoCallback;constructor({targetOrigin:e,timeoutMilliseconds:t=M,eventSource:r=window,eventTarget:o=window.parent}={}){super(),this.timeoutMilliseconds=t,this.eventSource=r,this.eventTarget=o,this.targetOrigin=e||E()||y,c.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.PROVIDER_RPC_RESPONSE,n=>{this.handleRpcRequests(n)},this.targetOrigin),c.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.PROVIDER_ON_EVENT,n=>{this.handleOnEvent(n)},this.targetOrigin),c.listenToMessageFromWindow(this.eventSource,this.eventTarget,s.SEND_PROVIDER_META_INFO,n=>{this.providerMetaInfo=n,this.providerMetaInfoCallback&&this.providerMetaInfoCallback(this.providerMetaInfo)},this.targetOrigin)}async execute(e,t){const r=W(),o={jsonrpc:C,id:r,method:e,params:t},n=new Promise((d,a)=>this.completers[r]={resolve:d,reject:a});return c.postMessageToWindow(this.eventTarget,s.PROVIDER_RPC_REQUEST,{rpcRequest:o},this.targetOrigin),setTimeout(()=>{this.completers[r]&&(this.completers[r].reject(new Error("Request timed out. Please try again and submit it faster.")),delete this.completers[r])},this.timeoutMilliseconds),n}async send(e,t){const{method:r,params:o}=typeof e=="string"?{method:e,params:t}:{method:e.method,params:e.params},n=await this.execute(r,o);if("error"in n)throw new N(n.error.code,n.error.message);return n.result}async enable(){if(this.enabled===null){const e=this.enabled=this.send("eth_requestAccounts",[]).catch(t=>{throw this.enabled===e&&(this.enabled=null),t})}return this.enabled}async sendAsync(e,t){try{const r=await this.execute(e.method,e.params);t(null,r)}catch(r){t(D(r),null)}}onProviderMetaInfo(e){this.providerMetaInfo?e(this.providerMetaInfo):(this.providerMetaInfoCallback=e,c.postMessageToWindow(this.eventTarget,s.REQUEST_PROVIDER_META_INFO,null,this.targetOrigin))}handleRpcRequests=({rpcResponse:e})=>{if(e.id===void 0||e.id===null)return;const t=this.completers[""+e.id];t&&("error"in e||"result"in e?t.resolve(e):t.reject(new Error("Response from provider did not have error or result key")),delete this.completers[e.id])};handleOnEvent(e){const t=e.params;switch(e.event){case"notification":this.emitNotification(t);break;case"connect":this.emitConnect(t);break;case"disconnect":this.emitDisconnect(t);break;case"chainChanged":this.emitChainChanged(t);break;case"accountsChanged":this.emitAccountsChanged(t);break;case"message":this.emitMessage(t);break;case"networkChanged":this.emitNetworkChanged(t);break;case"close":this.emitClose(t);break;default:console.warn(`[WidgetEthereumProvider] Unknown event type: ${e.event}`);break}}emitNotification(e){this.emit("notification",e)}emitConnect(e){this.enabled===null&&(this.enabled=Promise.resolve([])),this.emit("connect",e)}emitClose(e){Array.isArray(e)&&e.length===2?this.emit("close",e[0],e[1]):this.emit("close")}emitDisconnect(e){this.emit("disconnect",e)}emitChainChanged(e){this.emit("chainChanged",e)}emitNetworkChanged(e){this.emit("networkChanged",e)}emitAccountsChanged(e){this.enabled=Promise.resolve(e),this.emit("accountsChanged",e)}emitMessage(e){this.emit("message",e)}}function W(){return Math.floor(Math.random()*Number.MAX_SAFE_INTEGER)}function D(i){if(!i)return null;if(typeof i=="string")return i;if(i instanceof Error||i.message)return i.message;try{return JSON.stringify(i)}catch{const e="Unknown WidgetEthereumProvider error";return console.error(e,i),e}}exports.IframeRpcProviderBridge=O;exports.IframeRpcProviderEvents=s;exports.IframeTransport=f;exports.WidgetEthereumProvider=S;exports.getParentOrigin=E;exports.iframeRpcProviderTransport=c;
package/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export { IframeRpcProviderBridge } from './iframeRpcProvider/IframeRpcProviderBridge';
2
+ export type { EthereumProviderWithRemoveListener } from './iframeRpcProvider/IframeRpcProviderBridge';
2
3
  export { WidgetEthereumProvider } from './iframeRpcProvider/WidgetEthereumProvider';
3
4
  export { IframeTransport } from './IframeTransport';
4
5
  export { getParentOrigin } from './getParentOrigin';
package/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import f from "eventemitter3";
1
+ import g from "eventemitter3";
2
2
  const l = "https://swap.cow.fi";
3
3
  function h(...i) {
4
4
  process.env.NODE_ENV !== "test" && console.debug("%c [COW][Widget]", "font-weight: bold; color: #ff0000", ...i);
@@ -17,73 +17,73 @@ class E {
17
17
  constructor(e) {
18
18
  this.key = e;
19
19
  }
20
- postMessageToWindow(e, t, n, c = l) {
21
- const r = typeof n == "object" ? n : {}, d = {
20
+ postMessageToWindow(e, t, r, s = l) {
21
+ const n = typeof r == "object" ? r : {}, d = {
22
22
  key: this.key,
23
23
  method: t,
24
- ...r
24
+ ...n
25
25
  };
26
- e.postMessage(d, c);
26
+ e.postMessage(d, s);
27
27
  }
28
- listenToMessageFromWindow(e, t, n, c, r = l) {
29
- const d = (s) => {
30
- if (!(!R(s.data) || s.data.key !== this.key || s.data.method !== n)) {
31
- if (!s.source || s.source !== t) {
32
- if (!(m(s.origin) || m(r))) {
28
+ listenToMessageFromWindow(e, t, r, s, n = l) {
29
+ const d = (o) => {
30
+ if (!(!p(o.data) || o.data.key !== this.key || o.data.method !== r)) {
31
+ if (!o.source || o.source !== t) {
32
+ if (!(m(o.origin) || m(n))) {
33
33
  h("Rejected message due to source mismatch", {
34
34
  key: this.key,
35
- method: n,
36
- actualSource: s.source,
35
+ method: r,
36
+ actualSource: o.source,
37
37
  expectedSource: t
38
38
  });
39
39
  return;
40
40
  }
41
41
  h("Non-matching or missing message source. Continuing due to local env.", {
42
42
  key: this.key,
43
- method: n,
44
- actualSource: s.source,
43
+ method: r,
44
+ actualSource: o.source,
45
45
  expectedSource: t
46
46
  });
47
47
  }
48
- if (s.origin !== r) {
48
+ if (o.origin !== n) {
49
49
  h("Rejected message due to origin mismatch", {
50
50
  key: this.key,
51
- method: n,
52
- actualOrigin: s.origin,
53
- trustedOrigin: r
51
+ method: r,
52
+ actualOrigin: o.origin,
53
+ trustedOrigin: n
54
54
  });
55
55
  return;
56
56
  }
57
- c(s.data);
57
+ s(o.data);
58
58
  }
59
59
  };
60
60
  return e.addEventListener("message", d), d;
61
61
  }
62
- stopListeningToMessageFromWindow(e, t, n) {
63
- e.removeEventListener("message", n);
62
+ stopListeningToMessageFromWindow(e, t, r) {
63
+ e.removeEventListener("message", r);
64
64
  }
65
65
  stopListeningWindowListener(e, t) {
66
66
  e.removeEventListener("message", t);
67
67
  }
68
68
  }
69
- function R(i) {
69
+ function p(i) {
70
70
  return typeof i == "object" && i !== null && "key" in i && "method" in i && typeof i.key == "string" && typeof i.method == "string";
71
71
  }
72
- var o = /* @__PURE__ */ ((i) => (i.PROVIDER_RPC_REQUEST = "PROVIDER_RPC_REQUEST", i.PROVIDER_RPC_RESPONSE = "PROVIDER_RPC_RESPONSE", i.PROVIDER_ON_EVENT = "PROVIDER_ON_EVENT", i.SEND_PROVIDER_META_INFO = "SEND_PROVIDER_META_INFO", i.REQUEST_PROVIDER_META_INFO = "REQUEST_PROVIDER_META_INFO", i))(o || {});
73
- const a = new E("cowSwapIframeRpcProviderTransport");
74
- function p(i) {
72
+ var a = /* @__PURE__ */ ((i) => (i.PROVIDER_RPC_REQUEST = "PROVIDER_RPC_REQUEST", i.PROVIDER_RPC_RESPONSE = "PROVIDER_RPC_RESPONSE", i.PROVIDER_ON_EVENT = "PROVIDER_ON_EVENT", i.SEND_PROVIDER_META_INFO = "SEND_PROVIDER_META_INFO", i.REQUEST_PROVIDER_META_INFO = "REQUEST_PROVIDER_META_INFO", i))(a || {});
73
+ const c = new E("cowSwapIframeRpcProviderTransport");
74
+ function R(i) {
75
75
  if (i.isWalletConnect)
76
76
  return i?.session?.peer?.metadata;
77
77
  }
78
78
  function w(i, e) {
79
79
  return e.find((t) => t.provider === i)?.info;
80
80
  }
81
- const O = ["connect", "disconnect", "close", "chainChanged", "accountsChanged"], g = [];
81
+ const v = ["connect", "disconnect", "close", "chainChanged", "accountsChanged"], f = [];
82
82
  typeof window < "u" && window.addEventListener("eip6963:announceProvider", (i) => {
83
83
  const e = i;
84
- g.push(e.detail);
84
+ f.push(e.detail);
85
85
  });
86
- class F {
86
+ class k {
87
87
  /**
88
88
  * Creates an instance of IframeRpcProviderBridge.
89
89
  * @param iframeWindow - The iFrame window that will post up general RPC messages and to which the IframeRpcProviderBridge will forward the RPC result.
@@ -99,20 +99,37 @@ class F {
99
99
  ethereumProvider = null;
100
100
  /** Stored JSON-RPC requests, to queue them when disconnected. */
101
101
  requestWaitingForConnection = {};
102
+ /** Bound event-forwarding listeners so they can be removed on disconnect. */
103
+ providerEventListeners = [];
102
104
  /**
103
105
  * Disconnects the JSON-RPC bridge from the Ethereum provider.
104
106
  */
105
107
  disconnect() {
106
- typeof window > "u" || (this.ethereumProvider = null, a.stopListeningToMessageFromWindow(window, o.PROVIDER_RPC_REQUEST, this.processRpcCallFromWindow), a.stopListeningToMessageFromWindow(window, o.REQUEST_PROVIDER_META_INFO, this.processProviderMetaInfoRequest));
108
+ if (!(typeof window > "u")) {
109
+ if (this.ethereumProvider) {
110
+ const e = this.ethereumProvider;
111
+ if (typeof e.removeListener == "function")
112
+ for (const {
113
+ event: t,
114
+ handler: r
115
+ } of this.providerEventListeners)
116
+ e.removeListener(t, r);
117
+ }
118
+ this.providerEventListeners = [], this.ethereumProvider = null, c.stopListeningToMessageFromWindow(window, a.PROVIDER_RPC_REQUEST, this.processRpcCallFromWindow), c.stopListeningToMessageFromWindow(window, a.REQUEST_PROVIDER_META_INFO, this.processProviderMetaInfoRequest);
119
+ }
107
120
  }
108
121
  /**
109
122
  * Handles the 'connect' event and sets up event listeners for Ethereum provider events.
110
123
  * @param newProvider - The Ethereum provider to connect.
111
124
  */
112
125
  onConnect(e) {
113
- typeof window > "u" || (this.ethereumProvider ? this.disconnect() : a.listenToMessageFromWindow(window, this.iframeWindow, o.PROVIDER_RPC_REQUEST, this.processRpcCallFromWindow, this.iframeOrigin), this.ethereumProvider = e, this.processPendingRequests(), O.forEach((t) => {
114
- e.on(t, (n) => this.onProviderEvent(t, n));
115
- }), a.listenToMessageFromWindow(window, this.iframeWindow, o.REQUEST_PROVIDER_META_INFO, this.processProviderMetaInfoRequest, this.iframeOrigin));
126
+ typeof window > "u" || (this.ethereumProvider ? this.disconnect() : c.listenToMessageFromWindow(window, this.iframeWindow, a.PROVIDER_RPC_REQUEST, this.processRpcCallFromWindow, this.iframeOrigin), this.ethereumProvider = e, this.processPendingRequests(), v.forEach((t) => {
127
+ const r = (s) => this.onProviderEvent(t, s);
128
+ this.providerEventListeners.push({
129
+ event: t,
130
+ handler: r
131
+ }), e.on(t, r);
132
+ }), c.listenToMessageFromWindow(window, this.iframeWindow, a.REQUEST_PROVIDER_META_INFO, this.processProviderMetaInfoRequest, this.iframeOrigin));
116
133
  }
117
134
  // TODO: Add proper return type annotation
118
135
  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -130,13 +147,13 @@ class F {
130
147
  processRpcRequest(e) {
131
148
  const {
132
149
  id: t,
133
- jsonrpc: n,
134
- method: c
150
+ jsonrpc: r,
151
+ method: s
135
152
  } = e;
136
153
  if (!this.ethereumProvider || !t)
137
154
  return;
138
155
  // Keep the legacy "enable" method for backward compatibility
139
- (c === "enable" ? this.ethereumProvider.request({
156
+ (s === "enable" ? this.ethereumProvider.request({
140
157
  method: "eth_requestAccounts",
141
158
  id: t
142
159
  }) : this.ethereumProvider.request({
@@ -144,13 +161,13 @@ class F {
144
161
  id: t
145
162
  })).then((d) => this.forwardRpcResponseToIframe({
146
163
  rpcResponse: {
147
- jsonrpc: n,
164
+ jsonrpc: r,
148
165
  id: t,
149
166
  result: d
150
167
  }
151
168
  })).catch((d) => this.forwardRpcResponseToIframe({
152
169
  rpcResponse: {
153
- jsonrpc: n,
170
+ jsonrpc: r,
154
171
  id: t,
155
172
  error: d
156
173
  }
@@ -167,14 +184,14 @@ class F {
167
184
  };
168
185
  processProviderMetaInfoRequest = () => {
169
186
  if (!this.ethereumProvider) return;
170
- const e = w(this.ethereumProvider, g), t = p(this.ethereumProvider);
171
- a.postMessageToWindow(this.iframeWindow, o.SEND_PROVIDER_META_INFO, {
187
+ const e = w(this.ethereumProvider, f), t = R(this.ethereumProvider);
188
+ c.postMessageToWindow(this.iframeWindow, a.SEND_PROVIDER_META_INFO, {
172
189
  providerEip6963Info: e,
173
190
  providerWcMetadata: t
174
191
  }, this.iframeOrigin);
175
192
  };
176
193
  onProviderEvent(e, t) {
177
- a.postMessageToWindow(this.iframeWindow, o.PROVIDER_ON_EVENT, {
194
+ c.postMessageToWindow(this.iframeWindow, a.PROVIDER_ON_EVENT, {
178
195
  event: e,
179
196
  params: t
180
197
  }, this.iframeOrigin);
@@ -185,11 +202,11 @@ class F {
185
202
  // TODO: Add proper return type annotation
186
203
  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
187
204
  forwardRpcResponseToIframe(e) {
188
- a.postMessageToWindow(this.iframeWindow, o.PROVIDER_RPC_RESPONSE, e, this.iframeOrigin);
205
+ c.postMessageToWindow(this.iframeWindow, a.PROVIDER_RPC_RESPONSE, e, this.iframeOrigin);
189
206
  }
190
207
  }
191
208
  function P() {
192
- const i = u(v()) || u(_()) || u(T());
209
+ const i = u(O()) || u(_()) || u(T());
193
210
  if (i)
194
211
  try {
195
212
  return new URL(i).origin;
@@ -203,7 +220,7 @@ function P() {
203
220
  function u(i) {
204
221
  return i && i !== "null" ? i : void 0;
205
222
  }
206
- function v() {
223
+ function O() {
207
224
  if (typeof window > "u")
208
225
  return;
209
226
  const i = window.location.ancestorOrigins;
@@ -235,14 +252,14 @@ class y extends Error {
235
252
  super(`${e}: ${t}`), this.code = e, this.reason = t;
236
253
  }
237
254
  }
238
- class k extends f {
255
+ class F extends g {
239
256
  // TODO: Add proper return type annotation
240
257
  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
241
258
  request({
242
259
  method: e,
243
260
  params: t
244
261
  }) {
245
- return this.send(e, t);
262
+ return e === "wallet_revokePermissions" ? Promise.resolve(null) : this.send(e, t);
246
263
  }
247
264
  isConnected() {
248
265
  return !0;
@@ -270,15 +287,15 @@ class k extends f {
270
287
  constructor({
271
288
  targetOrigin: e,
272
289
  timeoutMilliseconds: t = I,
273
- eventSource: n = window,
274
- eventTarget: c = window.parent
290
+ eventSource: r = window,
291
+ eventTarget: s = window.parent
275
292
  } = {}) {
276
- super(), this.timeoutMilliseconds = t, this.eventSource = n, this.eventTarget = c, this.targetOrigin = e || P() || C, a.listenToMessageFromWindow(this.eventSource, this.eventTarget, o.PROVIDER_RPC_RESPONSE, (r) => {
277
- this.handleRpcRequests(r);
278
- }, this.targetOrigin), a.listenToMessageFromWindow(this.eventSource, this.eventTarget, o.PROVIDER_ON_EVENT, (r) => {
279
- this.handleOnEvent(r);
280
- }, this.targetOrigin), a.listenToMessageFromWindow(this.eventSource, this.eventTarget, o.SEND_PROVIDER_META_INFO, (r) => {
281
- this.providerMetaInfo = r, this.providerMetaInfoCallback && this.providerMetaInfoCallback(this.providerMetaInfo);
293
+ super(), this.timeoutMilliseconds = t, this.eventSource = r, this.eventTarget = s, this.targetOrigin = e || P() || C, c.listenToMessageFromWindow(this.eventSource, this.eventTarget, a.PROVIDER_RPC_RESPONSE, (n) => {
294
+ this.handleRpcRequests(n);
295
+ }, this.targetOrigin), c.listenToMessageFromWindow(this.eventSource, this.eventTarget, a.PROVIDER_ON_EVENT, (n) => {
296
+ this.handleOnEvent(n);
297
+ }, this.targetOrigin), c.listenToMessageFromWindow(this.eventSource, this.eventTarget, a.SEND_PROVIDER_META_INFO, (n) => {
298
+ this.providerMetaInfo = n, this.providerMetaInfoCallback && this.providerMetaInfoCallback(this.providerMetaInfo);
282
299
  }, this.targetOrigin);
283
300
  }
284
301
  /**
@@ -287,37 +304,37 @@ class k extends f {
287
304
  * @param params params to pass the method
288
305
  */
289
306
  async execute(e, t) {
290
- const n = N(), c = {
307
+ const r = N(), s = {
291
308
  jsonrpc: M,
292
- id: n,
309
+ id: r,
293
310
  method: e,
294
311
  params: t
295
- }, r = new Promise((d, s) => this.completers[n] = {
312
+ }, n = new Promise((d, o) => this.completers[r] = {
296
313
  resolve: d,
297
- reject: s
314
+ reject: o
298
315
  });
299
- return a.postMessageToWindow(this.eventTarget, o.PROVIDER_RPC_REQUEST, {
300
- rpcRequest: c
316
+ return c.postMessageToWindow(this.eventTarget, a.PROVIDER_RPC_REQUEST, {
317
+ rpcRequest: s
301
318
  }, this.targetOrigin), setTimeout(() => {
302
- this.completers[n] && (this.completers[n].reject(new Error("Request timed out. Please try again and submit it faster.")), delete this.completers[n]);
303
- }, this.timeoutMilliseconds), r;
319
+ this.completers[r] && (this.completers[r].reject(new Error("Request timed out. Please try again and submit it faster.")), delete this.completers[r]);
320
+ }, this.timeoutMilliseconds), n;
304
321
  }
305
322
  // TODO: Replace any with proper type definitions
306
323
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
307
324
  async send(e, t) {
308
325
  const {
309
- method: n,
310
- params: c
326
+ method: r,
327
+ params: s
311
328
  } = typeof e == "string" ? {
312
329
  method: e,
313
330
  params: t
314
331
  } : {
315
332
  method: e.method,
316
333
  params: e.params
317
- }, r = await this.execute(n, c);
318
- if ("error" in r)
319
- throw new y(r.error.code, r.error.message);
320
- return r.result;
334
+ }, n = await this.execute(r, s);
335
+ if ("error" in n)
336
+ throw new y(n.error.code, n.error.message);
337
+ return n.result;
321
338
  }
322
339
  /**
323
340
  * Request the parent window to enable access to the user's web3 provider. Return accounts list immediately if already enabled.
@@ -338,10 +355,10 @@ class k extends f {
338
355
  */
339
356
  async sendAsync(e, t) {
340
357
  try {
341
- const n = await this.execute(e.method, e.params);
342
- t(null, n);
343
- } catch (n) {
344
- t(S(n), null);
358
+ const r = await this.execute(e.method, e.params);
359
+ t(null, r);
360
+ } catch (r) {
361
+ t(S(r), null);
345
362
  }
346
363
  }
347
364
  /**
@@ -351,7 +368,7 @@ class k extends f {
351
368
  // TODO: Add proper return type annotation
352
369
  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
353
370
  onProviderMetaInfo(e) {
354
- this.providerMetaInfo ? e(this.providerMetaInfo) : (this.providerMetaInfoCallback = e, a.postMessageToWindow(this.eventTarget, o.REQUEST_PROVIDER_META_INFO, null, this.targetOrigin));
371
+ this.providerMetaInfo ? e(this.providerMetaInfo) : (this.providerMetaInfoCallback = e, c.postMessageToWindow(this.eventTarget, a.REQUEST_PROVIDER_META_INFO, null, this.targetOrigin));
355
372
  }
356
373
  /**
357
374
  * Handle a Rpc Request
@@ -465,10 +482,10 @@ function S(i) {
465
482
  }
466
483
  }
467
484
  export {
468
- F as IframeRpcProviderBridge,
469
- o as IframeRpcProviderEvents,
485
+ k as IframeRpcProviderBridge,
486
+ a as IframeRpcProviderEvents,
470
487
  E as IframeTransport,
471
- k as WidgetEthereumProvider,
488
+ F as WidgetEthereumProvider,
472
489
  P as getParentOrigin,
473
- a as iframeRpcProviderTransport
490
+ c as iframeRpcProviderTransport
474
491
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cowprotocol/iframe-transport",
3
- "version": "2.2.3",
3
+ "version": "2.2.4",
4
4
  "description": "CoW Swap iframe-transport",
5
5
  "repository": {
6
6
  "type": "git",