diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts index b6d0fc3f3..cbcbd57aa 100644 --- a/src/lib/clickhouse.ts +++ b/src/lib/clickhouse.ts @@ -32,7 +32,7 @@ function getClient() { } = new URL(process.env.CLICKHOUSE_URL); const client = createClient({ - host: `${protocol}//${hostname}:${port}`, + url: `${protocol}//${hostname}:${port}`, database: pathname.replace('/', ''), username: username, password, diff --git a/src/lib/kafka.ts b/src/lib/kafka.ts index da38baa44..d1201d9c1 100644 --- a/src/lib/kafka.ts +++ b/src/lib/kafka.ts @@ -19,7 +19,7 @@ function getClient() { ? { ssl: true, sasl: { - mechanism: 'scram-sha-256', + mechanism: 'plain', username, password, }, @@ -57,7 +57,7 @@ async function getProducer(): Promise { } function getDateFormat(date: Date, format?: string): string { - return dateFormat(date, format ? format : 'UTC:yyyy-mm-dd HH:MM:ss'); + return dateFormat(date, format ? format : 'yyyy-mm-dd HH:MM:ss'); } async function sendMessage( diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts index 0ed3c8b01..d3f434bec 100644 --- a/src/queries/analytics/eventData/saveEventData.ts +++ b/src/queries/analytics/eventData/saveEventData.ts @@ -75,7 +75,7 @@ async function clickhouseQuery(data: { string_value: getStringValue(value, dataType), number_value: dataType === DATA_TYPE.number ? value : null, date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null, - created_at: createdAt, + created_at: createdAt ?? getDateFormat(new Date()), }; }); diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts index 429c6e281..45e99ea45 100644 --- a/src/queries/analytics/sessions/saveSessionData.ts +++ b/src/queries/analytics/sessions/saveSessionData.ts @@ -94,7 +94,7 @@ async function clickhouseQuery(data: { string_value: getStringValue(value, dataType), number_value: dataType === DATA_TYPE.number ? value : null, date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null, - created_at: createdAt, + created_at: createdAt ?? getDateFormat(new Date()), }; }); diff --git a/src/tracker/index.d.ts b/src/tracker/index.d.ts index 05497da20..0f626fa56 100644 --- a/src/tracker/index.d.ts +++ b/src/tracker/index.d.ts @@ -146,6 +146,7 @@ export type UmamiTracker = { */ (eventFunction: CustomEventFunction): Promise; }; + identify: (data: { [key: string]: number | string | number[] | string[] }) => Promise; }; interface Window {