commit a982988e0fe2e4bdcf938d13b7a367e5296e2f2d · notnite.com/moonlight

+32 -5

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

···

       2
       2
        
       import * as fs from "node:fs/promises";

     

       3
       3
        
       import * as path from "node:path";

     

       4
       4
        
       import getNatives from "./native";

     

       5
       5
       +
       import { MoonlightBranch } from "@moonlight-mod/types";

     

       5
       6
        
       

     

       6
       7
        
       const natives = getNatives();

     

       7
       8
        
       

     
···

       64
       65
        
           if (i === -1) return original.call(this, entries);

     

       65
       66
        
       

     

       66
       67
        
           if (!entries.find((e) => e.label === "moonlight")) {

     

       68
       68
       +
             const options: Electron.MenuItemConstructorOptions[] = [

     

       69
       69
       +
               { label: "Update and restart", click: updateAndRestart },

     

       70
       70
       +
               { label: "Reset config", click: resetConfig }

     

       71
       71
       +
             ];

     

       72
       72
       +
       

     

       73
       73
       +
             if (moonlightHost.branch !== MoonlightBranch.DEV) {

     

       74
       74
       +
               options.push({

     

       75
       75
       +
                 label: "Switch branch",

     

       76
       76
       +
                 submenu: [MoonlightBranch.STABLE, MoonlightBranch.NIGHTLY].map((branch) => ({

     

       77
       77
       +
                   label: branch,

     

       78
       78
       +
                   type: "radio",

     

       79
       79
       +
                   checked: moonlightHost.branch === branch,

     

       80
       80
       +
                   click: async () => {

     

       81
       81
       +
                     if (moonlightHost.branch === branch) return;

     

       82
       82
       +
                     if (!(await confirm("switch branches"))) return;

     

       83
       83
       +
                     try {

     

       84
       84
       +
                       await natives.updateMoonlight(branch);

     

       85
       85
       +
                       await electron.dialog.showMessageBox({ message: "Branch switch successful, restarting Discord." });

     

       86
       86
       +
                       electron.app.relaunch();

     

       87
       87
       +
                       electron.app.exit(0);

     

       88
       88
       +
                     } catch (e) {

     

       89
       89
       +
                       await electron.dialog.showMessageBox({ message: "Failed to switch branches:\n" + e, type: "error" });

     

       90
       90
       +
                     }

     

       91
       91
       +
                   }

     

       92
       92
       +
                 }))

     

       93
       93
       +
               });

     

       94
       94
       +
             }

     

       95
       95
       +
       

     

       96
       96
       +
             options.push({ label: "About", click: showAbout });

     

       97
       97
       +
       

     

       67
       98
        
             entries.splice(i + 1, 0, {

     

       68
       99
        
               label: "moonlight",

     

       69
       69
       -
               submenu: [

     

       70
       70
       -
                 { label: "Update and restart", click: updateAndRestart },

     

       71
       71
       -
                 { label: "Reset config", click: resetConfig },

     

       72
       72
       -
                 { label: "About", click: showAbout }

     

       73
       73
       -
               ]

     

       100
       100
       +
               submenu: options

     

       74
       101
        
             });

     

       75
       102
        
           }

     

       76
       103

+5 -3

packages/core-extensions/src/moonbase/native.ts

···

       58
       58
        
             }

     

       59
       59
        
           },

     

       60
       60
        
       

     

       61
       61
       -
           async updateMoonlight() {

     

       61
       61
       +
           async updateMoonlight(overrideBranch?: MoonlightBranch) {

     

       62
       62
       +
             const branch = overrideBranch ?? moonlightGlobal.branch;

     

       63
       63
       +
       

     

       62
       64
        
             // Note: this won't do anything on browser, we should probably disable it

     

       63
       65
        
             // entirely when running in browser.

     

       64
       66
        
             async function downloadStable(): Promise<[ArrayBuffer, string]> {

     
···

       98
       100
        
             }

     

       99
       101
        
       

     

       100
       102
        
             const [tar, ref] =

     

       101
       101
       -
               moonlightGlobal.branch === MoonlightBranch.STABLE

     

       103
       103
       +
               branch === MoonlightBranch.STABLE

     

       102
       104
        
                 ? await downloadStable()

     

       103
       103
       -
                 : moonlightGlobal.branch === MoonlightBranch.NIGHTLY

     

       105
       105
       +
                 : branch === MoonlightBranch.NIGHTLY

     

       104
       106
        
                   ? await downloadNightly()

     

       105
       107
        
                   : [null, null];

     

       106
       108

+2 -2

packages/core-extensions/src/moonbase/types.ts

···

       1
       1
        
       import { ExtensionCompat } from "@moonlight-mod/core/extension/loader";

     

       2
       2
       -
       import { DetectedExtension, ExtensionManifest } from "@moonlight-mod/types";

     

       2
       2
       +
       import { DetectedExtension, ExtensionManifest, MoonlightBranch } from "@moonlight-mod/types";

     

       3
       3
        
       

     

       4
       4
        
       export type MoonbaseNatives = {

     

       5
       5
        
         checkForMoonlightUpdate(): Promise<string | null>;

     

       6
       6
       -
         updateMoonlight(): Promise<void>;

     

       6
       6
       +
         updateMoonlight(overrideBranch?: MoonlightBranch): Promise<void>;

     

       7
       7
        
       

     

       8
       8
        
         fetchRepositories(repos: string[]): Promise<Record<string, RepositoryManifest[]>>;

     

       9
       9
        
         installExtension(manifest: RepositoryManifest, url: string, repo: string): Promise<void>;