diff --git a/.gitignore b/.gitignore index 62c8935..637d92c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea/ \ No newline at end of file +.idea/ +node_modules/ \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 2bf2a2e..dbf4943 100644 --- a/src/index.ts +++ b/src/index.ts @@ -66,16 +66,8 @@ if(!glob[PROCESS_EVENT]){ if(environment === "client"){ // set up internal pass-through events - register('__rpc:callServer', ([name, args], info) => { - return _callServer(name, args, { - fenv: info.environment - }); - }); - register('__rpc:callBrowsers', ([name, args], info) => { - return _callBrowsers(null, name, args, { - fenv: info.environment - }); - }); + register('__rpc:callServer', ([name, args], info) => _callServer(name, args, { fenv: info.environment })); + register('__rpc:callBrowsers', ([name, args], info) => _callBrowsers(null, name, args, { fenv: info.environment })); // set up browser identifiers glob.__rpcBrowsers = {}; @@ -112,7 +104,7 @@ if(!glob[PROCESS_EVENT]){ } function passEventToBrowser(browser: Browser, data: Event, ignoreNotFound: boolean): void { - const raw = util.stringifyData(data); + const raw = util.stringifyData(data).replace(/'/g, "\\'"); browser.execute(`var process = window["${PROCESS_EVENT}"]; if(process){ process('${raw}'); }else{ ${ignoreNotFound ? '' : `mp.trigger("${PROCESS_EVENT}", '{"ret":1,"id":"${data.id}","err":"${ERR_NOT_FOUND}","env":"cef"}');`} }`); }