github/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon: wait for page load before dispatching IPC messages

Browse Source
This commit is contained in:
CanadaHonk 2022-12-11 13:35:28 +00:00
parent e9b3022e53
commit 12e8fa90e0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gluon/index.js
View File

@ -88,7 +88,7 @@ const startChromium = async (url, { windowSize }) => {
// todo: move this to it's own library // todo: move this to it's own library
const { 3: pipeWrite, 4: pipeRead } = proc.stdio; const { 3: pipeWrite, 4: pipeRead } = proc.stdio;
let onReply = {}; let onReply = {}, pageLoadCallback = () => {};
const onMessage = msg => { const onMessage = msg => {
msg = JSON.parse(msg); msg = JSON.parse(msg);
@ -99,6 +99,7 @@ const startChromium = async (url, { windowSize }) => {
} }
if (msg.method === 'Runtime.bindingCalled' && msg.name === 'gluonSend') onWindowMessage(JSON.parse(msg.payload)); if (msg.method === 'Runtime.bindingCalled' && msg.name === 'gluonSend') onWindowMessage(JSON.parse(msg.payload));
if (msg.method === 'Page.frameStoppedLoading') pageLoadCallback(msg.params);
}; };
let msgId = 0; let msgId = 0;
@ -266,10 +267,15 @@ delete window._gluonSend;
source: windowInjectionSource source: windowInjectionSource
}, sessionId); }, sessionId);
const pageLoadPromise = new Promise(res => {
pageLoadCallback = res;
});
let onIPCReply = {}, ipcListeners = {}; let onIPCReply = {}, ipcListeners = {};
const sendToWindow = async (type, data, id = undefined) => { const sendToWindow = async (type, data, id = undefined) => {
id = id ?? Math.random().toString().split('.')[1]; id = id ?? Math.random().toString().split('.')[1];
await pageLoadPromise; // wait for page to load before sending, otherwise messages won't be heard
evalInWindow(`window.Gluon.ipc._recieve(${JSON.stringify({ evalInWindow(`window.Gluon.ipc._recieve(${JSON.stringify({
id, id,
type, type,