Merge pull request #203 from MaaAssistantArknights/format

format
MaaAssistantArknights · Sep 22, 2023 · df33e94 · df33e94
2 parents 436285a + 280f3ba
commit df33e94
Show file tree

Hide file tree

Showing 147 changed files with 896 additions and 675 deletions.
diff --git a/packages/main/componentManager/components/adb.ts b/packages/main/componentManager/components/adb.ts
@@ -1,7 +1,7 @@
-import fs from 'fs'
-
 import AdbInstaller from '@main/componentManager/installers/adb'
 import type { Component } from '@type/componentManager'
+import fs from 'fs'
+
 import { infoPathOf } from '../utils/update'
 
 export const getComponentAdb = async (): Promise<Component> => {

diff --git a/packages/main/componentManager/components/core.ts b/packages/main/componentManager/components/core.ts
@@ -1,9 +1,9 @@
-import fs from 'fs'
-
-import CoreLoader from '@main/coreLoader'
 import CoreInstaller from '@main/componentManager/installers/core'
-import path from 'path'
+import CoreLoader from '@main/coreLoader'
 import type { Component } from '@type/componentManager'
+import fs from 'fs'
+import path from 'path'
+
 import { infoPathOf } from '../utils/update'
 import { getComponentBaseDir } from '../utils/path'
 

diff --git a/packages/main/componentManager/index.ts b/packages/main/componentManager/index.ts
@@ -1,9 +1,10 @@
 import { Singleton } from '@common/function/singletonDecorator'
-import { getComponentAdb } from './components/adb'
-import { getComponentCore } from './components/core'
 import CoreLoader from '@main/coreLoader'
-import type { Module } from '@type/misc'
 import type { Component, ComponentType } from '@type/componentManager'
+import type { Module } from '@type/misc'
+
+import { getComponentAdb } from './components/adb'
+import { getComponentCore } from './components/core'
 
 @Singleton
 class ComponentManager implements Module {

diff --git a/packages/main/componentManager/installer.ts b/packages/main/componentManager/installer.ts
@@ -1,13 +1,13 @@
-import path from 'path'
-
 import DownloadManager from '@main/downloadManager'
-import type { Installer, Notifier, SourceMirror, UpdateStatus } from './types'
-import type { ComponentType } from '@type/componentManager'
+import { extractFile } from '@main/utils/extract'
 import logger from '@main/utils/logger'
 import { getAppBaseDir } from '@main/utils/path'
-import { createNotifier } from './utils/notifier'
+import type { ComponentType } from '@type/componentManager'
 import type { InstallerStatus } from '@type/misc'
-import { extractFile } from '@main/utils/extract'
+import path from 'path'
+
+import type { Installer, Notifier, SourceMirror, UpdateStatus } from './types'
+import { createNotifier } from './utils/notifier'
 
 export default abstract class InstallerBase implements Installer {
   public readonly componentType: ComponentType

diff --git a/packages/main/componentManager/installers/adb.ts b/packages/main/componentManager/installers/adb.ts
@@ -1,10 +1,11 @@
-import type { SourceMirror, UpdateStatus } from '../types'
 import { Singleton } from '@common/function/singletonDecorator'
-import { createFixedGetRelease } from '../utils/release'
+import Storage from '@main/storageManager'
 import { getPlatform } from '@main/utils/os'
-import { createCheckUpdate } from '../utils/update'
+
 import InstallerBase from '../installer'
-import Storage from '@main/storageManager'
+import type { SourceMirror, UpdateStatus } from '../types'
+import { createFixedGetRelease } from '../utils/release'
+import { createCheckUpdate } from '../utils/update'
 
 @Singleton
 export default class AdbInstaller extends InstallerBase {

diff --git a/packages/main/componentManager/installers/core.ts b/packages/main/componentManager/installers/core.ts
@@ -1,11 +1,12 @@
-import type { SourceMirror, UpdateStatus } from '../types'
 import { Singleton } from '@common/function/singletonDecorator'
-import { createGetRelease } from '../utils/release'
-import { getDownloadUrlExtension, getDownloadUrlSuffix } from '@main/utils/os'
-import { createCheckUpdate } from '../utils/update'
 import CoreLoader from '@main/coreLoader'
-import InstallerBase from '../installer'
 import Storage from '@main/storageManager'
+import { getDownloadUrlExtension, getDownloadUrlSuffix } from '@main/utils/os'
+
+import InstallerBase from '../installer'
+import type { SourceMirror, UpdateStatus } from '../types'
+import { createGetRelease } from '../utils/release'
+import { createCheckUpdate } from '../utils/update'
 
 @Singleton
 export default class CoreInstaller extends InstallerBase {

diff --git a/packages/main/componentManager/utils/notifier.ts b/packages/main/componentManager/utils/notifier.ts
@@ -1,5 +1,6 @@
 import type { ComponentType } from '@type/componentManager'
 import type { InstallerStatus } from '@type/misc'
+
 import type { Notifier } from '../types'
 
 export function createNotifier(

diff --git a/packages/main/componentManager/utils/release.ts b/packages/main/componentManager/utils/release.ts
@@ -1,10 +1,9 @@
-import axios from 'axios'
-
-import { getProxy } from './proxy'
 import logger from '@main/utils/logger'
-
 import type { ComponentType } from '@type/componentManager'
+import axios from 'axios'
+
 import type { ReleaseObject } from '../types'
+import { getProxy } from './proxy'
 
 const MaxRetryTimes = 3
 

diff --git a/packages/main/componentManager/utils/update.ts b/packages/main/componentManager/utils/update.ts
@@ -1,9 +1,9 @@
+import logger from '@main/utils/logger'
+import { getAppBaseDir } from '@main/utils/path'
+import type { ComponentType } from '@type/componentManager'
 import fs from 'fs'
 import path from 'path'
-
-import logger from '@main/utils/logger'
 import type { ReleaseObject, SourceMirror, UpdateStatus } from '../types'
-import type { ComponentType } from '@type/componentManager'
 import { getComponentBaseDir } from './path'
 
 export function infoPathOf(componentDir: string) {

diff --git a/packages/main/coreLoader/callback.ts b/packages/main/coreLoader/callback.ts
@@ -1,6 +1,6 @@
+import logger from '@main/utils/logger'
 import ffi from '@tigerconnect/ffi-napi'
 import ref from '@tigerconnect/ref-napi'
-import logger from '@main/utils/logger'
 import type { AsstMsg } from '@type/task/callback'
 
 const callbackHandle = ffi.Callback(

diff --git a/packages/main/coreLoader/index.ts b/packages/main/coreLoader/index.ts
@@ -1,19 +1,23 @@
 import { Singleton } from '@common/function/singletonDecorator'
 import Storage from '@main/storageManager'
-import path from 'path'
-import _ from 'lodash'
+import { extractFile } from '@main/utils/extract'
 import logger from '@main/utils/logger'
-import { existsSync, mkdirSync, readFileSync, rmdirSync, unlinkSync, writeFileSync } from 'fs'
+import { getAppBaseDir } from '@main/utils/path'
 import ffi, { DynamicLibrary } from '@tigerconnect/ffi-napi'
 import ref from '@tigerconnect/ref-napi'
-import callbackHandle from './callback'
-import { getAppBaseDir } from '@main/utils/path'
+import type { ResourceType } from '@type/game'
 import type { TouchMode } from '@type/misc'
 import { InstanceOptionKey } from '@type/misc'
-import { extractFile } from '@main/utils/extract'
+import { existsSync, mkdirSync, readFileSync, rmdirSync, unlinkSync, writeFileSync } from 'fs'
+import _ from 'lodash'
+import path from 'path'
+
+import callbackHandle from './callback'
+
 import type { ResourceType } from '@type/game'
 import { getComponentBaseDir } from '@main/componentManager/utils/path'
 
+
 const storage = new Storage()
 
 /** Some types for core */

diff --git a/packages/main/deviceDetector/adapters/linuxAdapter.ts b/packages/main/deviceDetector/adapters/linuxAdapter.ts
@@ -1,6 +1,6 @@
-import psList from 'ps-list'
 import { Singleton } from '@common/function/singletonDecorator'
 import type { Device, Emulator, EmulatorAdapter } from '@type/device'
+import psList from 'ps-list'
 
 @Singleton
 class LinuxEmulator implements EmulatorAdapter {

diff --git a/packages/main/deviceDetector/adapters/macAdapter.ts b/packages/main/deviceDetector/adapters/macAdapter.ts
@@ -1,6 +1,6 @@
-import psList from 'ps-list'
 import { Singleton } from '@common/function/singletonDecorator'
-import type { EmulatorAdapter, Device, Emulator } from '@type/device'
+import type { Device, Emulator, EmulatorAdapter } from '@type/device'
+import psList from 'ps-list'
 
 @Singleton
 class MacEmulator implements EmulatorAdapter {

diff --git a/packages/main/deviceDetector/adapters/winAdapter.ts b/packages/main/deviceDetector/adapters/winAdapter.ts
@@ -1,13 +1,13 @@
 /* eslint-disable vue/max-len */
 import { Singleton } from '@common/function/singletonDecorator'
-import path from 'path'
-import { readFileSync, existsSync } from 'fs'
+import { defaultAdbPath, getDeviceUuid } from '@main/deviceDetector/utils'
+import logger from '@main/utils/logger'
+import { $ } from '@main/utils/shell'
+import type { Device, Emulator, EmulatorAdapter } from '@type/device'
 import { assert } from 'console'
+import { existsSync, readFileSync } from 'fs'
 import _ from 'lodash'
-import { $ } from '@main/utils/shell'
-import logger from '@main/utils/logger'
-import { defaultAdbPath, getDeviceUuid } from '@main/deviceDetector/utils'
-import type { EmulatorAdapter, Emulator, Device } from '@type/device'
+import path from 'path'
 
 const inUsePorts: string[] = [] // 本次识别已被使用的端口，将会在此暂存。
 

diff --git a/packages/main/deviceDetector/hooks.ts b/packages/main/deviceDetector/hooks.ts
@@ -1,8 +1,9 @@
-import { defaultAdbPath, getDeviceUuid, isDefaultAdbExists } from './utils'
-import { $$, $ } from '@main/utils/shell'
 import { parseArguments } from '@main/utils/arguments'
+import { $, $$ } from '@main/utils/shell'
 import type { EmulatorAdapter } from '@type/device'
 
+import { defaultAdbPath, getDeviceUuid, isDefaultAdbExists } from './utils'
+
 export function useEmulatorHooks(adapter: Promise<EmulatorAdapter>): void {
   globalThis.main.DeviceDetector = {
     async getEmulators() {

diff --git a/packages/main/deviceDetector/index.ts b/packages/main/deviceDetector/index.ts
@@ -1,9 +1,10 @@
 import { Singleton } from '@common/function/singletonDecorator'
-import { useEmulatorHooks } from './hooks'
-import adapters from './adapters'
-import type { EmulatorAdapter, Emulator, Device } from '@type/device'
+import type { Device, Emulator, EmulatorAdapter } from '@type/device'
 import type { Module } from '@type/misc'
 
+import adapters from './adapters'
+import { useEmulatorHooks } from './hooks'
+
 @Singleton
 class DeviceDetector implements Module {
   private readonly adapter: Promise<EmulatorAdapter>

diff --git a/packages/main/deviceDetector/utils.ts b/packages/main/deviceDetector/utils.ts
@@ -1,9 +1,12 @@
-import _ from 'lodash'
-import { app } from 'electron'
-import path from 'path'
+import logger from '@main/utils/logger'
 import { getPlatform } from '@main/utils/os'
 import { $, $$ } from '@main/utils/shell'
+import { app } from 'electron'
 import fs from 'fs'
+
+import _ from 'lodash'
+import path from 'path'
+
 import logger from '@main/utils/logger'
 import { getComponentBaseDir } from '@main/componentManager/utils/path'
 

diff --git a/packages/main/downloadManager/index.ts b/packages/main/downloadManager/index.ts
@@ -1,13 +1,12 @@
-import fs from 'fs'
-import path from 'path'
-import type { BrowserWindow } from 'electron'
-
 import { Singleton } from '@main/../common/function/singletonDecorator'
+import logger from '@main/utils/logger'
+import { getAppBaseDir } from '@main/utils/path'
 import WindowManager from '@main/windowManager'
 import type { DownloadHandle, DownloadTask } from '@type/downloadManager'
 import type { Module } from '@type/misc'
-import { getAppBaseDir } from '@main/utils/path'
-import logger from '@main/utils/logger'
+import type { BrowserWindow } from 'electron'
+import fs from 'fs'
+import path from 'path'
 
 @Singleton
 export default class DownloadManager implements Module {

diff --git a/packages/main/global.d.ts b/packages/main/global.d.ts
@@ -1,4 +1,4 @@
-import type { IpcRendererOnEventProxy, IpcMainHandleEventCalleeProxy } from '@type/ipc'
+import type { IpcMainHandleEventCalleeProxy, IpcRendererOnEventProxy } from '@type/ipc'
 
 export {}
 

diff --git a/packages/main/hooks/asst.ts b/packages/main/hooks/asst.ts
@@ -1,8 +1,8 @@
-import path from 'path'
-import fs from 'fs'
 import CoreLoader from '@main/coreLoader'
 import logger from '@main/utils/logger'
 import type { IpcMainHandleEventCalleeProxy } from '@type/ipc'
+import fs from 'fs'
+import path from 'path'
 
 const core = new CoreLoader()
 

diff --git a/packages/main/hooks/clear.ts b/packages/main/hooks/clear.ts
@@ -1,8 +1,10 @@
-import fs from 'fs'
-import path from 'path'
-import { app } from 'electron'
 import { manager } from '@main/utils/logger'
 import { getAppBaseDir } from '@main/utils/path'
+
+import { app } from 'electron'
+import fs from 'fs'
+import path from 'path'
+
 import type { ComponentType } from '@type/componentManager'
 import { getComponentBaseDir } from '@main/componentManager/utils/path'
 import { getComponentAdb } from '@main/componentManager/components/adb'

diff --git a/packages/main/hooks/index.ts b/packages/main/hooks/index.ts
@@ -1,11 +1,11 @@
-import useVersionHooks from './version'
 import useAsstHooks from './asst'
-import useStorageHooks from './storage'
+import useClearHooks from './clear'
 import useOsHooks from './os'
+import usePathHooks from './path'
 import useShutdownHooks from './shutdown'
-import useClearHooks from './clear'
+import useStorageHooks from './storage'
 import useTaskHooks from './task'
-import usePathHooks from './path'
+import useVersionHooks from './version'
 
 export default function useHooks(): void {
   useVersionHooks()

diff --git a/packages/main/hooks/os.ts b/packages/main/hooks/os.ts
@@ -1,10 +1,10 @@
 import {
+  generateIdempotentKey,
   getArch,
   getPlatform,
   getSystemInformation,
-  reload,
-  generateIdempotentKey,
   isInDev,
+  reload,
 } from '@main/utils/os'
 
 export default function useOsHooks(): void {

diff --git a/packages/main/hooks/path.ts b/packages/main/hooks/path.ts
@@ -1,6 +1,7 @@
 import { openFolder, openExternal, saveTempJson } from '@main/utils/path'
 import { moveComponentBaseDir } from '@main/componentManager/utils/path'
 
+
 export default function usePathHooks(): void {
   globalThis.main.Util = {
     openFolder,

diff --git a/packages/main/hooks/shutdown.ts b/packages/main/hooks/shutdown.ts
@@ -1,7 +1,7 @@
-import { $ } from '@main/utils/shell'
+import logger from '@main/utils/logger'
 import { getPlatform } from '@main/utils/os'
+import { $ } from '@main/utils/shell'
 import WindowManager from '@main/windowManager'
-import logger from '@main/utils/logger'
 
 async function shutdownEmulator(pid: string): Promise<void> {
   logger.silly('Shutdown Emulator')

diff --git a/packages/main/hooks/task.ts b/packages/main/hooks/task.ts
@@ -1,5 +1,5 @@
-import fs from 'fs'
 import logger from '@main/utils/logger'
+import fs from 'fs'
 
 export default function useTaskHooks(): void {
   globalThis.main.Task.readInfrastConfig = ({ filepath }) => {

diff --git a/packages/main/hooks/version.ts b/packages/main/hooks/version.ts
@@ -1,5 +1,5 @@
-import { app } from 'electron'
 import CoreLoader from '@main/coreLoader'
+import { app } from 'electron'
 
 export default function useVersionHooks(): void {
   globalThis.main.Util.getUiVersion = () => app.getVersion()

diff --git a/packages/main/index.ts b/packages/main/index.ts
@@ -1,22 +1,21 @@
-import { app, BrowserWindow, shell } from 'electron'
-import { release } from 'os'
-import { join } from 'path'
-import fs from 'fs'
-
+import ComponentManager from '@main/componentManager'
+import CoreLoader from '@main/coreLoader'
+import DeviceDetector from '@main/deviceDetector'
+import useHooks from '@main/hooks'
+import StorageManager from '@main/storageManager'
 import useDebug from '@main/utils/debug'
 import logger from '@main/utils/logger'
-import useHooks from '@main/hooks'
 import { getPlatform, isInDev } from '@main/utils/os'
-
 // modules
 import WindowManager from '@main/windowManager'
-import StorageManager from '@main/storageManager'
-import ComponentManager from '@main/componentManager'
-import CoreLoader from '@main/coreLoader'
-import DeviceDetector from '@main/deviceDetector'
+import { BrowserWindow, app, shell } from 'electron'
+import fs from 'fs'
+import { release } from 'os'
+import { join } from 'path'
+
 import DownloadManager from './downloadManager'
-import { getAppBaseDir } from './utils/path'
 import { setupHookProxy } from './utils/ipc-main'
+import { getAppBaseDir } from './utils/path'
 
 require('source-map-support').install()