refactor: Use async-mutext to lock

.vscode/settings.json

@@ -32,7 +32,6 @@
         "optifine",
         "resourcepack",
         "vite",
-        "vuex",
         "windicss",
         "xmcl"
     ],

xmcl-keystone-ui/package.json

@@ -37,12 +37,12 @@
         "@xmcl/runtime-api": "workspace:*",
         "@xmcl/text-component": "workspace:*",
         "@xmcl/user": "workspace:*",
+        "async-mutex": "^0.5.0",
         "driver.js": "^1.3.1",
         "fuzzy": "^0.1.3",
         "lodash.debounce": "^4.0.8",
         "markdown-it": "^13.0.1",
         "markdown-it-link-attributes": "^4.0.1",
-        "rfc6902": "^5.0.1",
         "semver": "^7.5.8",
         "skinview3d": "^3.0.1",
         "swrv": "v2-latest",
@@ -54,8 +54,7 @@
         "vue-i18n": "^8.28.2",
         "vue-i18n-bridge": "9.13.1",
         "vue-router": "^3.6.5",
-        "vuetify": "^2.6.13",
-        "vuex": "^3.6.2"
+        "vuetify": "^2.6.13"
     },
     "devDependencies": {
         "@intlify/unplugin-vue-i18n": "^0.13.0",

xmcl-keystone-ui/src/composables/ftb.ts

@@ -138,7 +138,7 @@ export function useFeedTheBeastModpackInstall() {
     installFiles(path, files)
 
     const lock = getInstanceLock(path)
-    lock.write(async () => {
+    lock.runExclusive(async () => {
       const resolved = existed ? await getResolvedVersion(existed) : undefined
       const instruction = await getInstallInstruction(path, config.runtime, options.version || '', resolved, all.value)
       await handleInstallInstruction(instruction)

xmcl-keystone-ui/src/composables/instanceVersionInstall.ts

@@ -1,7 +1,8 @@
 import { getSWRV } from '@/util/swrvGet'
 import type { AssetIndexIssue, AssetIssue, JavaVersion, LibraryIssue, MinecraftJarIssue, ResolvedVersion } from '@xmcl/core'
 import type { InstallProfileIssueReport } from '@xmcl/installer'
-import { DiagnoseServiceKey, InstallServiceKey, Instance, InstanceServiceKey, JavaRecord, JavaServiceKey, ReadWriteLock, RuntimeVersions, ServerVersionHeader, VersionHeader, VersionServiceKey, parseOptifineVersion } from '@xmcl/runtime-api'
+import { Mutex } from 'async-mutex'
+import { DiagnoseServiceKey, InstallServiceKey, Instance, InstanceServiceKey, JavaRecord, JavaServiceKey, RuntimeVersions, ServerVersionHeader, VersionHeader, VersionServiceKey, parseOptifineVersion } from '@xmcl/runtime-api'
 import { InjectionKey, Ref, ShallowRef } from 'vue'
 import { InstanceResolveVersion } from './instanceVersion'
 import { useService } from './service'
@@ -245,7 +246,7 @@ export function useInstanceVersionInstallInstruction(path: Ref<string>, instance
   const loading = ref(0)
   const config = inject(kSWRVConfig)
 
-  const instanceLock: Record<string, ReadWriteLock> = {}
+  const instanceLock: Record<string, Mutex> = {}
 
   async function update(version: InstanceResolveVersion | undefined) {
     if (!version) return
@@ -255,7 +256,7 @@ export function useInstanceVersionInstallInstruction(path: Ref<string>, instance
       loading.value += 1
       const lock = getInstanceLock(path.value)
       console.time('[getInstallInstruction]')
-      await lock.write(async () => {
+      await lock.runExclusive(async () => {
         try {
           const _path = version.instance
           const _selectedVersion = version.version
@@ -287,7 +288,7 @@ export function useInstanceVersionInstallInstruction(path: Ref<string>, instance
     if (lock) {
       return lock
     }
-    const newLock = new ReadWriteLock()
+    const newLock = new Mutex()
     instanceLock[path] = newLock
     return newLock
   }
@@ -512,7 +513,7 @@ export function useInstanceVersionInstallInstruction(path: Ref<string>, instance
     }
     const last = resolvedVersion.value
     const lock = getInstanceLock(path.value)
-    await lock.write(() => handleInstallInstruction(inst))
+    await lock.runExclusive(() => handleInstallInstruction(inst))
     if (last === resolvedVersion.value) {
       await update(last)
     }

xmcl-keystone-ui/src/composables/modpackInstaller.ts

@@ -57,7 +57,7 @@ export function useModpackInstaller() {
     }
 
     const lock = getInstanceLock(instancePath)
-    lock.write(async () => {
+    lock.runExclusive(async () => {
       const resolved = version ? await resolveLocalVersion(version) : undefined
       const instruction = await getInstallInstruction(instancePath, runtime, '', resolved, all.value)
       await handleInstallInstruction(instruction)

xmcl-runtime-api/index.ts

@@ -79,10 +79,9 @@ export * from './src/task'
 export * from './src/util/authority'
 export * from './src/util/mavenVersion'
 export * from './src/util/SharedState'
-export * from './src/util/mutex'
 export { default as packFormatVersionRange } from './src/util/packFormatVersionRange'
 export * from './src/util/promiseSignal'
 export { default as protocolToMinecraft } from './src/util/protocolToMinecraft'
 export * from './src/util/sdp'
-export * from './src/util/semaphore'
+export * from './src/util/LockKey'
 export * from './src/util/versionRange'

xmcl-runtime-api/src/services/InstanceService.ts

@@ -40,9 +40,6 @@ export class InstanceState {
   instances: Instance[] = []
 
   instanceAdd(instance: Instance) {
-    /**
-     * Prevent the case that hot reload keep the vuex state
-     */
     if (!this.all[instance.path]) {
       // TODO: remove in vue3
       // set(this.all, instance.path, { ...instance, serverStatus: UNKNOWN_STATUS })

xmcl-runtime-api/src/util/LockKey.ts

@@ -0,0 +1,11 @@
+
+export const LockKey = {
+  versions: 'versions',
+  libraries: 'libraries',
+  assets: 'assets',
+  version: (v: string) => `versions/${v}`,
+  instance: (p: string) => `instances/${p}`,
+  instanceRemove: (p: string) => `instances/${p}/remove`,
+  shaderpacks: (p: string) => `shaderpacks/${p}`,
+  resourcepacks: (p: string) => `resourcepacks/${p}`,
+}