Partial fix for BD Plugins compatibility layer

joe27g · Feb 9, 2021 · f14309e · f14309e
1 parent af67eb2
commit f14309e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/bd_shit.js b/bd_shit.js
@@ -3,13 +3,13 @@ const fs = require('fs');
 const Module = require('module').Module;
 const originalRequire = Module._extensions['.js'];
 const EDPlugin = require('./plugin');
+const electron = require('electron');
 
 const splitRegex = /[^\S\r\n]*?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/;
 const escapedAtRegex = /^\\@/;
 module.exports = class BDManager {
 
- static async setup(currentWindow) {
- this.currentWindow = currentWindow;
+ static async setup() {
  this.defineGlobals();
  this.jqueryElement = document.createElement('script');
  this.jqueryElement.src = `//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js`;
@@ -23,7 +23,9 @@ module.exports = class BDManager {
  });
  this.observer.observe(document, {childList: true, subtree: true});
 
- this.currentWindow.webContents.on('did-navigate-in-page', BDManager.onSwitch);
+ //this.currentWindow.webContents.on('did-navigate-in-page', BDManager.onSwitch);
+ electron.ipcRenderer.invoke('bd-navigate-page-listener', BDManager.onSwitch);
+
 
  fs.readFile(path.join(process.env.injDir, 'bd.css'), (err, text) => {
  if (err) return console.error(err);
@@ -36,7 +38,8 @@ module.exports = class BDManager {
  static destroy() {
  EDApi.clearCSS('BDManager');
  this.observer.disconnect();
- this.currentWindow.webContents.removeEventListener('did-navigate-in-page', BDManager.onSwitch);
+ //this.currentWindow.webContents.removeEventListener('did-navigate-in-page', BDManager.onSwitch);
+ electron.ipcRenderer.invoke('remove-bd-navigate-page-listener', BDManager.onSwitch);
  this.jqueryElement.remove();
  Module._extensions['.js'] = originalRequire;
  }

diff --git a/dom_shit.js b/dom_shit.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const electron = require('electron');
+
 const mainProcessInfo = JSON.parse(electron.ipcRenderer.sendSync('main-process-info'));
 const Module = require('module');
 Module.globalPaths.push(mainProcessInfo.originalNodeModulesPath);
@@ -11,6 +12,8 @@ if (mainProcessInfo.originalPreloadScript) {
  require(mainProcessInfo.originalPreloadScript);
 }
 
+//electron.ipcRenderer.sendSync('current-web-contents');
+
 //Get inject directory
 if (!process.env.injDir) process.env.injDir = __dirname;
 
@@ -169,7 +172,7 @@ process.once('loaded', async () => {
 
  if (ED.config.bdPlugins) {
  try {
- await require('./bd_shit').setup(currentWindow);
+ await require('./bd_shit').setup();
  c.log(`Preparing BD plugins...`);
  for (const i in pluginFiles) {
  if (!pluginFiles[i].endsWith('.js') || !pluginFiles[i].endsWith('.plugin.js')) continue;

diff --git a/main_process_shit.js b/main_process_shit.js
@@ -9,12 +9,16 @@ ipcMain.on('main-process-info', (event, arg) => {
  }`
 });
 
-ipcMain.on('current-web-contents', (event, arg) => {
- event.returnValue = event.sender.__currentWebContents
-});
-
 ipcMain.on('main-process-utils', (event, arg) => {
  event.returnValue = `{
  "dialog": "${electron.dialog}"
  }`
-});
+});
+
+ipcMain.handle('bd-navigate-page-listener', (event, arg) => {
+ event.sender.getOwnerBrowserWindow().webContents.on('did-navigate-in-page', arg);
+})
+
+ipcMain.handle('remove-bd-navigate-page-listener', (event, arg) => {
+ event.sender.getOwnerBrowserWindow().webContents.removeEventListener('did-navigate-in-page', arg);
+})