add new e2e test env for events endpoints

tests/bun/Makefile

@@ -1,5 +1,5 @@
 .PHONY: all
-all: all/default all/trusted-proxy all/untrusted-proxy
+all: all/default all/events all/trusted-proxy all/untrusted-proxy
 	@true
 
 all/%: start/% test/% clean/%

tests/bun/default/index.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'bun:test'
-import { PRISME_URL } from './utils'
+import { PRISME_URL } from '../const'
 
 test('anonymous request is redirected to /sign_in', async () => {
   const response = await fetch(PRISME_URL, {

tests/bun/default/prisme.env

@@ -1,7 +1,6 @@
 export PRISME_POSTGRES_URL='postgres://postgres:[email protected]:5432/prisme?sslmode=disable'
 
 export PRISME_CLICKHOUSE_HOSTPORT='clickhouse.localhost:9000'
-export PRISME_CLICKHOUSE_DB="prisme"
 export PRISME_CLICKHOUSE_USER="clickhouse"
 export PRISME_CLICKHOUSE_PASSWORD="password"
 

tests/bun/events/Makefile

@@ -0,0 +1,29 @@
+repository_root := $(shell git rev-parse --show-toplevel)
+export repository_root := $(or $(repository_root), $(CURDIR))
+include $(repository_root)/variables.mk
+
+export COMPOSE_PROJECT_NAME := prisme-bun-events
+
+.PHONY: start
+start:
+	source $(CURDIR)/prisme.env && \
+	$(DOCKER_COMPOSE) \
+		-f $(repository_root)/docker-compose.yml \
+		-f ./docker-compose.env.yml \
+		up --wait -d
+
+.PHONY: test
+test:
+	$(DOCKER_COMPOSE) \
+		-f ./docker-compose.test.yml \
+		up \
+		--abort-on-container-exit \
+		--exit-code-from bun
+
+.PHONY: clean
+clean:
+	$(DOCKER_COMPOSE) \
+		-f $(repository_root)/docker-compose.yml \
+		-f ./docker-compose.env.yml \
+		-f ./docker-compose.test.yml \
+		down --volumes --remove-orphans

tests/bun/events/docker-compose.env.yml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  prisme:
+    image: prismelabs/analytics:dev
+    env_file: $PWD/prisme.env
+    networks:
+      default:
+        aliases:
+          - prisme.localhost
+

tests/bun/events/docker-compose.test.yml

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  bun:
+    image: docker.io/oven/bun
+    command: sh -c "bun install && cd ./events && exec bun test"
+    working_dir: /data
+    volumes:
+      - ..:/data

tests/bun/default/events_pageviews.test.ts → tests/bun/events/events_pageviews.test.ts

@@ -1,7 +1,13 @@
 import { expect, test } from 'bun:test'
+import { faker } from '@faker-js/faker'
+
 import { createClient } from '@clickhouse/client-web'
 import { PRISME_PAGEVIEWS_URL, TIMESTAMP_REGEX } from '../const'
 
+const seed = new Date().getTime()
+console.log('faker seed', seed)
+faker.seed(seed)
+
 test('GET request instead of POST request', async () => {
   const response = await fetch(PRISME_PAGEVIEWS_URL)
   expect(response.status).toBe(404)
@@ -11,6 +17,7 @@ test('invalid URL in X-Prisme-Referrer header', async () => {
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       'X-Prisme-Referrer': 'not an url'
     }
   })
@@ -21,6 +28,7 @@ test('invalid URL in Referer header', async () => {
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       Referer: 'not an url'
     }
   })
@@ -31,6 +39,7 @@ test('non registered domain in X-Prisme-Referrer header is rejected', async () =
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       'X-Prisme-Referrer': 'https://example.com/foo?bar=baz#qux'
     }
   })
@@ -41,6 +50,7 @@ test('non registered domain in Referer header is rejected', async () => {
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       Referer: 'https://example.com/foo?bar=baz#qux'
     }
   })
@@ -51,6 +61,7 @@ test('valid URL with registered domain in X-Prisme-Referrer header is accepted',
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       'X-Prisme-Referrer': 'http://mywebsite.localhost/foo?bar=baz#qux'
     }
   })
@@ -85,6 +96,7 @@ test('valid URL with registered domain in Referer header is accepted', async ()
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       Referer: 'http://foo.mywebsite.localhost/another/foo?bar=baz#qux'
     }
   })
@@ -119,6 +131,7 @@ test('valid pageview with Windows + Chrome user agent', async () => {
   const response = await fetch(PRISME_PAGEVIEWS_URL, {
     method: 'POST',
     headers: {
+      'X-Forwarded-For': faker.internet.ip(),
       Referer: 'http://foo.mywebsite.localhost/another/foo?bar=baz#qux',
       'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.3'
     }

tests/bun/events/prisme.env

@@ -0,0 +1,12 @@
+export PRISME_POSTGRES_URL='postgres://postgres:[email protected]:5432/prisme?sslmode=disable'
+
+export PRISME_CLICKHOUSE_HOSTPORT='clickhouse.localhost:9000'
+export PRISME_CLICKHOUSE_USER="clickhouse"
+export PRISME_CLICKHOUSE_PASSWORD="password"
+
+export PRISME_SOURCE_REGISTRY_SOURCES="mywebsite.localhost,foo.mywebsite.localhost"
+
+export PRISME_EVENTSTORE_MAX_BATCH_SIZE="1"
+
+# Trust proxy so we can change rate limited IP address using X-Forwarded-For
+export PRISME_TRUST_PROXY="true"