save sdk name and version

.prettierignore

@@ -1 +1,2 @@
-*.mdx
+*.mdx
+*.sql

apps/api/src/controllers/event.controller.ts

@@ -7,6 +7,8 @@ import { eventsQueue } from '@openpanel/queue';
 import { getRedisCache } from '@openpanel/redis';
 import type { PostEventPayload } from '@openpanel/sdk';
 
+import { getStringHeaders } from './track.controller';
+
 export async function postEvent(
   request: FastifyRequest<{
     Body: PostEventPayload;
@@ -49,9 +51,7 @@ export async function postEvent(
     type: 'incomingEvent',
     payload: {
       projectId: request.projectId,
-      headers: {
+      headers: getStringHeaders(request.headers),
-        ua,
-      },
       event: {
         ...request.body,
         // Dont rely on the client for the timestamp

apps/api/src/controllers/import.controller.ts

@@ -26,9 +26,6 @@ export async function importEvents(
       table: TABLE_NAMES.events,
       values,
       format: 'JSONEachRow',
-      clickhouse_settings: {
-        date_time_input_format: 'best_effort',
-      },
     });
 
     console.log(res.summary?.written_rows, 'events imported');

apps/api/src/controllers/track.controller.ts

@@ -7,7 +7,8 @@ import { assocPath, pathOr } from 'ramda';
 import { generateDeviceId } from '@openpanel/common';
 import {
   ch,
-  chQuery,
+  createProfileAlias,
+  formatClickhouseDate,
   getProfileById,
   getProfileId,
   getSalts,
@@ -24,6 +25,16 @@ import type {
   TrackHandlerPayload,
 } from '@openpanel/sdk';
 
+export function getStringHeaders(headers: FastifyRequest['headers']) {
+  return Object.entries(headers).reduce(
+    (acc, [key, value]) => ({
+      ...acc,
+      [key]: value ? String(value) : undefined,
+    }),
+    {}
+  );
+}
+
 export async function handler(
   request: FastifyRequest<{
     Body: TrackHandlerPayload;
@@ -45,12 +56,6 @@ export async function handler(
     request.body.payload.profileId = profileId;
   }
 
-  console.log(
-    '> Request',
-    request.body.type,
-    JSON.stringify(request.body.payload, null, 2)
-  );
-
   if (!projectId) {
     reply.status(400).send('missing origin');
     return;
@@ -59,25 +64,29 @@ export async function handler(
   switch (request.body.type) {
     case 'track': {
       const [salts, geo] = await Promise.all([getSalts(), parseIp(ip)]);
-      const currentDeviceId = generateDeviceId({
+      const currentDeviceId = ua
-        salt: salts.current,
+        ? generateDeviceId({
-        origin: projectId,
+            salt: salts.current,
-        ip,
+            origin: projectId,
-        ua,
+            ip,
-      });
+            ua,
-      const previousDeviceId = generateDeviceId({
+          })
-        salt: salts.previous,
+        : '';
-        origin: projectId,
+      const previousDeviceId = ua
-        ip,
+        ? generateDeviceId({
-        ua,
+            salt: salts.previous,
-      });
+            origin: projectId,
+            ip,
+            ua,
+          })
+        : '';
       await track({
         payload: request.body.payload,
         currentDeviceId,
         previousDeviceId,
         projectId,
         geo,
-        ua,
+        headers: getStringHeaders(request.headers),
       });
       break;
     }
@@ -126,14 +135,14 @@ async function track({
   previousDeviceId,
   projectId,
   geo,
-  ua,
+  headers,
 }: {
   payload: TrackPayload;
   currentDeviceId: string;
   previousDeviceId: string;
   projectId: string;
   geo: GeoLocation;
-  ua: string;
+  headers: Record<string, string | undefined>;
 }) {
   // this will ensure that we don't have multiple events creating sessions
   const locked = await getRedisCache().set(
@@ -148,9 +157,7 @@ async function track({
     type: 'incomingEvent',
     payload: {
       projectId,
-      headers: {
+      headers,
-        ua,
-      },
       event: {
         ...payload,
         // Dont rely on the client for the timestamp
@@ -173,7 +180,7 @@ async function identify({
   payload: IdentifyPayload;
   projectId: string;
   geo: GeoLocation;
-  ua: string;
+  ua?: string;
 }) {
   const uaInfo = parseUserAgent(ua);
   await upsertProfile({
@@ -196,15 +203,10 @@ async function alias({
   payload: AliasPayload;
   projectId: string;
 }) {
-  await ch.insert({
+  await createProfileAlias({
-    table: TABLE_NAMES.alias,
+    alias: payload.alias,
-    values: [
+    profileId: payload.profileId,
-      {
+    projectId,
-        projectId,
-        profile_id: payload.profileId,
-        alias: payload.alias,
-      },
-    ],
   });
 }
 

apps/worker/src/jobs/events.incoming-event.ts

@@ -11,14 +11,14 @@ import {
   toISOString,
 } from '@openpanel/common';
 import type { IServiceCreateEventPayload, IServiceEvent } from '@openpanel/db';
-import { chQuery, createEvent, TABLE_NAMES } from '@openpanel/db';
+import { createEvent } from '@openpanel/db';
 import { getLastScreenViewFromProfileId } from '@openpanel/db/src/services/event.service';
 import { eventsQueue, findJobByPrefix, sessionsQueue } from '@openpanel/queue';
 import type {
   EventsQueuePayloadCreateSessionEnd,
   EventsQueuePayloadIncomingEvent,
 } from '@openpanel/queue';
-import { cacheable, getRedisQueue } from '@openpanel/redis';
+import { getRedisQueue } from '@openpanel/redis';
 
 const GLOBAL_PROPERTIES = ['__path', '__referrer'];
 const SESSION_TIMEOUT = 1000 * 60 * 30;
@@ -55,7 +55,10 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
     ? null
     : parseReferrer(getProperty('__referrer'));
   const utmReferrer = getReferrerWithQuery(query);
-  const uaInfo = parseUserAgent(headers.ua);
+  const userAgent = headers['user-agent'];
+  const sdkName = headers['openpanel-sdk-name'];
+  const sdkVersion = headers['openpanel-sdk-version'];
+  const uaInfo = parseUserAgent(userAgent);
 
   if (uaInfo.isServer) {
     const event = await getLastScreenViewFromProfileId({
@@ -71,7 +74,7 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
       projectId,
       properties: {
         ...omit(GLOBAL_PROPERTIES, properties),
-        user_agent: headers.ua,
+        user_agent: userAgent,
       },
       createdAt,
       country: event?.country || geo.country || '',
@@ -95,6 +98,8 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
       profile: undefined,
       meta: undefined,
       importedAt: null,
+      sdkName,
+      sdkVersion,
     };
 
     return createEvent(payload);
@@ -168,6 +173,8 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
     referrer: referrer?.url,
     referrerName: referrer?.name || utmReferrer?.name || '',
     referrerType: referrer?.type || utmReferrer?.type || '',
+    sdkName,
+    sdkVersion,
   };
 
   if (!sessionEnd) {

packages/db/clickhouse_init.sql

@@ -1,8 +1,10 @@
 CREATE DATABASE IF NOT EXISTS openpanel;
 
-CREATE TABLE IF NOT EXISTS openpanel.events_v2 (
+CREATE TABLE openpanel.events_v2 (
   `id` UUID DEFAULT generateUUIDv4(),
   `name` String,
+  `sdk_name` String,
+  `sdk_version` String,
   `device_id` String,
   `profile_id` String,
   `project_id` String,
@@ -29,9 +31,9 @@ CREATE TABLE IF NOT EXISTS openpanel.events_v2 (
   `model` String,
   `imported_at` Nullable(DateTime),
   INDEX idx_name name TYPE bloom_filter GRANULARITY 1,
-  INDEX idx_properties_bounce properties ['__bounce'] TYPE
+  INDEX idx_properties_bounce properties ['__bounce'] TYPE set (3) GRANULARITY 1,
-  set
+  INDEX idx_origin origin TYPE bloom_filter(0.05) GRANULARITY 1,
-    (3) GRANULARITY 1
+  INDEX idx_path path TYPE bloom_filter(0.01) GRANULARITY 1
 ) ENGINE = MergeTree PARTITION BY toYYYYMM(created_at)
 ORDER BY
   (project_id, toDate(created_at), profile_id, name) SETTINGS index_granularity = 8192;

packages/db/src/buffers/profile-buffer.ts

@@ -78,9 +78,6 @@ export class ProfileBuffer extends RedisBuffer<IClickhouseProfile> {
           is_external: item.event.is_external,
         };
       }),
-      clickhouse_settings: {
-        date_time_input_format: 'best_effort',
-      },
       format: 'JSONEachRow',
     });
     return queue.map((item) => item.index);

packages/db/src/clickhouse-client.ts

@@ -21,6 +21,9 @@ export const originalCh = createClient({
   compression: {
     request: true,
   },
+  clickhouse_settings: {
+    date_time_input_format: 'best_effort',
+  },
 });
 
 export const ch = new Proxy(originalCh, {

packages/db/src/services/event.service.ts

@@ -56,6 +56,8 @@ export interface IClickhouseEvent {
   brand: string;
   model: string;
   imported_at: string | null;
+  sdk_name: string;
+  sdk_version: string;
 
   // They do not exist here. Just make ts happy for now
   profile?: IServiceProfile;
@@ -93,6 +95,8 @@ export function transformEvent(event: IClickhouseEvent): IServiceEvent {
     profile: event.profile,
     meta: event.meta,
     importedAt: event.imported_at ? new Date(event.imported_at) : null,
+    sdkName: event.sdk_name,
+    sdkVersion: event.sdk_version,
   };
 }
 
@@ -134,6 +138,8 @@ export interface IServiceEvent {
   importedAt: Date | null;
   profile: IServiceProfile | undefined;
   meta: EventMeta | undefined;
+  sdkName: string | undefined;
+  sdkVersion: string | undefined;
 }
 
 export interface IServiceEventMinimal {
@@ -295,6 +301,8 @@ export async function createEvent(payload: IServiceCreateEventPayload) {
     referrer_name: payload.referrerName ?? '',
     referrer_type: payload.referrerType ?? '',
     imported_at: null,
+    sdk_name: payload.sdkName ?? '',
+    sdk_version: payload.sdkVersion ?? '',
   };
 
   await eventBuffer.insert(event);

packages/db/src/services/profile.service.ts

@@ -6,6 +6,7 @@ import type { IChartEventFilter } from '@openpanel/validation';
 
 import { profileBuffer } from '../buffers';
 import {
+  ch,
   chQuery,
   formatClickhouseDate,
   TABLE_NAMES,
@@ -170,6 +171,29 @@ export function transformProfile({
   };
 }
 
+export async function createProfileAlias({
+  projectId,
+  alias,
+  profileId,
+}: {
+  projectId: string;
+  alias: string;
+  profileId: string;
+}) {
+  await ch.insert({
+    table: TABLE_NAMES.alias,
+    format: 'JSONEachRow',
+    values: [
+      {
+        projectId,
+        profile_id: profileId,
+        alias,
+        created_at: new Date(),
+      },
+    ],
+  });
+}
+
 export async function upsertProfile({
   id,
   firstName,

packages/queue/src/queues.ts

@@ -18,9 +18,7 @@ export interface EventsQueuePayloadIncomingEvent {
       longitude: number | undefined;
       latitude: number | undefined;
     };
-    headers: {
+    headers: Record<string, string | undefined>;
-      ua: string | undefined;
-    };
     currentDeviceId: string;
     previousDeviceId: string;
     priority: boolean;

packages/sdks/sdk/src/index.ts

@@ -85,7 +85,7 @@ export class OpenPanel {
       defaultHeaders['openpanel-client-secret'] = options.clientSecret;
     }
 
-    defaultHeaders['openpanel-sdk'] = options.sdk || 'node';
+    defaultHeaders['openpanel-sdk-name'] = options.sdk || 'node';
     defaultHeaders['openpanel-sdk-version'] =
       options.sdkVersion || process.env.SDK_VERSION!;