90dc-core 1.2.16 → 1.3.0

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "90dc-core",
-  "version": "1.2.16",
+  "version": "1.3.0",
   "description": "A package that contains utils and interfaces used to create 90dc",
   "main": "dist/index.js",
   "type": "module",
   "devDependencies": {
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.36",
+    "@types/debug": "^4.1.12",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.14.1",
     "@types/validator": "^13.7.12",
@@ -20,6 +21,8 @@
   },
   "dependencies": {
     "@typescript-eslint/parser": "^5.53.0",
+    "axios": "^1.6.2",
+    "debug": "^4.3.4",
     "eslint": "^8.34.0",
     "sequelize-typescript": "^2.1.5",
     "winston": "^3.8.2"

package/src/lib/dbmodels/PersistedUser.ts

@@ -1,8 +1,8 @@
-import { Column, DataType, Default, Model, Table } from 'sequelize-typescript';
-import { UsersFriends } from './UsersFriends';
+import { Column, DataType, Default, Index, Model, Table } from "sequelize-typescript";
 
 @Table
 export class PersistedUser extends Model {
+
   @Default(DataType.UUIDV4)
   @Column({
     type: DataType.UUID,
@@ -12,6 +12,7 @@ export class PersistedUser extends Model {
   })
   declare userUuid: string;
 
+  @Index
   @Column({ type: DataType.TEXT, allowNull: false, unique: false })
   declare email: string;
 
@@ -93,17 +94,4 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.JSONB, allowNull: true })
   declare subscription: object;
 
-  async $addFriend(friendUuid: string) {
-    await UsersFriends.create({
-      userId: this.userUuid,
-      friendId: friendUuid,
-      createDate: new Date()
-    });
-
-    await UsersFriends.create({
-      userId: friendUuid,
-      friendId: this.userUuid,
-      createDate: new Date()
-    });
-  }
 }

package/src/lib/utils/Logger.ts

@@ -1,54 +1,78 @@
-import winston from 'winston'
+/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access */
+import axios from "axios";
+import Debug, { Debugger } from "debug";
+import * as crypto from "crypto";
 
-class Logger {
+export class Log {
+  private static instance: Log | null = null;
+  private readonly debugLib: Debugger;
 
-  public static getLogger(serviceName: string){
-    const levels = {
-      error: 0,
-      warn: 1,
-      info: 2,
-      http: 3,
-      debug: 4,
-    }
+  constructor(debug: Debugger) {
+    this.debugLib = debug;
+  }
 
-    const level = () => {
-      const env = process.env.NODE_ENV || 'development'
-      const isDevelopment = env === 'development'
-      return isDevelopment ? 'debug' : 'warn'
+  public static getInstance(): Log {
+    if (!Log.instance) {
+      const debug: Debugger = Debug(
+        "@swish:" + (process.env.npm_package_name || "package-name-not-specified")
+      );
+      Log.instance = new Log(debug);
     }
 
-    const colors = {
-      error: 'red',
-      warn: 'yellow',
-      info: 'magenta',
-      http: 'magenta',
-      debug: 'white',
-      serviceName: 'magenta'
-    }
+    return Log.instance;
+  }
+
+  public static extendInstance(name: string) {
+    return this.getInstance().extend(name);
+  }
+
+  public debug(message: string): void {
+    this.debugLib(message);
+  }
 
-    winston.addColors(colors)
+  public info(message: string): void {
+    // eslint-disable-next-line no-console
+    this.debugLib.log = console.info.bind(console);
+    this.debugLib(message);
+  }
 
-    const format: winston.Logform.Format = winston.format.combine(
-      winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss:ms' }),
-      winston.format.colorize({ all: true }),
-      winston.format.printf(
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-       (info) => `\n        @${serviceName.toUpperCase()}: ${info.message}\n`,
-      ),
-    )
+  public warn(message: string): void {
+    const warnDebug: Debugger = this.debugLib.extend("warning");
+    // eslint-disable-next-line no-console
+    warnDebug.log = console.warn.bind(console);
+    warnDebug(message);
+  }
 
-    const transports = [
-      new winston.transports.Console(),
-    ]
-    return winston.createLogger({
-      level: level(),
-      levels,
-      format,
-      transports,
-    })
+  public error(message: string | unknown, error?: unknown): void {
+    const errorDebug: Debugger = this.debugLib.extend("error");
+    // eslint-disable-next-line no-console
+    errorDebug.log = console.error.bind(console);
+    errorDebug(message, error);
+  }
 
+  public catchError(error: unknown): void {
+    if (axios.isAxiosError(error)) {
+      this.error(error.toJSON());
+    }
+    if (typeof error === "string") {
+      error.toUpperCase(); // works, `e` narrowed to string
+      this.error(error);
+    } else if (error instanceof Error) {
+      error.message; // works, `e` narrowed to Error
+      this.error(error.message);
+    }
   }
-}
 
+  public catchErrorAndLogUuid(error: unknown): string {
+    const uuid: string = crypto.randomUUID();
+    this.error(`ERROR UUID: ${uuid}`);
+    this.catchError(error);
+
+    return uuid;
+  }
 
-export default Logger
+  public extend(extensionName: string): Log {
+    const debugExtension: Debugger = this.debugLib.extend(extensionName);
+    return new Log(debugExtension);
+  }
+}