commit 36cf7589107befb3f788eaefbd25f643c22c1a85 · notnite.com/moonlight

+19 -9

build.mjs

···

       121
       121
        
               dest: "./dist/browser/manifest.json"

     

       122
       122
        
             })

     

       123
       123
        
           );

     

       124
       124
       -
           plugins.push(

     

       125
       125
       -
             copyStaticFiles({

     

       126
       126
       -
               src: "./packages/browser/modifyResponseHeaders.json",

     

       127
       127
       -
               dest: "./dist/browser/modifyResponseHeaders.json"

     

       128
       128
       -
             })

     

       129
       129
       -
           );

     

       130
       130
       -
           if (mv2) {

     

       124
       124
       +
       

     

       125
       125
       +
           if (!mv2) {

     

       131
       126
        
             plugins.push(

     

       132
       127
        
               copyStaticFiles({

     

       133
       133
       -
                 src: "./packages/browser/src/background.js",

     

       134
       134
       -
                 dest: "./dist/browser/background.js"

     

       128
       128
       +
                 src: "./packages/browser/modifyResponseHeaders.json",

     

       129
       129
       +
                 dest: "./dist/browser/modifyResponseHeaders.json"

     

       130
       130
       +
               })

     

       131
       131
       +
             );

     

       132
       132
       +
             plugins.push(

     

       133
       133
       +
               copyStaticFiles({

     

       134
       134
       +
                 src: "./packages/browser/blockLoading.json",

     

       135
       135
       +
                 dest: "./dist/browser/blockLoading.json"

     

       135
       136
        
               })

     

       136
       137
        
             );

     

       137
       138
        
           }

     

       139
       139
       +
       

     

       140
       140
       +
           plugins.push(

     

       141
       141
       +
             copyStaticFiles({

     

       142
       142
       +
               src: mv2

     

       143
       143
       +
                 ? "./packages/browser/src/background-mv2.js"

     

       144
       144
       +
                 : "./packages/browser/src/background.js",

     

       145
       145
       +
               dest: "./dist/browser/background.js"

     

       146
       146
       +
             })

     

       147
       147
       +
           );

     

       138
       148
        
         }

     

       139
       149
        
       

     

       140
       150
        
         /** @type {import("esbuild").BuildOptions} */

+13

packages/browser/blockLoading.json

···

       1
       1
       +
       [

     

       2
       2
       +
         {

     

       3
       3
       +
           "id": 2,

     

       4
       4
       +
           "priority": 1,

     

       5
       5
       +
           "action": {

     

       6
       6
       +
             "type": "block"

     

       7
       7
       +
           },

     

       8
       8
       +
           "condition": {

     

       9
       9
       +
             "urlFilter": "*://discord.com/assets/*.js",

     

       10
       10
       +
             "resourceTypes": ["script"]

     

       11
       11
       +
           }

     

       12
       12
       +
         }

     

       13
       13
       +
       ]

+26 -6

packages/browser/manifest.json

···

       3
       3
        
         "name": "moonlight",

     

       4
       4
        
         "description": "Yet another Discord mod",

     

       5
       5
        
         "version": "1.1.0",

     

       6
       6
       -
         "permissions": ["declarativeNetRequestWithHostAccess"],

     

       6
       6
       +
         "permissions": [

     

       7
       7
       +
           "declarativeNetRequestWithHostAccess",

     

       8
       8
       +
           "webRequest",

     

       9
       9
       +
           "scripting",

     

       10
       10
       +
           "webNavigation"

     

       11
       11
       +
         ],

     

       12
       12
       +
         "host_permissions": [

     

       13
       13
       +
           "https://moonlight-mod.github.io/*",

     

       14
       14
       +
           "https://*.discord.com/*"

     

       15
       15
       +
         ],

     

       7
       16
        
         "content_scripts": [

     

       8
       17
        
           {

     

       9
       18
        
             "js": ["index.js"],

     
···

       12
       21
        
             "world": "MAIN"

     

       13
       22
        
           }

     

       14
       23
        
         ],

     

       15
       15
       -
         "host_permissions": [

     

       16
       16
       -
           "https://moonlight-mod.github.io/*",

     

       17
       17
       -
           "https://*.discord.com/*"

     

       18
       18
       -
         ],

     

       19
       24
        
         "declarative_net_request": {

     

       20
       25
        
           "rule_resources": [

     

       21
       26
        
             {

     

       22
       27
        
               "id": "modifyResponseHeaders",

     

       23
       28
        
               "enabled": true,

     

       24
       29
        
               "path": "modifyResponseHeaders.json"

     

       30
       30
       +
             },

     

       31
       31
       +
             {

     

       32
       32
       +
               "id": "blockLoading",

     

       33
       33
       +
               "enabled": true,

     

       34
       34
       +
               "path": "blockLoading.json"

     

       25
       35
        
             }

     

       26
       36
        
           ]

     

       27
       27
       -
         }

     

       37
       37
       +
         },

     

       38
       38
       +
         "background": {

     

       39
       39
       +
           "service_worker": "background.js",

     

       40
       40
       +
           "type": "module"

     

       41
       41
       +
         },

     

       42
       42
       +
         "web_accessible_resources": [

     

       43
       43
       +
           {

     

       44
       44
       +
             "resources": ["index.js"],

     

       45
       45
       +
             "matches": ["https://*.discord.com/*"]

     

       46
       46
       +
           }

     

       47
       47
       +
         ]

     

       28
       48
        
       }

+12 -10

packages/browser/manifestv2.json

···

       3
       3
        
         "name": "moonlight",

     

       4
       4
        
         "description": "Yet another Discord mod",

     

       5
       5
        
         "version": "1.1.0",

     

       6
       6
       -
         "content_scripts": [

     

       7
       7
       -
           {

     

       8
       8
       -
             "js": ["index.js"],

     

       9
       9
       -
             "matches": ["https://*.discord.com/*"],

     

       10
       10
       -
             "run_at": "document_start",

     

       11
       11
       -
             "world": "MAIN"

     

       12
       12
       -
           }

     

       13
       13
       -
         ],

     

       14
       6
        
         "permissions": [

     

       15
       7
        
           "webRequest",

     

       16
       8
        
           "webRequestBlocking",

     

       17
       17
       -
           "https://moonlight-mod.github.io/*",

     

       9
       9
       +
           "scripting",

     

       10
       10
       +
           "webNavigation",

     

       11
       11
       +
           "https://*.discord.com/assets/*.js",

     

       18
       12
        
           "https://*.discord.com/*"

     

       19
       13
        
         ],

     

       20
       14
        
         "background": {

     

       21
       15
        
           "scripts": ["background.js"]

     

       22
       22
       -
         }

     

       16
       16
       +
         },

     

       17
       17
       +
         "content_scripts": [

     

       18
       18
       +
           {

     

       19
       19
       +
             "js": ["index.js"],

     

       20
       20
       +
             "matches": ["https://*.discord.com/*"],

     

       21
       21
       +
             "run_at": "document_start",

     

       22
       22
       +
             "world": "MAIN"

     

       23
       23
       +
           }

     

       24
       24
       +
         ]

     

       23
       25
        
       }

+1 -1

packages/browser/modifyResponseHeaders.json

···

       1
       1
        
       [

     

       2
       2
        
         {

     

       3
       3
        
           "id": 1,

     

       4
       4
       -
           "priority": 1,

     

       4
       4
       +
           "priority": 2,

     

       5
       5
        
           "action": {

     

       6
       6
        
             "type": "modifyHeaders",

     

       7
       7
        
             "responseHeaders": [

+99

packages/browser/src/background-mv2.js

···

       1
       1
       +
       /* eslint-disable no-console */

     

       2
       2
       +
       /* eslint-disable no-undef */

     

       3
       3
       +
       

     

       4
       4
       +
       const starterUrls = ["web.", "sentry."];

     

       5
       5
       +
       let blockLoading = true;

     

       6
       6
       +
       let doing = false;

     

       7
       7
       +
       let collectedUrls = new Set();

     

       8
       8
       +
       

     

       9
       9
       +
       chrome.webNavigation.onBeforeNavigate.addListener(async (details) => {

     

       10
       10
       +
         const url = new URL(details.url);

     

       11
       11
       +
         if (!blockLoading && url.hostname.endsWith("discord.com")) {

     

       12
       12
       +
           console.log("Blocking", details.url);

     

       13
       13
       +
           blockLoading = true;

     

       14
       14
       +
           collectedUrls.clear();

     

       15
       15
       +
         }

     

       16
       16
       +
       });

     

       17
       17
       +
       

     

       18
       18
       +
       async function doTheThing(urls, tabId) {

     

       19
       19
       +
         console.log("Doing", urls, tabId);

     

       20
       20
       +
       

     

       21
       21
       +
         blockLoading = false;

     

       22
       22
       +
       

     

       23
       23
       +
         try {

     

       24
       24
       +
           await chrome.scripting.executeScript({

     

       25
       25
       +
             target: { tabId },

     

       26
       26
       +
             world: "MAIN",

     

       27
       27
       +
             args: [urls],

     

       28
       28
       +
             func: async (urls) => {

     

       29
       29
       +
               try {

     

       30
       30
       +
                 await window._moonlightBrowserInit();

     

       31
       31
       +
               } catch (e) {

     

       32
       32
       +
                 console.log(e);

     

       33
       33
       +
               }

     

       34
       34
       +
       

     

       35
       35
       +
               const scripts = [...document.querySelectorAll("script")].filter(

     

       36
       36
       +
                 (script) => script.src && urls.some((url) => url.includes(script.src))

     

       37
       37
       +
               );

     

       38
       38
       +
       

     

       39
       39
       +
               // backwards

     

       40
       40
       +
               urls.reverse();

     

       41
       41
       +
               for (const url of urls) {

     

       42
       42
       +
                 const script = scripts.find((script) => url.includes(script.src));

     

       43
       43
       +
                 console.log("adding new script", script);

     

       44
       44
       +
       

     

       45
       45
       +
                 const newScript = document.createElement("script");

     

       46
       46
       +
                 for (const { name, value } of script.attributes) {

     

       47
       47
       +
                   newScript.setAttribute(name, value);

     

       48
       48
       +
                 }

     

       49
       49
       +
       

     

       50
       50
       +
                 script.remove();

     

       51
       51
       +
                 document.documentElement.appendChild(newScript);

     

       52
       52
       +
               }

     

       53
       53
       +
             }

     

       54
       54
       +
           });

     

       55
       55
       +
         } catch (e) {

     

       56
       56
       +
           console.log(e);

     

       57
       57
       +
         }

     

       58
       58
       +
       

     

       59
       59
       +
         doing = false;

     

       60
       60
       +
         collectedUrls.clear();

     

       61
       61
       +
       }

     

       62
       62
       +
       

     

       63
       63
       +
       chrome.webRequest.onBeforeRequest.addListener(

     

       64
       64
       +
         async (details) => {

     

       65
       65
       +
           if (starterUrls.some((url) => details.url.includes(url))) {

     

       66
       66
       +
             console.log("Adding", details.url);

     

       67
       67
       +
             collectedUrls.add(details.url);

     

       68
       68
       +
           }

     

       69
       69
       +
       

     

       70
       70
       +
           if (collectedUrls.size === starterUrls.length) {

     

       71
       71
       +
             if (doing) return;

     

       72
       72
       +
             if (!blockLoading) return;

     

       73
       73
       +
             doing = true;

     

       74
       74
       +
             const urls = [...collectedUrls];

     

       75
       75
       +
             const tabId = details.tabId;

     

       76
       76
       +
       

     

       77
       77
       +
             // yes this is a load-bearing sleep

     

       78
       78
       +
             setTimeout(() => doTheThing(urls, tabId), 0);

     

       79
       79
       +
           }

     

       80
       80
       +
       

     

       81
       81
       +
           if (blockLoading) return { cancel: true };

     

       82
       82
       +
         },

     

       83
       83
       +
         {

     

       84
       84
       +
           urls: ["https://*.discord.com/assets/*.js"]

     

       85
       85
       +
         },

     

       86
       86
       +
         ["blocking"]

     

       87
       87
       +
       );

     

       88
       88
       +
       

     

       89
       89
       +
       chrome.webRequest.onHeadersReceived.addListener(

     

       90
       90
       +
         (details) => {

     

       91
       91
       +
           return {

     

       92
       92
       +
             responseHeaders: details.responseHeaders.filter(

     

       93
       93
       +
               (header) => header.name.toLowerCase() !== "content-security-policy"

     

       94
       94
       +
             )

     

       95
       95
       +
           };

     

       96
       96
       +
         },

     

       97
       97
       +
         { urls: ["https://*.discord.com/*"] },

     

       98
       98
       +
         ["blocking", "responseHeaders"]

     

       99
       99
       +
       );

+112 -10

packages/browser/src/background.js

···

       1
       1
       -
       // This is so tiny that I don't need to esbuild it

     

       1
       1
       +
       /* eslint-disable no-console */

     

       2
       2
       +
       /* eslint-disable no-undef */

     

       3
       3
       +
       

     

       4
       4
       +
       const starterUrls = ["web.", "sentry."];

     

       5
       5
       +
       let blockLoading = true;

     

       6
       6
       +
       let doing = false;

     

       7
       7
       +
       let collectedUrls = new Set();

     

       8
       8
       +
       

     

       9
       9
       +
       chrome.webNavigation.onBeforeNavigate.addListener(async (details) => {

     

       10
       10
       +
         const url = new URL(details.url);

     

       11
       11
       +
         if (!blockLoading && url.hostname.endsWith("discord.com")) {

     

       12
       12
       +
           await chrome.declarativeNetRequest.updateEnabledRulesets({

     

       13
       13
       +
             enableRulesetIds: ["modifyResponseHeaders", "blockLoading"]

     

       14
       14
       +
           });

     

       15
       15
       +
           blockLoading = true;

     

       16
       16
       +
           collectedUrls.clear();

     

       17
       17
       +
         }

     

       18
       18
       +
       });

     

       19
       19
       +
       

     

       20
       20
       +
       chrome.webRequest.onBeforeRequest.addListener(

     

       21
       21
       +
         async (details) => {

     

       22
       22
       +
           if (details.tabId === -1) return;

     

       23
       23
       +
           if (starterUrls.some((url) => details.url.includes(url))) {

     

       24
       24
       +
             console.log("Adding", details.url);

     

       25
       25
       +
             collectedUrls.add(details.url);

     

       26
       26
       +
           }

     

       27
       27
       +
       

     

       28
       28
       +
           if (collectedUrls.size === starterUrls.length) {

     

       29
       29
       +
             if (doing) return;

     

       30
       30
       +
             if (!blockLoading) return;

     

       31
       31
       +
             doing = true;

     

       32
       32
       +
             const urls = [...collectedUrls];

     

       33
       33
       +
             console.log("Doing", urls);

     

       2
       34
        
       

     

       3
       3
       -
       // eslint-disable-next-line no-undef

     

       4
       4
       -
       chrome.webRequest.onHeadersReceived.addListener(

     

       5
       5
       -
         (details) => ({

     

       6
       6
       -
           responseHeaders: details.responseHeaders.filter(

     

       7
       7
       -
             (header) => header.name.toLowerCase() !== "content-security-policy"

     

       8
       8
       -
           )

     

       9
       9
       -
         }),

     

       10
       10
       -
         { urls: ["https://*.discord.com/*"] },

     

       11
       11
       -
         ["blocking", "responseHeaders"]

     

       35
       35
       +
             console.log("Running moonlight script");

     

       36
       36
       +
             try {

     

       37
       37
       +
               await chrome.scripting.executeScript({

     

       38
       38
       +
                 target: { tabId: details.tabId },

     

       39
       39
       +
                 world: "MAIN",

     

       40
       40
       +
                 files: ["index.js"]

     

       41
       41
       +
               });

     

       42
       42
       +
             } catch (e) {

     

       43
       43
       +
               console.log(e);

     

       44
       44
       +
             }

     

       45
       45
       +
       

     

       46
       46
       +
             console.log("Initializing moonlight");

     

       47
       47
       +
             try {

     

       48
       48
       +
               await chrome.scripting.executeScript({

     

       49
       49
       +
                 target: { tabId: details.tabId },

     

       50
       50
       +
                 world: "MAIN",

     

       51
       51
       +
                 func: async () => {

     

       52
       52
       +
                   try {

     

       53
       53
       +
                     await window._moonlightBrowserInit();

     

       54
       54
       +
                   } catch (e) {

     

       55
       55
       +
                     console.log(e);

     

       56
       56
       +
                   }

     

       57
       57
       +
                 }

     

       58
       58
       +
               });

     

       59
       59
       +
             } catch (e) {

     

       60
       60
       +
               console.log(e);

     

       61
       61
       +
             }

     

       62
       62
       +
       

     

       63
       63
       +
             console.log("Updating rulesets");

     

       64
       64
       +
             try {

     

       65
       65
       +
               blockLoading = false;

     

       66
       66
       +
               await chrome.declarativeNetRequest.updateEnabledRulesets({

     

       67
       67
       +
                 disableRulesetIds: ["blockLoading"],

     

       68
       68
       +
                 enableRulesetIds: ["modifyResponseHeaders"]

     

       69
       69
       +
               });

     

       70
       70
       +
             } catch (e) {

     

       71
       71
       +
               console.log(e);

     

       72
       72
       +
             }

     

       73
       73
       +
       

     

       74
       74
       +
             console.log("Readding scripts");

     

       75
       75
       +
             try {

     

       76
       76
       +
               await chrome.scripting.executeScript({

     

       77
       77
       +
                 target: { tabId: details.tabId },

     

       78
       78
       +
                 world: "MAIN",

     

       79
       79
       +
                 args: [urls],

     

       80
       80
       +
                 func: async (urls) => {

     

       81
       81
       +
                   const scripts = [...document.querySelectorAll("script")].filter(

     

       82
       82
       +
                     (script) =>

     

       83
       83
       +
                       script.src && urls.some((url) => url.includes(script.src))

     

       84
       84
       +
                   );

     

       85
       85
       +
       

     

       86
       86
       +
                   // backwards

     

       87
       87
       +
                   urls.reverse();

     

       88
       88
       +
                   for (const url of urls) {

     

       89
       89
       +
                     const script = scripts.find((script) => url.includes(script.src));

     

       90
       90
       +
                     console.log("adding new script", script);

     

       91
       91
       +
       

     

       92
       92
       +
                     const newScript = document.createElement("script");

     

       93
       93
       +
                     for (const { name, value } of script.attributes) {

     

       94
       94
       +
                       newScript.setAttribute(name, value);

     

       95
       95
       +
                     }

     

       96
       96
       +
       

     

       97
       97
       +
                     script.remove();

     

       98
       98
       +
                     document.documentElement.appendChild(newScript);

     

       99
       99
       +
                   }

     

       100
       100
       +
                 }

     

       101
       101
       +
               });

     

       102
       102
       +
             } catch (e) {

     

       103
       103
       +
               console.log(e);

     

       104
       104
       +
             }

     

       105
       105
       +
       

     

       106
       106
       +
             console.log("Done");

     

       107
       107
       +
             doing = false;

     

       108
       108
       +
             collectedUrls.clear();

     

       109
       109
       +
           }

     

       110
       110
       +
         },

     

       111
       111
       +
         {

     

       112
       112
       +
           urls: ["*://*.discord.com/assets/*.js"]

     

       113
       113
       +
         }

     

       12
       114
        
       );

+3 -6

packages/browser/src/index.ts

···

       4
       4
        
       import { getExtensions } from "@moonlight-mod/core/extension";

     

       5
       5
        
       import { loadExtensions } from "@moonlight-mod/core/extension/loader";

     

       6
       6
        
       import { MoonlightBrowserFS, MoonlightNode } from "@moonlight-mod/types";

     

       7
       7
       -
       

     

       8
       7
        
       import { IndexedDB } from "@zenfs/dom";

     

       9
       8
        
       import { configure } from "@zenfs/core";

     

       10
       9
        
       import * as fs from "@zenfs/core/promises";

     

       11
       10
        
       

     

       12
       12
       -
       // Mostly copy pasted from node-preload, FIXME

     

       13
       13
       -
       // TODO: is this safe an in IIFE?

     

       14
       14
       -
       (async () => {

     

       11
       11
       +
       window._moonlightBrowserInit = async () => {

     

       15
       12
        
         // Set up a virtual filesystem with IndexedDB

     

       16
       13
        
         await configure({

     

       17
       14
        
           mounts: {

     
···

       131
       128
        
         });

     

       132
       129
        
       

     

       133
       130
        
         // This is set by web-preload for us

     

       134
       134
       -
         await window._moonlightLoad();

     

       135
       135
       -
       })();

     

       131
       131
       +
         await window._moonlightBrowserLoad();

     

       132
       132
       +
       };

+4 -1

packages/browser/tsconfig.json

···

       1
       1
        
       {

     

       2
       2
       -
         "extends": "../../tsconfig.json"

     

       2
       2
       +
         "extends": "../../tsconfig.json",

     

       3
       3
       +
         "compilerOptions": {

     

       4
       4
       +
           "module": "ES2022"

     

       5
       5
       +
         }

     

       3
       6
        
       }

+9 -7

packages/core/src/extension.ts

···

       246
       246
        
         }

     

       247
       247
        
       

     

       248
       248
        
         const fs = getFS();

     

       249
       249
       -
         ret.push(

     

       250
       250
       -
           ...(await loadDetectedExtensions(

     

       251
       251
       -
             fs,

     

       252
       252
       -
             "/extensions",

     

       253
       253
       -
             ExtensionLoadSource.Normal

     

       254
       254
       -
           ))

     

       255
       255
       -
         );

     

       249
       249
       +
         if (await fs.exists("/extensions")) {

     

       250
       250
       +
           ret.push(

     

       251
       251
       +
             ...(await loadDetectedExtensions(

     

       252
       252
       +
               fs,

     

       253
       253
       +
               "/extensions",

     

       254
       254
       +
               ExtensionLoadSource.Normal

     

       255
       255
       +
             ))

     

       256
       256
       +
           );

     

       257
       257
       +
         }

     

       256
       258
        
       

     

       257
       259
        
         return ret;

     

       258
       260
        
       }

+2 -1

packages/types/src/index.ts

···

       35
       35
        
         var moonlightNode: MoonlightNode;

     

       36
       36
        
         var moonlight: MoonlightWeb;

     

       37
       37
        
       

     

       38
       38
       -
         var _moonlightLoad: () => Promise<void>;

     

       38
       38
       +
         var _moonlightBrowserInit: () => Promise<void>;

     

       39
       39
       +
         var _moonlightBrowserLoad: () => Promise<void>;

     

       39
       40
        
         var _moonlightBrowserFS: MoonlightBrowserFS | undefined;

     

       40
       41
        
       }

+1 -1

packages/web-preload/src/index.ts

···

       56
       56
        
       if (MOONLIGHT_ENV === "web-preload") {

     

       57
       57
        
         load();

     

       58
       58
        
       } else {

     

       59
       59
       -
         window._moonlightLoad = load;

     

       59
       59
       +
         window._moonlightBrowserLoad = load;

     

       60
       60
        
       }