@onekeyfe/react-native-native-logger 1.1.46 → 1.1.47

package/android/src/main/java/com/margelo/nitro/nativelogger/NativeLogger.kt

@@ -36,6 +36,10 @@ class NativeLogger : HybridNativeLoggerSpec() {
         }
     }
 
+    override fun flushPendingRepeat() {
+        OneKeyLog.flushPendingRepeat()
+    }
+
     override fun write(level: Double, msg: String) {
         val sanitized = sanitize(msg)
         when (level.toInt()) {

package/android/src/main/java/com/margelo/nitro/nativelogger/OneKeyLog.kt

@@ -243,7 +243,32 @@ object OneKeyLog {
         }
     }
 
+    // -----------------------------------------------------------------------
+    // Dedup: collapse identical consecutive messages into [N repeat]
+    // -----------------------------------------------------------------------
+    private val dedupLock = Any()
+    @Volatile private var prevLogMessage: String? = null
+    private var repeatCount: Int = 0
+
     private fun log(tag: String, level: String, message: String, androidLogLevel: Int) {
+        // Dedup identical consecutive messages
+        synchronized(dedupLock) {
+            if (message == prevLogMessage) {
+                repeatCount += 1
+                return
+            }
+            val pendingRepeat = repeatCount
+            prevLogMessage = message
+            repeatCount = 0
+
+            if (pendingRepeat > 0) {
+                val repeatMsg = "[$pendingRepeat repeat]"
+                val l = logger
+                if (l != null) l.info(repeatMsg)
+                else android.util.Log.i("OneKeyLog", repeatMsg)
+            }
+        }
+
         val decision = evaluateRateLimit(level)
         decision.report?.let { emitRateLimitReport(it) }
         if (decision.drop) return
@@ -283,6 +308,26 @@ object OneKeyLog {
         }
     }
 
+    /**
+     * Flush any pending dedup repeat summary to the log file.
+     * Call before log export to ensure trailing repeated messages are included.
+     */
+    @JvmStatic
+    fun flushPendingRepeat() {
+        synchronized(dedupLock) {
+            val pending = repeatCount
+            repeatCount = 0
+            prevLogMessage = null
+
+            if (pending > 0) {
+                val repeatMsg = "[$pending repeat]"
+                val l = logger
+                if (l != null) l.info(repeatMsg)
+                else android.util.Log.i("OneKeyLog", repeatMsg)
+            }
+        }
+    }
+
     @JvmStatic
     fun debug(tag: String, message: String) { log(tag, "DEBUG", message, android.util.Log.DEBUG) }
 

package/ios/NativeLogger.swift

@@ -54,6 +54,10 @@ class NativeLogger: HybridNativeLoggerSpec {
         }
     }
 
+    func flushPendingRepeat() {
+        OneKeyLog.flushPendingRepeat()
+    }
+
     func write(level: Double, msg: String) {
         let sanitized = NativeLogger.sanitize(msg)
         switch Int(level) {

package/ios/OneKeyLog.swift

@@ -232,6 +232,13 @@ private class OneKeyLogFileManager: DDLogFileManagerDefault {
         return (true, report)
     }
 
+    // -----------------------------------------------------------------------
+    // Dedup: collapse identical consecutive messages into [N repeat]
+    // -----------------------------------------------------------------------
+    private static let dedupLock = NSLock()
+    private static var prevLogMessage: String?
+    private static var repeatCount: Int = 0
+
     private static func log(
         _ level: String,
         _ tag: String,
@@ -239,6 +246,24 @@ private class OneKeyLogFileManager: DDLogFileManagerDefault {
         writer: (String) -> Void
     ) {
         _ = configured
+
+        // Dedup identical consecutive messages
+        dedupLock.lock()
+        let isDuplicate = (message == prevLogMessage)
+        if isDuplicate {
+            repeatCount += 1
+            dedupLock.unlock()
+            return
+        }
+        let pendingRepeat = repeatCount
+        prevLogMessage = message
+        repeatCount = 0
+        dedupLock.unlock()
+
+        if pendingRepeat > 0 {
+            DDLogInfo("[\(pendingRepeat) repeat]")
+        }
+
         let decision = evaluateRateLimit(for: level)
         if let report = decision.report {
             DDLogWarn(report)
@@ -294,6 +319,20 @@ private class OneKeyLogFileManager: DDLogFileManagerDefault {
         return truncate("\(time) | \(level) : [\(safeTag)] \(safeMessage)")
     }
 
+    /// Flush any pending dedup repeat summary to the log file.
+    /// Call before log export to ensure trailing repeated messages are included.
+    @objc public static func flushPendingRepeat() {
+        dedupLock.lock()
+        let pending = repeatCount
+        repeatCount = 0
+        prevLogMessage = nil
+        dedupLock.unlock()
+
+        if pending > 0 {
+            DDLogInfo("[\(pending) repeat]")
+        }
+    }
+
     @objc public static func debug(_ tag: String, _ message: String) {
         log("DEBUG", tag, message) { DDLogDebug($0) }
     }

package/lib/typescript/src/NativeLogger.nitro.d.ts

@@ -4,6 +4,8 @@ export interface NativeLogger extends HybridObject<{
     android: 'kotlin';
 }> {
     write(level: number, msg: string): void;
+    /** Flush any pending dedup repeat summary to the log file. Call before log export. */
+    flushPendingRepeat(): void;
     getLogDirectory(): string;
     getLogFilePaths(): Promise<string[]>;
     deleteLogFiles(): Promise<void>;

package/lib/typescript/src/NativeLogger.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeLogger.nitro.d.ts","sourceRoot":"","sources":["../../../src/NativeLogger.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,YACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,eAAe,IAAI,MAAM,CAAC;IAC1B,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC"}
+{"version":3,"file":"NativeLogger.nitro.d.ts","sourceRoot":"","sources":["../../../src/NativeLogger.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,WAAW,YACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IACzD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,sFAAsF;IACtF,kBAAkB,IAAI,IAAI,CAAC;IAC3B,eAAe,IAAI,MAAM,CAAC;IAC1B,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC"}

package/nitrogen/generated/android/c++/JHybridNativeLoggerSpec.cpp

@@ -50,6 +50,10 @@ namespace margelo::nitro::nativelogger {
     static const auto method = javaClassStatic()->getMethod<void(double /* level */, jni::alias_ref<jni::JString> /* msg */)>("write");
     method(_javaPart, level, jni::make_jstring(msg));
   }
+  void JHybridNativeLoggerSpec::flushPendingRepeat() {
+    static const auto method = javaClassStatic()->getMethod<void()>("flushPendingRepeat");
+    method(_javaPart);
+  }
   std::string JHybridNativeLoggerSpec::getLogDirectory() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getLogDirectory");
     auto __result = method(_javaPart);

package/nitrogen/generated/android/c++/JHybridNativeLoggerSpec.hpp

@@ -55,6 +55,7 @@ namespace margelo::nitro::nativelogger {
   public:
     // Methods
     void write(double level, const std::string& msg) override;
+    void flushPendingRepeat() override;
     std::string getLogDirectory() override;
     std::shared_ptr<Promise<std::vector<std::string>>> getLogFilePaths() override;
     std::shared_ptr<Promise<void>> deleteLogFiles() override;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelogger/HybridNativeLoggerSpec.kt

@@ -50,6 +50,10 @@ abstract class HybridNativeLoggerSpec: HybridObject() {
   @Keep
   abstract fun write(level: Double, msg: String): Unit
   
+  @DoNotStrip
+  @Keep
+  abstract fun flushPendingRepeat(): Unit
+  
   @DoNotStrip
   @Keep
   abstract fun getLogDirectory(): String

package/nitrogen/generated/ios/c++/HybridNativeLoggerSpecSwift.hpp

@@ -68,6 +68,12 @@ namespace margelo::nitro::nativelogger {
         std::rethrow_exception(__result.error());
       }
     }
+    inline void flushPendingRepeat() override {
+      auto __result = _swiftPart.flushPendingRepeat();
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
     inline std::string getLogDirectory() override {
       auto __result = _swiftPart.getLogDirectory();
       if (__result.hasError()) [[unlikely]] {

package/nitrogen/generated/ios/swift/HybridNativeLoggerSpec.swift

@@ -15,6 +15,7 @@ public protocol HybridNativeLoggerSpec_protocol: HybridObject {
 
   // Methods
   func write(level: Double, msg: String) throws -> Void
+  func flushPendingRepeat() throws -> Void
   func getLogDirectory() throws -> String
   func getLogFilePaths() throws -> Promise<[String]>
   func deleteLogFiles() throws -> Promise<Void>

package/nitrogen/generated/ios/swift/HybridNativeLoggerSpec_cxx.swift

@@ -128,6 +128,17 @@ open class HybridNativeLoggerSpec_cxx {
     }
   }
   
+  @inline(__always)
+  public final func flushPendingRepeat() -> bridge.Result_void_ {
+    do {
+      try self.__implementation.flushPendingRepeat()
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+  
   @inline(__always)
   public final func getLogDirectory() -> bridge.Result_std__string_ {
     do {

package/nitrogen/generated/shared/c++/HybridNativeLoggerSpec.cpp

@@ -15,6 +15,7 @@ namespace margelo::nitro::nativelogger {
     // load custom methods/properties
     registerHybrids(this, [](Prototype& prototype) {
       prototype.registerHybridMethod("write", &HybridNativeLoggerSpec::write);
+      prototype.registerHybridMethod("flushPendingRepeat", &HybridNativeLoggerSpec::flushPendingRepeat);
       prototype.registerHybridMethod("getLogDirectory", &HybridNativeLoggerSpec::getLogDirectory);
       prototype.registerHybridMethod("getLogFilePaths", &HybridNativeLoggerSpec::getLogFilePaths);
       prototype.registerHybridMethod("deleteLogFiles", &HybridNativeLoggerSpec::deleteLogFiles);

package/nitrogen/generated/shared/c++/HybridNativeLoggerSpec.hpp

@@ -51,6 +51,7 @@ namespace margelo::nitro::nativelogger {
     public:
       // Methods
       virtual void write(double level, const std::string& msg) = 0;
+      virtual void flushPendingRepeat() = 0;
       virtual std::string getLogDirectory() = 0;
       virtual std::shared_ptr<Promise<std::vector<std::string>>> getLogFilePaths() = 0;
       virtual std::shared_ptr<Promise<void>> deleteLogFiles() = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-logger",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "description": "react-native-native-logger",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -80,7 +80,7 @@
     "nitrogen": "0.31.10",
     "prettier": "^2.8.8",
     "react": "19.2.0",
-    "react-native": "0.83.0",
+    "react-native": "patch:react-native@npm%3A0.83.0#~/.yarn/patches/react-native-npm-0.83.0-577d0f2d83.patch",
     "react-native-builder-bob": "^0.40.13",
     "react-native-nitro-modules": "0.33.2",
     "release-it": "^19.0.4",

package/src/NativeLogger.nitro.ts

@@ -3,6 +3,8 @@ import type { HybridObject } from 'react-native-nitro-modules';
 export interface NativeLogger
   extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
   write(level: number, msg: string): void;
+  /** Flush any pending dedup repeat summary to the log file. Call before log export. */
+  flushPendingRepeat(): void;
   getLogDirectory(): string;
   getLogFilePaths(): Promise<string[]>;
   deleteLogFiles(): Promise<void>;