commit fb3ddc7cce4f7c7569fb31615dfa17ea9079c5d0 · notnite.com/moonlight

+4

packages/browser/src/index.ts

···

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

     

       9
       9
        
       import { configureSingle } from "@zenfs/core";

     

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

     

       11
       11
       +
       import { NodeEventPayloads, NodeEventType } from "@moonlight-mod/types/core/event";

     

       12
       12
       +
       import { createEventEmitter } from "@moonlight-mod/core/util/event";

     

       11
       13
        
       

     

       12
       14
        
       function getParts(path: string) {

     

       13
       15
        
         if (path.startsWith("/")) path = path.substring(1);

     
···

       110
       112
        
           processedExtensions,

     

       111
       113
        
           nativesCache: {},

     

       112
       114
        
           isBrowser: true,

     

       115
       115
       +
           events: createEventEmitter<NodeEventType, NodeEventPayloads>(),

     

       113
       116
        
       

     

       114
       117
        
           version: MOONLIGHT_VERSION,

     

       115
       118
        
           branch: MOONLIGHT_BRANCH as MoonlightBranch,

     
···

       141
       144
        
           async writeConfig(newConfig) {

     

       142
       145
        
             await writeConfig(newConfig);

     

       143
       146
        
             config = newConfig;

     

       147
       147
       +
             this.events.dispatchEvent(NodeEventType.ConfigSaved, newConfig);

     

       144
       148
        
           }

     

       145
       149
        
         };

     

       146
       150

+5 -5

packages/core/src/extension/loader.ts

···

       13
       13
        
       import calculateDependencies from "../util/dependency";

     

       14
       14
        
       import { createEventEmitter } from "../util/event";

     

       15
       15
        
       import { registerStyles } from "../styles";

     

       16
       16
       -
       import { EventPayloads, EventType } from "@moonlight-mod/types/core/event";

     

       16
       16
       +
       import { WebEventPayloads, WebEventType } from "@moonlight-mod/types/core/event";

     

       17
       17
        
       

     

       18
       18
        
       const logger = new Logger("core/extension/loader");

     

       19
       19
        
       

     
···

       202
       202
        
       }

     

       203
       203
        
       

     

       204
       204
        
       export async function loadProcessedExtensions({ extensions, dependencyGraph }: ProcessedExtensions) {

     

       205
       205
       -
         const eventEmitter = createEventEmitter<EventType, EventPayloads>();

     

       205
       205
       +
         const eventEmitter = createEventEmitter<WebEventType, WebEventPayloads>();

     

       206
       206
        
         const finished: Set<string> = new Set();

     

       207
       207
        
       

     

       208
       208
        
         logger.trace(

     
···

       224
       224
        
                 }

     

       225
       225
        
       

     

       226
       226
        
                 function done() {

     

       227
       227
       -
                   eventEmitter.removeEventListener(EventType.ExtensionLoad, cb);

     

       227
       227
       +
                   eventEmitter.removeEventListener(WebEventType.ExtensionLoad, cb);

     

       228
       228
        
                   r();

     

       229
       229
        
                 }

     

       230
       230
        
       

     

       231
       231
       -
                 eventEmitter.addEventListener(EventType.ExtensionLoad, cb);

     

       231
       231
       +
                 eventEmitter.addEventListener(WebEventType.ExtensionLoad, cb);

     

       232
       232
        
                 if (finished.has(dep)) done();

     

       233
       233
        
               })

     

       234
       234
        
           );

     
···

       242
       242
        
           await loadExt(ext);

     

       243
       243
        
       

     

       244
       244
        
           finished.add(ext.id);

     

       245
       245
       -
           eventEmitter.dispatchEvent(EventType.ExtensionLoad, ext.id);

     

       245
       245
       +
           eventEmitter.dispatchEvent(WebEventType.ExtensionLoad, ext.id);

     

       246
       246
        
           logger.debug(`Loaded "${ext.id}"`);

     

       247
       247
        
         }

     

       248
       248

+3 -3

packages/core/src/patch.ts

···

       11
       11
        
       } from "@moonlight-mod/types";

     

       12
       12
        
       import Logger from "./util/logger";

     

       13
       13
        
       import calculateDependencies, { Dependency } from "./util/dependency";

     

       14
       14
       -
       import { EventType } from "@moonlight-mod/types/core/event";

     

       14
       14
       +
       import { WebEventType } from "@moonlight-mod/types/core/event";

     

       15
       15
        
       import { processFind, processReplace, testFind } from "./util/patch";

     

       16
       16
        
       

     

       17
       17
        
       const logger = new Logger("core/patch");

     
···

       402
       402
        
             const realPush = jsonp.push;

     

       403
       403
        
             if (jsonp.push.__moonlight !== true) {

     

       404
       404
        
               jsonp.push = (items) => {

     

       405
       405
       -
                 moonlight.events.dispatchEvent(EventType.ChunkLoad, {

     

       405
       405
       +
                 moonlight.events.dispatchEvent(WebEventType.ChunkLoad, {

     

       406
       406
        
                   chunkId: items[0],

     

       407
       407
        
                   modules: items[1],

     

       408
       408
        
                   require: items[2]

     
···

       450
       450
        
           set(modules: any) {

     

       451
       451
        
             const { stack } = new Error();

     

       452
       452
        
             if (stack!.includes("/assets/") && !Array.isArray(modules)) {

     

       453
       453
       -
               moonlight.events.dispatchEvent(EventType.ChunkLoad, {

     

       453
       453
       +
               moonlight.events.dispatchEvent(WebEventType.ChunkLoad, {

     

       454
       454
        
                 modules: modules

     

       455
       455
        
               });

     

       456
       456
        
               patchModules(modules);

+4

packages/node-preload/src/index.ts

···

       11
       11
        
       import createFS from "@moonlight-mod/core/fs";

     

       12
       12
        
       import { registerCors, registerBlocked, getDynamicCors } from "@moonlight-mod/core/cors";

     

       13
       13
        
       import { getConfig, getConfigOption, getManifest, setConfigOption } from "@moonlight-mod/core/util/config";

     

       14
       14
       +
       import { NodeEventPayloads, NodeEventType } from "@moonlight-mod/types/core/event";

     

       15
       15
       +
       import { createEventEmitter } from "@moonlight-mod/core/util/event";

     

       14
       16
        
       

     

       15
       17
        
       let initialized = false;

     

       16
       18
        
       let logger: Logger;

     
···

       51
       53
        
           processedExtensions,

     

       52
       54
        
           nativesCache: {},

     

       53
       55
        
           isBrowser: false,

     

       56
       56
       +
           events: createEventEmitter<NodeEventType, NodeEventPayloads>(),

     

       54
       57
        
       

     

       55
       58
        
           version: MOONLIGHT_VERSION,

     

       56
       59
        
           branch: MOONLIGHT_BRANCH as MoonlightBranch,

     
···

       69
       72
        
           async writeConfig(newConfig) {

     

       70
       73
        
             await writeConfig(newConfig);

     

       71
       74
        
             config = newConfig;

     

       75
       75
       +
             this.events.dispatchEvent(NodeEventType.ConfigSaved, newConfig);

     

       72
       76
        
           },

     

       73
       77
        
       

     

       74
       78
        
           getNatives: (ext: string) => global.moonlightNode.nativesCache[ext],

+13 -4

packages/types/src/core/event.ts

···

       1
       1
       +
       import { Config } from "../config";

     

       1
       2
        
       import { WebpackModuleFunc, WebpackRequireType } from "../discord";

     

       2
       3
        
       

     

       3
       4
        
       export interface MoonlightEventEmitter<EventId extends string = string, EventData = Record<EventId, any>> {

     
···

       6
       7
        
         removeEventListener: <Id extends keyof EventData>(id: Id, cb: (data: EventData[Id]) => void) => void;

     

       7
       8
        
       }

     

       8
       9
        
       

     

       9
       9
       -
       export enum EventType {

     

       10
       10
       +
       export enum WebEventType {

     

       10
       11
        
         ChunkLoad = "chunkLoad",

     

       11
       12
        
         ExtensionLoad = "extensionLoad"

     

       12
       13
        
       }

     

       13
       14
        
       

     

       14
       14
       -
       export type EventPayloads = {

     

       15
       15
       -
         [EventType.ChunkLoad]: {

     

       15
       15
       +
       export type WebEventPayloads = {

     

       16
       16
       +
         [WebEventType.ChunkLoad]: {

     

       16
       17
        
           chunkId?: number[];

     

       17
       18
        
           modules: { [id: string]: WebpackModuleFunc };

     

       18
       19
        
           require?: (require: WebpackRequireType) => any;

     

       19
       20
        
         };

     

       20
       20
       -
         [EventType.ExtensionLoad]: string;

     

       21
       21
       +
         [WebEventType.ExtensionLoad]: string;

     

       22
       22
       +
       };

     

       23
       23
       +
       

     

       24
       24
       +
       export enum NodeEventType {

     

       25
       25
       +
         ConfigSaved = "configSaved"

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       export type NodeEventPayloads = {

     

       29
       29
       +
         [NodeEventType.ConfigSaved]: Config;

     

       21
       30
        
       };

+9 -2

packages/types/src/globals.ts

···

       4
       4
        
       import type EventEmitter from "events";

     

       5
       5
        
       import type LunAST from "@moonlight-mod/lunast";

     

       6
       6
        
       import type Moonmap from "@moonlight-mod/moonmap";

     

       7
       7
       -
       import type { EventPayloads, EventType, MoonlightEventEmitter } from "./core/event";

     

       7
       7
       +
       import type {

     

       8
       8
       +
         WebEventPayloads,

     

       9
       9
       +
         WebEventType,

     

       10
       10
       +
         MoonlightEventEmitter,

     

       11
       11
       +
         NodeEventType,

     

       12
       12
       +
         NodeEventPayloads

     

       13
       13
       +
       } from "./core/event";

     

       8
       14
        
       import { MoonlightFS } from "./fs";

     

       9
       15
        
       

     

       10
       16
        
       export type MoonlightHost = {

     
···

       34
       40
        
         processedExtensions: ProcessedExtensions;

     

       35
       41
        
         nativesCache: Record<string, any>;

     

       36
       42
        
         isBrowser: boolean;

     

       43
       43
       +
         events: MoonlightEventEmitter<NodeEventType, NodeEventPayloads>;

     

       37
       44
        
       

     

       38
       45
        
         version: string;

     

       39
       46
        
         branch: MoonlightBranch;

     
···

       60
       67
        
         unpatched: Set<IdentifiedPatch>;

     

       61
       68
        
         pendingModules: Set<IdentifiedWebpackModule>;

     

       62
       69
        
         enabledExtensions: Set<string>;

     

       63
       63
       -
         events: MoonlightEventEmitter<EventType, EventPayloads>;

     

       70
       70
       +
         events: MoonlightEventEmitter<WebEventType, WebEventPayloads>;

     

       64
       71
        
         patchingInternals: {

     

       65
       72
        
           onModuleLoad: (moduleId: string | string[], callback: (moduleId: string) => void) => void;

     

       66
       73
        
           registerPatch: (patch: IdentifiedPatch) => void;

+2 -2

packages/web-preload/src/index.ts

···

       7
       7
        
       import Moonmap from "@moonlight-mod/moonmap";

     

       8
       8
        
       import loadMappings from "@moonlight-mod/mappings";

     

       9
       9
        
       import { createEventEmitter } from "@moonlight-mod/core/util/event";

     

       10
       10
       -
       import { EventPayloads, EventType } from "@moonlight-mod/types/core/event";

     

       10
       10
       +
       import { WebEventPayloads, WebEventType } from "@moonlight-mod/types/core/event";

     

       11
       11
        
       

     

       12
       12
        
       async function load() {

     

       13
       13
        
         delete window._moonlightWebLoad;

     
···

       20
       20
        
           pendingModules: new Set(),

     

       21
       21
        
           enabledExtensions: new Set(),

     

       22
       22
        
       

     

       23
       23
       -
           events: createEventEmitter<EventType, EventPayloads>(),

     

       23
       23
       +
           events: createEventEmitter<WebEventType, WebEventPayloads>(),

     

       24
       24
        
           patchingInternals: {

     

       25
       25
        
             onModuleLoad,

     

       26
       26
        
             registerPatch,