Expand e2e tests and move them to separate JSON files

.github/workflows/deploy.yml

@@ -14,6 +14,9 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '>=22'
     - run: make
     - uses: actions/upload-pages-artifact@v3
       with:

.github/workflows/test-typescript.yml

@@ -22,6 +22,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
+        with:
+          node-version: '>=22'
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test

impl/e2e-tests/CONFIG.json

@@ -0,0 +1,13 @@
+{
+  "aggregationServices": {
+    "https://agg-service.example": "dap-15-histogram"
+  },
+  "maxConversionSitesPerImpression": 3,
+  "maxConversionCallersPerImpression": 3,
+  "maxCreditSize": 10,
+  "maxLifetimeDays": 30,
+  "maxLookbackDays": 60,
+  "maxHistogramSize": 5,
+  "privacyBudgetMicroEpsilons": 1000000,
+  "privacyBudgetEpochDays": 7
+}

impl/e2e-tests/basic.json

@@ -0,0 +1,28 @@
+{
+  "events": [
+    {
+      "seconds": 1,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": { "histogramIndex": 0 }
+    },
+    {
+      "seconds": 2,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": { "histogramIndex": 1 }
+    },
+    {
+      "seconds": 3,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 3,
+        "value": 5,
+        "maxValue": 10
+      },
+      "expected": [0, 5, 0]
+    }
+  ]
+}

impl/e2e-tests/measure-conversion-errors.json

@@ -0,0 +1,153 @@
+{
+  "events": [
+    {
+      "seconds": 1,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://invalid.example",
+        "histogramSize": 1
+      },
+      "expected": "ReferenceError"
+    },
+    {
+      "seconds": 2,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "epsilon": 0,
+        "histogramSize": 1
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 3,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "epsilon": -1,
+        "histogramSize": 1
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 4,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 0
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 5,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "$comment": "Greater than CONFIG.maxHistogramSize",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 6
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 6,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "value": 0
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 7,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "value": 2,
+        "maxValue": 1
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 8,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "logicOptions": { "credit": [] }
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 9,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "logicOptions": { "credit": [0] }
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 10,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "$comment": "Greater than CONFIG.maxCreditSize",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "logicOptions": { "credit": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] }
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 11,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "lookbackDays": 0
+      },
+      "expected": "RangeError"
+    },
+    {
+      "seconds": 12,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "impressionSites": ["a"]
+      },
+      "expected": {
+        "error": "DOMException",
+        "name": "SyntaxError"
+      }
+    },
+    {
+      "seconds": 13,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 1,
+        "impressionCallers": ["a"]
+      },
+      "expected": {
+        "error": "DOMException",
+        "name": "SyntaxError"
+      }
+    }
+  ]
+}

impl/e2e-tests/save-impression-errors.json

@@ -0,0 +1,88 @@
+{
+  "events": [
+    {
+      "seconds": 1,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": { "histogramIndex": -1 },
+      "expectedError": "RangeError"
+    },
+    {
+      "seconds": 2,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "$comment": "Equal to CONFIG.maxHistogramSize",
+      "options": { "histogramIndex": 5 },
+      "expectedError": "RangeError"
+    },
+    {
+      "seconds": 3,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": {
+        "histogramIndex": 0,
+        "lifetimeDays": 0
+      },
+      "expectedError": "RangeError"
+    },
+    {
+      "seconds": 4,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": {
+        "histogramIndex": 0,
+        "conversionSites": ["a"]
+      },
+      "expectedError": {
+        "error": "DOMException",
+        "name": "SyntaxError"
+      }
+    },
+    {
+      "seconds": 5,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "$comment": "Greater than CONFIG.maxConversionSitesPerImpression",
+      "options": {
+        "histogramIndex": 0,
+        "conversionSites": ["a", "a", "a", "a"]
+      },
+      "expectedError": "RangeError"
+    },
+    {
+      "seconds": 6,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": {
+        "histogramIndex": 0,
+        "conversionCallers": ["a"]
+      },
+      "expectedError": {
+        "error": "DOMException",
+        "name": "SyntaxError"
+      }
+    },
+    {
+      "seconds": 7,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "$comment": "Greater than CONFIG.maxConversionCallersPerImpression",
+      "options": {
+        "histogramIndex": 0,
+        "conversionCallers": ["a", "a", "a", "a"]
+      },
+      "expectedError": "RangeError"
+    },
+    {
+      "seconds": 8,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 5
+      },
+      "$comment": "check that no impression was stored",
+      "expected": [0, 0, 0, 0, 0]
+    }
+  ]
+}

impl/e2e-tests/simulate-multiple-buckets.json

@@ -0,0 +1,54 @@
+{
+  "events": [
+    {
+      "seconds": 1,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "$comment": "100 will be used for campaign queries",
+      "options": { "histogramIndex": 0, "matchValue": 100 }
+    },
+    {
+      "seconds": 2,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "$comment": "200 will be used for geo queries",
+      "options": { "histogramIndex": 1, "matchValue": 200 }
+    },
+    {
+      "seconds": 3,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": { "histogramIndex": 2, "matchValue": 100 }
+    },
+    {
+      "seconds": 4,
+      "site": "publisher.example",
+      "event": "saveImpression",
+      "options": { "histogramIndex": 3, "matchValue": 200 }
+    },
+    {
+      "seconds": 5,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 4,
+        "matchValues": [100],
+        "epsilon": 0.5
+      },
+      "expected": [0, 0, 1, 0]
+    },
+    {
+      "seconds": 6,
+      "site": "advertiser.example",
+      "event": "measureConversion",
+      "options": {
+        "aggregationService": "https://agg-service.example",
+        "histogramSize": 5,
+        "matchValues": [200],
+        "epsilon": 0.5
+      },
+      "expected": [0, 0, 0, 1, 0]
+    }
+  ]
+}

impl/src/backend.ts

@@ -140,7 +140,11 @@ export class Backend {
 
     const timestamp = this.#delegate.now();
 
-    if (histogramIndex < 0 || !Number.isInteger(histogramIndex)) {
+    if (
+      histogramIndex < 0 ||
+      histogramIndex >= this.#delegate.maxHistogramSize ||
+      !Number.isInteger(histogramIndex)
+    ) {
       throw new RangeError("histogramIndex must be a non-negative integer");
     }