✨ Use rich text rendering instead of Chrome for HTML clipboard rendering (#3193)

Author: guiyanakuang

.github/scripts/updateKnownGoodVersionsWithDownloads.js

@@ -106,19 +106,6 @@ jobs:
       - name: Install dependencies
         run: npm install semver fs-extra axios
 
-      - name: Update known-good-versions-with-downloads.json
-        run: node .github/scripts/updateKnownGoodVersionsWithDownloads.js
-
-      - name: Upload known-good-versions-with-downloads.json
-        id: upload_known_good_versions_with_downloads_json
-        uses: CrossPaste/oss-upload-action@main
-        with:
-          key-id: ${{ secrets.ALIYUN_ACCESSKEY_ID }}
-          key-secret: ${{ secrets.ALIYUN_ACCESSKEY_SECRET }}
-          region: oss-cn-shenzhen
-          bucket: crosspaste-desktop
-          assets: known-good-versions-with-downloads.json:known-good-versions-with-downloads.json
-
       - name: Validate and update version
         run: node .github/scripts/validateAndUpdateVersion.js
 

.github/workflows/build-release.yml

@@ -115,6 +115,7 @@ kotlin {
             implementation(libs.lifecycle.viewmodel.compose)
             implementation(libs.material.desktop)
             implementation(libs.okio)
+            implementation(libs.richeditor)
             implementation(libs.semver)
             implementation(libs.sqldelight.coroutines.extensions)
         }
@@ -141,8 +142,7 @@ kotlin {
             implementation(libs.jnativehook)
             implementation(libs.ktor.server.netty)
             implementation(libs.logback.classic)
-            implementation(libs.selenium.chrome.driver)
-            implementation(libs.selenium.devtools)
+            implementation(libs.ph.css)
             implementation(libs.sqlite.driver)
             implementation(libs.system.tray)
             implementation("com.github.Dansoftowner:jSystemThemeDetector:3.9.1") {

app/build.gradle.kts

@@ -490,9 +490,7 @@ class PasteDao(
     }
 
     private fun addRenderingTask(id: Long, pasteType: PasteType, addTask: (Long) -> Unit) {
-        if (pasteType.isHtml()) {
-            addTask(taskDao.createTask(id, TaskType.HTML_TO_IMAGE_TASK))
-        } else if (pasteType.isRtf()) {
+        if (pasteType.isRtf()) {
             addTask(taskDao.createTask(id, TaskType.RTF_TO_IMAGE_TASK))
         } else if (pasteType.isUrl()) {
             addTask(taskDao.createTask(id, TaskType.OPEN_GRAPH_TASK))

app/src/commonMain/kotlin/com/crosspaste/db/paste/PasteDao.kt

@@ -7,6 +7,7 @@ object TaskType {
     const val DELETE_PASTE_TASK = 1
     const val PULL_FILE_TASK = 2
     const val CLEAN_PASTE_TASK = 3
+    @Deprecated("not used anymore")
     const val HTML_TO_IMAGE_TASK = 4
     const val PULL_ICON_TASK = 5
     const val RTF_TO_IMAGE_TASK = 6

app/src/commonMain/kotlin/com/crosspaste/db/task/TaskType.kt

@@ -131,9 +131,6 @@ class CrossPaste {
                     ioCoroutineDispatcher.launch {
                         val jobs =
                             listOf(
-                                async(ioDispatcher) {
-                                    koin.get<RenderingService<String>>(named("htmlRendering")).start()
-                                },
                                 async(ioDispatcher) {
                                     koin.get<RenderingService<String>>(named("rtfRendering")).start()
                                 },
@@ -186,12 +183,6 @@ class CrossPaste {
                         async {
                             stopService<TaskExecutor>("TaskExecutor") { it.shutdown() }
                         },
-                        async {
-                            stopService<RenderingService<String>>(
-                                qualifier = named("htmlRendering"),
-                                serviceName = "RenderingService",
-                            ) { it.stop() }
-                        },
                         async {
                             stopService<RenderingService<String>>(
                                 qualifier = named("rtfRendering"),

app/src/commonMain/kotlin/com/crosspaste/task/Html2ImageTaskExecutor.kt

@@ -157,7 +157,6 @@ import com.crosspaste.platform.Platform
 import com.crosspaste.presist.FilePersist
 import com.crosspaste.recommend.DesktopRecommendationService
 import com.crosspaste.recommend.RecommendationService
-import com.crosspaste.rendering.DesktopHtmlRenderingService
 import com.crosspaste.rendering.DesktopRenderingHelper
 import com.crosspaste.rendering.DesktopRtfRenderingService
 import com.crosspaste.rendering.OpenGraphService
@@ -182,7 +181,6 @@ import com.crosspaste.sync.TokenCache
 import com.crosspaste.task.CleanPasteTaskExecutor
 import com.crosspaste.task.CleanTaskTaskExecutor
 import com.crosspaste.task.DeletePasteTaskExecutor
-import com.crosspaste.task.Html2ImageTaskExecutor
 import com.crosspaste.task.OpenGraphTaskExecutor
 import com.crosspaste.task.PullFileTaskExecutor
 import com.crosspaste.task.PullIconTaskExecutor
@@ -433,9 +431,6 @@ class DesktopModule(
             single<CleanScheduler> { CleanScheduler(get(), get(), get()) }
             single<CurrentPaste> { DesktopCurrentPaste(lazy { get() }) }
             single<RenderingHelper> { DesktopRenderingHelper(get()) }
-            single<RenderingService<String>>(named("htmlRendering")) {
-                DesktopHtmlRenderingService(get(), get(), get(), get(), get(), get(), get(), get(), get())
-            }
             single<RenderingService<String>>(named("rtfRendering")) {
                 DesktopRtfRenderingService(get(), get(), get(), get())
             }
@@ -460,10 +455,6 @@ class DesktopModule(
                         CleanPasteTaskExecutor(get(), get()),
                         CleanTaskTaskExecutor(get()),
                         DeletePasteTaskExecutor(get()),
-                        Html2ImageTaskExecutor(
-                            lazy { get<RenderingService<String>>(named("htmlRendering")) },
-                            get(),
-                        ),
                         OpenGraphTaskExecutor(
                             lazy { get<RenderingService<String>>(named("urlRendering")) },
                             get(),

app/src/desktopMain/kotlin/com/crosspaste/CrossPaste.kt

@@ -1,17 +1,23 @@
 package com.crosspaste.paste.plugin.type
 
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import com.crosspaste.paste.PasteCollector
 import com.crosspaste.paste.PasteDataFlavor
 import com.crosspaste.paste.PasteTransferable
 import com.crosspaste.paste.PasteType
 import com.crosspaste.paste.item.HtmlPasteItem
 import com.crosspaste.paste.item.PasteItem
+import com.crosspaste.paste.item.PasteItem.Companion.updateExtraInfo
+import com.crosspaste.paste.item.PasteItemProperties.BACKGROUND
 import com.crosspaste.paste.toPasteDataFlavor
 import com.crosspaste.platform.Platform
 import com.crosspaste.platform.windows.html.HTMLCodec
 import com.crosspaste.plugin.office.OfficeHtmlPlugin
+import com.crosspaste.utils.HtmlColorUtils
 import com.crosspaste.utils.getCodecsUtils
 import com.crosspaste.utils.getHtmlUtils
+import kotlinx.serialization.json.put
 import java.awt.datatransfer.DataFlavor
 
 class DesktopHtmlTypePlugin(
@@ -60,6 +66,7 @@ class DesktopHtmlTypePlugin(
     ) {
         if (transferData is String) {
             val html = extractHtml(transferData)
+            val background = HtmlColorUtils.getBackgroundColor(html) ?: Color.Transparent
             val htmlBytes = html.encodeToByteArray()
             val hash = codecsUtils.hash(htmlBytes)
             val size = htmlBytes.size.toLong()
@@ -69,7 +76,13 @@ class DesktopHtmlTypePlugin(
                     hash = hash,
                     size = size,
                     html = html,
-                    extraInfo = pasteItem.extraInfo,
+                    extraInfo =
+                        updateExtraInfo(
+                            pasteItem.extraInfo,
+                            update = {
+                                put(BACKGROUND, background.toArgb())
+                            },
+                        ),
                 )
             }
             pasteCollector.updateCollectItem(itemIndex, this::class, update)