sparkling-debug-tool 2.1.0-rc.12 → 2.1.0-rc.16

package/android/src/main/java/com/tiktok/sparkling/debugtool/SparklingDebugTool.kt

@@ -22,6 +22,12 @@ object SparklingDebugTool {
 
     @JvmStatic
     fun init(application: Application) {
+        // Preset values must be set BEFORE LynxEnv flags so the DevTool
+        // service picks them up during initialization.
+        LynxDevToolService.INSTANCE.setLynxDebugPresetValue(true)
+        LynxDevToolService.INSTANCE.setLogBoxPresetValue(true)
+        LynxDevToolService.INSTANCE.setLoadJsBridge(true)
+
         LynxServiceCenter.inst().registerService(LynxDevToolService.INSTANCE)
         LynxEnv.inst().enableLynxDebug(true)
         LynxEnv.inst().enableDevtool(true)

package/ios/Sources/SparklingDebugTool.swift

@@ -5,15 +5,30 @@
 import Foundation
 import Lynx
 import UIKit
+import DebugRouter
 
 @objcMembers
 public class SparklingDebugTool: NSObject {
     private static let devURLKey = "sparkling.debug.dev_url"
 
     public static func setup() {
-        LynxEnv.sharedInstance().lynxDebugEnabled = true
-        LynxEnv.sharedInstance().devtoolEnabled = true
-        LynxEnv.sharedInstance().logBoxEnabled = true
+        // Preset values must be set BEFORE LynxEnv flags so the DevTool
+        // service picks them up during initialization.
+        
+        if let devtool = LynxServices.getInstanceWith(LynxServiceDevToolProtocol.self) 
+            as? LynxServiceDevToolProtocol {
+            devtool.logBoxPresetValue = true
+            devtool.lynxDebugPresetValue = true
+        }
+
+        let env = LynxEnv.sharedInstance()
+        env.lynxDebugEnabled = true
+        env.devtoolEnabled = true
+        env.logBoxEnabled = true
+
+        // Enable DebugRouter so the DevTool desktop app can discover and
+        // connect to this app (via USB or network).
+        DebugRouter.instance().enableAllSessions()
     }
 
     public static func devURL(fallback: String) -> String {

package/ios/Sparkling-DebugTool.podspec

@@ -1,12 +1,8 @@
-require 'json'
-
-package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
-
 Pod::Spec.new do |s|
   s.name           = 'Sparkling-DebugTool'
-  s.version        = package['version']
-  s.summary        = package['description']
-  s.description    = package['description']
+  s.version        = "2.1.0-rc.16"
+  s.summary        = "Sparkling debug tool SDK"
+  s.description    = "Sparkling debug tool SDK"
   s.license        = { :type => 'Apache-2.0' }
   s.author         = 'TikTok'
   s.homepage       = 'https://github.com/tiktok/sparkling'
@@ -16,12 +12,11 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.source_files = [
-    'packages/sparkling-debug-tool/ios/Sources/**/*.{h,m,swift}',
-    'ios/Sources/**/*.{h,m,swift}',
     'Sources/**/*.{h,m,swift}'
   ]
 
   s.dependency 'Lynx', '~> 3.6.0'
   s.dependency 'LynxService/Devtool', '~> 3.6.0'
   s.dependency 'LynxDevtool/Framework', '~> 3.6.0'
+  s.dependency 'DebugRouter'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparkling-debug-tool",
-  "version": "2.1.0-rc.12",
+  "version": "2.1.0-rc.16",
   "description": "Sparkling debug tool SDK",
   "homepage": "https://tiktok.github.io/sparkling/",
   "repository": {