serverless-simple-middleware 0.0.74 → 0.0.75

package/src/utils/logger.ts

@@ -1,94 +1,94 @@
-import { basename } from 'path';
-import { envDefault as currentStage, StagingLevel } from 'simple-staging';
-import { $enum } from 'ts-enum-util';
-import { stringifyError } from './misc';
-
-export enum LogLevel {
-  Error = 'error',
-  Warn = 'warn',
-  Info = 'info',
-  Debug = 'debug',
-  Verbose = 'verbose',
-  Silly = 'silly',
-  Stupid = 'stupid',
-}
-
-const severity = (level: LogLevel) => {
-  switch (level) {
-    case LogLevel.Error:
-      return 100;
-    case LogLevel.Warn:
-      return 200;
-    case LogLevel.Info:
-      return 300;
-    case LogLevel.Debug:
-      return 400;
-    case LogLevel.Verbose:
-      return 500;
-    case LogLevel.Silly:
-      return 600;
-    case LogLevel.Stupid:
-      return 700;
-    default:
-      return 1000;
-  }
-};
-
-export const currentLogLevel = $enum(LogLevel).asValueOrDefault(
-  process.env.LOG_LEVEL,
-  currentStage.level !== StagingLevel.Release
-    ? LogLevel.Verbose
-    : LogLevel.Debug,
-);
-
-type LogMessage = string | Error;
-
-export class Logger {
-  private name: string;
-  private severity: number;
-
-  constructor(name: string, level: LogLevel = currentLogLevel) {
-    this.name = name;
-    this.severity = severity(level);
-  }
-
-  public log = (level: LogLevel, message: LogMessage) => {
-    if (this.severity >= severity(level)) {
-      console.log(
-        `[${new Date().toISOString()}][${level.toUpperCase()}][${this.name}] ${
-          message instanceof Error ? stringifyError(message) : message
-        }`,
-      );
-    }
-    return message;
-  };
-
-  public error = (message: LogMessage) => this.log(LogLevel.Error, message);
-  public warn = (message: LogMessage) => this.log(LogLevel.Warn, message);
-  public info = (message: LogMessage) => this.log(LogLevel.Info, message);
-  public debug = (message: LogMessage) => this.log(LogLevel.Debug, message);
-  public verbose = (message: LogMessage) => this.log(LogLevel.Verbose, message);
-  public silly = (message: LogMessage) => this.log(LogLevel.Silly, message);
-
-  public stupid = <T>(
-    message: string,
-    object: T,
-    replacer?: (key: string, value: T) => T,
-  ) => {
-    this.log(
-      LogLevel.Stupid,
-      `${message}: ${JSON.stringify(object, replacer)}`,
-    );
-    return object;
-  };
-}
-
-const loggers: { [name: string]: Logger } = {};
-
-export const getLogger = (fileName: string, level?: LogLevel): Logger => {
-  const name = basename(fileName);
-  if (loggers[name] === undefined) {
-    loggers[name] = new Logger(name, level);
-  }
-  return loggers[name];
-};
+import { basename } from 'path';
+import { envDefault as currentStage, StagingLevel } from 'simple-staging';
+import { $enum } from 'ts-enum-util';
+import { stringifyError } from './misc';
+
+export enum LogLevel {
+  Error = 'error',
+  Warn = 'warn',
+  Info = 'info',
+  Debug = 'debug',
+  Verbose = 'verbose',
+  Silly = 'silly',
+  Stupid = 'stupid',
+}
+
+const severity = (level: LogLevel) => {
+  switch (level) {
+    case LogLevel.Error:
+      return 100;
+    case LogLevel.Warn:
+      return 200;
+    case LogLevel.Info:
+      return 300;
+    case LogLevel.Debug:
+      return 400;
+    case LogLevel.Verbose:
+      return 500;
+    case LogLevel.Silly:
+      return 600;
+    case LogLevel.Stupid:
+      return 700;
+    default:
+      return 1000;
+  }
+};
+
+export const currentLogLevel = $enum(LogLevel).asValueOrDefault(
+  process.env.LOG_LEVEL,
+  currentStage.level !== StagingLevel.Release
+    ? LogLevel.Verbose
+    : LogLevel.Debug,
+);
+
+type LogMessage = string | Error;
+
+export class Logger {
+  private name: string;
+  private severity: number;
+
+  constructor(name: string, level: LogLevel = currentLogLevel) {
+    this.name = name;
+    this.severity = severity(level);
+  }
+
+  public log = (level: LogLevel, message: LogMessage) => {
+    if (this.severity >= severity(level)) {
+      console.log(
+        `[${new Date().toISOString()}][${level.toUpperCase()}][${this.name}] ${
+          message instanceof Error ? stringifyError(message) : message
+        }`,
+      );
+    }
+    return message;
+  };
+
+  public error = (message: LogMessage) => this.log(LogLevel.Error, message);
+  public warn = (message: LogMessage) => this.log(LogLevel.Warn, message);
+  public info = (message: LogMessage) => this.log(LogLevel.Info, message);
+  public debug = (message: LogMessage) => this.log(LogLevel.Debug, message);
+  public verbose = (message: LogMessage) => this.log(LogLevel.Verbose, message);
+  public silly = (message: LogMessage) => this.log(LogLevel.Silly, message);
+
+  public stupid = <T>(
+    message: string,
+    object: T,
+    replacer?: (key: string, value: T) => T,
+  ) => {
+    this.log(
+      LogLevel.Stupid,
+      `${message}: ${JSON.stringify(object, replacer)}`,
+    );
+    return object;
+  };
+}
+
+const loggers: { [name: string]: Logger } = {};
+
+export const getLogger = (fileName: string, level?: LogLevel): Logger => {
+  const name = basename(fileName);
+  if (loggers[name] === undefined) {
+    loggers[name] = new Logger(name, level);
+  }
+  return loggers[name];
+};

package/src/utils/misc.ts

@@ -1,20 +1,20 @@
-import { AwsError } from '../internal/AwsError';
-
-export const stringifyError = (
-  err: any,
-  replacer?: (key: string, value: any) => any,
-  space?: string | number,
-) => {
-  const error = isAWSv3Error(err) ? new AwsError(err) : err;
-  const plainObject = {} as any;
-  Object.getOwnPropertyNames(error).forEach((key) => {
-    plainObject[key] = error[key];
-  });
-  return JSON.stringify(plainObject, replacer, space);
-};
-
-const isAWSv3Error = (
-  error: unknown,
-): error is Error & { $metadata?: object } => {
-  return error instanceof Error && 'name' in error && '$metadata' in error;
-};
+import { AwsError } from '../internal/AwsError';
+
+export const stringifyError = (
+  err: any,
+  replacer?: (key: string, value: any) => any,
+  space?: string | number,
+) => {
+  const error = isAWSv3Error(err) ? new AwsError(err) : err;
+  const plainObject = {} as any;
+  Object.getOwnPropertyNames(error).forEach((key) => {
+    plainObject[key] = error[key];
+  });
+  return JSON.stringify(plainObject, replacer, space);
+};
+
+const isAWSv3Error = (
+  error: unknown,
+): error is Error & { $metadata?: object } => {
+  return error instanceof Error && 'name' in error && '$metadata' in error;
+};

package/src/utils/secretsManager.ts

@@ -1,86 +1,86 @@
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-  SecretsManagerClientConfig,
-} from '@aws-sdk/client-secrets-manager';
-import type { DatabaseCredentials } from '../middleware/mysql';
-import { getLogger } from './logger';
-import { stringifyError } from './misc';
-
-const logger = getLogger(__filename);
-
-export class SecretsManagerCache {
-  private static instance: SecretsManagerCache;
-  private client: SecretsManagerClient | undefined;
-  private clientConfig: SecretsManagerClientConfig | undefined;
-  private cache = new Map<string, any>();
-
-  private constructor() {}
-
-  public static getInstance(): SecretsManagerCache {
-    if (!SecretsManagerCache.instance) {
-      SecretsManagerCache.instance = new SecretsManagerCache();
-    }
-    return SecretsManagerCache.instance;
-  }
-
-  public configure(config: SecretsManagerClientConfig): void {
-    if (this.client) {
-      logger.warn(
-        'SecretsManager client already initialized. Reconfiguring with new config.',
-      );
-      this.client = undefined;
-    }
-    this.clientConfig = config;
-    logger.debug('SecretsManager client config updated');
-  }
-
-  private getClient(): SecretsManagerClient {
-    if (!this.client) {
-      this.client = new SecretsManagerClient(this.clientConfig ?? {});
-      logger.debug('SecretsManager client initialized');
-    }
-    return this.client;
-  }
-
-  public async getSecret<T = any>(secretId: string): Promise<T> {
-    if (this.cache.has(secretId)) {
-      logger.debug(`Secret ${secretId} found in cache`);
-      return this.cache.get(secretId);
-    }
-
-    try {
-      const command = new GetSecretValueCommand({ SecretId: secretId });
-      const response = await this.getClient().send(command);
-
-      if (!response.SecretString) {
-        throw new Error(`Secret ${secretId} has no SecretString value`);
-      }
-
-      const secretValue = JSON.parse(response.SecretString);
-
-      this.cache.set(secretId, secretValue);
-
-      return secretValue;
-    } catch (error) {
-      logger.error(
-        `Failed to fetch secret ${secretId}: ${stringifyError(error)}`,
-      );
-      throw error;
-    }
-  }
-
-  public async getDatabaseCredentials(
-    secretId: string,
-  ): Promise<DatabaseCredentials> {
-    const secret = await this.getSecret<DatabaseCredentials>(secretId);
-
-    if (!secret.username || !secret.password) {
-      throw new Error(
-        `Secret ${secretId} does not contain required database credentials (username, password)`,
-      );
-    }
-
-    return secret;
-  }
-}
+import {
+  GetSecretValueCommand,
+  SecretsManagerClient,
+  SecretsManagerClientConfig,
+} from '@aws-sdk/client-secrets-manager';
+import type { DatabaseCredentials } from '../middleware/mysql';
+import { getLogger } from './logger';
+import { stringifyError } from './misc';
+
+const logger = getLogger(__filename);
+
+export class SecretsManagerCache {
+  private static instance: SecretsManagerCache;
+  private client: SecretsManagerClient | undefined;
+  private clientConfig: SecretsManagerClientConfig | undefined;
+  private cache = new Map<string, any>();
+
+  private constructor() {}
+
+  public static getInstance(): SecretsManagerCache {
+    if (!SecretsManagerCache.instance) {
+      SecretsManagerCache.instance = new SecretsManagerCache();
+    }
+    return SecretsManagerCache.instance;
+  }
+
+  public configure(config: SecretsManagerClientConfig): void {
+    if (this.client) {
+      logger.warn(
+        'SecretsManager client already initialized. Reconfiguring with new config.',
+      );
+      this.client = undefined;
+    }
+    this.clientConfig = config;
+    logger.debug('SecretsManager client config updated');
+  }
+
+  private getClient(): SecretsManagerClient {
+    if (!this.client) {
+      this.client = new SecretsManagerClient(this.clientConfig ?? {});
+      logger.debug('SecretsManager client initialized');
+    }
+    return this.client;
+  }
+
+  public async getSecret<T = any>(secretId: string): Promise<T> {
+    if (this.cache.has(secretId)) {
+      logger.debug(`Secret ${secretId} found in cache`);
+      return this.cache.get(secretId);
+    }
+
+    try {
+      const command = new GetSecretValueCommand({ SecretId: secretId });
+      const response = await this.getClient().send(command);
+
+      if (!response.SecretString) {
+        throw new Error(`Secret ${secretId} has no SecretString value`);
+      }
+
+      const secretValue = JSON.parse(response.SecretString);
+
+      this.cache.set(secretId, secretValue);
+
+      return secretValue;
+    } catch (error) {
+      logger.error(
+        `Failed to fetch secret ${secretId}: ${stringifyError(error)}`,
+      );
+      throw error;
+    }
+  }
+
+  public async getDatabaseCredentials(
+    secretId: string,
+  ): Promise<DatabaseCredentials> {
+    const secret = await this.getSecret<DatabaseCredentials>(secretId);
+
+    if (!secret.username || !secret.password) {
+      throw new Error(
+        `Secret ${secretId} does not contain required database credentials (username, password)`,
+      );
+    }
+
+    return secret;
+  }
+}

package/tsconfig.json

@@ -1,16 +1,16 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "commonjs",
-    "lib": ["ES2022", "es7", "es6", "esnext", "dom"],
-    "rootDir": "src",
-    "outDir": "dist",
-    "declaration": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "skipLibCheck": true
-  },
-  "exclude": ["node_modules", "dist", "__tests__"]
-}
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "commonjs",
+    "lib": ["ES2022", "es7", "es6", "esnext", "dom"],
+    "rootDir": "src",
+    "outDir": "dist",
+    "declaration": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "skipLibCheck": true
+  },
+  "exclude": ["node_modules", "dist", "__tests__"]
+}

package/tslint.json

@@ -1,12 +1,12 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "linterOptions": {
-    "exclude": ["node_modules", "dist"]
-  },
-  "rules": {
-    "object-literal-sort-keys": false,
-    "interface-name": false,
-    "max-classes-per-file": false,
-    "no-console": false
-  }
-}
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "linterOptions": {
+    "exclude": ["node_modules", "dist"]
+  },
+  "rules": {
+    "object-literal-sort-keys": false,
+    "interface-name": false,
+    "max-classes-per-file": false,
+    "no-console": false
+  }
+}