refactor: implement context isolation preload

src/main/app/LauncherApp.ts

@@ -10,7 +10,7 @@ import LogManager from '../managers/LogManager'
 import NetworkManager from '../managers/NetworkManager'
 import { SemaphoreManager } from '../managers/SemaphoreManager'
 import ServiceManager from '../managers/ServiceManager'
-import StoreManager from '../managers/StoreManager'
+import ServiceStateManager from '../managers/ServiceStateManager'
 import TaskManager from '../managers/TaskManager'
 import TelemetryManager from '../managers/TelemetryManager'
 import WorkerManager from '../managers/WorkerManager'
@@ -115,7 +115,7 @@ export abstract class LauncherApp extends EventEmitter {
 
   readonly serviceManager = new ServiceManager(this)
 
-  readonly storeManager = new StoreManager(this)
+  readonly storeManager = new ServiceStateManager(this)
 
   readonly taskManager = new TaskManager(this)
 

src/main/electron/Controller.ts

@@ -20,6 +20,7 @@ import favcon2XPath from '/@static/[email protected]'
 import './controlIpc'
 import './dialog'
 import { InstanceServiceKey } from '/@shared/services/InstanceService'
+import { LaunchServiceKey } from '/@shared/services/LaunchService'
 
 export default class Controller implements LauncherAppController {
   private mainWin: BrowserWindow | undefined = undefined
@@ -400,9 +401,12 @@ export default class Controller implements LauncherAppController {
       this.app.broadcast('minecraft-stderr', ...args)
     })
 
-    this.app
+    const launchService = this.app.serviceManager.getService(LaunchServiceKey)
+    if (launchService) {
+      launchService
       .on('minecraft-window-ready', this.onMinecraftWindowReady.bind(this))
       .on('minecraft-exit', this.onMinecraftExited.bind(this))
+    }
   }
 
   async dataReady(): Promise<void> {

src/main/electron/updater.ts

@@ -9,13 +9,12 @@ import { basename, dirname, join } from 'path'
 import { SemVer } from 'semver'
 import { URL } from 'url'
 import { promisify } from 'util'
-import StoreManager from '../managers/StoreManager'
+import ServiceStateManager from '../managers/ServiceStateManager'
 import { checksum } from '../util/fs'
 import ElectronLauncherApp from './ElectronLauncherApp'
 import { AZURE_CDN, AZURE_CDN_HOST, IS_DEV } from '/@main/constant'
 import { UpdateInfo as _UpdateInfo } from '/@shared/entities/update'
 
-
 /**
  * Only download asar file update.
  *
@@ -26,7 +25,9 @@ export class DownloadAsarUpdateTask extends DownloadTask {
   constructor(private updateInfo: UpdateInfo, private isInGFW: boolean, destination: string) {
     let sha256 = ''
     super({
-      url: '', destination, validator: {
+      url: '',
+      destination,
+      validator: {
         async validate(fd, file, url) {
           const missed = await stat(file).then(s => s.size === 0, () => false)
           if (missed) {
@@ -41,10 +42,10 @@ export class DownloadAsarUpdateTask extends DownloadTask {
           const expect = sha256
           const actual = await checksum(file, 'sha256')
           if (!expect !== actual) {
-            throw new ChecksumNotMatchError('sha256', expect, actual, file, url);
+            throw new ChecksumNotMatchError('sha256', expect, actual, file, url)
           }
-        }
-      }
+        },
+      },
     })
   }
 
@@ -101,7 +102,7 @@ export class DownloadFullUpdateTask extends BaseTask<void> {
 
   protected resumeTask(): Promise<void> {
     // this.runRunt()
-    return Promise.resolve();
+    return Promise.resolve()
   }
 }
 
@@ -228,7 +229,7 @@ export function checkUpdateTask(this: ElectronLauncherApp): Task<_UpdateInfo> {
   })
 }
 
-export function setup(storeMananger: StoreManager) {
+export function setup(storeMananger: ServiceStateManager) {
   storeMananger.subscribe('autoInstallOnAppQuitSet', (value) => {
     autoUpdater.autoInstallOnAppQuit = value
   }).subscribe('allowPrereleaseSet', (value) => {

src/main/entities/hmclModpack.ts

@@ -1,4 +1,4 @@
-import { CancelledError, TaskBase } from '@xmcl/task'
+import { CancelledError, BaseTask } from '@xmcl/task'
 import { open, openEntryReadStream, readAllEntries, readEntry, walkEntriesGenerator } from '@xmcl/unzip'
 import { createWriteStream } from 'fs'
 import { Readable } from 'stream'
@@ -29,7 +29,7 @@ export function resolveHMCLVersion(version: HMCLVersion) {
  *
  * It will not handle the HMCL version or auto-update function.
  */
-export class InstallHMCLModpackTask extends TaskBase<HMCLServerManagedModpack> {
+export class InstallHMCLModpackTask extends BaseTask<HMCLServerManagedModpack> {
   private zip: ZipFile | undefined
   private entries: (Entry[]) | undefined = []
   private openedStreams: Readable[] = []
@@ -55,7 +55,7 @@ export class InstallHMCLModpackTask extends TaskBase<HMCLServerManagedModpack> {
     this.openedStreams.push(readStream)
   }
 
-  protected async run(): Promise<HMCLServerManagedModpack> {
+  protected async runTask(): Promise<HMCLServerManagedModpack> {
     const [zip, entries] = await this.ensureZip()
     const destination = this._to!
     if (entries.find(e => e.fileName === 'server-manifest.json')) {
@@ -75,19 +75,19 @@ export class InstallHMCLModpackTask extends TaskBase<HMCLServerManagedModpack> {
     throw new Error('Malformed HMCL Modpack!')
   }
 
-  protected async performCancel(): Promise<void> {
+  protected async cancelTask(): Promise<void> {
     for (const stream of this.openedStreams) {
-      stream.destroy(new CancelledError(undefined))
+      stream.destroy(new CancelledError())
     }
   }
 
-  protected async performPause(): Promise<void> {
+  protected async pauseTask(): Promise<void> {
     for (const stream of this.openedStreams) {
       stream.pause()
     }
   }
 
-  protected performResume(): void {
+  protected async resumeTask(): Promise<void> {
     for (const stream of this.openedStreams) {
       stream.resume()
     }

src/main/managers/CredentialManager.ts

@@ -59,7 +59,8 @@ export default class CredentialManager extends Manager {
       }
     }
     const scopes = this.scopes
-    const redirectUri = IS_DEV ? 'http://localhost:3000/auth'
+    const redirectUri = IS_DEV
+      ? 'http://localhost:3000/auth'
       : directRedirectToLauncher ? 'xmcl://launcher/auth' : 'https://xmcl.vercel.app/auth'
     if (!code) {
       const url = await app.getAuthCodeUrl({

src/main/managers/NetworkManager.ts

@@ -24,7 +24,7 @@ export default class NetworkManager extends Manager {
 
   private natType: NatType = 'Blocked'
 
-  private publicIp: string = ''
+  private publicIp = ''
 
   private discoveredPort: number[] = []
 
@@ -60,13 +60,13 @@ export default class NetworkManager extends Manager {
   }
 
   async updateNatType() {
-    this.log(`Try to get NAT type`)
-    this.natType = await getNatType({ logsEnabled: false, stunHost: this.inGFW ? "stun.qq.com" : undefined })
+    this.log('Try to get NAT type')
+    this.natType = await getNatType({ logsEnabled: false, stunHost: this.inGFW ? 'stun.qq.com' : undefined })
     this.log(`Update NAT type: ${this.natType}`)
   }
 
   async updatePublicIp() {
-    this.log(`Try update public ip`)
+    this.log('Try update public ip')
 
     this.publicIp = await new Promise<string>((resolve, reject) => {
       this.nat.externalIp((err, ip) => {
@@ -95,8 +95,7 @@ export default class NetworkManager extends Manager {
   getPublicIp() {
     return new Promise<string>((resolve, reject) => {
       this.nat.externalIp((err, ip) => {
-        if (err) { reject(err) }
-        else { resolve(ip) }
+        if (err) { reject(err) } else { resolve(ip) }
       })
     })
   }

src/main/managers/SemaphoreManager.ts

@@ -1,5 +1,5 @@
-import { Manager } from '.';
-import { ReadWriteLock } from '../util/mutex';
+import { Manager } from '.'
+import { ReadWriteLock } from '../util/mutex'
 
 export class SemaphoreManager extends Manager {
   private locks: Record<string, ReadWriteLock> = {}

src/main/managers/ServiceManager.ts

@@ -53,6 +53,10 @@ export default class ServiceManager extends Manager {
     return this.exposedService[key as any] as any
   }
 
+  propagateEvent(service: string, event: string, ...args: any[]) {
+    this.app.broadcast('service-event', { service, event, args })
+  }
+
   protected addService<S extends AbstractService>(type: ServiceConstructor<S>) {
     this.registeredServices.push(type)
   }
@@ -258,7 +262,7 @@ export default class ServiceManager extends Manager {
   }
 
   async engineReady() {
-    this.log(`Register service manager to handle ipc`)
+    this.log('Register service manager to handle ipc')
     this.app.handle('service-call', (e, service: string, name: string, payload: any) => this.prepareServiceCall(e.sender, service, name, payload))
     this.app.handle('session', (_, id) => this.startServiceCall(id))
   }

src/main/managers/StoreManager.ts → src/main/managers/ServiceStateManager.ts

@@ -4,7 +4,7 @@ import { isState } from '../services/Service'
 import { State } from '/@shared/services/Service'
 import { MutationKeys, MutationPayload } from '/@shared/state'
 
-export default class StoreManager extends Manager {
+export default class ServiceStateManager extends Manager {
   private eventbus = new EventEmitter()
 
   /**
@@ -47,7 +47,7 @@ export default class StoreManager extends Manager {
     const stateKeys = [] as string[]
     const update = (key: string, value: any) => {
       this.checkPointId += 1
-      app.broadcast('commit', { type: key, payload: value }, this.checkPointId)
+      app.broadcast('commit', { mutation: { type: key, payload: value }, id: this.checkPointId })
       bus.emit(key, value)
     }
     const app = this.app

src/main/managers/TaskManager.ts

@@ -79,7 +79,7 @@ export default class TaskManager extends Manager {
     const index = this.tasks.length
     this.tasks.push(task)
     return task.wait().finally(() => {
-      this.log(`Task done and delete record!`)
+      this.log('Task done and delete record!')
       delete this.record[uid]
       this.tasks.splice(index, 1)
     })
@@ -90,7 +90,7 @@ export default class TaskManager extends Manager {
   }
 
   storeReady() {
-    this.emitter.on("fail", (uuid, task, error) => {
+    this.emitter.on('fail', (uuid, task, error) => {
       this.warn(`Task ${task.name}(${uuid}) failed!`)
       this.warn(error)
     })

src/main/managers/TelemetryManager.ts

@@ -5,7 +5,6 @@ import { Manager } from '.'
 import { APP_INSIGHT_KEY, IS_DEV } from '/@main/constant'
 
 export default class TelemetryManager extends Manager {
-
   private sessionId: string = v4()
 
   async setup() {

src/main/services/DiagnoseService.ts

@@ -2,10 +2,12 @@ import { basename } from 'path'
 import { AggregateExecutor } from '../util/aggregator'
 import { ExportService, Singleton, StatefulService } from './Service'
 import LauncherApp from '/@main/app/LauncherApp'
+import { Exception } from '/@shared/entities/exception'
 import { Issue, IssueReport } from '/@shared/entities/issue'
 import { DiagnoseService as IDiagnoseService, DiagnoseServiceKey, DiagnoseState } from '/@shared/services/DiagnoseService'
 
 export type DiagnoseFunction = (report: Partial<IssueReport>) => Promise<void>
+
 export interface Fix {
   match(issues: readonly Issue[]): boolean
   fix(issues: readonly Issue[]): Promise<void>
@@ -60,23 +62,6 @@ export default class DiagnoseService extends StatefulService<DiagnoseState> impl
   //   this.release('diagnose')
   // }
 
-  // @Subscribe('instance')
-  // async onInstance(payload: any) {
-  //   if (payload.path !== this.state.instance.path) {
-  //     return
-  //   }
-  //   const report: Partial<IssueReport> = {}
-  //   if ('runtime' in payload) {
-  //     this.aquire('diagnose')
-  //     await this.diagnoseServer(report)
-  //     // await this.diagnoseCustomSkin(report);
-  //     this.release('diagnose')
-  //     this.report(report)
-  //     return
-  //   }
-  //   this.report(report)
-  // }
-
   // @Subscribe('instanceStatus')
   // async onInstanceStatus() {
   //   const report: Partial<IssueReport> = {}
@@ -160,7 +145,9 @@ export default class DiagnoseService extends StatefulService<DiagnoseState> impl
       try {
         for (const fix of this.fixes) {
           if (fix.match(issues)) {
-            await fix.fix(issues).catch(e => this.pushException({ type: 'issueFix', error: e }))
+            await fix.fix(issues).catch(e => {
+              this.emit('error', new Exception({ type: 'issueFix', error: e }))
+            })
             if (fix.recheck) {
               rechecks.push(fix.recheck)
             }