refactor: Handle more errors

Voxelum · Jan 16, 2025 · 0739181 · 0739181
1 parent f4ddce0
commit 0739181
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/xmcl-electron-app/main/ElectronLauncherApp.ts b/xmcl-electron-app/main/ElectronLauncherApp.ts
@@ -131,6 +131,8 @@ export default class ElectronLauncherApp extends LauncherApp {
           code = NetworkErrorCode.NETWORK_CHANGED
         } else if (e.message === 'net::PROXY_CONNECTION_FAILED') {
           code = NetworkErrorCode.PROXY_CONNECTION_FAILED
+        } else if (e.message === 'net::ERR_UNEXPECTED') {
+          code = NetworkErrorCode.CONNECTION_RESET
         }
         if (code) {
           // expected exceptions

diff --git a/xmcl-runtime/service/ServiceStateContainer.ts b/xmcl-runtime/service/ServiceStateContainer.ts
@@ -88,13 +88,21 @@ export class ServiceStateContainer<T = any> implements ServiceStateContext {
     try {
       this.semaphore += 1
       for (const [c] of this.#clients) {
+        if (c.isDestroyed()) {
+          this.untrack(c)
+          continue
+        }
         c.send('state-validating', { id: this.id, semaphore: this.semaphore })
       }
       return await action
     } finally {
       this.semaphore -= 1
       if (this.semaphore === 0) {
         for (const [c] of this.#clients) {
+          if (c.isDestroyed()) {
+            this.untrack(c)
+            continue
+          }
           c.send('state-validating', { id: this.id, semaphore: this.semaphore })
         }
       }

diff --git a/xmcl-runtime/sql/SqliteWASMDriver.ts b/xmcl-runtime/sql/SqliteWASMDriver.ts
@@ -1,6 +1,8 @@
 import { CompiledQuery, DatabaseConnection, Driver, QueryResult, SelectQueryNode } from 'kysely'
 import type { Database } from 'node-sqlite3-wasm'
+import { SQLite3Error } from 'node-sqlite3-wasm'
 import { SqliteWASMDialectDatabaseConfig, SqliteWASMDialectWorkerConfig } from './SqliteWASMDialectConfig'
+import { Exception } from '@xmcl/runtime-api'
 
 declare module 'node-sqlite3-wasm' {
   interface Statement {
@@ -56,7 +58,7 @@ export class SqliteWASMDriver extends AbstractSqliteDriver {
   readonly #config: SqliteWASMDialectDatabaseConfig
 
   #db?: Database
-  #connection?: DatabaseConnection
+  #connection?: SqliteConnection
 
   constructor(config: SqliteWASMDialectDatabaseConfig) {
     super()
@@ -76,17 +78,23 @@ export class SqliteWASMDriver extends AbstractSqliteDriver {
   }
 
   async destroy(): Promise<void> {
+    this.#connection?.dispose()
     this.#db?.close()
   }
 }
 
 class SqliteConnection implements DatabaseConnection {
   readonly #db: Database
+  #disposed = false
 
   constructor(db: Database) {
     this.#db = db
   }
 
+  dispose() {
+    this.#disposed = true
+  }
+
   executeQuery<O>(compiledQuery: CompiledQuery): Promise<QueryResult<O>> {
     const { sql, parameters } = compiledQuery
     const stmt = this.#db.prepare(sql)
@@ -110,6 +118,11 @@ class SqliteConnection implements DatabaseConnection {
             : undefined,
         rows: [],
       })
+    } catch (e) {
+      if (this.#disposed && e instanceof SQLite3Error) {
+        return Promise.reject(new Exception({ type: 'sqlite3Exception' }, e.message, { cause: e }))
+      }
+      return Promise.reject(e)
     } finally {
       stmt.finalize()
     }