refactor: model display & credential persist

Voxelum · Apr 14, 2021 · 30f84f0 · 30f84f0
1 parent 03cf878
commit 30f84f0
Show file tree

Hide file tree

Showing 37 changed files with 1,211 additions and 1,110 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,24 +20,27 @@
         "build:locale": "node scripts/build-locale.js",
         "build:schema": "node scripts/build-schema.js",
         "build:production": "cross-env BUILD_TARGET=production node scripts/build.js",
-        "build:production:full": "cross-env BUILD_TARGET=production FULL_RELEASE=true node scripts/build.js",
-        "build:debug": "cross-env BUILD_TARGET=debug node scripts/build.js",
+        "build:dir": "cross-env BUILD_TARGET=dir node scripts/build.js",
+        "build:electron": "cross-env BUILD_TARGET=dir ONLY=electron node scripts/build.js",
+        "build:main": "cross-env BUILD_TARGET=dir ONLY=main node scripts/build.js",
+        "build:renderer": "cross-env BUILD_TARGET=dir ONLY=renderer node scripts/build.js",
         "dev": "cross-env NODE_ENV=development node scripts/dev.js",
         "lint": "eslint --ext .ts,.vue src",
         "lint:fix": "eslint --ext .ts,.vue --fix src",
         "test": "jest"
     },
     "dependencies": {
-        "@azure/msal-node": "^1.0.0-beta.2",
+        "@azure/msal-node": "^1.0.1",
+        "@types/three": "^0.127.0",
         "@vue/composition-api": "^1.0.0-rc.2",
         "@xmcl/client": "2.0.6",
         "@xmcl/core": "2.6.0",
         "@xmcl/curseforge": "^0.1.2",
-        "@xmcl/forge-site-parser": "^2.0.7",
+        "@xmcl/forge-site-parser": "^2.0.8",
         "@xmcl/gamesetting": "^2.0.2",
-        "@xmcl/installer": "^3.2.0",
+        "@xmcl/installer": "^3.2.1",
         "@xmcl/mod-parser": "^3.1.0",
-        "@xmcl/model": "^1.0.16",
+        "@xmcl/model": "^1.0.17",
         "@xmcl/nbt": "^2.0.3",
         "@xmcl/resourcepack": "^1.1.0",
         "@xmcl/server-info": "^2.0.3",
@@ -64,7 +67,7 @@
         "node-powershell": "^4.0.0",
         "node-watch": "^0.6.4",
         "original-fs": "^1.1.0",
-        "three": "^0.110.0",
+        "three": "^0.127.0",
         "uuid": "^7.0.3",
         "vue": "^2.6.11",
         "vue-i18n": "^7.8.1",
@@ -79,6 +82,7 @@
         "atomically",
         "semver",
         "electron-updater",
+        "electron-devtools-installer",
         "fs-extra",
         "ajv",
         "7zip-min",
@@ -87,6 +91,7 @@
         "filenamify",
         "iconv-lite",
         "jschardet",
+        "keytar",
         "node-powershell",
         "@xmcl/client",
         "@xmcl/core",
@@ -121,6 +126,7 @@
         "@rollup/plugin-typescript": "^8.2.0",
         "@types/7zip-min": "^1.1.0",
         "@types/bytebuffer": "^5.0.40",
+        "@types/electron-devtools-installer": "^2.2.0",
         "@types/fs-extra": "^8.1.0",
         "@types/jest": "^24.9.1",
         "@types/lodash.debounce": "^4.0.6",
@@ -141,6 +147,7 @@
         "cross-env": "^5.2.1",
         "electron": "^11.3.0",
         "electron-builder": "^22.9.1",
+        "electron-devtools-installer": "^3.1.1",
         "esbuild": "^0.9.2",
         "eslint": "^7.13.0",
         "eslint-config-standard": "^14.1.1",

diff --git a/scripts/build.base.config.js b/scripts/build.base.config.js
@@ -18,12 +18,10 @@ const config = {
     repo: "x-minecraft-launcher"
   }],
   files: [
-    // don't include node_modules as all js modules are bundled into production js by rollup
-    // unless you want to prevent some module to bundle up
-    // list them below
+    '**/*'
   ],
   asarUnpack: [
-    "dist/static/Acrylic.cs",
+    "static/Acrylic.cs",
     "node_modules/7zip-bin/**/*"
   ],
 }

diff --git a/scripts/build.full.config.js b/scripts/build.full.config.js
@@ -46,7 +46,7 @@ const config = {
         ],
         files: [
             "node_modules/7zip-bin/**/*",
-            "!dist/electron/static/Acrylic.cs",
+            "!dist/static/Acrylic.cs",
             "!node_modules/7zip-bin/linux/**",
             "!node_modules/7zip-bin/win/**"
         ]
@@ -92,7 +92,7 @@ const config = {
         ],
         files: [
             "node_modules/7zip-bin/**/*",
-            "!dist/electron/static/Acrylic.cs",
+            "!dist/static/Acrylic.cs",
             "!node_modules/7zip-bin/win/**",
             "!node_modules/7zip-bin/mac/**"
         ]

diff --git a/scripts/build.js b/scripts/build.js
@@ -116,25 +116,35 @@ async function start() {
         return require('./build.lite.config')
     }
   }
+  const onlyRenderer = process.env.ONLY === 'renderer'
+  const onlyMain = process.env.ONLY === 'main'
+  const onlyElectron = process.env.ONLY === 'electron'
 
-  const [mainConfig] = await loadRollupConfig()
+  if (!onlyRenderer && !onlyElectron) {
+    const [mainConfig] = await loadRollupConfig()
 
-  await remove(join(__dirname, '../dist'))
+    await remove(join(__dirname, '../dist'))
 
-  console.log(chalk.bold.underline('Build main process & preload'))
-  const startTime = Date.now()
-  await buildMain(mainConfig)
-  console.log(
-    `Build completed in ${((Date.now() - startTime) / 1000).toFixed(2)}s.\n`
-  )
-  await buildRenderer()
-
-  console.log()
-  if (process.env.BUILD_TARGET) {
-    const config = loadElectronBuilderConfig()
-    const dir = process.env.BUILD_TARGET === 'dir'
-    await generatePackageJson()
-    await buildElectron(config, dir)
+    console.log(chalk.bold.underline('Build main process & preload'))
+    const startTime = Date.now()
+    await buildMain(mainConfig)
+    console.log(
+      `Build completed in ${((Date.now() - startTime) / 1000).toFixed(2)}s.\n`
+    )
+  }
+
+  if (!onlyMain && !onlyElectron) {
+    await buildRenderer()
+    console.log()
+  }
+
+  if (!onlyMain && !onlyRenderer) {
+    if (process.env.BUILD_TARGET) {
+      const config = loadElectronBuilderConfig()
+      const dir = process.env.BUILD_TARGET === 'dir'
+      await generatePackageJson()
+      await buildElectron(config, dir)
+    }
   }
 }
 

diff --git a/scripts/build.lite.config.js b/scripts/build.lite.config.js
@@ -14,7 +14,7 @@ const config = {
     ],
     files: [
       "node_modules/7zip-bin/**/*",
-      "!dist/electron/static/Acrylic.cs",
+      "!dist/static/Acrylic.cs",
       "!node_modules/7zip-bin/linux/**",
       "!node_modules/7zip-bin/win/**"
     ]
@@ -45,7 +45,7 @@ const config = {
     ],
     files: [
       "node_modules/7zip-bin/**/*",
-      "!dist/electron/static/Acrylic.cs",
+      "!dist/static/Acrylic.cs",
       "!node_modules/7zip-bin/win/**",
       "!node_modules/7zip-bin/mac/**"
     ]

diff --git a/src/main/app/LauncherApp.ts b/src/main/app/LauncherApp.ts
@@ -370,9 +370,10 @@ export abstract class LauncherApp extends EventEmitter {
   }
 
   protected async setup() {
-    await ensureDir(this.appDataPath)
     try {
-      (this.gameDataPath as any) = await readFile(join(this.appDataPath, 'root')).then((b) => b.toString().trim())
+      await ensureDir(this.appDataPath)
+      const self = this as any
+      self.gameDataPath = await readFile(join(this.appDataPath, 'root')).then((b) => b.toString().trim())
     } catch (e) {
       if (e.code === 'ENOENT') {
         // first launch

diff --git a/src/main/electron/Controller.ts b/src/main/electron/Controller.ts
@@ -67,6 +67,7 @@ export default class Controller implements LauncherAppController {
 
   async createMainWindow() {
     const configPath = join(this.app.appDataPath, 'main-window-config.json')
+    this.app.log(`[Controller] Creating main window by config ${configPath}`)
     const configData = await readJSON(configPath).catch(() => ({
       width: -1,
       height: -1,
@@ -82,6 +83,10 @@ export default class Controller implements LauncherAppController {
 
     const sess = session.fromPartition('persist:main')
 
+    // sess.protocol.interceptHttpProtocol('https', (req, cb) => {
+    // eslint-disable-next-line standard/no-callback-literal
+    // cb({ headers: { 'Access-Control-Allow-Origin': '*' } })
+    // })
     sess.protocol.registerFileProtocol('dataroot', (req, callback) => {
       const pathname = decodeURIComponent(req.url.replace('dataroot:///', ''))
       callback(join(this.app.appDataPath, pathname))
@@ -105,14 +110,15 @@ export default class Controller implements LauncherAppController {
       vibrancy: 'sidebar', // or popover
       icon: iconPath,
       webPreferences: {
-        // webSecurity: !IS_DEV, // disable security for loading local image
+        webSecurity: !IS_DEV, // disable security for loading local image
         nodeIntegration: IS_DEV, // enable node for webpack in dev
         preload: indexPreload,
         session: sess,
         webviewTag: true,
       },
     })
 
+    this.app.log(`[Controller] Created main window by config ${configPath}`)
     browser.on('ready-to-show', () => { this.app.log('Main Window is ready to show!') })
     browser.on('close', () => { })
 
@@ -124,6 +130,8 @@ export default class Controller implements LauncherAppController {
     browser.loadURL(mainWinUrl)
     browser.show()
 
+    this.app.log(`[Controller] Load main window url ${mainWinUrl}`)
+
     this.mainWin = browser
   }
 

diff --git a/src/main/electron/updater.ts b/src/main/electron/updater.ts
@@ -168,6 +168,7 @@ export function checkUpdateTask (this: ElectronLauncherApp): Task<_UpdateInfo> {
       this.log('Update available and set status to pending')
       this.storeManager.store.commit('updateStatus', 'pending')
     })
+    console.log(`check update task`)
     const info = await autoUpdater.checkForUpdates()
 
     if (this.networkManager.isInGFW && !injectedUpdate) {

diff --git a/src/main/entities/user.ts b/src/main/entities/user.ts
@@ -45,9 +45,9 @@ export interface XBoxGameProfileResponse {
     }, {
       'id': 'PublicGamerpic'
       'value': string
-    } ]
+    }]
     isSponsoredUser: boolean
-  } ]
+  }]
 }
 
 export interface MinecraftAuthResponse {
@@ -66,12 +66,12 @@ export interface MinecraftProfileResponse {
     url: string
     variant: 'CLASSIC' | string
     alias: 'STEVE' | string
-  } ]
+  }]
   capes: [{
     id: string
     state: 'ACTIVE' | string
     url: string
-  } ]
+  }]
 }
 export interface MinecraftProfileErrorResponse {
   path: '/minecraft/profile'
@@ -98,7 +98,7 @@ export interface MinecraftOwnershipResponse {
   keyId: string
 }
 
-export async function getOAuthToken (request: Got, code: string) {
+export async function getOAuthToken(request: Got, code: string) {
   const oauthResponse: OAuthTokenResponse = await request.post('https://login.live.com/oauth20_token.srf', {
     form: {
       client_id: CLIENT_ID,
@@ -118,7 +118,7 @@ export async function getOAuthToken (request: Got, code: string) {
  * authenticate with xbox live by ms oauth access token
  * @param oauthAccessToken The oauth access token
  */
-export async function authenticateXboxLive (request: Got, oauthAccessToken: string) {
+export async function authenticateXboxLive(request: Got, oauthAccessToken: string) {
   const xblResponse: XBoxResponse = await request.post('https://user.auth.xboxlive.com/user/authenticate', {
     body: JSON.stringify({
       Properties: {
@@ -142,7 +142,7 @@ export async function authenticateXboxLive (request: Got, oauthAccessToken: stri
  * Authorize the xbox live. It will get the xsts token in response.
  * @param xblResponseToken
  */
-export async function authorizeXboxLive (request: Got, xblResponseToken: string, relyingParty: 'rp://api.minecraftservices.com/' | 'http://xboxlive.com' = 'rp://api.minecraftservices.com/') {
+export async function authorizeXboxLive(request: Got, xblResponseToken: string, relyingParty: 'rp://api.minecraftservices.com/' | 'http://xboxlive.com' = 'rp://api.minecraftservices.com/') {
   const xstsResponse: XBoxResponse = await request.post('https://xsts.auth.xboxlive.com/xsts/authorize', {
     headers: {
       'Content-Type': 'application/json',
@@ -160,7 +160,7 @@ export async function authorizeXboxLive (request: Got, xblResponseToken: string,
   return xstsResponse
 }
 
-export async function aquireXBoxToken (request: Got, oauthAccessToken: string) {
+export async function aquireXBoxToken(request: Got, oauthAccessToken: string) {
   const req = request.extend({
     headers: {
       'Content-Type': 'application/json',
@@ -175,7 +175,7 @@ export async function aquireXBoxToken (request: Got, oauthAccessToken: string) {
   return { xstsResponse: minecraftXstsResponse, xboxGameProfile }
 }
 
-export async function getXboxGameProfile (request: Got, xuid: string, uhs: string, xstsToken: string) {
+export async function getXboxGameProfile(request: Got, xuid: string, uhs: string, xstsToken: string) {
   const response: XBoxGameProfileResponse = await request.get(`https://profile.xboxlive.com/users/xuid(${xuid})/profile/settings`, {
     searchParams: {
       settings: ['PublicGamerpic', 'Gamertag'].join(','),
@@ -197,7 +197,7 @@ export async function getXboxGameProfile (request: Got, xuid: string, uhs: strin
  * @param uhs uhs from {@link XBoxResponse}
  * @param xstsToken
  */
-export async function loginMinecraftWithXBox (request: Got, uhs: string, xstsToken: string) {
+export async function loginMinecraftWithXBox(request: Got, uhs: string, xstsToken: string) {
   const mcResponse: MinecraftAuthResponse = await request.post('https://api.minecraftservices.com/authentication/login_with_xbox', {
     json: {
       identityToken: `XBL3.0 x=${uhs};${xstsToken}`,
@@ -211,7 +211,7 @@ export async function loginMinecraftWithXBox (request: Got, uhs: string, xstsTok
  * Return the owner ship list of the player with those token.
  * @param accessToken The Minecraft access token
  */
-export async function checkGameOwnership (request: Got, accessToken: string) {
+export async function checkGameOwnership(request: Got, accessToken: string) {
   const mcResponse: MinecraftOwnershipResponse = await request.get('https://api.minecraftservices.com/entitlements/mcstore', {
     headers: {
       Authorization: `Bearer ${accessToken}`,
@@ -225,7 +225,7 @@ export async function checkGameOwnership (request: Got, accessToken: string) {
  * The new way to get game profile by the access token
  * @param accessToken The minecraft access token
  */
-export async function getGameProfile (request: Got, accessToken: string) {
+export async function getGameProfile(request: Got, accessToken: string) {
   const profileResponse: MinecraftProfileResponse | MinecraftProfileErrorResponse = await request.get('https://api.minecraftservices.com/minecraft/profile', {
     headers: {
       Authorization: `Bearer ${accessToken}`,

diff --git a/src/main/index.dev.ts b/src/main/index.dev.ts
@@ -15,6 +15,7 @@ import { autoUpdater } from 'electron-updater';
 import { existsSync } from 'fs-extra';
 import { Socket } from 'net';
 import { join } from 'path';
+import install, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
 import './main';
 
 app.on('web-contents-created', (event, contents) => {
@@ -32,12 +33,13 @@ autoUpdater.setFeedURL({
 });
 autoUpdater.logger = null;
 
-// Require `main` process to boot app
-
-app.on('browser-window-created', (event, window) => {
-  // if (!window.webContents.isDevToolsOpened()) {
-  //   window.webContents.openDevTools()
-  // }
+app.whenReady().then(() => {
+  install(VUEJS_DEVTOOLS).then((v) => {
+    console.log(`Installed vue devtool ${v}`)
+  }, (e) => {
+    console.error(`Fail to install vue devtool`)
+    console.error(e)
+  })
 })
 
 const devServer = new Socket({}).connect(25555, '127.0.0.1')

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -1,3 +1,12 @@
+import { app } from 'electron'
 import ElectronLauncherApp from './electron/ElectronLauncherApp'
 
 new ElectronLauncherApp().start()
+
+app.on('web-contents-created', (event, contents) => {
+  // const extensionDir = join(__dirname, '../extensions')
+  // if (existsSync(extensionDir)) {
+  //   contents.session.loadExtension(extensionDir)
+  // }
+  contents.openDevTools({ mode: 'detach' })
+})