@teardown/react-native 2.0.33 → 2.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@teardown/react-native",
-	"version": "2.0.33",
+	"version": "2.0.34",
 	"type": "module",
 	"private": false,
 	"publishConfig": {
@@ -52,9 +52,9 @@
 		"prepublishOnly": "bun run build"
 	},
 	"dependencies": {
-		"@teardown/ingest-api": "2.0.33",
-		"@teardown/schemas": "2.0.33",
-		"@teardown/types": "2.0.33",
+		"@teardown/ingest-api": "2.0.34",
+		"@teardown/schemas": "2.0.34",
+		"@teardown/types": "2.0.34",
 		"eventemitter3": "^5.0.1",
 		"react-native-get-random-values": "^2.0.0",
 		"uuid": "^13.0.0",
@@ -62,9 +62,8 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.3.10",
-		"@elysiajs/eden": "1.4.5",
 		"@react-native-firebase/messaging": "*",
-		"@teardown/tsconfig": "2.0.33",
+		"@teardown/tsconfig": "2.0.34",
 		"@types/bun": "1.3.5",
 		"@types/react": "~19.1.0",
 		"@types/uuid": "^11.0.0",

package/src/clients/api/api.client.ts

@@ -1,9 +1,8 @@
-import type * as Eden from "@elysiajs/eden";
-import * as IngestApi from "@teardown/ingest-api";
+import { createIngestClient, type Endpoints, type IngestClient, type RequestOptions } from "@teardown/ingest-api";
 import type { LoggingClient } from "../logging";
 import type { StorageClient } from "../storage";
 
-export type { Eden, IngestApi };
+export type { IngestClient, Endpoints, RequestOptions };
 
 const TEARDOWN_INGEST_URL = "https://ingest.teardown.dev";
 const TEARDOWN_API_KEY_HEADER = "td-api-key";
@@ -11,7 +10,7 @@ const TEARDOWN_ORG_ID_HEADER = "td-org-id";
 const TEARDOWN_PROJECT_ID_HEADER = "td-project-id";
 const TEARDOWN_ENVIRONMENT_SLUG_HEADER = "td-environment-slug";
 
-export type ApiClientOptions = {
+export interface ApiClientOptions {
 	/**
 	 * The API key.
 	 */
@@ -30,29 +29,23 @@ export type ApiClientOptions = {
 	 * @default "production"
 	 */
 	environment_slug?: string | null;
-	/**
-	 * A function that will be called before each request.
-	 * @param endpoint The endpoint being requested.
-	 * @param options The options for the request.
-	 * @returns The options for the request.
-	 */
-	onRequest?: (endpoint: IngestApi.Endpoints, options: IngestApi.RequestOptions) => Promise<IngestApi.RequestOptions>;
 	/**
 	 * The URL of the ingest API.
 	 * @default https://ingest.teardown.dev
 	 */
 	ingestUrl?: string;
-};
+}
 
 export class ApiClient {
-	public client: IngestApi.Client;
+	public client: IngestClient;
 
 	constructor(
 		_logging: LoggingClient,
 		_storage: StorageClient,
 		private readonly options: ApiClientOptions
 	) {
-		this.client = IngestApi.client(options.ingestUrl ?? TEARDOWN_INGEST_URL, {
+		this.client = createIngestClient({
+			baseUrl: options.ingestUrl ?? TEARDOWN_INGEST_URL,
 			headers: {
 				[TEARDOWN_API_KEY_HEADER]: `Bearer ${this.apiKey}`,
 				[TEARDOWN_ORG_ID_HEADER]: this.orgId,

package/src/clients/events/events.client.ts

@@ -64,28 +64,29 @@ export class EventsClient {
 		try {
 			const deviceId = await this.device.getDeviceId();
 
-			const response = await this.api.client("/v1/events", {
-				method: "POST",
-				headers: {
-					"td-api-key": this.api.apiKey,
-					"td-org-id": this.api.orgId,
-					"td-project-id": this.api.projectId,
-					"td-environment-slug": this.api.environmentSlug,
-					"td-device-id": deviceId,
-					...(sessionId ? { "td-session-id": sessionId } : {}),
+			const { error } = await this.api.client.POST("/v1/events", {
+				params: {
+					header: {
+						"td-api-key": this.api.apiKey,
+						"td-org-id": this.api.orgId,
+						"td-project-id": this.api.projectId,
+						"td-environment-slug": this.api.environmentSlug,
+						"td-device-id": deviceId,
+						...(sessionId ? { "td-session-id": sessionId } : {}),
+					},
 				},
 				body: {
 					events: events.map((event) => ({
 						event_name: event.event_name,
 						event_type: event.event_type ?? "custom",
-						properties: event.properties,
+						properties: event.properties as Record<string, unknown>,
 						timestamp: event.timestamp ?? new Date().toISOString(),
 					})),
 				},
 			});
 
-			if (response.error != null) {
-				this.logger.warn("Failed to track events", { error: response.error });
+			if (error) {
+				this.logger.warn("Failed to track events", { error });
 				return { success: false, error: "Failed to track events" };
 			}
 

package/src/clients/identity/identity.client.test.ts

@@ -61,19 +61,19 @@ function createMockUtilsClient() {
 function createMockDeviceClient(
 	overrides: Partial<{
 		deviceId: string;
-		timestamp: string;
+		timestamp: Date;
 		application: { name: string; version: string; build: string; bundle_id: string };
 		hardware: { brand: string; model: string; device_type: string };
-		os: { name: string; version: string };
+		os: { name: string; version: string; platform: string };
 		notifications: { push_token: string | null; platform: string | null };
 		update: null;
 	}> = {}
 ) {
 	const defaultDeviceInfo = {
-		timestamp: new Date().toISOString(),
+		timestamp: new Date(),
 		application: { name: "TestApp", version: "1.0.0", build: "100", bundle_id: "com.test.app" },
 		hardware: { brand: "Apple", model: "iPhone 15", device_type: "PHONE" },
-		os: { name: "iOS", version: "17.0" },
+		os: { name: "iOS", version: "17.0", platform: "iOS" },
 		notifications: { push_token: null, platform: null },
 		update: null,
 	};
@@ -84,15 +84,23 @@ function createMockDeviceClient(
 			...defaultDeviceInfo,
 			...overrides,
 		}),
+		reset: () => {},
+	};
+}
+
+function createMockEventsClient() {
+	return {
+		track: async () => ({ success: true, data: undefined }),
 	};
 }
 
 type ApiCallRecord = {
 	endpoint: string;
 	config: {
-		method: string;
-		headers: Record<string, string>;
-		body: unknown;
+		params?: {
+			header?: Record<string, string>;
+		};
+		body?: unknown;
 	};
 };
 
@@ -123,49 +131,59 @@ function createMockApiClient(
 
 	const calls: ApiCallRecord[] = [];
 
-	return {
-		apiKey: "test-api-key",
-		orgId: "test-org-id",
-		projectId: "test-project-id",
-		environmentSlug: "production",
-		client: async (endpoint: string, config: ApiCallRecord["config"]) => {
-			calls.push({ endpoint, config });
-
-			if (throwError) {
-				throw throwError;
-			}
+	const postHandler = async (endpoint: string, config: ApiCallRecord["config"]) => {
+		calls.push({ endpoint, config });
 
-			if (!success) {
-				return {
-					error: {
-						status: errorStatus ?? 500,
-						value: {
-							message: errorMessage ?? "API Error",
-							error: { message: errorMessage ?? "API Error" },
-						},
-					},
-					data: null,
-				};
-			}
+		if (throwError) {
+			throw throwError;
+		}
 
+		if (!success) {
 			return {
-				error: null,
-				data: {
-					data: {
-						session_id: sessionId,
-						device_id: deviceId,
-						user_id: user_id,
-						token: token,
-						version_info: { status: versionStatus },
-					},
+				error: {
+					message: errorMessage ?? "API Error",
+				},
+				data: null,
+				response: {
+					status: errorStatus ?? 500,
 				},
 			};
+		}
+
+		return {
+			error: null,
+			data: {
+				data: {
+					session_id: sessionId,
+					device_id: deviceId,
+					user_id: user_id,
+					token: token,
+					version_info: { status: versionStatus },
+				},
+			},
+			response: {
+				status: 200,
+			},
+		};
+	};
+
+	return {
+		apiKey: "test-api-key",
+		orgId: "test-org-id",
+		projectId: "test-project-id",
+		environmentSlug: "production",
+		client: {
+			POST: postHandler,
 		},
 		getCalls: () => calls,
 		getLastCall: () => calls[calls.length - 1],
 		clearCalls: () => {
 			calls.length = 0;
 		},
+		setPostHandler: (handler: typeof postHandler) => {
+			// @ts-expect-error - dynamic override
+			return handler as unknown as typeof postHandler;
+		},
 	};
 }
 
@@ -177,6 +195,7 @@ function createTestClient(
 		utils?: ReturnType<typeof createMockUtilsClient>;
 		api?: ReturnType<typeof createMockApiClient>;
 		device?: ReturnType<typeof createMockDeviceClient>;
+		events?: ReturnType<typeof createMockEventsClient>;
 	} = {}
 ) {
 	const mockLogging = overrides.logging ?? createMockLoggingClient();
@@ -184,13 +203,15 @@ function createTestClient(
 	const mockUtils = overrides.utils ?? createMockUtilsClient();
 	const mockApi = overrides.api ?? createMockApiClient();
 	const mockDevice = overrides.device ?? createMockDeviceClient();
+	const mockEvents = overrides.events ?? createMockEventsClient();
 
 	const client = new IdentityClient(
 		mockLogging as never,
 		mockUtils as never,
 		mockStorage as never,
 		mockApi as never,
-		mockDevice as never
+		mockDevice as never,
+		mockEvents as never
 	);
 
 	return {
@@ -200,6 +221,7 @@ function createTestClient(
 		mockUtils,
 		mockApi,
 		mockDevice,
+		mockEvents,
 	};
 }
 
@@ -425,12 +447,12 @@ describe("IdentityClient", () => {
 			const mockApi = createMockApiClient({ success: false, errorStatus: 422 });
 			// Override to return null message
 			// @ts-expect-error - message is not yet implemented
-			mockApi.client = async () => ({
-				error: {
+			mockApi.client.POST = async () => ({
+				error: {},
+				data: null,
+				response: {
 					status: 422,
-					value: { message: null, error: { message: null } },
 				},
-				data: null,
 			});
 
 			const { client } = createTestClient({ api: mockApi });
@@ -474,7 +496,7 @@ describe("IdentityClient", () => {
 
 		test("handles non-Error thrown exceptions", async () => {
 			const mockApi = createMockApiClient();
-			mockApi.client = async () => {
+			mockApi.client.POST = async () => {
 				throw "string error"; // Non-Error throw
 			};
 
@@ -542,7 +564,6 @@ describe("IdentityClient", () => {
 
 			const lastCall = mockApi.getLastCall();
 			expect(lastCall.endpoint).toBe("/v1/identify");
-			expect(lastCall.config.method).toBe("POST");
 		});
 
 		test("sends correct headers to API", async () => {
@@ -551,19 +572,20 @@ describe("IdentityClient", () => {
 			await client.identify();
 
 			const lastCall = mockApi.getLastCall();
-			expect(lastCall.config.headers["td-api-key"]).toBe("test-api-key");
-			expect(lastCall.config.headers["td-org-id"]).toBe("test-org-id");
-			expect(lastCall.config.headers["td-project-id"]).toBe("test-project-id");
-			expect(lastCall.config.headers["td-environment-slug"]).toBe("production");
-			expect(lastCall.config.headers["td-device-id"]).toBe("mock-device-id");
+			expect(lastCall.config.params?.header?.["td-api-key"]).toBe("test-api-key");
+			expect(lastCall.config.params?.header?.["td-org-id"]).toBe("test-org-id");
+			expect(lastCall.config.params?.header?.["td-project-id"]).toBe("test-project-id");
+			expect(lastCall.config.params?.header?.["td-environment-slug"]).toBe("production");
+			expect(lastCall.config.params?.header?.["td-device-id"]).toBe("mock-device-id");
 		});
 
 		test("sends device info in request body", async () => {
+			const mockTimestamp = new Date("2024-01-15T10:30:00.000Z");
 			const mockDevice = createMockDeviceClient({
 				deviceId: "custom-device-id",
-				timestamp: "2024-01-15T10:30:00.000Z",
+				timestamp: mockTimestamp,
 				application: { name: "MyApp", version: "2.0.0", build: "200", bundle_id: "com.my.app" },
-				os: { name: "Android", version: "14" },
+				os: { name: "Android", version: "14", platform: "Android" },
 				hardware: { brand: "Samsung", model: "Galaxy S24", device_type: "PHONE" },
 			});
 			const { client, mockApi } = createTestClient({ device: mockDevice });
@@ -576,7 +598,7 @@ describe("IdentityClient", () => {
 					device?: {
 						timestamp: string;
 						application: { name: string; version: string; build: string; bundle_id: string };
-						os: { name: string; version: string };
+						os: { name: string; version: string; platform: string };
 						hardware: { brand: string; model: string; device_type: string };
 						update: null;
 					};
@@ -756,7 +778,7 @@ describe("IdentityClient", () => {
 			await client.identify();
 
 			// Update mock to return new session
-			mockApi.client = async (_endpoint: string, _config: ApiCallRecord["config"]) => ({
+			mockApi.client.POST = async (_endpoint: string, _config: ApiCallRecord["config"]) => ({
 				error: null,
 				data: {
 					data: {
@@ -767,6 +789,9 @@ describe("IdentityClient", () => {
 						version_info: { status: IdentifyVersionStatusEnum.UP_TO_DATE },
 					},
 				},
+				response: {
+					status: 200,
+				},
 			});
 
 			const result = await client.refresh();
@@ -916,7 +941,7 @@ describe("IdentityClient", () => {
 			expect(client.getSessionState()?.session_id).toBe("first-session");
 
 			// Change what API returns
-			mockApi.client = async () => ({
+			mockApi.client.POST = async () => ({
 				error: null,
 				data: {
 					data: {
@@ -927,6 +952,9 @@ describe("IdentityClient", () => {
 						version_info: { status: IdentifyVersionStatusEnum.UP_TO_DATE },
 					},
 				},
+				response: {
+					status: 200,
+				},
 			});
 
 			await client.identify();
@@ -1027,7 +1055,7 @@ describe("IdentityClient", () => {
 				resolveApi = resolve;
 			});
 
-			mockApi.client = async () => {
+			mockApi.client.POST = async () => {
 				await apiPromise;
 				return {
 					error: null,
@@ -1040,6 +1068,9 @@ describe("IdentityClient", () => {
 							version_info: { status: IdentifyVersionStatusEnum.UP_TO_DATE },
 						},
 					},
+					response: {
+						status: 200,
+					},
 				};
 			};
 

package/src/clients/identity/identity.client.ts

@@ -440,7 +440,7 @@ export class IdentityClient {
 	/**
 	 * Flatten nested version_info structure from API response
 	 */
-	private flattenVersionInfo(rawVersionInfo: { status: string; update: unknown }): {
+	private flattenVersionInfo(rawVersionInfo: { status: string; update?: unknown }): {
 		status: IdentifyVersionStatusEnum;
 		update: UpdateInfo | null;
 	} {
@@ -471,43 +471,57 @@ export class IdentityClient {
 				const notificationsInfo = await this.getNotificationsInfo();
 
 				this.logger.debug("Calling identify API...");
-				const response = await this.api.client("/v1/identify", {
-					method: "POST",
-					headers: {
-						"td-api-key": this.api.apiKey,
-						"td-org-id": this.api.orgId,
-						"td-project-id": this.api.projectId,
-						"td-environment-slug": this.api.environmentSlug,
-						"td-device-id": deviceId,
+				const { data, error, response } = await this.api.client.POST("/v1/identify", {
+					params: {
+						header: {
+							"td-api-key": this.api.apiKey,
+							"td-org-id": this.api.orgId,
+							"td-project-id": this.api.projectId,
+							"td-environment-slug": this.api.environmentSlug,
+							"td-device-id": deviceId,
+						},
 					},
 					body: {
 						user,
 						device: {
-							timestamp: deviceInfo.timestamp,
-							os: deviceInfo.os,
+							timestamp: deviceInfo.timestamp?.toISOString(),
+							os: {
+								platform: deviceInfo.os.platform.toLowerCase() as "ios" | "android" | "web",
+								name: deviceInfo.os.name,
+								version: deviceInfo.os.version,
+							},
 							application: deviceInfo.application,
 							hardware: deviceInfo.hardware,
 							update: null,
-							notifications: notificationsInfo,
+							notifications: notificationsInfo
+								? {
+										push: {
+											enabled: notificationsInfo.push.enabled,
+											granted: notificationsInfo.push.granted,
+											token: notificationsInfo.push.token,
+											platform: notificationsInfo.push.platform.toLowerCase() as "fcm" | "apns" | "expo",
+										},
+									}
+								: undefined,
 						},
 					},
 				});
 
 				this.logger.info(`Identify API response received`);
-				if (response.error != null) {
-					this.logger.warn("Identify API error", response.error.status, response.error.value);
+				if (error) {
+					this.logger.warn("Identify API error", response.status, error);
 					this.setIdentifyState(previousState);
 
 					const errorMessage =
-						response.error.status === 422
-							? this.extractValidationErrorMessage(response.error.value)
-							: this.extractErrorMessage(response.error.value);
+						response.status === 422 ? this.extractValidationErrorMessage(error) : this.extractErrorMessage(error);
 
 					return { success: false, error: errorMessage };
 				}
 
-				const parsedSession = SessionSchema.parse(response.data.data);
-				const flattenedVersionInfo = this.flattenVersionInfo(response.data.data.version_info);
+				const parsedSession = SessionSchema.parse(data.data);
+				const flattenedVersionInfo = this.flattenVersionInfo(
+					data.data.version_info ?? { status: "up_to_date", update: null }
+				);
 
 				const identityUser: IdentityUser = {
 					...parsedSession,