Updates to insights, event data, telemetry.

lib/clickhouse.ts

@@ -62,10 +62,6 @@ function getDateFormat(date) {
   return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;
 }
 
-function getBetweenDates(field, startAt, endAt) {
-  return `${field} between ${getDateFormat(startAt)} and ${getDateFormat(endAt)}`;
-}
-
 function getEventDataFilterQuery(
   filters: {
     eventKey?: string;
@@ -150,7 +146,22 @@ function parseFilters(filters: WebsiteMetricFilter = {}, params: any = {}) {
   };
 }
 
-async function rawQuery<T>(query, params = {}): Promise<T> {
+function formatField(field, type, value) {
+  switch (type) {
+    case 'date':
+      return getDateFormat(value);
+    default:
+      return field;
+  }
+}
+
+async function rawQuery<T>(sql, params = {}): Promise<T> {
+  const query = sql.replaceAll(/\{\{\w+:\w+}}/g, token => {
+    const [, field, type] = token.match(/\{\{(\w+):(\w+)}}/);
+
+    return formatField(field, type, params[field]);
+  });
+
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
@@ -189,7 +200,6 @@ export default {
   getDateStringQuery,
   getDateQuery,
   getDateFormat,
-  getBetweenDates,
   getFilterQuery,
   getFunnelQuery,
   getEventDataFilterQuery,

lib/constants.ts

@@ -18,7 +18,7 @@ export const DEFAULT_THEME = 'light';
 export const DEFAULT_ANIMATION_DURATION = 300;
 export const DEFAULT_DATE_RANGE = '24hour';
 export const DEFAULT_WEBSITE_LIMIT = 10;
-export const DEFAULT_CREATED_AT = '2000-01-01';
+export const DEFAULT_RESET_DATE = '2000-01-01';
 
 export const REALTIME_RANGE = 30;
 export const REALTIME_INTERVAL = 5000;

lib/crypto.js

@@ -1,5 +1,3 @@
-import crypto from 'crypto';
-import { v4, v5 } from 'uuid';
 import { startOfMonth } from 'date-fns';
 import { hash } from 'next-basics';
 
@@ -12,13 +10,3 @@ export function salt() {
 
   return hash(secret(), ROTATING_SALT);
 }
-
-export function uuid(...args) {
-  if (!args.length) return v4();
-
-  return v5(hash(...args, salt()), v5.DNS);
-}
-
-export function md5(...args) {
-  return crypto.createHash('md5').update(args.join('')).digest('hex');
-}

lib/detect.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import requestIp from 'request-ip';
+import { getClientIp } from 'request-ip';
 import { browserName, detectOS } from 'detect-browser';
 import isLocalhost from 'is-localhost-ip';
 import maxmind from 'maxmind';
@@ -25,7 +25,7 @@ export function getIpAddress(req) {
     return req.headers['cf-connecting-ip'];
   }
 
-  return requestIp.getClientIp(req);
+  return getClientIp(req);
 }
 
 export function getDevice(screen, os) {

lib/session.ts

@@ -1,6 +1,6 @@
-import { secret, uuid } from 'lib/crypto';
+import { secret } from 'lib/crypto';
 import { getClientInfo, getJsonBody } from 'lib/detect';
-import { parseToken } from 'next-basics';
+import { parseToken, uuid } from 'next-basics';
 import { CollectRequestBody, NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import { validate } from 'uuid';
@@ -30,7 +30,6 @@ export async function findSession(req: NextApiRequestCollect) {
   // Verify payload
   const { website: websiteId, hostname, screen, language } = payload;
 
-
   // Check the hostname value for legality to eliminate dirty data
   const validHostnameRegex = /^[\w-.]+$/;
   if (!validHostnameRegex.test(hostname)) {

lib/sql.ts

@@ -0,0 +1,9 @@
+export function buildSql(query: string, parameters: object) {
+  const params = { ...parameters };
+
+  const sql = query.replaceAll(/\$[\w_]+/g, name => {
+    return name;
+  });
+
+  return { sql, params };
+}