Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send message to inpage when extension revives #15958

Merged
merged 6 commits into from
Sep 27, 2022
Merged

Send message to inpage when extension revives #15958

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc7d85b
Send message to inpage when extension revives
jpuri Sep 23, 2022
8ac178b
Merge branch 'develop' into inpage_message
jpuri Sep 23, 2022
afeb02d
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
jpuri Sep 26, 2022
7562c9f
fix
jpuri Sep 26, 2022
c2d6952
Merge branch 'inpage_message' of github.com:MetaMask/metamask-extensi…
jpuri Sep 26, 2022
1d5d078
Merge branch 'develop' into inpage_message
jpuri Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions app/scripts/contentscript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ const setupExtensionStreams = () => {
// connect "phishing" channel to warning system
extensionPhishingStream = extensionMux.createStream('phishing');
extensionPhishingStream.once('data', redirectToPhishingWarning);

notifyInpageOfExtensionStreamConnect();
};

/** Destroys all of the extension streams */
Expand Down Expand Up @@ -387,6 +389,26 @@ function logStreamDisconnectWarning(remoteLabel, error) {
);
}

/**
* The function send message to inpage to notify it of extension stream connection
*/
function notifyInpageOfExtensionStreamConnect() {
window.postMessage(
{
target: INPAGE, // the post-message-stream "target"
data: {
// this object gets passed to obj-multiplex
name: PROVIDER, // the obj-multiplex channel name
data: {
jsonrpc: '2.0',
method: 'METAMASK_EXTENSION_STREAM_CONNECT',
},
},
},
window.location.origin,
);
}

/**
* This function must ONLY be called in pump destruction/close callbacks.
* Notifies the inpage context that streams have failed, via window.postMessage.
Expand Down