sdk changes

apps/web/src/server/api/routers/chart.helpers.ts

@@ -5,7 +5,7 @@ import type {
   IGetChartDataInput,
   IInterval,
 } from '@/types';
-import { alphabetIds } from '@/utils/constants';
+import { alphabetIds, NOT_SET_VALUE } from '@/utils/constants';
 import { round } from '@/utils/math';
 import * as mathjs from 'mathjs';
 import { sort } from 'ramda';
@@ -207,7 +207,7 @@ export async function getChartData(payload: IGetChartDataInput) {
     (acc, item) => {
       // item.label can be null when using breakdowns on a property
       // that doesn't exist on all events
-      const label = item.label?.trim() || '(not set)';
+      const label = item.label?.trim() || NOT_SET_VALUE;
       if (label) {
         if (acc[label]) {
           acc[label]?.push(item);

apps/web/src/server/api/routers/chart.ts

@@ -29,19 +29,21 @@ interface Metrics {
   };
 }
 
-interface FinalChart {
-  events: IChartInput['events'];
-  series: {
-    name: string;
-    event: IChartEvent;
-    metrics: Metrics;
-    data: {
-      date: string;
-      count: number;
-      label: string | null;
-      previous: PreviousValue;
-    }[];
+export interface IChartSerie {
+  name: string;
+  event: IChartEvent;
+  metrics: Metrics;
+  data: {
+    date: string;
+    count: number;
+    label: string | null;
+    previous: PreviousValue;
   }[];
+}
+
+export interface FinalChart {
+  events: IChartInput['events'];
+  series: IChartSerie[];
   metrics: Metrics;
 }
 

apps/web/src/server/api/routers/client.ts

@@ -1,9 +1,10 @@
 import { randomUUID } from 'crypto';
 import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
 import { db } from '@/server/db';
-import { hashPassword } from '@/server/services/hash.service';
 import { z } from 'zod';
 
+import { hashPassword } from '@mixan/common';
+
 export const clientRouter = createTRPCRouter({
   list: protectedProcedure
     .input(

apps/web/src/server/api/routers/event.ts

@@ -29,6 +29,8 @@ export const eventRouter = createTRPCRouter({
         sb.where.name = `name IN (${events.map((e) => `'${e}'`).join(',')})`;
       }
 
+      sb.orderBy.created_at = 'created_at DESC';
+
       return (await chQuery<IDBEvent>(getSql())).map(transformEvent);
     }),
 });

apps/web/src/server/services/hash.service.ts

@@ -1,43 +0,0 @@
-import { randomBytes, scrypt, timingSafeEqual } from 'crypto';
-
-const keyLength = 32;
-/**
- * Has a password or a secret with a password hashing algorithm (scrypt)
- * @param {string} password
- * @returns {string} The salt+hash
- */
-export async function hashPassword(password: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    // generate random 16 bytes long salt - recommended by NodeJS Docs
-    const salt = randomBytes(16).toString('hex');
-    scrypt(password, salt, keyLength, (err, derivedKey) => {
-      if (err) reject(err);
-      // derivedKey is of type Buffer
-      resolve(`${salt}.${derivedKey.toString('hex')}`);
-    });
-  });
-}
-
-/**
- * Compare a plain text password with a salt+hash password
- * @param {string} password The plain text password
- * @param {string} hash The hash+salt to check against
- * @returns {boolean}
- */
-export async function verifyPassword(
-  password: string,
-  hash: string
-): Promise<boolean> {
-  return new Promise((resolve, reject) => {
-    const [salt, hashKey] = hash.split('.');
-    // we need to pass buffer values to timingSafeEqual
-    const hashKeyBuff = Buffer.from(hashKey!, 'hex');
-    scrypt(password, salt!, keyLength, (err, derivedKey) => {
-      if (err) {
-        reject(err);
-      }
-      // compare the new supplied password with the hashed password using timeSafeEqual
-      resolve(timingSafeEqual(hashKeyBuff, derivedKey));
-    });
-  });
-}