commit 60097c49e481318b28f5a37aecda0fd2e613d0cf · notnite.com/moonlight

+32 -1

packages/core-extensions/src/moonbase/index.tsx

···

       1
       1
       -
       import { ExtensionWebpackModule } from "@moonlight-mod/types";

     

       1
       1
       +
       import { ExtensionWebpackModule, Patch } from "@moonlight-mod/types";

     

       2
       2
       +
       

     

       3
       3
       +
       export const patches: Patch[] = [

     

       4
       4
       +
         {

     

       5
       5
       +
           find: "window.DiscordErrors=",

     

       6
       6
       +
           replace: [

     

       7
       7
       +
             // replace reporting line with update status

     

       8
       8
       +
             {

     

       9
       9
       +
               match: /,(\(0,.\.jsx\))\("p",{children:.\.[a-zA-Z]+\.Messages.ERRORS_ACTION_TO_TAKE}\)/,

     

       10
       10
       +
               replacement: (_, createElement) =>

     

       11
       11
       +
                 `,${createElement}(require("moonbase_crashScreen").UpdateText,{state:this.state,setState:this.setState.bind(this)})`

     

       12
       12
       +
             },

     

       13
       13
       +
       

     

       14
       14
       +
             // wrap actions field to display error details

     

       15
       15
       +
             {

     

       16
       16
       +
               match: /action:(.),className:/,

     

       17
       17
       +
               replacement: (_, action) => `action:require("moonbase_crashScreen").wrapAction(${action},this.state),className:`

     

       18
       18
       +
             },

     

       19
       19
       +
       

     

       20
       20
       +
             // add update button

     

       21
       21
       +
             {

     

       22
       22
       +
               match: /(?<=\.ERRORS_RELOAD}\),(\(0,.\.jsx\))\(.,{}\))/,

     

       23
       23
       +
               replacement: (_, createElement) =>

     

       24
       24
       +
                 `,${createElement}(require("moonbase_crashScreen").UpdateButton,{state:this.state,setState:this.setState.bind(this)})`

     

       25
       25
       +
             }

     

       26
       26
       +
           ]

     

       27
       27
       +
         }

     

       28
       28
       +
       ];

     

       2
       29
        
       

     

       3
       30
        
       export const webpackModules: Record<string, ExtensionWebpackModule> = {

     

       4
       31
        
         stores: {

     
···

       43
       70
        
       

     

       44
       71
        
         moonbase: {

     

       45
       72
        
           dependencies: [{ ext: "moonbase", id: "stores" }]

     

       73
       73
       +
         },

     

       74
       74
       +
       

     

       75
       75
       +
         crashScreen: {

     

       76
       76
       +
           dependencies: [{ id: "react" }]

     

       46
       77
        
         }

     

       47
       78
        
       };

+64 -1

packages/core-extensions/src/moonbase/style.css

···

       3
       3
        
         --moonbase-fg: #fffba6;

     

       4
       4
        
       }

     

       5
       5
        
       

     

       6
       6
       -
       .moonbase-settings > :first-child {

     

       6
       6
       +
       .moonbase-settings> :first-child {

     

       7
       7
        
         margin-top: 0px;

     

       8
       8
        
       }

     

       9
       9
        
       

     
···

       53
       53
        
         flex-direction: row;

     

       54
       54
        
         gap: 8px;

     

       55
       55
        
       }

     

       56
       56
       +
       

     

       57
       57
       +
       /* crash screen */

     

       58
       58
       +
       .moonbase-crash-wrapper>[class^="buttons_"] {

     

       59
       59
       +
         gap: 1rem;

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       62
       62
       +
       .moonbase-crash-wrapper {

     

       63
       63
       +
         display: flex;

     

       64
       64
       +
         flex-direction: column;

     

       65
       65
       +
         align-items: center;

     

       66
       66
       +
         gap: 1rem;

     

       67
       67
       +
         max-height: 50%;

     

       68
       68
       +
       }

     

       69
       69
       +
       

     

       70
       70
       +
       .moonbase-crash-details-wrapper {

     

       71
       71
       +
         overflow-y: scroll;

     

       72
       72
       +
         color: var(--text-normal);

     

       73
       73
       +
         background: var(--background-secondary);

     

       74
       74
       +
         border: 1px solid var(--background-tertiary);

     

       75
       75
       +
         border-radius: 4px;

     

       76
       76
       +
         padding: 0.5em;

     

       77
       77
       +
       

     

       78
       78
       +
         &::-webkit-scrollbar {

     

       79
       79
       +
           width: 8px;

     

       80
       80
       +
           height: 8px;

     

       81
       81
       +
         }

     

       82
       82
       +
       

     

       83
       83
       +
         &::-webkit-scrollbar-thumb {

     

       84
       84
       +
           background-clip: padding-box;

     

       85
       85
       +
           border: 2px solid transparent;

     

       86
       86
       +
           border-radius: 4px;

     

       87
       87
       +
           background-color: var(--scrollbar-thin-thumb);

     

       88
       88
       +
           min-height: 40px;

     

       89
       89
       +
         }

     

       90
       90
       +
       

     

       91
       91
       +
         &::-webkit-scrollbar-track {

     

       92
       92
       +
           border: 2px solid var(--scrollbar-thin-track);

     

       93
       93
       +
           background-color: var(--scrollbar-thin-track);

     

       94
       94
       +
           border-color: var(--scrollbar-thin-track);

     

       95
       95
       +
         }

     

       96
       96
       +
       }

     

       97
       97
       +
       

     

       98
       98
       +
       .moonbase-crash-details {

     

       99
       99
       +
         box-sizing: border-box;

     

       100
       100
       +
         padding: 0;

     

       101
       101
       +
         font-family: var(--font-code);

     

       102
       102
       +
         font-size: .75rem;

     

       103
       103
       +
         line-height: 1rem;

     

       104
       104
       +
         margin: 6px;

     

       105
       105
       +
         max-width: 50vw;

     

       106
       106
       +
         white-space: pre-wrap;

     

       107
       107
       +
         background-clip: border-box;

     

       108
       108
       +
       

     

       109
       109
       +
         &>code {

     

       110
       110
       +
           font-size: .875rem;

     

       111
       111
       +
           line-height: 1.125rem;

     

       112
       112
       +
           text-indent: 0;

     

       113
       113
       +
           white-space: pre-wrap;

     

       114
       114
       +
           text-size-adjust: none;

     

       115
       115
       +
           display: block;

     

       116
       116
       +
           user-select: text;

     

       117
       117
       +
         }

     

       118
       118
       +
       }

+102

packages/core-extensions/src/moonbase/webpackModules/crashScreen.tsx

···

       1
       1
       +
       import React from "@moonlight-mod/wp/react";

     

       2
       2
       +
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

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

     

       5
       5
       +
       

     

       6
       6
       +
       const { Button, ButtonSizes } = Components;

     

       7
       7
       +
       

     

       8
       8
       +
       const logger = moonlight.getLogger("moonbase/crashScreen");

     

       9
       9
       +
       

     

       10
       10
       +
       type ErrorState = {

     

       11
       11
       +
         error: Error;

     

       12
       12
       +
         info: {

     

       13
       13
       +
           componentStack: string;

     

       14
       14
       +
         };

     

       15
       15
       +
         __moonlight_update?: UpdateState;

     

       16
       16
       +
       };

     

       17
       17
       +
       

     

       18
       18
       +
       enum UpdateState {

     

       19
       19
       +
         Ready,

     

       20
       20
       +
         Working,

     

       21
       21
       +
         Installed,

     

       22
       22
       +
         Failed

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       const updateStrings: Record<UpdateState, string> = {

     

       26
       26
       +
         [UpdateState.Ready]: "A new version of moonlight is available.",

     

       27
       27
       +
         [UpdateState.Working]: "Updating moonlight...",

     

       28
       28
       +
         [UpdateState.Installed]: "Updated moonlight. Click Reload to apply changes.",

     

       29
       29
       +
         [UpdateState.Failed]: "Failed to update moonlight. Please use the installer."

     

       30
       30
       +
       };

     

       31
       31
       +
       const buttonStrings: Record<UpdateState, string> = {

     

       32
       32
       +
         [UpdateState.Ready]: "Update moonlight",

     

       33
       33
       +
         [UpdateState.Working]: "Updating moonlight...",

     

       34
       34
       +
         [UpdateState.Installed]: "",

     

       35
       35
       +
         [UpdateState.Failed]: "Update failed"

     

       36
       36
       +
       };

     

       37
       37
       +
       

     

       38
       38
       +
       export function wrapAction(action: React.ReactNode, { error, info }: ErrorState) {

     

       39
       39
       +
         return (

     

       40
       40
       +
           <div className="moonbase-crash-wrapper">

     

       41
       41
       +
             {action}

     

       42
       42
       +
             <div className="moonbase-crash-details-wrapper">

     

       43
       43
       +
               <pre className="moonbase-crash-details">

     

       44
       44
       +
                 <code>

     

       45
       45
       +
                   {error.stack}

     

       46
       46
       +
                   {"\n\nComponent stack:"}

     

       47
       47
       +
                   {info.componentStack}

     

       48
       48
       +
                 </code>

     

       49
       49
       +
               </pre>

     

       50
       50
       +
             </div>

     

       51
       51
       +
           </div>

     

       52
       52
       +
         );

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       export function UpdateText({ state, setState }: { state: ErrorState; setState: (state: ErrorState) => void }) {

     

       56
       56
       +
         if (!state.__moonlight_update) {

     

       57
       57
       +
           setState({

     

       58
       58
       +
             ...state,

     

       59
       59
       +
             __moonlight_update: UpdateState.Ready

     

       60
       60
       +
           });

     

       61
       61
       +
         }

     

       62
       62
       +
         const newVersion = useStateFromStores([MoonbaseSettingsStore], () => MoonbaseSettingsStore.newVersion);

     

       63
       63
       +
       

     

       64
       64
       +
         return newVersion == null ? null : (

     

       65
       65
       +
           <p>{state.__moonlight_update !== undefined ? updateStrings[state.__moonlight_update] : ""}</p>

     

       66
       66
       +
         );

     

       67
       67
       +
       }

     

       68
       68
       +
       

     

       69
       69
       +
       export function UpdateButton({ state, setState }: { state: ErrorState; setState: (state: ErrorState) => void }) {

     

       70
       70
       +
         const newVersion = useStateFromStores([MoonbaseSettingsStore], () => MoonbaseSettingsStore.newVersion);

     

       71
       71
       +
         return newVersion == null ||

     

       72
       72
       +
           state.__moonlight_update === UpdateState.Installed ||

     

       73
       73
       +
           state.__moonlight_update === undefined ? null : (

     

       74
       74
       +
           <Button

     

       75
       75
       +
             size={ButtonSizes.LARGE}

     

       76
       76
       +
             disabled={state.__moonlight_update !== UpdateState.Ready}

     

       77
       77
       +
             onClick={() => {

     

       78
       78
       +
               setState({

     

       79
       79
       +
                 ...state,

     

       80
       80
       +
                 __moonlight_update: UpdateState.Working

     

       81
       81
       +
               });

     

       82
       82
       +
       

     

       83
       83
       +
               MoonbaseSettingsStore.updateMoonlight()

     

       84
       84
       +
                 .then(() => {

     

       85
       85
       +
                   setState({

     

       86
       86
       +
                     ...state,

     

       87
       87
       +
                     __moonlight_update: UpdateState.Installed

     

       88
       88
       +
                   });

     

       89
       89
       +
                 })

     

       90
       90
       +
                 .catch((e) => {

     

       91
       91
       +
                   logger.error(e);

     

       92
       92
       +
                   setState({

     

       93
       93
       +
                     ...state,

     

       94
       94
       +
                     __moonlight_update: UpdateState.Failed

     

       95
       95
       +
                   });

     

       96
       96
       +
                 });

     

       97
       97
       +
             }}

     

       98
       98
       +
           >

     

       99
       99
       +
             {state.__moonlight_update !== undefined ? buttonStrings[state.__moonlight_update] : ""}

     

       100
       100
       +
           </Button>

     

       101
       101
       +
         );

     

       102
       102
       +
       }