diff --git a/code/functions/live-capture/java/nu/marginalia/livecapture/BrowserlessClient.java b/code/functions/live-capture/java/nu/marginalia/livecapture/BrowserlessClient.java index 0e48f0bf..ae27cf65 100644 --- a/code/functions/live-capture/java/nu/marginalia/livecapture/BrowserlessClient.java +++ b/code/functions/live-capture/java/nu/marginalia/livecapture/BrowserlessClient.java @@ -15,7 +15,9 @@ import java.util.Map; /** Client for local browserless.io API */ public class BrowserlessClient implements AutoCloseable { + private static final Logger logger = LoggerFactory.getLogger(BrowserlessClient.class); + private static final String BROWSERLESS_TOKEN = System.getProperty("live-capture.browserless-token", "BROWSERLESS_TOKEN"); private final HttpClient httpClient = HttpClient.newBuilder() .version(HttpClient.Version.HTTP_1_1) @@ -36,7 +38,7 @@ public class BrowserlessClient implements AutoCloseable { ); var request = HttpRequest.newBuilder() - .uri(browserlessURI.resolve("/content")) + .uri(browserlessURI.resolve("/content?token="+BROWSERLESS_TOKEN)) .method("POST", HttpRequest.BodyPublishers.ofString( gson.toJson(requestData) )) @@ -63,7 +65,7 @@ public class BrowserlessClient implements AutoCloseable { ); var request = HttpRequest.newBuilder() - .uri(browserlessURI.resolve("/screenshot")) + .uri(browserlessURI.resolve("/screenshot?token="+BROWSERLESS_TOKEN)) .method("POST", HttpRequest.BodyPublishers.ofString( gson.toJson(requestData) )) diff --git a/code/functions/live-capture/test/nu/marginalia/livecapture/BrowserlessClientTest.java b/code/functions/live-capture/test/nu/marginalia/livecapture/BrowserlessClientTest.java index f2db0a02..f6e0f13c 100644 --- a/code/functions/live-capture/test/nu/marginalia/livecapture/BrowserlessClientTest.java +++ b/code/functions/live-capture/test/nu/marginalia/livecapture/BrowserlessClientTest.java @@ -2,16 +2,21 @@ package nu.marginalia.livecapture; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; import java.net.URI; +import java.util.Map; @Testcontainers +@Tag("slow") public class BrowserlessClientTest { - static GenericContainer container = new GenericContainer<>(DockerImageName.parse("browserless/chrome")).withExposedPorts(3000); + static GenericContainer container = new GenericContainer<>(DockerImageName.parse("browserless/chrome")) + .withEnv(Map.of("TOKEN", "BROWSERLESS_TOKEN")) + .withExposedPorts(3000); @BeforeAll public static void setup() {