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

ipc/expose: rewrite to use proxy instead of eval definers

Browse Source
This commit is contained in:
CanadaHonk 2023-04-05 15:33:32 +01:00
parent 31d0975452
commit e961cba329
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/ipc.js
View File

@ -131,6 +131,12 @@ Gluon.ipc.on('backend store write', ({ key, value }) => {
else _store[key] = value; else _store[key] = value;
}); });
Gluon.ipc = new Proxy(Gluon.ipc, {
get(target, key) {
return target[key] ?? ((...args) => Gluon.ipc.send('exposed ' + key, args));
}
});
window.Gluon = Gluon; window.Gluon = Gluon;
delete window._gluonSend; delete window._gluonSend;
@ -204,22 +210,17 @@ delete window._gluonSend;
const makeExposeKey = key => 'exposed ' + key; const makeExposeKey = key => 'exposed ' + key;
const expose = (key, func) => { const expose = (key, func) => {
if (typeof func !== 'function') return new Error('Invalid arguments (expected key and function)'); if (typeof func !== 'function') throw new Error('Invalid arguments (expected string, function)');
if (logIPC) log('IPC: expose', key); if (logIPC) log('IPC: expose', key);
const exposeKey = makeExposeKey(key); const exposeKey = makeExposeKey(key);
API.on(exposeKey, args => func(...args)); // handle IPC events API.on(exposeKey, args => func(...args)); // handle IPC events
evalInWindow(`Gluon.ipc['${key}'] = (...args) => Gluon.ipc.send('${exposeKey}', args)`); // add wrapper func to window
}; };
const unexpose = key => { const unexpose = key => {
const exposeKey = makeExposeKey(key); const exposeKey = makeExposeKey(key);
API.removeListener(exposeKey);
const existed = API.removeListener(exposeKey); // returns false if type isn't registered/active
if (!existed) return;
evalInWindow(`delete Gluon.ipc['${key}']`); // remove wrapper func from window
}; };
API.expose = (...args) => { API.expose = (...args) => {