commit bd6b9bfb52376ce33782b5973fa068ea72c4b3eb · notnite.com/moonlight

+6 -2

packages/browser/src/index.ts

···

       3
       3
        
       import Logger, { initLogger } from "@moonlight-mod/core/util/logger";

     

       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";

     

       6
       6
       +
       import {

     

       7
       7
       +
         MoonlightBranch,

     

       8
       8
       +
         MoonlightBrowserFS,

     

       9
       9
       +
         MoonlightNode

     

       10
       10
       +
       } from "@moonlight-mod/types";

     

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

     

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

     

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

     
···

       104
       108
        
           nativesCache: {},

     

       105
       109
        
       

     

       106
       110
        
           version: MOONLIGHT_VERSION,

     

       107
       107
       -
           branch: MOONLIGHT_BRANCH,

     

       111
       111
       +
           branch: MOONLIGHT_BRANCH as MoonlightBranch,

     

       108
       112
        
       

     

       109
       113
        
           getConfig,

     

       110
       114
        
           getConfigOption: <T>(ext: string, name: string) => {

+3 -2

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

···

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

     

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

     

       6
       6
        
       import { githubRepo, userAgent, nightlyRefUrl } from "./consts";

     

       7
       7
       +
       import { MoonlightBranch } from "types/src";

     

       7
       8
        
       

     

       8
       9
        
       const logger = moonlightNode.getLogger("moonbase");

     

       9
       10
        
       

     

       10
       11
        
       async function checkForMoonlightUpdate() {

     

       11
       12
        
         try {

     

       12
       12
       -
           if (moonlightNode.branch === "stable") {

     

       13
       13
       +
           if (moonlightNode.branch === MoonlightBranch.STABLE) {

     

       13
       14
        
             const req = await fetch(

     

       14
       15
        
               `https://api.github.com/repos/${githubRepo}/releases/latest`,

     

       15
       16
        
               {

     
···

       20
       21
        
             );

     

       21
       22
        
             const json: { name: string } = await req.json();

     

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

     

       23
       23
       -
           } else if (moonlightNode.branch === "nightly") {

     

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

     

       24
       25
        
             const req = await fetch(nightlyRefUrl, {

     

       25
       26
        
               headers: {

     

       26
       27
        
                 "User-Agent": userAgent

+7 -3

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

···

       1
       1
       -
       import { Config, ExtensionLoadSource } from "@moonlight-mod/types";

     

       1
       1
       +
       import {

     

       2
       2
       +
         Config,

     

       3
       3
       +
         ExtensionLoadSource,

     

       4
       4
       +
         MoonlightBranch

     

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

     

       2
       6
        
       import {

     

       3
       7
        
         ExtensionState,

     

       4
       8
        
         MoonbaseExtension,

     
···

       19
       23
        
         natives = {

     

       20
       24
        
           checkForMoonlightUpdate: async () => {

     

       21
       25
        
             try {

     

       22
       22
       -
               if (moonlight.branch === "stable") {

     

       26
       26
       +
               if (moonlight.branch === MoonlightBranch.STABLE) {

     

       23
       27
        
                 const req = await fetch(

     

       24
       28
        
                   `https://api.github.com/repos/${githubRepo}/releases/latest`,

     

       25
       29
        
                   {

     
···

       30
       34
        
                 );

     

       31
       35
        
                 const json: { name: string } = await req.json();

     

       32
       36
        
                 return json.name !== moonlight.version ? json.name : null;

     

       33
       33
       -
               } else if (moonlight.branch === "nightly") {

     

       37
       37
       +
               } else if (moonlight.branch === MoonlightBranch.NIGHTLY) {

     

       34
       38
        
                 const req = await fetch(nightlyRefUrl, {

     

       35
       39
        
                   headers: {

     

       36
       40
        
                     "User-Agent": userAgent

+2 -1

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

···

       1
       1
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       2
       2
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       3
       3
        
       import Notices from "@moonlight-mod/wp/notices_notices";

     

       4
       4
       +
       import { MoonlightBranch } from "types/src";

     

       4
       5
        
       

     

       5
       6
        
       // FIXME: not indexed as importable

     

       6
       7
        
       const Constants = spacepack.require("discord/Constants");

     
···

       28
       29
        
       

     

       29
       30
        
           if (version != null) {

     

       30
       31
        
             message =

     

       31
       31
       -
               moonlightNode.branch === "nightly"

     

       32
       32
       +
               moonlightNode.branch === MoonlightBranch.NIGHTLY

     

       32
       33
        
                 ? `A new version of moonlight is available`

     

       33
       34
        
                 : `moonlight ${version} is available`;

     

       34
       35
        
           }

+2 -2

packages/injector/src/index.ts

···

       5
       5
        
         app

     

       6
       6
        
       } from "electron";

     

       7
       7
        
       import Module from "node:module";

     

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

     

       8
       8
       +
       import { constants, MoonlightBranch } from "@moonlight-mod/types";

     

       9
       9
        
       import { readConfig } from "@moonlight-mod/core/config";

     

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

     

       11
       11
        
       import Logger, { initLogger } from "@moonlight-mod/core/util/logger";

     
···

       225
       225
        
             },

     

       226
       226
        
       

     

       227
       227
        
             version: MOONLIGHT_VERSION,

     

       228
       228
       -
             branch: MOONLIGHT_BRANCH,

     

       228
       228
       +
             branch: MOONLIGHT_BRANCH as MoonlightBranch,

     

       229
       229
        
       

     

       230
       230
        
             getConfig,

     

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

+2 -2

packages/node-preload/src/index.ts

···

       3
       3
        
       import path from "path";

     

       4
       4
        
       

     

       5
       5
        
       import { readConfig, writeConfig } from "@moonlight-mod/core/config";

     

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

     

       6
       6
       +
       import { constants, MoonlightBranch } from "@moonlight-mod/types";

     

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

     

       8
       8
        
       import {

     

       9
       9
        
         getExtensionsPath,

     
···

       34
       34
        
           nativesCache: {},

     

       35
       35
        
       

     

       36
       36
        
           version: MOONLIGHT_VERSION,

     

       37
       37
       -
           branch: MOONLIGHT_BRANCH,

     

       37
       37
       +
           branch: MOONLIGHT_BRANCH as MoonlightBranch,

     

       38
       38
        
       

     

       39
       39
        
           getConfig,

     

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

+9 -3

packages/types/src/globals.ts

···

       19
       19
        
         processedExtensions: ProcessedExtensions;

     

       20
       20
        
       

     

       21
       21
        
         version: string;

     

       22
       22
       -
         branch: string;

     

       22
       22
       +
         branch: MoonlightBranch;

     

       23
       23
        
       

     

       24
       24
        
         getConfig: (ext: string) => ConfigExtension["config"];

     

       25
       25
        
         getConfigOption: <T>(ext: string, name: string) => T | undefined;

     
···

       33
       33
        
         nativesCache: Record<string, any>;

     

       34
       34
        
       

     

       35
       35
        
         version: string;

     

       36
       36
       -
         branch: string;

     

       36
       36
       +
         branch: MoonlightBranch;

     

       37
       37
        
       

     

       38
       38
        
         getConfig: (ext: string) => ConfigExtension["config"];

     

       39
       39
        
         getConfigOption: <T>(ext: string, name: string) => T | undefined;

     
···

       78
       78
        
         };

     

       79
       79
        
       

     

       80
       80
        
         version: string;

     

       81
       81
       -
         branch: string;

     

       81
       81
       +
         branch: MoonlightBranch;

     

       82
       82
        
       

     

       83
       83
        
         getConfig: (ext: string) => ConfigExtension["config"];

     

       84
       84
        
         getConfigOption: <T>(ext: string, name: string) => T | undefined;

     
···

       93
       93
        
         NodePreload = "node-preload",

     

       94
       94
        
         WebPreload = "web-preload"

     

       95
       95
        
       }

     

       96
       96
       +
       

     

       97
       97
       +
       export enum MoonlightBranch {

     

       98
       98
       +
         STABLE = "stable",

     

       99
       99
       +
         NIGHTLY = "nightly",

     

       100
       100
       +
         DEV = "dev"

     

       101
       101
       +
       }

+2 -2

packages/web-preload/src/index.ts

···

       5
       5
        
         registerPatch,

     

       6
       6
        
         registerWebpackModule

     

       7
       7
        
       } from "@moonlight-mod/core/patch";

     

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

     

       8
       8
       +
       import { constants, MoonlightBranch } from "@moonlight-mod/types";

     

       9
       9
        
       import { installStyles } from "@moonlight-mod/core/styles";

     

       10
       10
        
       import Logger, { initLogger } from "@moonlight-mod/core/util/logger";

     

       11
       11
        
       import LunAST from "@moonlight-mod/lunast";

     
···

       31
       31
        
           },

     

       32
       32
        
       

     

       33
       33
        
           version: MOONLIGHT_VERSION,

     

       34
       34
       -
           branch: MOONLIGHT_BRANCH,

     

       34
       34
       +
           branch: MOONLIGHT_BRANCH as MoonlightBranch,

     

       35
       35
        
       

     

       36
       36
        
           getConfig: moonlightNode.getConfig.bind(moonlightNode),

     

       37
       37
        
           getConfigOption: moonlightNode.getConfigOption.bind(moonlightNode),