fix: improve logging performance by switch from print to NSLog (#165)

* fix: improve logging performance by switch from print to NSLog

* bump: version to 2.9.1

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.9.1
+
+- Fix: performance issue on building a timestamp prefix in `print` (`HCaptchaLog`)
+
 # 2.9.0
 
 - Fix: emit `.htmlLoadError` if `HCaptcha` WebView is not loaded in specified timeout (5 sec default)

Example/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - AppSwizzle (1.3.1)
-  - HCaptcha/Core (2.9.0)
-  - HCaptcha/RxSwift (2.9.0):
+  - HCaptcha/Core (2.9.1)
+  - HCaptcha/RxSwift (2.9.1):
     - HCaptcha/Core
     - RxSwift (~> 6.2.0)
   - RxBlocking (6.2.0):
@@ -37,7 +37,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AppSwizzle: db36e436f56110d93e5ae0147683435df593cabc
-  HCaptcha: 7f68727bcf0b01d7022585485e3c577bdfb11d87
+  HCaptcha: e97d412ae88e01c09cbbdb1582a710f389403ae8
   RxBlocking: 0b29f7d2079109a8de49c411381bed7c33ef1eeb
   RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
   RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f

HCaptcha.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'HCaptcha'
-  s.version          = '2.9.0'
+  s.version          = '2.9.1'
   s.summary          = 'HCaptcha for iOS'
   s.swift_version    = '5.0'
 

HCaptcha/Classes/HCaptchaDebugInfo.swift

@@ -7,23 +7,15 @@
 
 import Foundation
 import CommonCrypto
-import ObjectiveC.runtime
 import UIKit
 
-extension String {
+private extension String {
     func jsSanitize() -> String {
         return self.replacingOccurrences(of: ".", with: "_")
     }
-}
 
-private func updateInfoFor(_ image: String, _ ctx: UnsafeMutablePointer<CC_MD5_CTX>, depth: UInt32 = 16) {
-    var count: UInt32 = 0
-    if let imagePtr = (image as NSString).utf8String {
-        let classes = objc_copyClassNamesForImage(imagePtr, &count)
-        for cls in UnsafeBufferPointer<UnsafePointer<CChar>>(start: classes, count: Int(min(depth, count))) {
-            CC_MD5_Update(ctx, cls, CC_LONG(strlen(cls)))
-        }
-        classes?.deallocate()
+    var isSystemFramework: Bool {
+        return self.contains("/System/Library/") || self.contains("/usr/lib/")
     }
 }
 
@@ -41,7 +33,6 @@ private func bundleShortVersion() -> String {
 }
 
 class HCaptchaDebugInfo {
-
     public static let json: String = HCaptchaDebugInfo.buildDebugInfoJson()
 
     private class func buildDebugInfoJson() -> String {
@@ -53,39 +44,39 @@ class HCaptchaDebugInfo {
     }
 
     private class func buildDebugInfo() -> [String] {
-        let depth: UInt32 = 16
-        var depsCount = 0
-        var sysCount = 0
         let depsCtx = UnsafeMutablePointer<CC_MD5_CTX>.allocate(capacity: 1)
         let sysCtx = UnsafeMutablePointer<CC_MD5_CTX>.allocate(capacity: 1)
         let appCtx = UnsafeMutablePointer<CC_MD5_CTX>.allocate(capacity: 1)
         CC_MD5_Init(depsCtx)
         CC_MD5_Init(sysCtx)
         CC_MD5_Init(appCtx)
 
-        for framework in Bundle.allFrameworks {
-            guard let frameworkPath = URL(string: framework.bundlePath) else { continue }
-            let frameworkBin = frameworkPath.deletingPathExtension().lastPathComponent
-            let image = frameworkPath.appendingPathComponent(frameworkBin).absoluteString
-            let systemFramework = image.contains("/Library/PrivateFrameworks/") ||
-                                  image.contains("/System/Library/Frameworks/")
+        let loadedCount = Int(min(objc_getClassList(nil, 0), 1024))
+        if loadedCount > 0 {
+            let classes = UnsafeMutablePointer<AnyClass?>.allocate(capacity: loadedCount)
+            defer { classes.deallocate() }
 
-            if systemFramework && sysCount < depth {
-                sysCount += 1
-            } else if !systemFramework && depsCount < depth {
-                depsCount += 1
-            } else if sysCount < depth || depsCount < depth {
-                continue
-            } else {
-                break
-            }
+            _ = objc_getClassList(AutoreleasingUnsafeMutablePointer(classes), Int32(loadedCount))
 
-            let md5Ctx = systemFramework ? sysCtx : depsCtx
-            updateInfoFor(image, md5Ctx)
-        }
+            for idx in 0..<loadedCount {
+                if let `class` = classes[idx] {
+                    var info = Dl_info()
+                    if dladdr(unsafeBitCast(`class`, to: UnsafeRawPointer.self), &info) != 0,
+                            let imagePathPtr = info.dli_fname {
+                        let imagePath = String(cString: imagePathPtr)
+
+                        var md5Ctx = depsCtx
+                        if imagePath.isSystemFramework {
+                            md5Ctx = sysCtx
+                        } else if let execPath = Bundle.main.executablePath, imagePath.hasPrefix(execPath) {
+                            md5Ctx = appCtx
+                        }
 
-        if let executablePath = Bundle.main.executablePath {
-            updateInfoFor(executablePath, appCtx)
+                        let className = NSStringFromClass(`class`)
+                        CC_MD5_Update(md5Ctx, className, CC_LONG(className.count))
+                    }
+                }
+            }
         }
 
         let depsHash = getFinalHash(depsCtx)

HCaptcha/Classes/HCaptchaLog.swift

@@ -2,10 +2,11 @@
 //  HCaptchaEvent.swift
 //  HCaptcha
 //
-//  Copyright © 2023 HCaptcha. All rights reserved.
+//  Copyright © 2024 HCaptcha. All rights reserved.
 //
 
 import Foundation
+import os
 
 /** Internal SDK logger level
  */
@@ -50,17 +51,12 @@ internal class HCaptchaLogger {
         }
 
         let formattedMessage = String(format: message, arguments: args)
-        let logMessage = "\(timestamp) \(threadId) HCaptcha/\(level.description): \(formattedMessage)"
+        let logMessage = "\(threadId) HCaptcha/\(level.description): \(formattedMessage)"
 
-        print(logMessage)
+        NSLog(logMessage)
 #endif
     }
 
-    private static var timestamp: String {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss.sss"
-        return dateFormatter.string(from: Date())
-    }
 
     private static var threadId: String {
         return Thread.isMainThread ? "main" : "\(pthread_self())"