sparkling-debug-tool 2.1.0-rc.2 → 2.1.0-rc.24

package/android/build.gradle.kts

@@ -23,7 +23,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -43,16 +43,22 @@ dependencies {
     implementation(libs.lynx.devtool)
 }
 
-val publishingGroupId = (findProperty("SPARKLING_PUBLISHING_GROUP_ID") as? String)
-    ?: System.getenv("SPARKLING_PUBLISHING_GROUP_ID")
-    ?: "com.tiktok.sparkling"
-val publishingVersion = (findProperty("SPARKLING_PUBLISHING_VERSION") as? String)
-    ?: System.getenv("SPARKLING_PUBLISHING_VERSION")
-    ?: "2.0.0"
+val publishingGroupId =
+    (findProperty("SPARKLING_PUBLISHING_GROUP_ID") as? String)
+        ?: System.getenv("SPARKLING_PUBLISHING_GROUP_ID")
+        ?: "com.tiktok.sparkling"
+val publishingVersion =
+    (findProperty("SPARKLING_PUBLISHING_VERSION") as? String)
+        ?: System.getenv("SPARKLING_PUBLISHING_VERSION")
+        ?: "2.0.0"
 
 val androidSourcesJar by tasks.register<Jar>("androidSourcesJar") {
     archiveClassifier.set("sources")
-    from(android.sourceSets.getByName("main").java.srcDirs)
+    from(
+        android.sourceSets
+            .getByName("main")
+            .java.srcDirs,
+    )
 }
 
 val emptyJavadocJar by tasks.register<Jar>("javadocJar") {
@@ -103,9 +109,10 @@ afterEvaluate {
         repositories {
             maven {
                 name = "MavenCentral"
-                val repoUrl = (findProperty("mavenCentralRepoUrl") as? String)
-                    ?: System.getenv("MAVEN_CENTRAL_REPO_URL")
-                    ?: "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"
+                val repoUrl =
+                    (findProperty("mavenCentralRepoUrl") as? String)
+                        ?: System.getenv("MAVEN_CENTRAL_REPO_URL")
+                        ?: "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"
                 url = uri(repoUrl)
                 credentials {
                     username = (findProperty("mavenCentralUsername") as? String)
@@ -121,12 +128,15 @@ afterEvaluate {
 }
 
 signing {
-    val signingKeyId = (findProperty("signing.keyId") as? String)
-        ?: System.getenv("SIGNING_KEY_ID")
-    val signingPassword = (findProperty("signing.password") as? String)
-        ?: System.getenv("SIGNING_PASSWORD")
-    val signingSecretKeyRingFile = (findProperty("signing.secretKeyRingFile") as? String)
-        ?: System.getenv("SIGNING_SECRET_KEY_RING_FILE")
+    val signingKeyId =
+        (findProperty("signing.keyId") as? String)
+            ?: System.getenv("SIGNING_KEY_ID")
+    val signingPassword =
+        (findProperty("signing.password") as? String)
+            ?: System.getenv("SIGNING_PASSWORD")
+    val signingSecretKeyRingFile =
+        (findProperty("signing.secretKeyRingFile") as? String)
+            ?: System.getenv("SIGNING_SECRET_KEY_RING_FILE")
     val signingKey = System.getenv("SIGNING_KEY")
 
     if (!signingKeyId.isNullOrBlank() && !signingPassword.isNullOrBlank()) {
@@ -146,8 +156,11 @@ signing {
 
 afterEvaluate {
     signing {
-        val hasSigningConfig = !(System.getenv("SIGNING_KEY_ID").isNullOrBlank() ||
-            System.getenv("SIGNING_PASSWORD").isNullOrBlank())
+        val hasSigningConfig =
+            !(
+                System.getenv("SIGNING_KEY_ID").isNullOrBlank() ||
+                    System.getenv("SIGNING_PASSWORD").isNullOrBlank()
+            )
         if (hasSigningConfig) {
             sign(extensions.getByType<PublishingExtension>().publications["release"])
         } else {

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

@@ -3,19 +3,110 @@
 // LICENSE file in the root directory of this source tree.
 package com.tiktok.sparkling.debugtool
 
+import android.app.Activity
+import android.app.AlertDialog
 import android.app.Application
+import android.content.Context
+import android.os.Looper
+import android.text.InputType
+import android.widget.EditText
+import android.widget.Toast
 import com.lynx.devtool.LynxDevtoolEnv
 import com.lynx.service.devtool.LynxDevToolService
 import com.lynx.tasm.LynxEnv
 import com.lynx.tasm.service.LynxServiceCenter
 
 object SparklingDebugTool {
+    private const val PREFS_NAME = "sparkling_debug_tool"
+    private const val KEY_DEV_URL = "dev_url"
+
     @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.setLoadQJSBridge(true)
+
         LynxServiceCenter.inst().registerService(LynxDevToolService.INSTANCE)
         LynxEnv.inst().enableLynxDebug(true)
         LynxEnv.inst().enableDevtool(true)
         LynxEnv.inst().enableLogBox(true)
         LynxDevtoolEnv.inst().enableLongPressMenu(true)
     }
+
+    @JvmStatic
+    fun getDevUrl(
+        context: Context,
+        fallback: String,
+    ): String {
+        val stored =
+            context.applicationContext
+                .getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+                .getString(KEY_DEV_URL, null)
+                ?.trim()
+        return if (stored.isNullOrEmpty()) fallback else stored
+    }
+
+    @JvmStatic
+    fun setDevUrl(
+        context: Context,
+        url: String,
+    ) {
+        context.applicationContext
+            .getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+            .edit()
+            .putString(KEY_DEV_URL, url.trim())
+            .apply()
+    }
+
+    @JvmStatic
+    fun showDevUrlDialog(
+        activity: Activity,
+        initialUrl: String? = null,
+        onSaved: ((String) -> Unit)? = null,
+    ) {
+        if (Looper.myLooper() != Looper.getMainLooper()) {
+            activity.runOnUiThread { showDevUrlDialog(activity, initialUrl, onSaved) }
+            return
+        }
+
+        val input =
+            EditText(activity).apply {
+                setText(initialUrl ?: "")
+                hint = "http://10.0.2.2:5969/main.lynx.bundle"
+                inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
+                setSelection(text.length)
+            }
+
+        val dialog =
+            AlertDialog
+                .Builder(activity)
+                .setTitle("Set Sparkling Dev URL")
+                .setMessage("Update the main Lynx bundle URL for debug mode.")
+                .setView(input)
+                .setNegativeButton("Cancel", null)
+                .setPositiveButton("Save", null)
+                .create()
+
+        dialog.setOnShowListener {
+            val saveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE)
+            saveButton.setOnClickListener {
+                val value =
+                    input.text
+                        ?.toString()
+                        ?.trim()
+                        .orEmpty()
+                if (value.isEmpty()) {
+                    Toast.makeText(activity, "Dev URL cannot be empty", Toast.LENGTH_SHORT).show()
+                    return@setOnClickListener
+                }
+                setDevUrl(activity, value)
+                onSaved?.invoke(value)
+                dialog.dismiss()
+            }
+        }
+
+        dialog.show()
+    }
 }

package/ios/Sources/SparklingDebugTool.swift

@@ -2,14 +2,82 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 
+import DebugRouter
 import Foundation
 import Lynx
+import UIKit
 
 @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 {
+        let stored = UserDefaults.standard.string(forKey: devURLKey)?.trimmingCharacters(in: .whitespacesAndNewlines)
+        if let stored, !stored.isEmpty {
+            return stored
+        }
+        return fallback
+    }
+
+    public static func setDevURL(_ url: String) {
+        let normalized = url.trimmingCharacters(in: .whitespacesAndNewlines)
+        UserDefaults.standard.set(normalized, forKey: devURLKey)
+    }
+
+    public static func showDevURLDialog(
+        from viewController: UIViewController,
+        initialURL: String?,
+        onSaved: ((String) -> Void)? = nil
+    ) {
+        DispatchQueue.main.async {
+            let alert = UIAlertController(
+                title: "Set Sparkling Dev URL",
+                message: "Update the main Lynx bundle URL for debug mode.",
+                preferredStyle: .alert
+            )
+
+            alert.addTextField { textField in
+                textField.placeholder = "http://localhost:5969/main.lynx.bundle"
+                textField.keyboardType = .URL
+                textField.text = initialURL
+                textField.clearButtonMode = .whileEditing
+            }
+
+            alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+            alert.addAction(
+                UIAlertAction(
+                    title: "Save", style: .default,
+                    handler: { _ in
+                        let value = alert.textFields?.first?.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        guard !value.isEmpty else {
+                            return
+                        }
+                        setDevURL(value)
+                        onSaved?(value)
+                    }))
+
+            viewController.present(alert, animated: true)
+        }
     }
 }

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.24"
+  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,11 +12,11 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.source_files = [
-    '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 'Lynx'
+  s.dependency 'LynxService/Devtool'
+  s.dependency 'LynxDevtool/Framework'
+  s.dependency 'DebugRouter'
 end

package/package.json

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