Merge pull request #60 from s1seven/chore-resolve-sonar-major-issues

chore: resolve SonarCloud major issues
getlarge · Aug 28, 2023 · 8acaf74 · 8acaf74
2 parents 03e1b8b + 4ddfa34
commit 8acaf74
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@s1seven/nestjs-tools",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "Common resources shared by microservices",
   "main": "dist/index.js",
   "bin": "dist/index.js",

diff --git a/packages/amqp-transport/src/amqp-client.ts b/packages/amqp-transport/src/amqp-client.ts
@@ -88,8 +88,8 @@ export class AmqpClient extends ClientProxy {
   }
 
   close(): void {
-    this.channel && this.channel.close();
-    this.client && this.client.close();
+    this.channel?.close();
+    this.client?.close();
     this.channel = null;
     this.client = null;
   }

diff --git a/packages/amqp-transport/src/amqp-server.ts b/packages/amqp-transport/src/amqp-server.ts
@@ -100,8 +100,8 @@ export class AmqpServer extends Server implements CustomTransportStrategy {
   }
 
   close(): void {
-    this.channel && this.channel.close();
-    this.server && this.server.close();
+    this.channel?.close();
+    this.server?.close();
     this.channel = null;
     this.server = null;
   }

diff --git a/packages/async-local-storage/src/async-local-storage.interceptor.ts b/packages/async-local-storage/src/async-local-storage.interceptor.ts
@@ -18,16 +18,22 @@ import { AsyncLocalStorageService } from './async-local-storage.service';
  */
 @Injectable()
 export class AsyncLocalStorageInterceptor implements NestInterceptor {
-  readonly mode: AsyncLocalStorageMode;
-
   constructor(
     @Inject(AsyncLocalStorageService)
     private readonly asyncLocalStorage: AsyncLocalStorageService,
     @Inject(ASYNC_LOCAL_STORAGE_MODULE_OPTIONS)
     private readonly options: AsyncLocalStorageModuleOptions,
-  ) {
+  ) {}
+
+  get mode(): AsyncLocalStorageMode {
     const { useGuard, useInterceptor } = this.options;
-    this.mode = useGuard ? AsyncLocalStorageMode.Guard : useInterceptor ? AsyncLocalStorageMode.Interceptor : null;
+    if (useGuard) {
+      return AsyncLocalStorageMode.Guard;
+    }
+    if (useInterceptor) {
+      return AsyncLocalStorageMode.Interceptor;
+    }
+    return null;
   }
 
   async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>> {

diff --git a/packages/async-local-storage/src/async-local-storage.service.ts b/packages/async-local-storage/src/async-local-storage.service.ts
@@ -90,7 +90,7 @@ export class AsyncLocalStorageService extends Map<K, T[K]> {
   }
 
   // AsyncLocalStorage methods and properties
-  run<R, TArgs extends any[]>(store: StoreMap = new Map(), callback: (...args: TArgs) => R, ...args: TArgs): R {
+  run<R, TArgs extends any[]>(store: StoreMap, callback: (...args: TArgs) => R, ...args: TArgs): R {
     return this.instance.run(store, callback, ...args);
   }
 

diff --git a/packages/boot/src/api-specs.ts b/packages/boot/src/api-specs.ts
@@ -114,18 +114,16 @@ export async function setupOpenApi<Conf extends BaseConfig>(
   setCommonOptions(openApiOptions, openApi);
   const openApiDocument = SwaggerModule.createDocument(app, openApiOptions.build(), { extraModels });
   const mainServerUrl = getMainServerUrl(config);
-  const customfavIcon =
-    typeof customFavIcon === 'function'
-      ? customFavIcon(app)
-      : `${mainServerUrl}/${customFavIcon}` || `${mainServerUrl}/favicon.ico`;
+  const customFavIconPath =
+    typeof customFavIcon === 'function' ? customFavIcon(app) : `${mainServerUrl}/${customFavIcon || 'favicon.ico'}`;
 
   const customOptions: SwaggerCustomOptions = {
     swaggerOptions: {
       persistAuthorization: true,
     },
     customSiteTitle:
       typeof customSiteTitle === 'function' ? customSiteTitle(app) : customSiteTitle || `${serviceName} API`,
-    customfavIcon,
+    customfavIcon: customFavIconPath,
     explorer: typeof enableExplorer === 'function' ? enableExplorer(app) : enableExplorer,
   };
 

diff --git a/packages/cluster-service/src/cluster.service.ts b/packages/cluster-service/src/cluster.service.ts
@@ -31,7 +31,6 @@ export type WorkerFn = (
   send?: (message: any, workerId?: number) => void,
 ) => void | Promise<void>;
 
-// export type PrimaryFn = (this: ClusterService) => void | Promise<void>;
 export type PrimaryFn = () => void | Promise<void>;
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function

diff --git a/packages/lock/src/lock.service.ts b/packages/lock/src/lock.service.ts
@@ -47,7 +47,7 @@ export class LockService implements OnModuleInit, OnModuleDestroy {
   createConnection(): void {
     this.redis = new IORedis(this.options.redis);
     this.redlock = new Redlock([this.redis], { ...this.defaultLockOptions, ...(this.options.lock || {}) });
-    // this.redlock.on('error', this.errorHandler);
+    // TODO: this.redlock.on('error', this.errorHandler);
   }
 
   isInitialized(): void {