feat: clean up loading

Author: izadoesdev

apps/basket/src/routes/observability.ts

@@ -97,7 +97,7 @@ async function insertObservabilityEvent(
 }
 
 const app = new Elysia()
-	.post('/', async ({ body }: { body: ObservabilityEvent }) => {
+	.post('/track', async ({ body }: { body: ObservabilityEvent }) => {
 		const parseResult = observabilityEventSchema.safeParse(body);
 		if (!parseResult.success) {
 			logger.error('Invalid observability event schema', {
@@ -125,7 +125,7 @@ const app = new Elysia()
 			};
 		}
 	})
-	.post('/batch', async ({ body }: { body: ObservabilityEvent[] }) => {
+	.post('/track/batch', async ({ body }: { body: ObservabilityEvent[] }) => {
 		if (!Array.isArray(body)) {
 			return {
 				status: 'error',

apps/basket/src/utils/validation.ts

@@ -33,6 +33,7 @@ export const VALIDATION_LIMITS = {
 	TIMEZONE_MAX_LENGTH: 64,
 	PATH_MAX_LENGTH: 2048,
 	TEXT_MAX_LENGTH: 2048,
+	EVENT_ID_MAX_LENGTH: 512,
 } as const;
 
 export const SAFE_HEADERS = new Set([

apps/dashboard/public/databuddy.js

@@ -483,6 +483,52 @@
 				finalProperties = { value: properties };
 			}
 
+			const customEvent = {
+				type: 'custom',
+				eventId: generateUUIDv4(),
+				name: eventName,
+				anonymousId: this.anonymousId,
+				sessionId: this.sessionId,
+				timestamp: Date.now(),
+				properties: finalProperties,
+			};
+
+			if (this.options.enableBatching) {
+				return this.send(customEvent);
+			}
+
+			try {
+				const beaconResult = await this.sendBeacon(customEvent);
+				if (beaconResult) {
+					return beaconResult;
+				}
+			} catch (_e) {}
+
+			return this.send(customEvent);
+		}
+
+		async _trackSystemEvent(eventName, properties) {
+			if (this.options.disabled || this.isLikelyBot) {
+				return;
+			}
+
+			if (this.options.samplingRate < 1.0) {
+				const samplingValue = Math.random();
+
+				if (samplingValue > this.options.samplingRate) {
+					return { sampled: false };
+				}
+			}
+
+			let finalProperties;
+			if (properties === undefined || properties === null) {
+				finalProperties = {};
+			} else if (typeof properties === 'object') {
+				finalProperties = properties;
+			} else {
+				finalProperties = { value: properties };
+			}
+
 			// Collect base context data
 			const baseContext = this.getBaseContext();
 
@@ -970,44 +1016,6 @@
 			};
 		}
 
-		trackCustomEvent(eventName, properties = {}) {
-			if (this.isServer()) {
-				return;
-			}
-
-			let finalProperties;
-			if (properties === undefined || properties === null) {
-				finalProperties = {};
-			} else if (typeof properties === 'object') {
-				finalProperties = properties;
-			} else {
-				finalProperties = { value: properties };
-			}
-
-			const customEvent = {
-				type: 'custom',
-				eventId: generateUUIDv4(),
-				name: eventName,
-				anonymousId: this.anonymousId,
-				sessionId: this.sessionId,
-				timestamp: Date.now(),
-				properties: finalProperties,
-			};
-
-			if (this.options.enableBatching) {
-				return this.send(customEvent);
-			}
-
-			try {
-				const beaconResult = this.sendBeacon(customEvent);
-				if (beaconResult) {
-					return beaconResult;
-				}
-			} catch (_e) {}
-
-			return this.send(customEvent);
-		}
-
 		async trackOutgoingLink(linkData) {
 			if (this.isServer()) {
 				return;
@@ -1373,7 +1381,7 @@
 					...(n ?? {}),
 				};
 
-				this.track('screen_view', pageData);
+				this._trackSystemEvent('screen_view', pageData);
 			}
 		}
 	};
@@ -1398,7 +1406,7 @@
 					clear: () => {},
 					flush: () => {},
 					setGlobalProperties: () => {},
-					trackCustomEvent: () => {},
+
 					trackOutgoingLink: () => {},
 					options: { disabled: true },
 				};
@@ -1409,7 +1417,7 @@
 					clear: () => {},
 					flush: () => {},
 					setGlobalProperties: () => {},
-					trackCustomEvent: () => {},
+
 					trackOutgoingLink: () => {},
 				};
 
@@ -1562,14 +1570,13 @@
 			});
 
 			window.db = {
-				track: (...args) => window.databuddy?.trackCustomEvent(...args),
+				track: (...args) => window.databuddy?.track(...args),
 				screenView: (...args) => window.databuddy?.screenView(...args),
 				clear: () => window.databuddy?.clear(),
 				flush: () => window.databuddy?.flush(),
 				setGlobalProperties: (...args) =>
 					window.databuddy?.setGlobalProperties(...args),
-				trackCustomEvent: (...args) =>
-					window.databuddy?.trackCustomEvent(...args),
+
 				trackOutgoingLink: (...args) =>
 					window.databuddy?.trackOutgoingLink(...args),
 			};
@@ -1608,7 +1615,6 @@
 				const noop = () => {};
 				window.databuddy.track = noop;
 				window.databuddy.screenView = noop;
-				window.databuddy.trackCustomEvent = noop;
 				window.databuddy.trackOutgoingLink = noop;
 				window.databuddy.clear = noop;
 				window.databuddy.flush = noop;
@@ -1619,7 +1625,6 @@
 				const noop = () => {};
 				window.db.track = noop;
 				window.db.screenView = noop;
-				window.db.trackCustomEvent = noop;
 				window.db.trackOutgoingLink = noop;
 				window.db.clear = noop;
 				window.db.flush = noop;