@capgo/capacitor-updater 4.17.37 → 4.17.39

package/ios/Plugin/BundleInfo.swift

@@ -1,9 +1,15 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 import Foundation
 
 @objc public class BundleInfo: NSObject, Decodable, Encodable {
-    public static let idBuiltin: String = "builtin"
-    public static let versionUnknown: String = "unknown"
-    public static let downloadedBuiltin: String = "1970-01-01T00:00:00.000Z"
+    public static let ID_BUILTIN: String = "builtin"
+    public static let VERSION_UNKNOWN: String = "unknown"
+    public static let DOWNLOADED_BUILTIN: String = "1970-01-01T00:00:00.000Z"
 
     private let downloaded: String
     private let id: String
@@ -15,7 +21,7 @@ import Foundation
         self.init(id: id, version: version, status: status, downloaded: downloaded.iso8601withFractionalSeconds, checksum: checksum)
     }
 
-    init(id: String, version: String, status: BundleStatus, downloaded: String = BundleInfo.downloadedBuiltin, checksum: String) {
+    init(id: String, version: String, status: BundleStatus, downloaded: String = BundleInfo.DOWNLOADED_BUILTIN, checksum: String) {
         self.downloaded = downloaded.trim()
         self.id = id
         self.version = version
@@ -28,11 +34,11 @@ import Foundation
     }
 
     public func isBuiltin() -> Bool {
-        return BundleInfo.idBuiltin == self.id
+        return BundleInfo.ID_BUILTIN == self.id
     }
 
     public func isUnknown() -> Bool {
-        return BundleInfo.versionUnknown == self.id
+        return BundleInfo.VERSION_UNKNOWN == self.id
     }
 
     public func isErrorStatus() -> Bool {
@@ -44,11 +50,11 @@ import Foundation
     }
 
     public func isDownloaded() -> Bool {
-        return !self.isBuiltin() && self.downloaded != "" && self.downloaded != BundleInfo.downloadedBuiltin && !self.isDeleted()
+        return !self.isBuiltin() && self.downloaded != "" && self.downloaded != BundleInfo.DOWNLOADED_BUILTIN && !self.isDeleted()
     }
 
     public func getDownloaded() -> String {
-        return self.isBuiltin() ? BundleInfo.downloadedBuiltin : self.downloaded
+        return self.isBuiltin() ? BundleInfo.DOWNLOADED_BUILTIN : self.downloaded
     }
 
     public func getChecksum() -> String {
@@ -64,7 +70,7 @@ import Foundation
     }
 
     public func getId() -> String {
-        return self.isBuiltin() ? BundleInfo.idBuiltin : self.id
+        return self.isBuiltin() ? BundleInfo.ID_BUILTIN : self.id
     }
 
     public func setId(id: String) -> BundleInfo {
@@ -72,7 +78,7 @@ import Foundation
     }
 
     public func getVersionName() -> String {
-        return (self.version ?? "").isEmpty ? BundleInfo.idBuiltin : self.version
+        return (self.version ?? "").isEmpty ? BundleInfo.ID_BUILTIN : self.version
     }
 
     public func setVersionName(version: String) -> BundleInfo {

package/ios/Plugin/BundleStatus.swift

@@ -1,3 +1,9 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 import Foundation
 
 struct LocalizedString: ExpressibleByStringLiteral, Equatable {
@@ -21,7 +27,7 @@ struct LocalizedString: ExpressibleByStringLiteral, Equatable {
     }
 }
 
-func == (lhs: LocalizedString, rhs: LocalizedString) -> Bool {
+func ==(lhs: LocalizedString, rhs: LocalizedString) -> Bool {
     return lhs.v == rhs.v
 }
 

package/ios/Plugin/CapacitorUpdater.swift

@@ -1,3 +1,9 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
 import Foundation
 import SSZipArchive
 import Alamofire
@@ -66,16 +72,16 @@ extension GetChannel {
 }
 struct InfoObject: Codable {
     let platform: String?
-    let deviceId: String?
-    let appId: String?
-    let customId: String?
-    let versionBuild: String?
-    let versionCode: String?
-    let versionOS: String?
-    let versionName: String?
-    let pluginVersion: String?
-    let isEmulator: Bool?
-    let isProd: Bool?
+    let device_id: String?
+    let app_id: String?
+    let custom_id: String?
+    let version_build: String?
+    let version_code: String?
+    let version_os: String?
+    let version_name: String?
+    let plugin_version: String?
+    let is_emulator: Bool?
+    let is_prod: Bool?
     var action: String?
     var channel: String?
 }
@@ -85,7 +91,7 @@ struct AppVersionDec: Decodable {
     let url: String?
     let message: String?
     let error: String?
-    let sessionKey: String?
+    let session_key: String?
     let major: Bool?
 }
 public class AppVersion: NSObject {
@@ -171,7 +177,6 @@ enum CustomError: Error {
 
 extension CustomError: LocalizedError {
     public var errorDescription: String? {
-        let invalidFolder: String = "Invalid folder"
         switch self {
         case .cannotUnzip:
             return NSLocalizedString(
@@ -181,17 +186,17 @@ extension CustomError: LocalizedError {
         case .cannotCreateDirectory:
             return NSLocalizedString(
                 "The folder cannot be created",
-                comment: invalidFolder
+                comment: "Invalid folder"
             )
         case .cannotDeleteDirectory:
             return NSLocalizedString(
                 "The folder cannot be deleted",
-                comment: invalidFolder
+                comment: "Invalid folder"
             )
         case .cannotUnflat:
             return NSLocalizedString(
                 "The file cannot be unflat",
-                comment: invalidFolder
+                comment: "Invalid folder"
             )
         case .unexpected:
             return NSLocalizedString(
@@ -220,23 +225,22 @@ extension CustomError: LocalizedError {
     private let documentsDir: URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
     private let libraryDir: URL = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!
     private let bundleDirectoryHot: String = "versions"
-    private let defaultFolder: String = ""
+    private let DEFAULT_FOLDER: String = ""
     private let bundleDirectory: String = "NoCloud/ionic_built_snapshots"
-    private let infoSuffix: String = "_info"
-    private let fallbackVersion: String = "pastVersion"
-    private let nextVersion: String = "nextVersion"
+    private let INFO_SUFFIX: String = "_info"
+    private let FALLBACK_VERSION: String = "pastVersion"
+    private let NEXT_VERSION: String = "nextVersion"
 
-    public let tag: String = "✨  Capacitor-updater:"
-    public let capServerPath: String = "serverBasePath"
+    public let TAG: String = "✨  Capacitor-updater:"
+    public let CAP_SERVER_PATH: String = "serverBasePath"
     public var customId: String = ""
-    public var pluginVersion: String = ""
+    public var PLUGIN_VERSION: String = ""
     public let timeout: Double = 20
     public var statsUrl: String = ""
     public var channelUrl: String = ""
     public var appId: String = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
     public var privateKey: String = ""
-    private let indexHTML: String = "index.html"
 
     public var notifyDownload: (String, Int) -> Void = { _, _  in }
 
@@ -292,7 +296,7 @@ extension CustomError: LocalizedError {
             do {
                 try FileManager.default.createDirectory(atPath: source.path, withIntermediateDirectories: true, attributes: nil)
             } catch {
-                print("\(self.tag) Cannot createDirectory \(source.path)")
+                print("\(self.TAG) Cannot createDirectory \(source.path)")
                 throw CustomError.cannotCreateDirectory
             }
         }
@@ -302,13 +306,13 @@ extension CustomError: LocalizedError {
         do {
             try FileManager.default.removeItem(atPath: source.path)
         } catch {
-            print("\(self.tag) File not removed. \(source.path)")
+            print("\(self.TAG) File not removed. \(source.path)")
             throw CustomError.cannotDeleteDirectory
         }
     }
 
     private func unflatFolder(source: URL, dest: URL) throws -> Bool {
-        let index: URL = source.appendingPathComponent(self.indexHTML)
+        let index: URL = source.appendingPathComponent("index.html")
         do {
             let files: [String] = try FileManager.default.contentsOfDirectory(atPath: source.path)
             if files.count == 1 && source.appendingPathComponent(files[0]).isDirectory && !FileManager.default.fileExists(atPath: index.path) {
@@ -319,7 +323,7 @@ extension CustomError: LocalizedError {
                 return false
             }
         } catch {
-            print("\(self.tag) File not moved. source: \(source.path) dest: \(dest.path)")
+            print("\(self.TAG) File not moved. source: \(source.path) dest: \(dest.path)")
             throw CustomError.cannotUnflat
         }
     }
@@ -330,14 +334,14 @@ extension CustomError: LocalizedError {
             let checksum: uLong = fileData.withUnsafeBytes { crc32(0, $0.bindMemory(to: Bytef.self).baseAddress, uInt(fileData.count)) }
             return String(format: "%08X", checksum).lowercased()
         } catch {
-            print("\(self.tag) Cannot get checksum: \(filePath.path)", error)
+            print("\(self.TAG) Cannot get checksum: \(filePath.path)", error)
             return ""
         }
     }
 
     private func decryptFile(filePath: URL, sessionKey: String) throws {
         if (self.privateKey ?? "").isEmpty || (sessionKey ?? "").isEmpty {
-            print("\(self.tag) Cannot found privateKey or sessionKey")
+            print("\(self.TAG) Cannot found privateKey or sessionKey")
             return
         }
         do {
@@ -359,7 +363,7 @@ extension CustomError: LocalizedError {
 
             try decryptedData.write(to: filePath)
         } catch {
-            print("\(self.tag) Cannot decode: \(filePath.path)", error)
+            print("\(self.TAG) Cannot decode: \(filePath.path)", error)
             throw CustomError.cannotDecode
         }
     }
@@ -379,16 +383,16 @@ extension CustomError: LocalizedError {
     private func createInfoObject() -> InfoObject {
         return InfoObject(
             platform: "ios",
-            deviceId: self.deviceID,
-            appId: self.appId,
-            customId: self.customId,
-            versionBuild: self.versionName,
-            versionCode: self.versionCode,
-            versionOS: self.versionOs,
-            versionName: self.getCurrentBundle().getVersionName(),
-            pluginVersion: self.pluginVersion,
-            isEmulator: self.isEmulator(),
-            isProd: self.isProd(),
+            device_id: self.deviceID,
+            app_id: self.appId,
+            custom_id: self.customId,
+            version_build: self.versionName,
+            version_code: self.versionCode,
+            version_os: self.versionOs,
+            version_name: self.getCurrentBundle().getVersionName(),
+            plugin_version: self.PLUGIN_VERSION,
+            is_emulator: self.isEmulator(),
+            is_prod: self.isProd(),
             action: nil,
             channel: nil
         )
@@ -398,7 +402,7 @@ extension CustomError: LocalizedError {
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let latest: AppVersion = AppVersion()
         let parameters: InfoObject = self.createInfoObject()
-        print("\(self.tag) Auto-update parameters: \(parameters)")
+        print("\(self.TAG) Auto-update parameters: \(parameters)")
         let request = AF.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
@@ -422,11 +426,11 @@ extension CustomError: LocalizedError {
                 if let message = response.value?.message {
                     latest.message = message
                 }
-                if let sessionKey = response.value?.sessionKey {
+                if let sessionKey = response.value?.session_key {
                     latest.sessionKey = sessionKey
                 }
             case let .failure(error):
-                print("\(self.tag) Error getting Latest", response.value ?? "", error )
+                print("\(self.TAG) Error getting Latest", response.value ?? "", error )
                 latest.message = "Error getting Latest \(String(describing: response.value))"
                 latest.error = "response_error"
             }
@@ -437,9 +441,9 @@ extension CustomError: LocalizedError {
     }
 
     private func setCurrentBundle(bundle: String) {
-        UserDefaults.standard.set(bundle, forKey: self.capServerPath)
+        UserDefaults.standard.set(bundle, forKey: self.CAP_SERVER_PATH)
         UserDefaults.standard.synchronize()
-        print("\(self.tag) Current bundle set to: \((bundle ?? "").isEmpty ? BundleInfo.idBuiltin : bundle)")
+        print("\(self.TAG) Current bundle set to: \((bundle ?? "").isEmpty ? BundleInfo.ID_BUILTIN : bundle)")
     }
 
     public func download(url: URL, version: String, sessionKey: String) throws -> BundleInfo {
@@ -474,11 +478,11 @@ extension CustomError: LocalizedError {
                         self.notifyDownload(id, 100)
                         try self.deleteFolder(source: fileURL)
                     } catch {
-                        print("\(self.tag) download unzip error", error)
+                        print("\(self.TAG) download unzip error", error)
                         mainError = error as NSError
                     }
                 case let .failure(error):
-                    print("\(self.tag) download error", response.value!, error)
+                    print("\(self.TAG) download error", response.value!, error)
                     mainError = error as NSError
                 }
             }
@@ -500,7 +504,7 @@ extension CustomError: LocalizedError {
         do {
             let files: [String] = try FileManager.default.contentsOfDirectory(atPath: dest.path)
             var res: [BundleInfo] = []
-            print("\(self.tag) list File : \(dest.path)")
+            print("\(self.TAG) list File : \(dest.path)")
             if dest.exist {
                 for id: String in files {
                     res.append(self.getBundleInfo(id: id))
@@ -508,7 +512,7 @@ extension CustomError: LocalizedError {
             }
             return res
         } catch {
-            print("\(self.tag) No version available \(dest.path)")
+            print("\(self.TAG) No version available \(dest.path)")
             return []
         }
     }
@@ -516,7 +520,7 @@ extension CustomError: LocalizedError {
     public func delete(id: String, removeInfo: Bool) -> Bool {
         let deleted: BundleInfo = self.getBundleInfo(id: id)
         if deleted.isBuiltin() || self.getCurrentBundleId() == id {
-            print("\(self.tag) Cannot delete \(id)")
+            print("\(self.TAG) Cannot delete \(id)")
             return false
         }
         let destHot: URL = documentsDir.appendingPathComponent(bundleDirectoryHot).appendingPathComponent(id)
@@ -524,12 +528,12 @@ extension CustomError: LocalizedError {
         do {
             try FileManager.default.removeItem(atPath: destHot.path)
         } catch {
-            print("\(self.tag) Hot Folder \(destHot.path), not removed.")
+            print("\(self.TAG) Hot Folder \(destHot.path), not removed.")
         }
         do {
             try FileManager.default.removeItem(atPath: destPersist.path)
         } catch {
-            print("\(self.tag) Folder \(destPersist.path), not removed.")
+            print("\(self.TAG) Folder \(destPersist.path), not removed.")
             return false
         }
         if removeInfo {
@@ -537,7 +541,7 @@ extension CustomError: LocalizedError {
         } else {
             self.saveBundleInfo(id: id, bundle: deleted.setStatus(status: BundleStatus.DELETED.localizedString))
         }
-        print("\(self.tag) bundle delete \(deleted.getVersionName())")
+        print("\(self.TAG) bundle delete \(deleted.getVersionName())")
         self.sendStats(action: "delete", versionName: deleted.getVersionName())
         return true
     }
@@ -557,8 +561,8 @@ extension CustomError: LocalizedError {
     private func bundleExists(id: String) -> Bool {
         let destHot: URL = self.getPathHot(id: id)
         let destHotPersist: URL = self.getPathPersist(id: id)
-        let indexHot: URL = destHot.appendingPathComponent(self.indexHTML)
-        let indexPersist: URL = destHotPersist.appendingPathComponent(self.indexHTML)
+        let indexHot: URL = destHot.appendingPathComponent("index.html")
+        let indexPersist: URL = destHotPersist.appendingPathComponent("index.html")
         let url: URL = self.getBundleDirectory(id: id)
         let bundleIndo: BundleInfo = self.getBundleInfo(id: id)
         if url.isDirectory && destHotPersist.isDirectory && indexHot.exist && indexPersist.exist && !bundleIndo.isDeleted() {
@@ -596,7 +600,7 @@ extension CustomError: LocalizedError {
     }
 
     public func reset(isInternal: Bool) {
-        print("\(self.tag) reset: \(isInternal)")
+        print("\(self.TAG) reset: \(isInternal)")
         self.setCurrentBundle(bundle: "")
         self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
         _ = self.setNextBundle(next: Optional<String>.none)
@@ -608,14 +612,14 @@ extension CustomError: LocalizedError {
     public func setSuccess(bundle: BundleInfo, autoDeletePrevious: Bool) {
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.SUCCESS)
         let fallback: BundleInfo = self.getFallbackBundle()
-        print("\(self.tag) Fallback bundle is: \(fallback.toString())")
-        print("\(self.tag) Version successfully loaded: \(bundle.toString())")
+        print("\(self.TAG) Fallback bundle is: \(fallback.toString())")
+        print("\(self.TAG) Version successfully loaded: \(bundle.toString())")
         if autoDeletePrevious && !fallback.isBuiltin() {
             let res = self.delete(id: fallback.getId())
             if res {
-                print("\(self.tag) Deleted previous bundle: \(fallback.toString())")
+                print("\(self.TAG) Deleted previous bundle: \(fallback.toString())")
             } else {
-                print("\(self.tag) Failed to delete previous bundle: \(fallback.toString())")
+                print("\(self.TAG) Failed to delete previous bundle: \(fallback.toString())")
             }
         }
         self.setFallbackBundle(fallback: bundle)
@@ -628,7 +632,7 @@ extension CustomError: LocalizedError {
     func setChannel(channel: String) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
         if (self.channelUrl ?? "").isEmpty {
-            print("\(self.tag) Channel URL is not set")
+            print("\(self.TAG) Channel URL is not set")
             setChannel.message = "Channel URL is not set"
             setChannel.error = "missing_config"
             return setChannel
@@ -652,7 +656,7 @@ extension CustomError: LocalizedError {
                     setChannel.message = message
                 }
             case let .failure(error):
-                print("\(self.tag) Error set Channel", response.value, error)
+                print("\(self.TAG) Error set Channel", response.value, error)
                 setChannel.message = "Error set Channel \(String(describing: response.value))"
                 setChannel.error = "response_error"
             }
@@ -665,7 +669,7 @@ extension CustomError: LocalizedError {
     func getChannel() -> GetChannel {
         let getChannel: GetChannel = GetChannel()
         if (self.channelUrl ?? "").isEmpty {
-            print("\(self.tag) Channel URL is not set")
+            print("\(self.TAG) Channel URL is not set")
             getChannel.message = "Channel URL is not set"
             getChannel.error = "missing_config"
             return getChannel
@@ -693,7 +697,7 @@ extension CustomError: LocalizedError {
                     getChannel.allowSet = allowSet
                 }
             case let .failure(error):
-                print("\(self.tag) Error get Channel", response.value ?? "", error)
+                print("\(self.TAG) Error get Channel", response.value ?? "", error)
                 getChannel.message = "Error get Channel \(String(describing: response.value)))"
                 getChannel.error = "response_error"
             }
@@ -714,34 +718,34 @@ extension CustomError: LocalizedError {
             request.responseData { response in
                 switch response.result {
                 case .success:
-                    print("\(self.tag) Stats send for \(action), version \(versionName)")
+                    print("\(self.TAG) Stats send for \(action), version \(versionName)")
                 case let .failure(error):
-                    print("\(self.tag) Error sending stats: ", response.value, error)
+                    print("\(self.TAG) Error sending stats: ", response.value, error)
                 }
             }
         }
     }
 
     public func getBundleInfo(id: String?) -> BundleInfo {
-        var trueId = BundleInfo.versionUnknown
+        var trueId = BundleInfo.VERSION_UNKNOWN
         if id != nil {
             trueId = id!
         }
-        print("\(self.tag) Getting info for bundle [\(trueId)]")
+        print("\(self.TAG) Getting info for bundle [\(trueId)]")
         let result: BundleInfo
-        if BundleInfo.idBuiltin == trueId {
+        if BundleInfo.ID_BUILTIN == trueId {
             result = BundleInfo(id: trueId, version: "", status: BundleStatus.SUCCESS, checksum: "")
-        } else if BundleInfo.versionUnknown == trueId {
+        } else if BundleInfo.VERSION_UNKNOWN == trueId {
             result = BundleInfo(id: trueId, version: "", status: BundleStatus.ERROR, checksum: "")
         } else {
             do {
-                result = try UserDefaults.standard.getObj(forKey: "\(trueId)\(self.infoSuffix)", castTo: BundleInfo.self)
+                result = try UserDefaults.standard.getObj(forKey: "\(trueId)\(self.INFO_SUFFIX)", castTo: BundleInfo.self)
             } catch {
-                print("\(self.tag) Failed to parse info for bundle [\(trueId)]", error.localizedDescription)
+                print("\(self.TAG) Failed to parse info for bundle [\(trueId)]", error.localizedDescription)
                 result = BundleInfo(id: trueId, version: "", status: BundleStatus.PENDING, checksum: "")
             }
         }
-        print("\(self.tag) Returning info bundle [\(result.toString())]")
+        print("\(self.TAG) Returning info bundle [\(result.toString())]")
         return result
     }
 
@@ -761,32 +765,32 @@ extension CustomError: LocalizedError {
 
     private func saveBundleInfo(id: String, bundle: BundleInfo?) {
         if bundle != nil && (bundle!.isBuiltin() || bundle!.isUnknown()) {
-            print("\(self.tag) Not saving info for bundle [\(id)]", bundle!.toString())
+            print("\(self.TAG) Not saving info for bundle [\(id)]", bundle!.toString())
             return
         }
         if bundle == nil {
-            print("\(self.tag) Removing info for bundle [\(id)]")
-            UserDefaults.standard.removeObject(forKey: "\(id)\(self.infoSuffix)")
+            print("\(self.TAG) Removing info for bundle [\(id)]")
+            UserDefaults.standard.removeObject(forKey: "\(id)\(self.INFO_SUFFIX)")
         } else {
             let update = bundle!.setId(id: id)
-            print("\(self.tag) Storing info for bundle [\(id)]", update.toString())
+            print("\(self.TAG) Storing info for bundle [\(id)]", update.toString())
             do {
-                try UserDefaults.standard.setObj(update, forKey: "\(id)\(self.infoSuffix)")
+                try UserDefaults.standard.setObj(update, forKey: "\(id)\(self.INFO_SUFFIX)")
             } catch {
-                print("\(self.tag) Failed to save info for bundle [\(id)]", error.localizedDescription)
+                print("\(self.TAG) Failed to save info for bundle [\(id)]", error.localizedDescription)
             }
         }
         UserDefaults.standard.synchronize()
     }
 
     public func setVersionName(id: String, version: String) {
-        print("\(self.tag) Setting version for folder [\(id)] to \(version)")
+        print("\(self.TAG) Setting version for folder [\(id)] to \(version)")
         let info = self.getBundleInfo(id: id)
         self.saveBundleInfo(id: id, bundle: info.setVersionName(version: version))
     }
 
     private func setBundleStatus(id: String, status: BundleStatus) {
-        print("\(self.tag) Setting status for bundle [\(id)] to \(status)")
+        print("\(self.TAG) Setting status for bundle [\(id)] to \(status)")
         let info = self.getBundleInfo(id: id)
         self.saveBundleInfo(id: id, bundle: info.setStatus(status: status.localizedString))
     }
@@ -796,38 +800,38 @@ extension CustomError: LocalizedError {
     }
 
     public func getCurrentBundleId() -> String {
-        guard let bundlePath: String = UserDefaults.standard.string(forKey: self.capServerPath) else {
-            return BundleInfo.idBuiltin
+        guard let bundlePath: String = UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) else {
+            return BundleInfo.ID_BUILTIN
         }
         if (bundlePath ?? "").isEmpty {
-            return BundleInfo.idBuiltin
+            return BundleInfo.ID_BUILTIN
         }
         let bundleID: String = bundlePath.components(separatedBy: "/").last ?? bundlePath
         return bundleID
     }
 
     public func isUsingBuiltin() -> Bool {
-        return (UserDefaults.standard.string(forKey: self.capServerPath) ?? "") == self.defaultFolder
+        return (UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) ?? "") == self.DEFAULT_FOLDER
     }
 
     public func getFallbackBundle() -> BundleInfo {
-        let id: String = UserDefaults.standard.string(forKey: self.fallbackVersion) ?? BundleInfo.idBuiltin
+        let id: String = UserDefaults.standard.string(forKey: self.FALLBACK_VERSION) ?? BundleInfo.ID_BUILTIN
         return self.getBundleInfo(id: id)
     }
 
     private func setFallbackBundle(fallback: BundleInfo?) {
-        UserDefaults.standard.set(fallback == nil ? BundleInfo.idBuiltin : fallback!.getId(), forKey: self.fallbackVersion)
+        UserDefaults.standard.set(fallback == nil ? BundleInfo.ID_BUILTIN : fallback!.getId(), forKey: self.FALLBACK_VERSION)
         UserDefaults.standard.synchronize()
     }
 
     public func getNextBundle() -> BundleInfo? {
-        let id: String? = UserDefaults.standard.string(forKey: self.nextVersion)
+        let id: String? = UserDefaults.standard.string(forKey: self.NEXT_VERSION)
         return self.getBundleInfo(id: id)
     }
 
     public func setNextBundle(next: String?) -> Bool {
         guard let nextId: String = next else {
-            UserDefaults.standard.removeObject(forKey: self.nextVersion)
+            UserDefaults.standard.removeObject(forKey: self.NEXT_VERSION)
             UserDefaults.standard.synchronize()
             return false
         }
@@ -836,7 +840,7 @@ extension CustomError: LocalizedError {
         if !newBundle.isBuiltin() && !bundle.exist {
             return false
         }
-        UserDefaults.standard.set(nextId, forKey: self.nextVersion)
+        UserDefaults.standard.set(nextId, forKey: self.NEXT_VERSION)
         UserDefaults.standard.synchronize()
         self.setBundleStatus(id: nextId, status: BundleStatus.PENDING)
         return true