pref: improve performance of shiki (#9)

Author: HowieHz

build.gradle

@@ -1,3 +1,5 @@
+import top.howiehz.gradle.YamlPluginVersionSupport
+
 /*
  * Halo Plugin Extra API - Build Configuration
  * 
@@ -115,7 +117,7 @@ tasks.register('processShikiResources', Copy) {
 // 为什么用 YamlPluginVersionSupport：比正则表达式更安全，保持 YAML 格式和注释
 def configurePluginYamlVersion() {
     def manifestFile = file('src/main/resources/plugin.yaml')
-    return top.howiehz.gradle.YamlPluginVersionSupport.configurePluginYamlVersion(project, manifestFile)
+    return YamlPluginVersionSupport.configurePluginYamlVersion(project, manifestFile)
 }
 
 def jarLiteIndexTask

buildSrc/src/main/java/top/howiehz/gradle/MultiJarPluginComponentsIndexTask.java

@@ -8,6 +8,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.ConfigurableFileCollection;
@@ -28,6 +29,7 @@
  * 支持多个 JAR 任务的插件组件索引生成任务
  * 解决 Halo 官方插件开发工具硬编码 "jar" 任务的限制
  */
+@Getter
 @Slf4j
 @DisableCachingByDefault(because = "Not worth caching")
 public class MultiJarPluginComponentsIndexTask extends DefaultTask {
@@ -124,22 +126,6 @@ public void generate() throws IOException {
         log.info("Component index file: {}", outputPath.getAbsolutePath());
     }
 
-    public ConfigurableFileCollection getClassesDirs() {
-        return classesDirs;
-    }
-
-    public Property<String> getJarTaskName() {
-        return jarTaskName;
-    }
-
-    public ListProperty<String> getExcludePackages() {
-        return excludePackages;
-    }
-
-    public RegularFileProperty getOutputFile() {
-        return outputFile;
-    }
-
     /**
      * Convert a "/"-based resource path to a "."-based fully qualified class name.
      *

src-js-bundle/shiki/src/main.js

@@ -1,6 +1,6 @@
 import { codeToHtml, bundledLanguages, bundledThemes } from 'shiki/bundle/full'
 
-// 创建一个包装函数给 Javet 调用
+// 单个代码高亮 - 简单包装
 async function highlightCode(code, options = {}) {
   try {
     const html = await codeToHtml(code, options)
@@ -10,6 +10,37 @@ async function highlightCode(code, options = {}) {
   }
 }
 
+// 批量高亮 - 在一个引擎中处理多个代码块
+async function highlightCodeBatch(requests) {
+  try {
+    const results = {}
+    
+    // 使用 Promise.all 在同一个引擎中并行处理
+    const entries = Object.entries(requests)
+    const promises = entries.map(async ([id, request]) => {
+      try {
+        const html = await codeToHtml(request.code, {
+          lang: request.lang,
+          theme: request.theme
+        })
+        return [id, html]
+      } catch (error) {
+        return [id, `Error: ${error.message}`]
+      }
+    })
+    
+    const resolvedResults = await Promise.all(promises)
+    
+    for (const [id, html] of resolvedResults) {
+      results[id] = html
+    }
+    
+    return results
+  } catch (error) {
+    throw new Error('批量高亮失败: ' + error.message)
+  }
+}
+
 // 获取支持的语言列表
 function getSupportedLanguages() {
   return Object.keys(bundledLanguages)
@@ -22,8 +53,9 @@ function getSupportedThemes() {
 
 // 暴露给 globalThis
 globalThis.highlightCode = highlightCode
+globalThis.highlightCodeBatch = highlightCodeBatch
 globalThis.getSupportedLanguages = getSupportedLanguages
 globalThis.getSupportedThemes = getSupportedThemes
 
 // 导出
-export { highlightCode, getSupportedLanguages, getSupportedThemes }
+export { highlightCode, highlightCodeBatch, getSupportedLanguages, getSupportedThemes }

src/main/java/top/howiehz/halo/plugin/extra/api/service/basic/config/JsEnginePoolConfig.java

@@ -0,0 +1,30 @@
+package top.howiehz.halo.plugin.extra.api.service.basic.config;
+
+import lombok.Data;
+
+/**
+ * Configuration class for V8 engine pool.
+ * V8 引擎池配置类。
+ */
+@Data
+public class JsEnginePoolConfig {
+
+    /**
+     * Minimum pool size.
+     * 最小池大小。
+     * <p>Default is 1 to minimize memory usage while ensuring at least one engine is always
+     * available.</p>
+     * <p>默认为 1,以最小化内存使用,同时确保至少有一个引擎始终可用。</p>
+     */
+    private int poolMinSize = 1;
+
+    /**
+     * Maximum pool size.
+     * 最大池大小。
+     * <p>Default is 2.
+     * Setting this too high may cause OutOfMemoryError.</p>
+     * <p>默认为 2。
+     * 设置过高可能导致内存溢出错误。</p>
+     */
+    private int poolMaxSize = 2;
+}

src/main/java/top/howiehz/halo/plugin/extra/api/service/basic/config/JsEnginePoolConfigSupplier.java

@@ -0,0 +1,28 @@
+package top.howiehz.halo.plugin.extra.api.service.basic.config;
+
+import java.util.function.Supplier;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+import run.halo.app.plugin.ReactiveSettingFetcher;
+
+/**
+ * Supplier for V8 engine pool configuration that fetches settings reactively.
+ * V8 引擎池配置的供应器，以响应式方式获取设置。
+ */
+@Component
+@RequiredArgsConstructor
+public class JsEnginePoolConfigSupplier implements Supplier<Mono<JsEnginePoolConfig>> {
+    private final ReactiveSettingFetcher fetcher;
+
+    /**
+     * Get the V8 engine pool configuration from plugin settings.
+     * 从插件设置中获取 V8 引擎池配置。
+     *
+     * @return Mono emitting the V8 engine pool configuration / 发出 V8 引擎池配置的 Mono
+     */
+    @Override
+    public Mono<JsEnginePoolConfig> get() {
+        return fetcher.fetch("jsEnginePool", JsEnginePoolConfig.class);
+    }
+}

src/main/java/top/howiehz/halo/plugin/extra/api/service/js/post/render/shiki/ShikiCacheMetrics.java

@@ -0,0 +1,173 @@
+package top.howiehz.halo.plugin.extra.api.service.js.post.render.shiki;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * Metrics collector for Shiki cache performance.
+ * Shiki 缓存性能指标收集器。
+ *
+ * <p>收集的指标包括:
+ * <ul>
+ *   <li>缓存命中/未命中次数</li>
+ *   <li>渲染总耗时</li>
+ *   <li>渲染请求数</li>
+ *   <li>去重节省的请求数</li>
+ * </ul>
+ */
+@Slf4j
+@Component
+public class ShikiCacheMetrics {
+
+    // 使用 LongAdder 提供更好的并发性能
+    private final LongAdder cacheHits = new LongAdder();
+    private final LongAdder cacheMisses = new LongAdder();
+    private final LongAdder totalRenderTimeMs = new LongAdder();
+    private final LongAdder renderCount = new LongAdder();
+    private final LongAdder deduplicatedRequests = new LongAdder();
+    private final AtomicLong lastResetTime = new AtomicLong(System.currentTimeMillis());
+
+    /**
+     * Record a cache hit.
+     * 记录缓存命中。
+     */
+    public void recordCacheHit() {
+        cacheHits.increment();
+    }
+
+    /**
+     * Record a cache miss.
+     * 记录缓存未命中。
+     */
+    public void recordCacheMiss() {
+        cacheMisses.increment();
+    }
+
+    /**
+     * Record render time for a batch.
+     * 记录批量渲染耗时。
+     *
+     * @param startTime render start time / 渲染开始时间
+     */
+    public void recordRenderTime(Instant startTime) {
+        long durationMs = Duration.between(startTime, Instant.now()).toMillis();
+        totalRenderTimeMs.add(durationMs);
+        renderCount.increment();
+    }
+
+    /**
+     * Record deduplicated requests count.
+     * 记录去重节省的请求数。
+     *
+     * @param count number of duplicates removed / 去除的重复数
+     */
+    public void recordDeduplication(int count) {
+        deduplicatedRequests.add(count);
+    }
+
+    /**
+     * Get current metrics snapshot.
+     * 获取当前指标快照。
+     *
+     * @return metrics snapshot / 指标快照
+     */
+    public MetricsSnapshot getSnapshot() {
+        long hits = cacheHits.sum();
+        long misses = cacheMisses.sum();
+        long total = hits + misses;
+
+        double hitRate = total > 0 ? (hits * 100.0 / total) : 0.0;
+        double missRate = total > 0 ? (misses * 100.0 / total) : 0.0;
+
+        long renders = renderCount.sum();
+        long totalTime = totalRenderTimeMs.sum();
+        double avgRenderTime = renders > 0 ? (totalTime * 1.0 / renders) : 0.0;
+
+        long deduped = deduplicatedRequests.sum();
+        long uptimeSeconds = (System.currentTimeMillis() - lastResetTime.get()) / 1000;
+
+        return new MetricsSnapshot(
+            hits,
+            misses,
+            total,
+            hitRate,
+            missRate,
+            renders,
+            totalTime,
+            avgRenderTime,
+            deduped,
+            uptimeSeconds
+        );
+    }
+
+    /**
+     * Reset all metrics.
+     * 重置所有指标。
+     */
+    public void reset() {
+        cacheHits.reset();
+        cacheMisses.reset();
+        totalRenderTimeMs.reset();
+        renderCount.reset();
+        deduplicatedRequests.reset();
+        lastResetTime.set(System.currentTimeMillis());
+        log.info("Shiki 缓存指标已重置");
+    }
+
+    /**
+     * Metrics snapshot record.
+     * 指标快照记录。
+     */
+    @Getter
+    public static class MetricsSnapshot {
+        private final long cacheHits;
+        private final long cacheMisses;
+        private final long totalRequests;
+        private final double hitRatePercent;
+        private final double missRatePercent;
+        private final long renderBatchCount;
+        private final long totalRenderTimeMs;
+        private final double avgRenderTimeMs;
+        private final long deduplicatedRequests;
+        private final long uptimeSeconds;
+
+        public MetricsSnapshot(
+            long cacheHits,
+            long cacheMisses,
+            long totalRequests,
+            double hitRatePercent,
+            double missRatePercent,
+            long renderBatchCount,
+            long totalRenderTimeMs,
+            double avgRenderTimeMs,
+            long deduplicatedRequests,
+            long uptimeSeconds) {
+            this.cacheHits = cacheHits;
+            this.cacheMisses = cacheMisses;
+            this.totalRequests = totalRequests;
+            this.hitRatePercent = hitRatePercent;
+            this.missRatePercent = missRatePercent;
+            this.renderBatchCount = renderBatchCount;
+            this.totalRenderTimeMs = totalRenderTimeMs;
+            this.avgRenderTimeMs = avgRenderTimeMs;
+            this.deduplicatedRequests = deduplicatedRequests;
+            this.uptimeSeconds = uptimeSeconds;
+        }
+
+        @Override
+        public String toString() {
+            return String.format(
+                "ShikiCacheMetrics{缓存命中=%d, 未命中=%d, 总请求=%d, 命中率=%.2f%%, "
+                    + "渲染批次=%d, 总耗时=%dms, 平均耗时=%.2fms, 去重节省=%d, 运行时间=%ds}",
+                cacheHits, cacheMisses, totalRequests, hitRatePercent,
+                renderBatchCount, totalRenderTimeMs, avgRenderTimeMs,
+                deduplicatedRequests, uptimeSeconds
+            );
+        }
+    }
+}