Adapt to external URI that might not a URL (#6)

Author: JohnNiang

build.gradle

@@ -1,15 +1,16 @@
 plugins {
-    id "io.github.guqing.plugin-development" version "0.0.5-SNAPSHOT"
+    id "io.freefair.lombok" version "8.0.0-rc2"
+    id "io.github.guqing.plugin-development" version "0.0.7-SNAPSHOT"
     id 'java'
 }
 
 group 'run.halo.sitemap'
 sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
+    mavenCentral()
     maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
     maven { url 'https://repo.spring.io/milestone' }
-    mavenCentral()
 }
 
 jar {
@@ -18,27 +19,14 @@ jar {
     manifest.attributes(
             'Plugin-Version': "${project.version}",
     )
-    from {
-        configurations.runtimeClasspath.collect {
-            it.isDirectory() ? it : zipTree(it)
-        }
-    }
 }
 
 dependencies {
-    compileOnly platform('run.halo.dependencies:halo-dependencies:1.0.0')
-
-    compileOnly files("lib/halo-2.0.0-plain.jar")
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok:1.18.22'
+    implementation platform('run.halo.tools.platform:plugin:2.5.0-SNAPSHOT')
+    compileOnly 'run.halo.app:api'
 
-    testImplementation "com.google.guava:guava"
-    testImplementation 'org.apache.commons:commons-lang3'
-    testImplementation 'org.springframework.boot:spring-boot-starter-webflux'
+    testImplementation 'run.halo.app:api'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'io.projectreactor:reactor-test'
-    testImplementation files("lib/halo-2.0.0-plain.jar")
 }
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/halo-2.0.0-plain.jar

@@ -13,7 +13,7 @@
 @AllArgsConstructor
 public class CachedSitemapGetter {
 
-    private final Cache<String, String> cache = CacheBuilder.newBuilder()
+    private final Cache<SitemapGeneratorOptions, String> cache = CacheBuilder.newBuilder()
         .concurrencyLevel(Runtime.getRuntime().availableProcessors())
         .initialCapacity(8)
         .maximumSize(8)
@@ -22,14 +22,13 @@ public class CachedSitemapGetter {
 
     private final DefaultSitemapEntryLister lister;
 
-    public Mono<String> get() {
-        String cacheKey = "sitemap";
-        return Mono.fromCallable(() -> cache.get(cacheKey, () -> lister.list()
+    public Mono<String> get(SitemapGeneratorOptions options) {
+        return Mono.fromCallable(() -> cache.get(options, () -> lister.list(options)
                 .collectList()
                 .map(entries -> {
                     String xml = new SitemapBuilder()
                         .buildSitemapXml(entries);
-                    cache.put(cacheKey, xml);
+                    cache.put(options, xml);
                     return xml;
                 })
                 .defaultIfEmpty(StringUtils.EMPTY)

src/main/java/run/halo/sitemap/CachedSitemapGetter.java

@@ -22,14 +22,16 @@
 @Component
 @AllArgsConstructor
 public class DefaultSitemapEntryLister implements SitemapEntryLister {
+
     private final ReactiveExtensionClient client;
-    private final SitemapGeneratorOptions options;
 
     @Override
-    public Flux<SitemapEntry> list() {
-        return Flux.mergeSequential(listPostUrls(), listCategoryUrls(), listTagUrls(),
-                listSinglePageUrls())
-            .concatWith(urlsForListPages())
+    public Flux<SitemapEntry> list(SitemapGeneratorOptions options) {
+        return Flux.mergeSequential(listPostUrls(),
+                listCategoryUrls(),
+                listTagUrls(),
+                listSinglePageUrls(),
+                urlsForListPages())
             .distinct()
             .map(options::transform);
     }

src/main/java/run/halo/sitemap/DefaultSitemapEntryLister.java

@@ -1,8 +1,7 @@
 package run.halo.sitemap;
 
-import java.util.List;
 import reactor.core.publisher.Flux;
 
 public interface SitemapEntryLister {
-    Flux<SitemapEntry> list();
+    Flux<SitemapEntry> list(SitemapGeneratorOptions options);
 }

src/main/java/run/halo/sitemap/SitemapEntryLister.java

@@ -2,10 +2,7 @@
 
 import org.pf4j.PluginWrapper;
 import org.springframework.stereotype.Component;
-import run.halo.app.infra.ExternalUrlSupplier;
 import run.halo.app.plugin.BasePlugin;
-import run.halo.app.plugin.HaloPluginManager;
-import run.halo.app.plugin.PluginApplicationContext;
 
 /**
  * @author ryanwang
@@ -14,7 +11,7 @@
 @Component
 public class SitemapPlugin extends BasePlugin {
 
-    public SitemapPlugin(PluginWrapper wrapper, PluginApplicationContext context) {
+    public SitemapPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 

src/main/java/run/halo/sitemap/SitemapPlugin.java

@@ -3,47 +3,43 @@
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
 import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
+import reactor.core.Exceptions;
 import run.halo.app.infra.ExternalUrlSupplier;
-import run.halo.app.infra.utils.JsonUtils;
-import run.halo.app.plugin.SettingFetcher;
 
 @Component
 @AllArgsConstructor
 public class SitemapPluginConfig {
-    private final ExternalUrlSupplier externalUrlSupplier;
 
-    @Bean
-    public SitemapGeneratorOptions sitemapGeneratorOptions()
-        throws MalformedURLException {
-        URI siteUri = externalUrlSupplier.get();
-        return SitemapGeneratorOptions.builder()
-            .siteUrl(siteUri.toURL())
-            .build();
-    }
+    private final ExternalUrlSupplier externalUrlSupplier;
 
     @Bean
-    RouterFunction<ServerResponse> sitemapRouterFunction(
-        CachedSitemapGetter cachedSitemapGetter) {
+    RouterFunction<ServerResponse> sitemapRouterFunction(CachedSitemapGetter cachedSitemapGetter) {
         return RouterFunctions.route(GET("/sitemap.xml")
-            .and(accept(MediaType.TEXT_XML)), request -> cachedSitemapGetter.get()
-            .flatMap(sitemap -> ServerResponse.ok()
-                .contentType(MediaType.TEXT_XML).bodyValue(sitemap))
+                .and(accept(MediaType.TEXT_XML)), request -> {
+                var uri = externalUrlSupplier.get();
+                if (!uri.isAbsolute()) {
+                    uri = request.exchange().getRequest().getURI().resolve(uri);
+                }
+                SitemapGeneratorOptions options;
+                try {
+                    options = SitemapGeneratorOptions.builder()
+                        .siteUrl(uri.toURL())
+                        .build();
+                } catch (MalformedURLException e) {
+                    throw Exceptions.propagate(e);
+                }
+                return cachedSitemapGetter.get(options)
+                    .flatMap(sitemap -> ServerResponse.ok()
+                        .contentType(MediaType.TEXT_XML).bodyValue(sitemap));
+            }
         );
     }
 }

src/main/java/run/halo/sitemap/SitemapPluginConfig.java

@@ -1,10 +1,15 @@
 package run.halo.sitemap;
 
-import static org.mockito.Mockito.times;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.concurrent.CountDownLatch;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,22 +25,30 @@ public class CachedSitemapGetterTest {
 
     @BeforeEach
     void setUp() {
-        when(lister.list()).thenReturn(
+        when(lister.list(any())).thenReturn(
             Flux.just(SitemapEntry.builder().loc("http://localhost:8090/about").build()));
         getter = new CachedSitemapGetter(lister);
     }
 
     @Test
-    void get() throws InterruptedException {
-        CountDownLatch countDownLatch = new CountDownLatch(10);
-
-        for (int i = 0; i < countDownLatch.getCount(); i++) {
-            new Thread(() -> {
-                getter.get().block();
-                countDownLatch.countDown();
-            }).start();
+    void get() throws InterruptedException, ExecutionException {
+        var options = mock(SitemapGeneratorOptions.class);
+
+        getter.get(options).block();
+        verify(lister).list(options);
+
+        var executorService = Executors.newCachedThreadPool();
+
+        List<? extends Future<?>> futures = IntStream.range(0, 10)
+            .mapToObj(i -> executorService.submit(() -> {
+                getter.get(options).block();
+            }))
+            .toList();
+
+        for (Future<?> future : futures) {
+            future.get();
         }
-        countDownLatch.await();
-        verify(lister, times(1)).list();
+
+        verify(lister).list(options);
     }
 }