@reservamos/browser-analytics 1.1.7-alpha.1 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reservamos/browser-analytics",
-  "version": "1.1.7-alpha.1",
+  "version": "1.1.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/reservamos/reservamos-browser-analytics.git"
@@ -74,6 +74,7 @@
   "devDependencies": {
     "@eslint/js": "^9.9.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
+    "@reservamos/js-api-client": "6.28.0",
     "@types/eslint__js": "^8.42.3",
     "@types/jsdom": "^21.1.6",
     "@types/mixpanel-browser": "^2.50.0",
@@ -93,7 +94,6 @@
     "typescript-eslint": "^8.4.0",
     "upgradeps": "^2.0.6",
     "vite": "^5.0.12",
-    "vitest": "^1.2.1",
-    "@reservamos/js-api-client": "6.0.1"
+    "vitest": "^1.2.1"
   }
 }

package/src/services/botDetectionRelay.test.ts

@@ -1,13 +1,7 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import configService from '@/services/config';
+import coreApi from '@reservamos/js-api-client/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import botDetectionRelayService from './botDetectionRelay';
 
-vi.mock('@/services/config', () => ({
-  default: {
-    getCoreAPIConfig: vi.fn(),
-  },
-}));
-
 const payload = {
   requestId: 'request-123',
   visitorId: 'visitor-123',
@@ -27,7 +21,13 @@ const coreApiConfig = {
 describe('botDetectionRelayService', () => {
   beforeEach(() => {
     vi.unstubAllGlobals();
-    vi.mocked(configService.getCoreAPIConfig).mockReturnValue(coreApiConfig);
+    coreApi.setConfig(coreApiConfig);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+    vi.restoreAllMocks();
   });
 
   it('enables only the SDK-owned Bot Detection events', () => {
@@ -42,8 +42,8 @@ describe('botDetectionRelayService', () => {
     ).toBe(false);
   });
 
-  it('posts the payload to the Core API fingerprint path with keepalive', async () => {
-    const fetchMock = vi.fn().mockResolvedValue({ ok: true });
+  it('sends an observation through the configured client', async () => {
+    const fetchMock = vi.fn().mockResolvedValue({ ok: true, status: 202 });
     vi.stubGlobal('fetch', fetchMock);
 
     await botDetectionRelayService.relay(payload);
@@ -55,32 +55,37 @@ describe('botDetectionRelayService', () => {
         headers: {
           'Content-Type': 'application/json',
           'x-app-name': 'reservamos-web',
+          'Authorization': 'Bearer test-token',
         },
-        body: JSON.stringify(payload),
-        keepalive: true,
+        body: JSON.stringify({
+          requestId: payload.requestId,
+          visitorId: payload.visitorId,
+          distinctId: payload.distinctId,
+          eventName: 'Fingerprint Requested',
+        }),
+        signal: expect.any(AbortSignal),
       },
     );
   });
 
-  it('omits x-app-name when it is not in the core API config', async () => {
-    const fetchMock = vi.fn().mockResolvedValue({ ok: true });
+  it('omits distinctId when unavailable', async () => {
+    const fetchMock = vi.fn().mockResolvedValue({ ok: true, status: 202 });
     vi.stubGlobal('fetch', fetchMock);
-    vi.mocked(configService.getCoreAPIConfig).mockReturnValue({
-      baseUrl: 'https://datalake-api-dev.reservamossaas.com/api',
-      defaultHeaders: {
-        Authorization: 'Bearer test-token',
-        Origin: 'https://example.com',
-      },
-    });
 
-    await botDetectionRelayService.relay(payload);
+    await botDetectionRelayService.relay({
+      requestId: payload.requestId,
+      visitorId: payload.visitorId,
+      eventName: 'Search',
+    });
 
     expect(fetchMock).toHaveBeenCalledWith(
-      'https://datalake-api-dev.reservamossaas.com/api/v1/fingerprint/bot-detection',
+      expect.any(String),
       expect.objectContaining({
-        headers: {
-          'Content-Type': 'application/json',
-        },
+        body: JSON.stringify({
+          requestId: payload.requestId,
+          visitorId: payload.visitorId,
+          eventName: 'Fingerprint Requested',
+        }),
       }),
     );
   });
@@ -97,7 +102,7 @@ describe('botDetectionRelayService', () => {
     ).resolves.toBeUndefined();
     expect(consoleError).toHaveBeenCalledWith(
       'Error relaying Fingerprint identification:',
-      error,
+      { httpStatus: null, reason: 'network_or_cors' },
     );
 
     consoleError.mockRestore();
@@ -117,11 +122,33 @@ describe('botDetectionRelayService', () => {
     ).resolves.toBeUndefined();
     expect(consoleError).toHaveBeenCalledWith(
       'Error relaying Fingerprint identification:',
-      expect.objectContaining({
-        message: 'Bot Detection relay failed with status 503',
-      }),
+      { httpStatus: 503, reason: 'service_unavailable' },
     );
 
     consoleError.mockRestore();
   });
+
+  it('contains client timeouts and reports a sanitized diagnostic', async () => {
+    vi.useFakeTimers();
+    const consoleError = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined);
+    const fetchMock = vi.fn(
+      (_url: string, { signal }: { signal: AbortSignal }) =>
+        new Promise<Response>((_resolve, reject) => {
+          signal.addEventListener('abort', () => reject(new Error('Aborted')));
+        }),
+    );
+    vi.stubGlobal('fetch', fetchMock);
+
+    const attempt = botDetectionRelayService.relay(payload);
+    await vi.advanceTimersByTimeAsync(5000);
+
+    await expect(attempt).resolves.toBeUndefined();
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(consoleError).toHaveBeenCalledWith(
+      'Error relaying Fingerprint identification:',
+      { httpStatus: null, reason: 'timeout' },
+    );
+  });
 });

package/src/services/botDetectionRelay.ts

@@ -1,7 +1,5 @@
 import type { BotDetectionRelayPayload } from '@/types/botDetection';
-import configService from '@/services/config';
-
-const BOT_DETECTION_RELAY_PATH = '/v1/fingerprint/bot-detection';
+import coreApi from '@reservamos/js-api-client/core';
 
 /**
  * Events that require a fresh Fingerprint identification and Core API relay.
@@ -30,27 +28,19 @@ function isEnabledFor(eventName: string): boolean {
  */
 async function relay(payload: BotDetectionRelayPayload): Promise<void> {
   try {
-    const coreApiConfig = configService.getCoreAPIConfig();
-    const response = await fetch(
-      `${coreApiConfig.baseUrl}${BOT_DETECTION_RELAY_PATH}`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          ...(coreApiConfig.defaultHeaders?.['x-app-name']
-            ? { 'x-app-name': coreApiConfig.defaultHeaders['x-app-name'] }
-            : {}),
-        },
-        body: JSON.stringify(payload),
-        keepalive: true,
+    await coreApi.fingerprint.sendObservation({
+      requestId: payload.requestId,
+      visitorId: payload.visitorId,
+      distinctId: payload.distinctId,
+      onDiagnostic(diagnostic) {
+        if (diagnostic.reason !== 'http_accepted') {
+          console.error(
+            'Error relaying Fingerprint identification:',
+            diagnostic,
+          );
+        }
       },
-    );
-
-    if (!response.ok) {
-      throw new Error(
-        `Bot Detection relay failed with status ${response.status}`,
-      );
-    }
+    });
   } catch (error) {
     console.error('Error relaying Fingerprint identification:', error);
   }