Add Skins and CurseForge plugin

Author: ShirasawaSama

.eslintrc.json

@@ -28,6 +28,7 @@
     "@typescript-eslint"
   ],
   "rules": {
+    "no-void": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/member-delimiter-style": ["error", { "multiline": { "delimiter": "none", "requireLast": false }, "singleline": { "delimiter": "comma" } }]

.npmrc

@@ -0,0 +1 @@
+ELECRON_SKIP_BINARY_DOWNOAD=1

package-lock.json

@@ -12,6 +12,10 @@
     "build:ai": "pl-plugin-dev build -e packages/AuthlibInjector/index.ts",
     "dev:bot": "pl-plugin-dev -e packages/MCBot/index.tsx",
     "build:bot": "pl-plugin-dev build -e packages/MCBot/index.tsx",
+    "dev:cf": "pl-plugin-dev -e packages/CurseForge/index.tsx",
+    "build:cf": "pl-plugin-dev build -e packages/CurseForge/index.tsx",
+    "dev:skins": "pl-plugin-dev -e packages/Skins/index.tsx",
+    "build:skins": "pl-plugin-dev build -e packages/Skins/index.tsx",
     "test": "npm run lint"
   },
   "repository": {
@@ -31,22 +35,22 @@
   },
   "homepage": "https://github.com/Apisium/PureLauncherOfficialPlugins#readme",
   "dependencies": {
-    "@types/fs-extra": "^8.1.0",
-    "@types/node": "^13.7.1",
-    "@types/react": "^16.9.19",
-    "@types/react-router-dom": "^5.1.3",
-    "@xmcl/core": "^2.0.1-alpha.1",
-    "@xmcl/text-component": "^2.0.1-alpha.1",
+    "@xmcl/task": "^2.1.2",
+    "@xmcl/text-component": "^2.1.0",
+    "cloudscraper": "^4.6.0",
     "commander": "^4.1.1",
     "crc": "^3.8.0",
     "crc32-stream": "^3.0.1",
+    "filenamify": "^4.1.0",
     "fs-extra": "^8.1.0",
     "history": "^4.10.1",
     "minecraft-data": "^2.41.0",
     "minecraft-protocol": "^1.11.0",
     "pure-launcher": "git+https://github.com/Apisium/PureLauncher.git",
     "react-router-cache-route": "^1.8.4",
+    "request": "^2.88.2",
     "reqwq": "^0.2.4",
+    "semver": "^7.1.3",
     "yazl": "^2.5.1"
   },
   "husky": {
@@ -55,19 +59,27 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.8.4",
+    "@babel/core": "^7.8.7",
     "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@typescript-eslint/eslint-plugin": "^2.19.0",
-    "@typescript-eslint/parser": "^2.19.0",
+    "@types/fs-extra": "^8.1.0",
+    "@types/node": "^13.9.0",
+    "@types/react": "^16.9.23",
+    "@types/react-router-dom": "^5.1.3",
+    "@typescript-eslint/eslint-plugin": "^2.23.0",
+    "@typescript-eslint/parser": "^2.23.0",
+    "@xmcl/core": "^2.0.4",
+    "@xmcl/installer": "^2.4.0",
+    "@xmcl/unzip": "^1.1.1",
     "babel-plugin-module-resolver": "^4.0.0",
+    "electron": "^8.1.0",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-standard": "^4.0.1",
-    "husky": "^4.2.1",
-    "typescript": "^3.7.5"
+    "husky": "^4.2.3",
+    "typescript": "^3.8.3"
   }
 }

package.json

@@ -1,4 +1,4 @@
-import { Authenticator, $ as $0, constants, fs, profilesStore, fetchJson, getJson } from '@plugin'
+import { Authenticator, $ as $0, constants, fs, profilesStore, fetchJson, getJson, notice } from '@plugin'
 import { join } from 'path'
 import $ from './langs'
 
@@ -67,13 +67,12 @@ export const AUTHLIB_INJECTOR = 'AuthlibInjector'
     }
   ]
 })
-export default class AuthlibInjectorAuthenticator extends Auth implements Authenticator.SkinChangeable {
+export default class AuthlibInjectorAuthenticator extends Auth {
   private db: Record<string, AuthlibInjectorProfile> = { }
 
   constructor () {
     super()
     try { this.db = fs.readJsonSync(DATABASE_PATH, { throws: false }) || { } } catch (e) { console.error(e) }
-    console.log(this.db)
   }
 
   public async login (options: { url: string, email: string, password: string }) {
@@ -157,20 +156,24 @@ export default class AuthlibInjectorAuthenticator extends Auth implements Authen
     await fs.writeJson(DATABASE_PATH, this.db)
   }
 
-  public async validate (key: string) {
+  public async validate (key: string, autoRefresh = true) {
     await this.checkLogined(key)
     const p = this.db[key]
     if (!p) return
     const json = await fetchJson(join(p.url, 'authserver/validate'), true,
       { accessToken: p.accessToken, clientToken: p.clientToken })
       .catch(e => {
         console.error(e)
-        throw new Error($0('Network connection failed!'))
+        const err: any = new Error($0('Network connection failed!'))
+        err.connectFailed = true
+        throw err
       })
-    if (json) {
-      console.log(json.errorMessage)
-      return true
-    } else return false
+    if (json && (!autoRefresh || !await this.refresh(key).then(() => true, () => false))) {
+      if (json.errorMessage) notice({ content: json.errorMessage, error: true })
+      delete this.db[key]
+      await fs.writeJson(DATABASE_PATH, this.db)
+      return false
+    } else return true
   }
 
   public getData (key: string) {
@@ -183,10 +186,10 @@ export default class AuthlibInjectorAuthenticator extends Auth implements Authen
     return Object.values(this.db)
   }
 
-  public async changeSkin (key: string, path: string, slim: boolean) {
-    console.log(key, path, slim)
-    // TODO:
-  }
+  // public async changeSkin (key: string, path: string, slim: boolean) {
+  //   console.log(key, path, slim)
+  //   // TODO:
+  // }
 
   private async checkLogined (key: string) {
     this.db = await fs.readJson(DATABASE_PATH, { throws: false }) || { }

packages/AuthlibInjector/AuthlibInjectorAuthenticator.ts

@@ -1,10 +1,10 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
+/* eslint-disable object-curly-newline, @typescript-eslint/explicit-function-return-type */
 import AuthlibInjectorAuthenticator, { AUTHLIB_INJECTOR, AuthlibInjectorProfile } from './AuthlibInjectorAuthenticator'
 import { join } from 'path'
-import { createHash } from 'crypto'
 import { version } from './package.json'
 import { LaunchOption } from '@xmcl/core'
-import { Plugin, plugin, event, pluginMaster, profilesStore, fs, constants, download, getJson, $ as $0 } from '@plugin'
+import { Plugin, plugin, event, pluginMaster, profilesStore, fs, constants,
+  download, getJson, $ as $0, openLoginDialog } from '@plugin'
 import $ from './langs'
 
 const JAR_PATH = join(constants.APP_PATH, 'authlib-injector/authlib-injector.jar')
@@ -15,7 +15,7 @@ const JSON_URL = 'https://bmclapi2.bangbang93.com/mirrors/authlib-injector/artif
   author: 'Shirasawa',
   title: () => 'Authlib-Injector',
   description: () => $.description,
-  id: '@Shirasawa/multi-instances'
+  id: '@PureLauncher/multi-instances'
 })
 export default class AuthlibInjector extends Plugin {
   constructor () {
@@ -34,14 +34,12 @@ export default class AuthlibInjector extends Plugin {
     const url = json?.download_url
     if (!url) throw new Error($0('Network connection failed!'))
     try {
-      await download({ url, file: JAR_PATH }, 'Authlib Injector')
       const hash = json.checksums?.sha256
-      // eslint-disable-next-line promise/param-names
-      if (hash && hash !== await new Promise<string>((resolve, e) => {
-        const s = createHash('sha1').setEncoding('hex')
-        fs.createReadStream(JAR_PATH).on('error', e).pipe(s).on('error', e)
-          .on('finish', () => resolve(s.read()))
-      })) throw new Error($.downloadFailed)
+      await download({
+        url,
+        destination: JAR_PATH,
+        checksum: hash ? { algorithm: 'sha256', hash } : undefined
+      }, 'Authlib Injector')
     } catch (e) {
       await fs.unlink(JAR_PATH).catch(console.error)
       throw e
@@ -52,6 +50,15 @@ export default class AuthlibInjector extends Plugin {
   public preLaunch (_: string, option: LaunchOption) {
     const profile = profilesStore.getCurrentProfile()
     if (profile?.type !== AUTHLIB_INJECTOR) return
-    option.yggdrasilAgent = { jar: JAR_PATH, server: (profile as AuthlibInjectorProfile).url }
+    const server = (profile as AuthlibInjectorProfile).url
+    // option.extraJVMArgs.push('-Dauthlibinjector.side=client', '-Dauthlibinjector.yggdrasil.prefetched=' + btoa(server))
+    option.yggdrasilAgent = { jar: JAR_PATH, server }
+  }
+
+  @event()
+  public dragIn (t: DataTransfer) {
+    let data = t.getData('text/plain')
+    if (!data.startsWith('authlib-injector:yggdrasil-server:') || !(data = data.slice(34))) return
+    openLoginDialog(AUTHLIB_INJECTOR, { url: decodeURIComponent(data) })
   }
 }