commit 28f297cb8a19de72e0243cd84954d05d390ae13c · notnite.com/moonlight

+19 -17

packages/core-extensions/src/disableSentry/host.ts

···

       4
       4
        
       

     

       5
       5
        
       const logger = moonlightHost.getLogger("disableSentry");

     

       6
       6
        
       

     

       7
       7
       -
       try {

     

       8
       8
       -
         const hostSentryPath = require.resolve(

     

       9
       9
       -
           join(moonlightHost.asarPath, "node_modules", "@sentry", "electron")

     

       10
       10
       -
         );

     

       11
       11
       -
         require.cache[hostSentryPath] = new Module(

     

       12
       12
       -
           hostSentryPath,

     

       13
       13
       -
           require.cache[require.resolve(moonlightHost.asarPath)]

     

       14
       14
       -
         );

     

       15
       15
       -
         require.cache[hostSentryPath]!.exports = {

     

       16
       16
       -
           init: () => {},

     

       17
       17
       -
           captureException: () => {},

     

       18
       18
       -
           setTag: () => {},

     

       19
       19
       -
           setUser: () => {}

     

       20
       20
       -
         };

     

       21
       21
       -
         logger.debug("Stubbed Sentry host side!");

     

       22
       22
       -
       } catch (err) {

     

       23
       23
       -
         logger.error("Failed to stub Sentry host side:", err);

     

       7
       7
       +
       if (moonlightHost.asarPath !== "moonlightDesktop") {

     

       8
       8
       +
         try {

     

       9
       9
       +
           const hostSentryPath = require.resolve(

     

       10
       10
       +
             join(moonlightHost.asarPath, "node_modules", "@sentry", "electron")

     

       11
       11
       +
           );

     

       12
       12
       +
           require.cache[hostSentryPath] = new Module(

     

       13
       13
       +
             hostSentryPath,

     

       14
       14
       +
             require.cache[require.resolve(moonlightHost.asarPath)]

     

       15
       15
       +
           );

     

       16
       16
       +
           require.cache[hostSentryPath]!.exports = {

     

       17
       17
       +
             init: () => {},

     

       18
       18
       +
             captureException: () => {},

     

       19
       19
       +
             setTag: () => {},

     

       20
       20
       +
             setUser: () => {}

     

       21
       21
       +
           };

     

       22
       22
       +
           logger.debug("Stubbed Sentry host side!");

     

       23
       23
       +
         } catch (err) {

     

       24
       24
       +
           logger.error("Failed to stub Sentry host side:", err);

     

       25
       25
       +
         }

     

       24
       26
        
       }

     

       25
       27
        
       

     

       26
       28
        
       moonlightHost.events.on("window-created", (window: BrowserWindow) => {

+19 -17

packages/core-extensions/src/disableSentry/node.ts

···

       5
       5
        
       

     

       6
       6
        
       const logger = moonlightNode.getLogger("disableSentry");

     

       7
       7
        
       

     

       8
       8
       -
       const preloadPath = ipcRenderer.sendSync(constants.ipcGetOldPreloadPath);

     

       9
       9
       -
       try {

     

       10
       10
       -
         const sentryPath = require.resolve(

     

       11
       11
       -
           resolve(preloadPath, "..", "node_modules", "@sentry", "electron")

     

       12
       12
       -
         );

     

       13
       13
       -
         require.cache[sentryPath] = new Module(

     

       14
       14
       -
           sentryPath,

     

       15
       15
       -
           require.cache[require.resolve(preloadPath)]

     

       16
       16
       -
         );

     

       17
       17
       -
         require.cache[sentryPath]!.exports = {

     

       18
       18
       -
           init: () => {},

     

       19
       19
       -
           setTag: () => {},

     

       20
       20
       -
           setUser: () => {}

     

       21
       21
       -
         };

     

       22
       22
       -
         logger.debug("Stubbed Sentry node side!");

     

       23
       23
       -
       } catch (err) {

     

       24
       24
       -
         logger.error("Failed to stub Sentry:", err);

     

       8
       8
       +
       if (!ipcRenderer.sendSync(constants.ipcGetIsMoonlightDesktop)) {

     

       9
       9
       +
         const preloadPath = ipcRenderer.sendSync(constants.ipcGetOldPreloadPath);

     

       10
       10
       +
         try {

     

       11
       11
       +
           const sentryPath = require.resolve(

     

       12
       12
       +
             resolve(preloadPath, "..", "node_modules", "@sentry", "electron")

     

       13
       13
       +
           );

     

       14
       14
       +
           require.cache[sentryPath] = new Module(

     

       15
       15
       +
             sentryPath,

     

       16
       16
       +
             require.cache[require.resolve(preloadPath)]

     

       17
       17
       +
           );

     

       18
       18
       +
           require.cache[sentryPath]!.exports = {

     

       19
       19
       +
             init: () => {},

     

       20
       20
       +
             setTag: () => {},

     

       21
       21
       +
             setUser: () => {}

     

       22
       22
       +
           };

     

       23
       23
       +
           logger.debug("Stubbed Sentry node side!");

     

       24
       24
       +
         } catch (err) {

     

       25
       25
       +
           logger.error("Failed to stub Sentry:", err);

     

       26
       26
       +
         }

     

       25
       27
        
       }

+10 -4

packages/core/src/util/data.ts

···

       31
       31
        
         const fs = requireImport("fs");

     

       32
       32
        
         const path = requireImport("path");

     

       33
       33
        
       

     

       34
       34
       +
         let configPath = "";

     

       35
       35
       +
       

     

       34
       36
        
         const buildInfoPath = path.join(process.resourcesPath, "build_info.json");

     

       35
       35
       -
         const buildInfo: BuildInfo = JSON.parse(

     

       36
       36
       -
           fs.readFileSync(buildInfoPath, "utf8")

     

       37
       37
       -
         );

     

       37
       37
       +
         if (!fs.existsSync(buildInfoPath)) {

     

       38
       38
       +
           configPath = path.join(dir, "desktop.json");

     

       39
       39
       +
         } else {

     

       40
       40
       +
           const buildInfo: BuildInfo = JSON.parse(

     

       41
       41
       +
             fs.readFileSync(buildInfoPath, "utf8")

     

       42
       42
       +
           );

     

       43
       43
       +
           configPath = path.join(dir, buildInfo.releaseChannel + ".json");

     

       44
       44
       +
         }

     

       38
       45
        
       

     

       39
       39
       -
         const configPath = path.join(dir, buildInfo.releaseChannel + ".json");

     

       40
       46
        
         return configPath;

     

       41
       47
        
       }

     

       42
       48

+8 -2

packages/injector/src/index.ts

···

       17
       17
        
       

     

       18
       18
        
       const logger = new Logger("injector");

     

       19
       19
        
       

     

       20
       20
       -
       let oldPreloadPath = "";

     

       20
       20
       +
       let oldPreloadPath: string | undefined;

     

       21
       21
        
       let corsAllow: string[] = [];

     

       22
       22
       +
       let isMoonlightDesktop = false;

     

       22
       23
        
       

     

       23
       24
        
       ipcMain.on(constants.ipcGetOldPreloadPath, (e) => {

     

       24
       25
        
         e.returnValue = oldPreloadPath;

     
···

       26
       27
        
       ipcMain.on(constants.ipcGetAppData, (e) => {

     

       27
       28
        
         e.returnValue = app.getPath("appData");

     

       28
       29
        
       });

     

       30
       30
       +
       ipcMain.on(constants.ipcGetIsMoonlightDesktop, (e) => {

     

       31
       31
       +
         e.returnValue = isMoonlightDesktop;

     

       32
       32
       +
       });

     

       29
       33
        
       ipcMain.handle(constants.ipcMessageBox, (_, opts) => {

     

       30
       34
        
         electron.dialog.showMessageBoxSync(opts);

     

       31
       35
        
       });

     
···

       72
       76
        
       

     

       73
       77
        
       class BrowserWindow extends ElectronBrowserWindow {

     

       74
       78
        
         constructor(opts: BrowserWindowConstructorOptions) {

     

       75
       75
       -
           oldPreloadPath = opts.webPreferences!.preload!;

     

       79
       79
       +
           oldPreloadPath = opts.webPreferences!.preload;

     

       76
       80
        
           opts.webPreferences!.preload = require.resolve("./node-preload.js");

     

       77
       81
        
       

     

       78
       82
        
           moonlightHost.events.emit("window-options", opts);

     
···

       114
       118
        
       // "aight i'm writing exclusively C# from now on and never touching JavaScript again"

     

       115
       119
        
       

     

       116
       120
        
       export async function inject(asarPath: string) {

     

       121
       121
       +
         isMoonlightDesktop = asarPath === "moonlightDesktop";

     

       117
       122
        
         try {

     

       118
       123
        
           const config = readConfig();

     

       119
       124
        
           const extensions = getExtensions();

     
···

       157
       162
        
           logger.error("Failed to inject", e);

     

       158
       163
        
         }

     

       159
       164
        
       

     

       165
       165
       +
         if (isMoonlightDesktop) return;

     

       160
       166
        
         // Need to do this instead of require() or it breaks require.main

     

       161
       167
        
         // @ts-expect-error why are you not documented

     

       162
       168
        
         Module._load(asarPath, Module, true);

+1 -2

packages/node-preload/src/index.ts

···

       28
       28
        
           extensions: getExtensions(),

     

       29
       29
        
           processedExtensions: processed,

     

       30
       30
        
           nativesCache: {},

     

       31
       31
       -
       

     

       32
       31
        
           getConfig,

     

       33
       32
        
           getConfigOption: <T>(ext: string, name: string) => {

     

       34
       33
        
             const config = getConfig(ext);

     
···

       84
       83
        
         }

     

       85
       84
        
       

     

       86
       85
        
         // Let Discord start even if we fail

     

       87
       87
       -
         require(oldPreloadPath);

     

       86
       86
       +
         if (oldPreloadPath) require(oldPreloadPath);

     

       88
       87
        
       }

     

       89
       88
        
       

     

       90
       89
        
       const oldPreloadPath: string = ipcRenderer.sendSync(

+1

packages/types/src/constants.ts

···

       5
       5
        
       

     

       6
       6
        
       export const ipcGetOldPreloadPath = "_moonlight_getOldPreloadPath";

     

       7
       7
        
       export const ipcGetAppData = "_moonlight_getAppData";

     

       8
       8
       +
       export const ipcGetIsMoonlightDesktop = "_moonlight_getIsMoonlightDesktop";

     

       8
       9
        
       export const ipcMessageBox = "_moonlight_messageBox";

     

       9
       10
        
       export const ipcSetCorsList = "_moonlight_setCorsList";