some optimization

Author: codersdg

NIO1901.xcodeproj/project.pbxproj

@@ -331,7 +331,7 @@ class MainViewController: BaseViewController {
             }
         }else{
             if vpnStatus == .connected {
-                mitmServer?.close()
+                mitmServer?.close(nil)
                 currentTask = nil
             }else{
                 let task = Task.newTask()

NIO1901/Modules/Home/Controller/MainViewController.swift

@@ -238,11 +238,11 @@ class SessionListViewController: BaseViewController {
         tableView.register(SessionCell.self, forCellReuseIdentifier: "SessionCell")
         tableView.separatorStyle = .none
         tableView.allowsMultipleSelectionDuringEditing = true
-        tableView.configRefreshHeader(container: self) {
-            self.loadData()
+        tableView.configRefreshHeader(container: self) { [weak self] in
+            self?.loadData()
         }
-        tableView.configRefreshFooter(container: self, action: {
-            self.loadData(isMore: true)
+        tableView.configRefreshFooter(container: self, action: { [weak self] in
+            self?.loadData(isMore: true)
         })
         tableView.switchRefreshHeader(to: .refreshing)
         return tableView

NIO1901/Modules/SessionList/Controller/SessionListViewController.swift

@@ -58,9 +58,12 @@ class WebViewController: BaseViewController,WKNavigationDelegate {
     }
     /// 加载服务条款
     @objc func loadTCHtml() -> Void {
-        let fwtkRequest = URLRequest(url: URL(string: fwtkUrl)!,cachePolicy: .reloadIgnoringLocalAndRemoteCacheData)
-        // reloadRevalidatingCacheData
-        webview.load(fwtkRequest)
+//        let fwtkRequest = URLRequest(url: URL(string: fwtkUrl)!,cachePolicy: .reloadIgnoringLocalAndRemoteCacheData)
+//        // reloadRevalidatingCacheData
+        if let bundleHttpPath = Bundle.main.url(forResource: "Http/fwtkcn", withExtension: "html") {
+            webview.loadFileURL(bundleHttpPath, allowingReadAccessTo: Bundle.main.bundleURL)
+        }
+//        webview.load(fwtkRequest)
     }
 
     func loadPPHtml() -> Void {

NIO1901/Modules/Setting/WebViewController.swift

@@ -116,7 +116,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         pendingStopCompletion = completionHandler
         // TODO:stop server
         if StartInExtension {
-            mitmServer.close()
+            mitmServer.close(completionHandler)
         }
     }
 

PacketTunnel/PacketTunnelProvider.swift

@@ -11,52 +11,93 @@ import SQLite
 
 //MARK: Custom Class
 open class ASConfigration {
-    public static var logLevel: LogLevel = .error// .debug//
+    public static var logLevel: LogLevel = .info
 
     private static var dbMap:Dictionary<String,Connection> = Dictionary<String,Connection>()
 
     private static var defaultDB:Connection!
+    private static var defaultDBName:String?
 
-    public static func setDB(path:String,name:String){
-        
-//        guard dbMap[name] == nil else {
-//            return
-//        }
-        let db = try! Connection(path)
-        dbMap[name] = db
-        
-//        #if DEBUG
-//            ASModel.db.trace{ debugPrint($0)}
-//        #endif
-        
-        if logLevel == .debug {
-            db.trace{ print($0)}
+    /// 创建数据库
+    ///
+    /// - Parameters:
+    ///   - path: 文件路径
+    ///   - name: 数据库名字
+    ///   - isAutoCreate: 文件不存在时候，是否自动创建文件。默认true
+        public static func setDB(path:String,name:String,isAutoCreate:Bool = true){
+            
+    //        guard dbMap[name] == nil else {
+    //            return
+    //        }
+            if isAutoCreate || fileExists( path){
+                do{
+                    
+                    let db = try Connection(path)
+                    db.busyTimeout = 5
+                    dbMap[name] = db
+                }catch{
+                    Log.e(error)
+                }
+               
+            }
+            
+            //        #if DEBUG
+            //            DBModel.db.trace{ debugPrint($0)}
+            //        #endif
+            
+    //        if logLevel == .debug {
+    //            db.trace{ print($0)}
+    //        }
         }
-    }
 
-    public static func setDefaultDB(path:String,name:String){
-        
-        guard dbMap[name] == nil else {
-            return
+        public static func setDefaultDB(path:String,name:String){
+            
+            guard dbMap[name] == nil else {
+                return
+            }
+            
+            defaultDBName = name
+            
+            do{
+                let db = try Connection(path)
+                db.busyTimeout = 5
+                dbMap[name] = db
+                
+                defaultDB = db
+            }catch{
+                Log.e(error)
+            }
+            
+    //        if logLevel == .debug {
+    //            db.trace{ print($0)}
+    //        }
         }
 
-        let db = try! Connection(path)
-        dbMap[name] = db
+        public static func getDefaultDB() throws -> Connection{
+            if let db = defaultDB{
+                return db
+            }else{
+                throw ASError.dbNotFound(dbName:defaultDBName ?? "默认数据库")
+            }
+        }
 
-        if logLevel == .debug {
-            db.trace{ print($0)}
+        public static func getDB(name:String) throws -> Connection{
+            if let db = dbMap[name]{
+                return db
+            }else{
+                throw ASError.dbNotFound(dbName:name)
+            }
+            
         }
 
-        defaultDB = db
-    }
-    
-    public static func getDefaultDB() -> Connection{
-        return defaultDB
-    }
-    
-    public static func getDB(name:String) -> Connection{
-        return dbMap[name]!
-    }
+        private static func fileExists(_ path:String) -> Bool{
+            var isDir:ObjCBool = false
+            let exists = FileManager.default.fileExists(atPath: path, isDirectory: &isDir)
+            if exists && !isDir.boolValue {
+                return true
+            }
+            return false
+        }
 
 }
 

TunnelServices/ActiveSQLite/ASConfigration.swift

@@ -0,0 +1,57 @@
+//
+//  ASError.swift
+//  ActiveSQLite
+//
+//  Created by Kevin Zhou on 2020/7/7.
+//  Copyright © 2020 hereigns. All rights reserved.
+//
+
+import Foundation
+
+public enum ASError:Error{
+    case dbNotFound(dbName:String)
+}
+
+extension ASError: LocalizedError{
+    public var errorDescription: String?{
+        switch self {
+        case .dbNotFound(_):
+            return description
+//        default:
+//            return "未知错误。"
+        }
+    }
+    
+}
+
+extension ASError:CustomNSError{
+    public static var errorDomain: String {
+        return "com.hereigns.ios.activesqlite"
+    }
+    public var errorCode: Int{
+        switch self {
+        case .dbNotFound(_):
+            return 10001
+//        default:
+//            return 00000
+        }
+    }
+    public var errorUserInfo: [String: Any] {
+        switch self {
+        case .dbNotFound(let dbName):
+            return [NSLocalizedDescriptionKey:"找不到数据库:【\(dbName)】"]
+        }
+        
+    }
+
+}
+
+extension ASError:CustomStringConvertible,CustomDebugStringConvertible{
+    public var description: String{
+        return "EaseSQLiteError: errodCode:\(errorCode),errorDomain:\(ASError.errorDomain),errorDescription：\(errorUserInfo)"
+    }
+    
+    public var debugDescription: String{
+        return description
+    }
+}