document-drive 1.0.0-alpha.31 → 1.0.0-alpha.33

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.31",
+    "version": "1.0.0-alpha.33",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -14,7 +14,8 @@
         "./storage/memory": "./src/storage/memory.ts",
         "./storage/prisma": "./src/storage/prisma.ts",
         "./utils": "./src/utils/index.ts",
-        "./utils/graphql": "./src/utils/graphql.ts"
+        "./utils/graphql": "./src/utils/graphql.ts",
+        "./logger": "./src/utils/logger.ts"
     },
     "files": [
         "./src"
@@ -41,8 +42,7 @@
         "graphql-request": "^6.1.0",
         "json-stringify-deterministic": "^1.0.12",
         "nanoevents": "^9.0.0",
-        "sanitize-filename": "^1.6.3",
-        "winston": "^3.13.0"
+        "sanitize-filename": "^1.6.3"
     },
     "devDependencies": {
         "@commitlint/cli": "^18.6.1",

package/src/server/index.ts

@@ -35,6 +35,7 @@ import {
     isNoopUpdate
 } from '../utils';
 import { requestPublicDrive } from '../utils/graphql';
+import { logger } from '../utils/logger';
 import {
     ConflictOperationError,
     MissingOperationError,
@@ -64,8 +65,6 @@ import {
     type SynchronizationUnit
 } from './types';
 import { filterOperationsByRevision } from './utils';
-import winston from 'winston';
-import { logger as defaultLogger, logger } from '../utils/logger';
 
 export * from './listener';
 export type * from './types';
@@ -122,16 +121,16 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
         const result = await (!strand.documentId
             ? this.addDriveOperations(
-                strand.driveId,
-                operations as Operation<DocumentDriveAction | BaseAction>[],
-                false
-            )
+                  strand.driveId,
+                  operations as Operation<DocumentDriveAction | BaseAction>[],
+                  false
+              )
             : this.addOperations(
-                strand.driveId,
-                strand.documentId,
-                operations,
-                false
-            ));
+                  strand.driveId,
+                  strand.documentId,
+                  operations,
+                  false
+              ));
 
         if (result.status === 'ERROR') {
             this.updateSyncStatus(strand.driveId, result.status, result.error);
@@ -247,10 +246,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 (!documentType?.length ||
                     documentType.includes(node.documentType) ||
                     documentType.includes('*'))
-        ) as Pick<
-            FileNode,
-            'id' | 'documentType' | 'synchronizationUnits'
-        >[];
+        ) as Pick<FileNode, 'id' | 'documentType' | 'synchronizationUnits'>[];
 
         // checks if document drive synchronization unit should be added
         if (
@@ -280,14 +276,14 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             const nodeUnits =
                 scope?.length || branch?.length
                     ? node.synchronizationUnits.filter(
-                        unit =>
-                            (!scope?.length ||
-                                scope.includes(unit.scope) ||
-                                scope.includes('*')) &&
-                            (!branch?.length ||
-                                branch.includes(unit.branch) ||
-                                branch.includes('*'))
-                    )
+                          unit =>
+                              (!scope?.length ||
+                                  scope.includes(unit.scope) ||
+                                  scope.includes('*')) &&
+                              (!branch?.length ||
+                                  branch.includes(unit.branch) ||
+                                  branch.includes('*'))
+                      )
                     : node.synchronizationUnits;
             if (!nodeUnits.length) {
                 continue;
@@ -581,11 +577,11 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                         e instanceof OperationError
                             ? e
                             : new OperationError(
-                                'ERROR',
-                                operation,
-                                (e as Error).message,
-                                (e as Error).cause
-                            );
+                                  'ERROR',
+                                  operation,
+                                  (e as Error).message,
+                                  (e as Error).cause
+                              );
                 }
                 break;
             }
@@ -879,11 +875,11 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 error instanceof OperationError
                     ? error
                     : new OperationError(
-                        'ERROR',
-                        undefined,
-                        (error as Error).message,
-                        (error as Error).cause
-                    );
+                          'ERROR',
+                          undefined,
+                          (error as Error).message,
+                          (error as Error).cause
+                      );
 
             return {
                 status: operationError.status,
@@ -1047,11 +1043,11 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 error instanceof OperationError
                     ? error
                     : new OperationError(
-                        'ERROR',
-                        undefined,
-                        (error as Error).message,
-                        (error as Error).cause
-                    );
+                          'ERROR',
+                          undefined,
+                          (error as Error).message,
+                          (error as Error).cause
+                      );
 
             return {
                 status: operationError.status,

package/src/server/types.ts

@@ -19,9 +19,6 @@ import type {
 import { Unsubscribe } from 'nanoevents';
 import { OperationError } from './error';
 import { ITransmitter } from './listener/transmitter/types';
-import winston from 'winston';
-import { logger as defaultLogger } from '../utils/logger';
-
 
 export type DriveInput = State<
     Omit<DocumentDriveState, '__typename' | 'id' | 'nodes'> & { id?: string },
@@ -270,7 +267,7 @@ export abstract class BaseListenerManager {
 
     constructor(
         drive: BaseDocumentDriveServer,
-        listenerState = new Map<string, Map<string, ListenerState>>(),
+        listenerState = new Map<string, Map<string, ListenerState>>()
     ) {
         this.drive = drive;
         this.listenerState = listenerState;

package/src/utils/logger.ts

@@ -1,8 +1,44 @@
-import winston from 'winston';
-
-export const logger = winston.createLogger({
-    level: 'info',
-    defaultMeta: { service: "document-drive" },
-    // format: winston.format.colorize(),
-    transports: [new winston.transports.Console()],
-});
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export type ILogger = Pick<Console, 'log' | 'info' | 'warn' | 'error' | 'debug' | 'trace'>;
+class Logger implements ILogger {
+    #logger: ILogger = console;
+
+    set logger(logger: ILogger) {
+        this.#logger = logger;
+    }
+
+    log(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.log(...data);
+    }
+
+    info(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.info(...data);
+    }
+
+    warn(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.warn(...data);
+    }
+
+    error(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.error(...data);
+    }
+
+    debug(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.debug(...data);
+    }
+
+    trace(...data: any[]): void {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return this.#logger.trace(...data);
+    }
+}
+
+const loggerInstance = new Logger();
+
+export const logger: ILogger = loggerInstance;
+export const setLogger = (logger: ILogger) => (loggerInstance.logger = logger);