sparkling-method 2.1.0-rc.2 → 2.1.0-rc.20

package/ios/SparklingMethod.podspec

@@ -1,10 +1,8 @@
 require 'json'
 
 Pod::Spec.new do |s|
-  source_root      = 'packages/sparkling-method/ios'
-  source_globs     = ->(patterns) { patterns.flat_map { |pattern| [pattern, "#{source_root}/#{pattern}"] } }
   s.name           = 'SparklingMethod'
-  s.version        = "2.1.0-rc.2"
+  s.version        = "2.1.0-rc.20"
   s.summary        = "iOS SDK for Sparkling Method"
   s.description    = "Core iOS method runtime for Sparkling, with Lynx integration, dependency injection support, and debug helpers."
   s.license        = "Apache 2.0"
@@ -24,44 +22,46 @@ Pod::Spec.new do |s|
   }
     
   s.subspec 'Core' do |core|
-    core.source_files = source_globs.call([
+    core.source_files = [
       'Sources/Core/Definitions/*.{h,m,swift}',
       'Sources/Core/Pipe/*.{h,m,swift}',
       'Sources/Core/Models/*.{h,m,swift}',
       'Sources/Core/Protocols/*.{h,m,swift}',
       'Sources/Core/Utils/*.{h,m,swift}',
       'Sources/Core/DI/**/*.{h,m,swift}',
-    ])
+    ]
     core.dependency 'Mantle', '~> 2.2.0'
   end
   
   s.subspec 'Lynx' do |lynx|
-    lynx.source_files = source_globs.call([
+    lynx.source_files = [
       'Sources/Lynx/Pipe/*.{h,m,swift}',
       'Sources/Lynx/Engine/*.{h,m,swift}',
       'Sources/Lynx/Definitions/*.{h,m,swift}',
       'Sources/Lynx/Module/*.{h,m,swift}',
       'Sources/Lynx/Models/*.{h,m,swift}',
-    ])
+    ]
     
     lynx.dependency 'SparklingMethod/Core'
     lynx.dependency 'Lynx/Framework', '3.6.0'
+    lynx.dependency 'LynxBase/Framework', '3.6.0'
+    lynx.dependency 'LynxServiceAPI', '3.6.0'
     lynx.dependency 'PrimJS/quickjs', '>=2.12.0'
     lynx.dependency 'PrimJS/napi', '>=2.12.0'
   end
   
   s.subspec 'DIProvider' do |di|
-    di.source_files = source_globs.call([
+    di.source_files = [
       'Sources/DIProvider/**/*.{h,m,swift}',
-    ])
+    ]
     
     di.dependency 'SparklingMethod/Core'
   end
   
   s.subspec 'Debug' do |de|
-    de.source_files = source_globs.call([
+    de.source_files = [
       'Sources/Debug/**/*.{h,m,swift}',
-    ])
+    ]
     
     de.dependency 'SparklingMethod/Core'
   end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparkling-method",
-  "version": "2.1.0-rc.2",
+  "version": "2.1.0-rc.20",
   "homepage": "https://tiktok.github.io/sparkling/",
   "repository": {
     "type": "git",
@@ -9,6 +9,11 @@
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "ios",
+    "README.md"
+  ],
   "devDependencies": {
     "@lynx-js/types": "3.6.0",
     "typescript": "^5.8.3"

package/android/build.gradle.kts

@@ -1,245 +0,0 @@
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.tasks.bundling.Jar
-
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-    id("maven-publish")
-    id("signing")
-    jacoco
-}
-
-android {
-    namespace = "com.tiktok.sparkling.method"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 21
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        debug {
-            enableUnitTestCoverage = true
-        }
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-    
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-            all {
-                it.jvmArgs("-Xmx2048m", "-XX:MaxMetaspaceSize=512m")
-                it.systemProperty("robolectric.logging.enabled", "true")
-                it.systemProperty(
-                    "user.home",
-                    buildDir.resolve("robolectric-home").absolutePath
-                )
-            }
-        }
-    }
-}
-
-dependencies {
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-
-    // Testing dependencies
-    testImplementation("io.mockk:mockk:1.13.8")
-    testImplementation("org.robolectric:robolectric:4.10.3")
-    testImplementation("org.bouncycastle:bcprov-jdk18on:1.75")
-    testImplementation("androidx.test:core:1.5.0")
-    testImplementation("androidx.test.ext:junit:1.1.5")
-    testImplementation("org.mockito:mockito-core:5.2.0")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
-    testImplementation("androidx.test:runner:1.5.2")
-    testImplementation("androidx.test:rules:1.5.0")
-    // Removed PowerMock due to compatibility issues with Robolectric and Java 11
-
-    api(libs.lynx)
-    api("com.google.code.gson:gson:2.8.9")
-}
-
-tasks.withType<Test>().configureEach {
-    doFirst {
-        buildDir.resolve("robolectric-home").mkdirs()
-    }
-}
-
-tasks.register<JacocoReport>("jacocoTestReport") {
-    dependsOn(tasks.named("testDebugUnitTest"))
-
-    reports {
-        xml.required.set(true)
-        html.required.set(true)
-    }
-
-    val fileFilter = listOf(
-        "**/R.class",
-        "**/R$*.class",
-        "**/BuildConfig.*",
-        "**/Manifest*.*",
-        "**/*Test*.*",
-        "android/**/*.*"
-    )
-
-    val mainSrc = "${project.projectDir}/src/main/java"
-    sourceDirectories.setFrom(files(mainSrc))
-
-    val debugJavaTree = layout.buildDirectory.dir("intermediates/javac/debug").map { dir ->
-        dir.asFileTree.matching {
-            exclude(fileFilter)
-        }
-    }
-    val debugKotlinTree = layout.buildDirectory.dir("tmp/kotlin-classes/debug").map { dir ->
-        dir.asFileTree.matching {
-            exclude(fileFilter)
-        }
-    }
-    classDirectories.setFrom(debugJavaTree, debugKotlinTree)
-
-    val unitTestCoverageExec = layout.buildDirectory.file("outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec")
-    val jacocoExec = layout.buildDirectory.file("jacoco/testDebugUnitTest.exec")
-    executionData.setFrom(files(unitTestCoverageExec, jacocoExec))
-
-    onlyIf {
-        executionData.files.any { it.exists() }
-    }
-    outputs.upToDateWhen { false }
-}
-
-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)
-}
-
-val emptyJavadocJar by tasks.register<Jar>("javadocJar") {
-    archiveClassifier.set("javadoc")
-}
-
-afterEvaluate {
-    extensions.configure<PublishingExtension>("publishing") {
-        publications {
-            create<MavenPublication>("release") {
-                groupId = publishingGroupId
-                artifactId = "sparkling-method"
-                version = publishingVersion
-
-                from(components["release"])
-                artifact(androidSourcesJar)
-                artifact(emptyJavadocJar)
-
-                pom {
-                    name.set("sparkling-method")
-                    description.set("Sparkling method Android SDK module")
-                    url.set("https://github.com/tiktok/sparkling")
-
-                    licenses {
-                        license {
-                            name.set("Apache-2.0")
-                            url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id.set("tiktok")
-                            name.set("TikTok")
-                            email.set("opensource@tiktok.com")
-                        }
-                    }
-
-                    scm {
-                        connection.set("scm:git:git://github.com/tiktok/sparkling.git")
-                        developerConnection.set("scm:git:ssh://github.com:tiktok/sparkling.git")
-                        url.set("https://github.com/tiktok/sparkling")
-                    }
-                }
-            }
-        }
-
-        repositories {
-            maven {
-                name = "MavenCentral"
-                // Central Portal staging API (replaces legacy s01.oss.sonatype.org shut down June 2025)
-                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)
-                        ?: System.getenv("MAVEN_CENTRAL_USERNAME")
-                        ?: ""
-                    password = (findProperty("mavenCentralPassword") as? String)
-                        ?: System.getenv("MAVEN_CENTRAL_PASSWORD")
-                        ?: ""
-                }
-            }
-        }
-    }
-}
-
-// Signing configuration
-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 signingKey = System.getenv("SIGNING_KEY")
-
-    if (!signingKeyId.isNullOrBlank() && !signingPassword.isNullOrBlank()) {
-        if (!signingKey.isNullOrBlank()) {
-            // Use in-memory key (for CI/CD)
-            useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-            print("Using in-memory GPG key for signing")
-        } else if (!signingSecretKeyRingFile.isNullOrBlank() && file(signingSecretKeyRingFile).exists()) {
-            // Use key ring file (for local development)
-            useInMemoryPgpKeys(signingKeyId, file(signingSecretKeyRingFile).readText(), signingPassword)
-            print("Using GPG key ring file for signing: $signingSecretKeyRingFile")
-        } else {
-            print("Warning: Signing key ID and password provided but no key content available")
-        }
-    } else {
-        print("Warning: GPG signing not configured. Set SIGNING_KEY_ID and SIGNING_PASSWORD environment variables.")
-    }
-}
-
-// Sign publications after they are configured
-afterEvaluate {
-    signing {
-        val hasSigningConfig = !(System.getenv("SIGNING_KEY_ID").isNullOrBlank() || 
-                                  System.getenv("SIGNING_PASSWORD").isNullOrBlank())
-        if (hasSigningConfig) {
-            sign(extensions.getByType<PublishingExtension>().publications["release"])
-        } else {
-            print("Skipping signing for publication 'release' - no signing configuration")
-        }
-    }
-}

package/android/gradle.properties

@@ -1 +0,0 @@
-SPARKLING_PUBLISHING_VERSION=2.0.0-rc.5

package/android/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

package/android/src/androidTest/java/com/tiktok/sparkling/sparkling/methods/ExampleInstrumentedTest.kt

@@ -1,27 +0,0 @@
-// Copyright (c) 2022 TikTok Pte. Ltd.
-// Licensed under the Apache License Version 2.0 that can be found in the
-// LICENSE file in the root directory of this source tree.
-package com.tiktok.sparkling.sparkling.methods
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.tiktok.sparkling.methods", appContext.packageName)
-    }
-}

package/android/src/main/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-</manifest>

package/android/src/main/java/com/tiktok/sparkling/method/protocol/BridgeContext.kt

@@ -1,74 +0,0 @@
-// Copyright (c) 2022 TikTok Pte. Ltd.
-// Licensed under the Apache License Version 2.0 that can be found in the
-// LICENSE file in the root directory of this source tree.
-
-
-package com.tiktok.sparkling.method.protocol
-
-import com.tiktok.sparkling.method.registry.core.BridgePlatformType
-import com.tiktok.sparkling.method.registry.api.BusinessCallHandler
-import com.tiktok.sparkling.method.registry.api.DefaultCallHandler
-import com.tiktok.sparkling.method.registry.api.SparklingBridge
-import com.lynx.tasm.LynxBackgroundRuntime
-import com.lynx.tasm.LynxView
-import com.tiktok.sparkling.method.protocol.entity.BridgeCall
-import com.tiktok.sparkling.method.protocol.handler.BridgeDispatcher
-import com.tiktok.sparkling.method.protocol.impl.errors.JSBErrorReportModel
-import com.tiktok.sparkling.method.protocol.impl.interceptor.BridgeMockInterceptor
-import com.tiktok.sparkling.method.protocol.impl.monitor.IBridgeMonitor
-import com.tiktok.sparkling.method.protocol.interfaces.IBridgeLifeClient
-import com.tiktok.sparkling.method.protocol.interfaces.IBridgeProtocol
-
-class BridgeContext {
-    companion object {
-        fun getPlatformByBridgeContext(bridgeContext: BridgeContext): BridgePlatformType {
-            return if (bridgeContext.platform == BridgePlatformType.LYNX) {
-                BridgePlatformType.LYNX
-            } else if (bridgeContext.platform == BridgePlatformType.WEB) {
-                BridgePlatformType.WEB
-            } else {
-                BridgePlatformType.ALL
-            }
-        }
-    }
-
-    var sparklingBridge: SparklingBridge? = null
-    var dispatcher: BridgeDispatcher? = null
-    var bridgeClient = DefaultBridgeClientImp(this)
-    val bridgeLifeClientImp = DefaultBridgeLifeClientImp(this)
-    var lynxView : LynxView? = null
-    var lynxBackgroundRuntime : LynxBackgroundRuntime? = null
-    var containerId : String?  = ""
-    var protocols : MutableList<IBridgeProtocol> = mutableListOf()
-    var monitor : MutableSet<IBridgeMonitor> = mutableSetOf()
-    val defaultCallHandler: DefaultCallHandler = DefaultCallHandler()
-    var businessCallHandler: BusinessCallHandler? = null
-    var jsbMockInterceptor : BridgeMockInterceptor? = null // for JSB Mock
-    var platform: BridgePlatformType = BridgePlatformType.ALL
-
-
-    /**
-     * force on context error, only record view level message in jsbExtension
-     */
-    val errorReportModel: JSBErrorReportModel = JSBErrorReportModel()
-
-    fun registerProtocol(protocol: IBridgeProtocol){
-        protocols.add(protocol)
-    }
-
-    fun getNamespace() = businessCallHandler?.nameSpace
-
-    fun shouldHandleWithBusinessHandler(call: BridgeCall): Boolean {
-        return if (businessCallHandler != null && (call.nameSpace == getNamespace() || call.nameSpace.isEmpty())) {
-            businessCallHandler?.getBridge(this, call.bridgeName) != null
-        } else false
-    }
-
-    fun registerIBridgeLifeClient(bridgeLifeClient: IBridgeLifeClient) {
-        bridgeLifeClientImp.registerIBridgeLifeClient(bridgeLifeClient)
-    }
-
-    fun getCurrentUrl() : String? {
-        return this.lynxView?.templateUrl ?: this.lynxBackgroundRuntime?.lastScriptUrl
-    }
-}

package/android/src/main/java/com/tiktok/sparkling/method/protocol/DefaultBridgeClientImp.kt

@@ -1,47 +0,0 @@
-// Copyright (c) 2022 TikTok Pte. Ltd.
-// Licensed under the Apache License Version 2.0 that can be found in the
-// LICENSE file in the root directory of this source tree.
-
-
-package com.tiktok.sparkling.method.protocol
-
-import com.tiktok.sparkling.method.protocol.entity.BridgeCall
-import com.tiktok.sparkling.method.protocol.entity.BridgeResult
-import com.tiktok.sparkling.method.protocol.interfaces.IBridgeClient
-import com.tiktok.sparkling.method.protocol.interfaces.IBridgeHandler
-import com.tiktok.sparkling.method.protocol.interfaces.IBridgeProtocol
-import com.tiktok.sparkling.method.protocol.utils.LogUtils
-import org.json.JSONObject
-
-/**
- *  default implementation
- */
-class DefaultBridgeClientImp(val bridgeContext: BridgeContext): IBridgeClient {
-    private val TAG = "DefaultBridgeClientImp"
-
-    override fun shouldInterceptRequest(call: BridgeCall): BridgeResult? {
-        // TODO: implement by injection
-        return null
-    }
-
-    override fun onBridgeInvoked(protocol: IBridgeProtocol, detail: JSONObject) {
-        // FIXME pending
-    }
-
-    override fun onBridgeDispatched(call: BridgeCall) {
-        LogUtils.e(TAG, "onBridgeCallback: bridgeName: ${call.bridgeName}")
-    }
-
-    override fun onBridgeResultReceived(name: String, handler: IBridgeHandler, detail: JSONObject) {
-        LogUtils.e(TAG, "onBridgeCallback: bridgeName: $name")
-    }
-
-    override fun onBridgeCallback() {
-        LogUtils.e(TAG, "onBridgeCallback")
-    }
-
-    override fun onBridgeRejected() {
-        LogUtils.e(TAG, "onBridgeRejected")
-    }
-
-}