commit d8a649e31c5cb8be07f672604e990095d6c0f413 · notnite.com/moonlight

+2 -1

packages/core-extensions/package.json

···

       3
        
         "private": true,

     

       4
        
         "dependencies": {

     

       5
        
           "@moonlight-mod/core": "workspace:*",

     

       6
       -
           "@moonlight-mod/types": "workspace:*"

     

       0
        
       
     

       7
        
         }

     

       8
        
       }

···

       3
        
         "private": true,

     

       4
        
         "dependencies": {

     

       5
        
           "@moonlight-mod/core": "workspace:*",

     

       6
       +
           "@moonlight-mod/types": "workspace:*",

     

       7
       +
           "nanotar": "^0.1.1"

     

       8
        
         }

     

       9
        
       }

+5 -1

packages/core-extensions/src/moonbase/manifest.json

···

       18
        
             "description": "Save extension filter in config",

     

       19
        
             "type": "boolean"

     

       20
        
           }

     

       21
       -
         }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
       }

···

       18
        
             "description": "Save extension filter in config",

     

       19
        
             "type": "boolean"

     

       20
        
           }

     

       21
       +
         },

     

       22
       +
         "cors": [

     

       23
       +
           "https://github.com/moonlight-mod/moonlight/releases/download/",

     

       24
       +
           "https://objects.githubusercontent.com/github-production-release-asset-"

     

       25
       +
         ]

     

       26
        
       }

+87 -12

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

···

       2
        
       import type { MoonbaseNatives, RepositoryManifest } from "./types";

     

       3
        
       import extractAsar from "@moonlight-mod/core/asar";

     

       4
        
       import { repoUrlFile } from "@moonlight-mod/types/constants";

     

       0
        
       
     

       5
        
       

     

       6
       -
       export const githubRepo = "moonlight-mod/moonlight";

     

       7
       -
       export const nightlyRefUrl = "https://moonlight-mod.github.io/moonlight/ref";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
       export const userAgent = `moonlight/${moonlightNode.version} (https://github.com/moonlight-mod/moonlight)`;

     

       9
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
       export default function getNatives(): MoonbaseNatives {

     

       11
        
         const fs = moonlightNode.fs;

     

       12
        
         const logger = moonlightNode.getLogger("moonbase/natives");

     
···

       15
        
           async checkForMoonlightUpdate() {

     

       16
        
             try {

     

       17
        
               if (moonlightNode.branch === MoonlightBranch.STABLE) {

     

       18
       -
                 const req = await fetch(

     

       19
       -
                   `https://api.github.com/repos/${githubRepo}/releases/latest?_=${Date.now()}`,

     

       20
       -
                   {

     

       21
       -
                     headers: {

     

       22
       -
                       "User-Agent": userAgent

     

       23
       -
                     }

     

       24
       -
                   }

     

       25
       -
                 );

     

       26
       -
                 const json: { name: string } = await req.json();

     

       27
        
                 return json.name !== moonlightNode.version ? json.name : null;

     

       28
        
               } else if (moonlightNode.branch === MoonlightBranch.NIGHTLY) {

     

       29
       -
                 const req = await fetch(`${nightlyRefUrl}?_=${Date.now()}`, {

     

       0
        
       
     

       30
        
                   headers: {

     

       31
        
                     "User-Agent": userAgent

     

       32
        
                   }

     
···

       42
        
             }

     

       43
        
           },

     

       44
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
           async fetchRepositories(repos) {

     

       46
        
             const ret: Record<string, RepositoryManifest[]> = {};

     

       47
        
       

     

       48
        
             for (const repo of repos) {

     

       49
        
               try {

     

       50
        
                 const req = await fetch(repo, {

     

       0
        
       
     

       51
        
                   headers: {

     

       52
        
                     "User-Agent": userAgent

     

       53
        
                   }

···

       2
        
       import type { MoonbaseNatives, RepositoryManifest } from "./types";

     

       3
        
       import extractAsar from "@moonlight-mod/core/asar";

     

       4
        
       import { repoUrlFile } from "@moonlight-mod/types/constants";

     

       5
       +
       import { parseTarGzip } from "nanotar";

     

       6
        
       

     

       7
       +
       const githubRepo = "moonlight-mod/moonlight";

     

       8
       +
       const githubApiUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`;

     

       9
       +
       const artifactName = "dist.tar.gz";

     

       10
       +
       

     

       11
       +
       const nightlyRefUrl = "https://moonlight-mod.github.io/moonlight/ref";

     

       12
       +
       const nightlyZipUrl = "https://moonlight-mod.github.io/moonlight/dist.tar.gz";

     

       13
       +
       

     

       14
        
       export const userAgent = `moonlight/${moonlightNode.version} (https://github.com/moonlight-mod/moonlight)`;

     

       15
        
       

     

       16
       +
       async function getStableRelease(): Promise<{

     

       17
       +
         name: string;

     

       18
       +
         assets: {

     

       19
       +
           name: string;

     

       20
       +
           browser_download_url: string;

     

       21
       +
         }[];

     

       22
       +
       }> {

     

       23
       +
         const req = await fetch(githubApiUrl, {

     

       24
       +
           cache: "no-store",

     

       25
       +
           headers: {

     

       26
       +
             "User-Agent": userAgent

     

       27
       +
           }

     

       28
       +
         });

     

       29
       +
         return await req.json();

     

       30
       +
       }

     

       31
       +
       

     

       32
        
       export default function getNatives(): MoonbaseNatives {

     

       33
        
         const fs = moonlightNode.fs;

     

       34
        
         const logger = moonlightNode.getLogger("moonbase/natives");

     
···

       37
        
           async checkForMoonlightUpdate() {

     

       38
        
             try {

     

       39
        
               if (moonlightNode.branch === MoonlightBranch.STABLE) {

     

       40
       +
                 const json = await getStableRelease();

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       41
        
                 return json.name !== moonlightNode.version ? json.name : null;

     

       42
        
               } else if (moonlightNode.branch === MoonlightBranch.NIGHTLY) {

     

       43
       +
                 const req = await fetch(nightlyRefUrl, {

     

       44
       +
                   cache: "no-store",

     

       45
        
                   headers: {

     

       46
        
                     "User-Agent": userAgent

     

       47
        
                   }

     
···

       57
        
             }

     

       58
        
           },

     

       59
        
       

     

       60
       +
           async updateMoonlight() {

     

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

     

       62
       +
             // entirely when running in browser.

     

       63
       +
             async function downloadStable() {

     

       64
       +
               const json = await getStableRelease();

     

       65
       +
               const asset = json.assets.find((a) => a.name === artifactName);

     

       66
       +
               if (!asset) throw new Error("Artifact not found");

     

       67
       +
       

     

       68
       +
               logger.debug(`Downloading ${asset.browser_download_url}`);

     

       69
       +
               const req = await fetch(asset.browser_download_url, {

     

       70
       +
                 cache: "no-store",

     

       71
       +
                 headers: {

     

       72
       +
                   "User-Agent": userAgent

     

       73
       +
                 }

     

       74
       +
               });

     

       75
       +
       

     

       76
       +
               return await req.arrayBuffer();

     

       77
       +
             }

     

       78
       +
       

     

       79
       +
             async function downloadNightly() {

     

       80
       +
               logger.debug(`Downloading ${nightlyZipUrl}`);

     

       81
       +
               const req = await fetch(nightlyZipUrl, {

     

       82
       +
                 cache: "no-store",

     

       83
       +
                 headers: {

     

       84
       +
                   "User-Agent": userAgent

     

       85
       +
                 }

     

       86
       +
               });

     

       87
       +
       

     

       88
       +
               return await req.arrayBuffer();

     

       89
       +
             }

     

       90
       +
       

     

       91
       +
             const tar =

     

       92
       +
               moonlightNode.branch === MoonlightBranch.STABLE

     

       93
       +
                 ? await downloadStable()

     

       94
       +
                 : moonlightNode.branch === MoonlightBranch.NIGHTLY

     

       95
       +
                   ? await downloadNightly()

     

       96
       +
                   : null;

     

       97
       +
       

     

       98
       +
             if (!tar) return;

     

       99
       +
       

     

       100
       +
             const distDir = fs.join(moonlightNode.getMoonlightDir(), "dist");

     

       101
       +
             if (await fs.exists(distDir)) await fs.rmdir(distDir);

     

       102
       +
             await fs.mkdir(distDir);

     

       103
       +
       

     

       104
       +
             logger.debug("Extracting update");

     

       105
       +
             const files = await parseTarGzip(tar);

     

       106
       +
             for (const file of files) {

     

       107
       +
               if (!file.data) continue;

     

       108
       +
               // @ts-expect-error What do you mean their own types are wrong

     

       109
       +
               if (file.type !== "file") continue;

     

       110
       +
       

     

       111
       +
               const fullFile = fs.join(distDir, file.name);

     

       112
       +
               const fullDir = fs.dirname(fullFile);

     

       113
       +
               if (!(await fs.exists(fullDir))) await fs.mkdir(fullDir);

     

       114
       +
               await fs.writeFile(fullFile, file.data);

     

       115
       +
             }

     

       116
       +
             logger.debug("Update extracted");

     

       117
       +
           },

     

       118
       +
       

     

       119
        
           async fetchRepositories(repos) {

     

       120
        
             const ret: Record<string, RepositoryManifest[]> = {};

     

       121
        
       

     

       122
        
             for (const repo of repos) {

     

       123
        
               try {

     

       124
        
                 const req = await fetch(repo, {

     

       125
       +
                   cache: "no-store",

     

       126
        
                   headers: {

     

       127
        
                     "User-Agent": userAgent

     

       128
        
                   }

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

···

       2
        
       

     

       3
        
       export type MoonbaseNatives = {

     

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

     

       0
        
       
     

       0
        
       
     

       5
        
         fetchRepositories(

     

       6
        
           repos: string[]

     

       7
        
         ): Promise<Record<string, RepositoryManifest[]>>;

···

       2
        
       

     

       3
        
       export type MoonbaseNatives = {

     

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

     

       5
       +
         updateMoonlight(): Promise<void>;

     

       6
       +
       

     

       7
        
         fetchRepositories(

     

       8
        
           repos: string[]

     

       9
        
         ): Promise<Record<string, RepositoryManifest[]>>;

+17 -19

packages/core-extensions/src/moonbase/webpackModules/updates.ts

···

       53
        
           Notices.addNotice({

     

       54
        
             element: message,

     

       55
        
             color: "moonbase-updates-notice",

     

       56
       -
             buttons: hasExtensionUpdates

     

       57
       -
               ? [

     

       58
       -
                   {

     

       59
       -
                     name: "Open Moonbase",

     

       60
       -
                     onClick: () => {

     

       61
       -
                       const { open } = spacepack.findByExports(

     

       62
       -
                         "setSection",

     

       63
       -
                         "clearSubsection"

     

       64
       -
                       )[0].exports.Z;

     

       65
        
       

     

       66
       -
                       // settings is lazy loaded thus lazily patched

     

       67
       -
                       // FIXME: figure out a way to detect if settings has been opened

     

       68
       -
                       //        alreadyjust so the transition isnt as jarring

     

       69
       -
                       open(UserSettingsSections.ACCOUNT);

     

       70
       -
                       setTimeout(() => open("moonbase", 0), 0);

     

       71
       -
                       return true;

     

       72
       -
                     }

     

       73
       -
                   }

     

       74
       -
                 ]

     

       75
       -
               : []

     

       76
        
           });

     

       77
        
         }

     

       78
        
       }

···

       53
        
           Notices.addNotice({

     

       54
        
             element: message,

     

       55
        
             color: "moonbase-updates-notice",

     

       56
       +
             buttons: [

     

       57
       +
               {

     

       58
       +
                 name: "Open Moonbase",

     

       59
       +
                 onClick: () => {

     

       60
       +
                   const { open } = spacepack.findByExports(

     

       61
       +
                     "setSection",

     

       62
       +
                     "clearSubsection"

     

       63
       +
                   )[0].exports.Z;

     

       0
        
       
     

       64
        
       

     

       65
       +
                   // settings is lazy loaded thus lazily patched

     

       66
       +
                   // FIXME: figure out a way to detect if settings has been opened

     

       67
       +
                   //        alreadyjust so the transition isnt as jarring

     

       68
       +
                   open(UserSettingsSections.ACCOUNT);

     

       69
       +
                   setTimeout(() => open("moonbase", 0), 0);

     

       70
       +
                   return true;

     

       71
       +
                 }

     

       72
       +
               }

     

       73
       +
             ]

     

       0
        
       
     

       74
        
           });

     

       75
        
         }

     

       76
        
       }

pnpm-lock.yaml

···

       74
        
             '@moonlight-mod/types':

     

       75
        
               specifier: workspace:*

     

       76
        
               version: link:../types

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       77
        
       

     

       78
        
         packages/injector:

     

       79
        
           dependencies:

     
···

       1077
        
       

     

       1078
        
         ms@2.1.2:

     

       1079
        
           resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1080
        
       

     

       1081
        
         natural-compare@1.4.0:

     

       1082
        
           resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}

     
···

       2484
        
             brace-expansion: 2.0.1

     

       2485
        
       

     

       2486
        
         ms@2.1.2: {}

     

       0
        
       
     

       0
        
       
     

       2487
        
       

     

       2488
        
         natural-compare@1.4.0: {}

     

       2489

···

       74
        
             '@moonlight-mod/types':

     

       75
        
               specifier: workspace:*

     

       76
        
               version: link:../types

     

       77
       +
             nanotar:

     

       78
       +
               specifier: ^0.1.1

     

       79
       +
               version: 0.1.1

     

       80
        
       

     

       81
        
         packages/injector:

     

       82
        
           dependencies:

     
···

       1080
        
       

     

       1081
        
         ms@2.1.2:

     

       1082
        
           resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}

     

       1083
       +
       

     

       1084
       +
         nanotar@0.1.1:

     

       1085
       +
           resolution: {integrity: sha512-AiJsGsSF3O0havL1BydvI4+wR76sKT+okKRwWIaK96cZUnXqH0uNBOsHlbwZq3+m2BR1VKqHDVudl3gO4mYjpQ==}

     

       1086
        
       

     

       1087
        
         natural-compare@1.4.0:

     

       1088
        
           resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}

     
···

       2490
        
             brace-expansion: 2.0.1

     

       2491
        
       

     

       2492
        
         ms@2.1.2: {}

     

       2493
       +
       

     

       2494
       +
         nanotar@0.1.1: {}

     

       2495
        
       

     

       2496
        
         natural-compare@1.4.0: {}

     

       2497