cordova-plugin-unvired-logger 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-plugin-unvired-logger",
-    "version": "0.0.15",
+    "version": "0.0.17",
     "description": "A logger plugin for Electron, Android, Browser, and iOS that appends logs to log.txt files organized by user ID.",
     "cordova": {
         "id": "cordova-plugin-unvired-logger",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin id="cordova-plugin-unvired-logger" version="0.0.15"
+<plugin id="cordova-plugin-unvired-logger" version="0.0.17"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 

package/src/electron/Logger.js

@@ -146,7 +146,7 @@ function loggerWithLevel(args) {
             level = parseInt(level, 8);
         }
 
-       if (level < defaultLogLevel) {
+       if (level > defaultLogLevel) {
            return;
        }
 

package/src/electron/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-plugin-unvired-logger",
-    "version": "0.0.15",
+    "version": "0.0.17",
     "description": "Electron platform package for cordova-plugin-unvired-logger",
     "main": "Logger.js",
     "scripts": {

package/src/ios/Logger.swift

@@ -8,7 +8,6 @@ import UIKit
     private let MAX_LOG_SIZE: Int64 = 10 * 1024 * 1024 // 10MB
     
     private var defaultLogLevel: Int = 8
-    private let fileWriteQueue = DispatchQueue(label: "com.logger.filewrite", qos: .background)
 
     @objc(logDebug:)
     func logDebug(_ command: CDVInvokedUrlCommand) {
@@ -27,53 +26,54 @@ import UIKit
     
     @objc(loggerWithLevel:)
     func loggerWithLevel(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any] else {
-            sendErrorResult(command.callbackId, message: "Invalid arguments")
-            return
-        }
-        
-        guard let userId = args["userId"] as? String, !userId.isEmpty else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        guard let level = args["level"] as? Int else {
-            sendErrorResult(command.callbackId, message: "level is required")
-            return
-        }
-        
-        guard let message = args["message"] as? String, !message.isEmpty else {
-            sendErrorResult(command.callbackId, message: "message is required")
-            return
-        }
-        
-        let sourceClass = args["sourceClass"] as? String ?? ""
-        let sourceMethod = args["sourceMethod"] as? String ?? ""
-        
-        // Log level filtering
-        if shouldSkipLog(level: level) {
-            sendSuccessResult(command.callbackId, message: "Log skipped due to level filter")
-            return
-        }
-        
-        do {
-            let logFile = try getLogFile(userId: userId)
-            try checkAndRotateLogFile(logFile: logFile, userId: userId)
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any] else {
+                self.sendErrorResult(command.callbackId, message: "Invalid arguments")
+                return
+            }
+            
+            guard let userId = args["userId"] as? String, !userId.isEmpty else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            guard let level = args["level"] as? Int else {
+                self.sendErrorResult(command.callbackId, message: "level is required")
+                return
+            }
             
-            let logEntry = formatLogEntry(level: level, sourceClass: sourceClass, sourceMethod: sourceMethod, message: message)
+            guard let message = args["message"] as? String, !message.isEmpty else {
+                self.sendErrorResult(command.callbackId, message: "message is required")
+                return
+            }
+            
+            let sourceClass = args["sourceClass"] as? String ?? ""
+            let sourceMethod = args["sourceMethod"] as? String ?? ""
             
-            // Send success result immediately without waiting for file write
-            sendSuccessResult(command.callbackId, message: "Logged to \(logFile.path)")
+            // Log level filtering
+            if self.shouldSkipLog(level: level) {
+                self.sendSuccessResult(command.callbackId, message: "Log skipped due to level filter")
+                return
+            }
             
-            // Perform file write in background with silent error handling
-            appendToFile(file: logFile, data: logEntry) { error in
-                if let error = error {
-                    print("Background logging error: \(error.localizedDescription)")
+            do {
+                let logFile = try self.getLogFile(userId: userId)
+                try self.checkAndRotateLogFile(logFile: logFile, userId: userId)
+                
+                let logEntry = self.formatLogEntry(level: level, sourceClass: sourceClass, sourceMethod: sourceMethod, message: message)
+                
+                // Perform file write in background
+                self.appendToFile(file: logFile, data: logEntry) { error in
+                    if let error = error {
+                        self.sendErrorResult(command.callbackId, message: "Logging failed: \(error.localizedDescription)")
+                    } else {
+                        self.sendSuccessResult(command.callbackId, message: "Logged to \(logFile.path)")
+                    }
                 }
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Logging failed: \(error.localizedDescription)")
             }
-        } catch {
-            sendErrorResult(command.callbackId, message: "Logging failed: \(error.localizedDescription)")
-        }
+        })
     }
     
     @objc(setLogLevel:)
@@ -95,103 +95,115 @@ import UIKit
     
     @objc(getLogFileContent:)
     func getLogFileContent(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let logFile = try getLogFile(userId: userId)
-            let content = try readFile(file: logFile)
-            sendSuccessResult(command.callbackId, message: content)
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to read log file: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let logFile = try self.getLogFile(userId: userId)
+                let content = try self.readFile(file: logFile)
+                self.sendSuccessResult(command.callbackId, message: content)
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to read log file: \(error.localizedDescription)")
+            }
+        })
     }
     
     @objc(clearLogFile:)
     func clearLogFile(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let logFile = try getLogFile(userId: userId)
-            try "".write(to: logFile, atomically: true, encoding: .utf8)
-            sendSuccessResult(command.callbackId, message: "Log file cleared")
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to clear log file: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let logFile = try self.getLogFile(userId: userId)
+                try "".write(to: logFile, atomically: true, encoding: .utf8)
+                self.sendSuccessResult(command.callbackId, message: "Log file cleared")
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to clear log file: \(error.localizedDescription)")
+            }
+        })
     }
     
     @objc(getBackupLogFileContent:)
     func getBackupLogFileContent(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let backupFile = try getBackupLogFile(userId: userId)
-            let content = try readFile(file: backupFile)
-            sendSuccessResult(command.callbackId, message: content)
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to read backup log file: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let backupFile = try self.getBackupLogFile(userId: userId)
+                let content = try self.readFile(file: backupFile)
+                self.sendSuccessResult(command.callbackId, message: content)
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to read backup log file: \(error.localizedDescription)")
+            }
+        })
     }
     
     @objc(copyLogToBackup:)
     func copyLogToBackup(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let logFile = try getLogFile(userId: userId)
-            let backupFile = try getBackupLogFile(userId: userId)
-            try copyFile(from: logFile, to: backupFile)
-            sendSuccessResult(command.callbackId, message: "Log file copied to backup")
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to copy log file to backup: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let logFile = try self.getLogFile(userId: userId)
+                let backupFile = try self.getBackupLogFile(userId: userId)
+                try self.copyFile(from: logFile, to: backupFile)
+                self.sendSuccessResult(command.callbackId, message: "Log file copied to backup")
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to copy log file to backup: \(error.localizedDescription)")
+            }
+        })
     }
     
     @objc(getLogFileURL:)
     func getLogFileURL(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let logFile = try getLogFile(userId: userId)
-            sendSuccessResult(command.callbackId, message: logFile.path)
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to get log file URL: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let logFile = try self.getLogFile(userId: userId)
+                self.sendSuccessResult(command.callbackId, message: logFile.path)
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to get log file URL: \(error.localizedDescription)")
+            }
+        })
     }
     
     @objc(getBackupLogFileURL:)
     func getBackupLogFileURL(_ command: CDVInvokedUrlCommand) {
-        guard let args = command.arguments.first as? [String: Any],
-              let userId = args["userId"] as? String else {
-            sendErrorResult(command.callbackId, message: "userId is required")
-            return
-        }
-        
-        do {
-            let backupFile = try getBackupLogFile(userId: userId)
-            sendSuccessResult(command.callbackId, message: backupFile.path)
-        } catch {
-            sendErrorResult(command.callbackId, message: "Failed to get backup log file URL: \(error.localizedDescription)")
-        }
+        self.commandDelegate.run(inBackground: {
+            guard let args = command.arguments.first as? [String: Any],
+                  let userId = args["userId"] as? String else {
+                self.sendErrorResult(command.callbackId, message: "userId is required")
+                return
+            }
+            
+            do {
+                let backupFile = try self.getBackupLogFile(userId: userId)
+                self.sendSuccessResult(command.callbackId, message: backupFile.path)
+            } catch {
+                self.sendErrorResult(command.callbackId, message: "Failed to get backup log file URL: \(error.localizedDescription)")
+            }
+        })
     }
     
     // MARK: - Helper Methods
@@ -257,28 +269,19 @@ import UIKit
     }
     
     private func appendToFile(file: URL, data: String, completion: @escaping (Error?) -> Void = { _ in }) {
-        fileWriteQueue.async {
-            do {
-                let fileManager = FileManager.default
-                if !fileManager.fileExists(atPath: file.path) {
-                    // Create the file if it doesn't exist
-                    fileManager.createFile(atPath: file.path, contents: nil, attributes: nil)
-                }
-                let fileHandle = try FileHandle(forWritingTo: file)
-                fileHandle.seekToEndOfFile()
-                fileHandle.write(data.data(using: .utf8)!)
-                fileHandle.closeFile()
-                
-                // Notify success on main thread
-                DispatchQueue.main.async {
-                    completion(nil)
-                }
-            } catch {
-                // Notify error on main thread
-                DispatchQueue.main.async {
-                    completion(error)
-                }
+        do {
+            let fileManager = FileManager.default
+            if !fileManager.fileExists(atPath: file.path) {
+                // Create the file if it doesn't exist
+                fileManager.createFile(atPath: file.path, contents: nil, attributes: nil)
             }
+            let fileHandle = try FileHandle(forWritingTo: file)
+            fileHandle.seekToEndOfFile()
+            fileHandle.write(data.data(using: .utf8)!)
+            fileHandle.closeFile()
+            completion(nil)
+        } catch {
+            completion(error)
         }
     }
     
@@ -297,12 +300,16 @@ import UIKit
     }
     
     private func sendSuccessResult(_ callbackId: String, message: String) {
-        let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: message)
-        self.commandDelegate.send(result, callbackId: callbackId)
+        DispatchQueue.main.async {
+            let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: message)
+            self.commandDelegate.send(result, callbackId: callbackId)
+        }
     }
     
     private func sendErrorResult(_ callbackId: String, message: String) {
-        let result = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: message)
-        self.commandDelegate.send(result, callbackId: callbackId)
+        DispatchQueue.main.async {
+            let result = CDVPluginResult(status: CDVCommandStatus_ERROR, messageAs: message)
+            self.commandDelegate.send(result, callbackId: callbackId)
+        }
     }
 }