apeframework 0.0.0-dev.3 → 0.0.0-dev.5

package/config/parseProperty.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseProperty = void 0;
-const ConfigParseError_1 = require("./errors/ConfigParseError");
+const PropertyParseError_1 = require("./errors/PropertyParseError");
 const parseProperty = (name, parser, defaultValue, fileValue, envValue, argsValue) => {
     const sources = [
         {
@@ -31,7 +31,7 @@ const parseProperty = (name, parser, defaultValue, fileValue, envValue, argsValu
         return parser(source.value);
     }
     catch (error) {
-        throw new ConfigParseError_1.ConfigParseError(name, source.name, error.message);
+        throw new PropertyParseError_1.PropertyParseError(name, source.name, error.message);
     }
 };
 exports.parseProperty = parseProperty;

package/config/parseProperty.ts

@@ -1,4 +1,4 @@
-import { ConfigParseError } from './errors/ConfigParseError'
+import { PropertyParseError } from './errors/PropertyParseError'
 import type { Parser } from '../parser/Parser'
 
 const parseProperty = <Type>(
@@ -38,7 +38,7 @@ const parseProperty = <Type>(
   try {
     return parser(source.value)
   } catch (error) {
-    throw new ConfigParseError(name, source.name, (error as Error).message)
+    throw new PropertyParseError(name, source.name, (error as Error).message)
   }
 }
 

package/config/readFile.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFile = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const ConfigFileReadError_1 = require("./errors/ConfigFileReadError");
+const FileReadError_1 = require("./errors/FileReadError");
 const readFile = (path, required = false) => {
     let json = {};
     let fileExists;
@@ -16,15 +16,15 @@ const readFile = (path, required = false) => {
         }
     }
     catch (error) {
-        throw new ConfigFileReadError_1.ConfigFileReadError(path, error.message);
+        throw new FileReadError_1.FileReadError(path, error.message);
     }
     if (required && !fileExists) {
-        throw new ConfigFileReadError_1.ConfigFileReadError(path, 'missing file');
+        throw new FileReadError_1.FileReadError(path, 'missing file');
     }
     if (typeof json !== 'object'
         || Array.isArray(json)
         || json === null) {
-        throw new ConfigFileReadError_1.ConfigFileReadError(path, 'invalid content');
+        throw new FileReadError_1.FileReadError(path, 'invalid content');
     }
     return json;
 };

package/config/readFile.ts

@@ -1,5 +1,5 @@
 import fs from 'fs-extra'
-import { ConfigFileReadError } from './errors/ConfigFileReadError'
+import { FileReadError } from './errors/FileReadError'
 
 const readFile = (path: string, required = false): Record<string, any> => {
   let json: any = {}
@@ -11,11 +11,11 @@ const readFile = (path: string, required = false): Record<string, any> => {
       json = fs.readJsonSync(path)
     }
   } catch (error) {
-    throw new ConfigFileReadError(path, (error as Error).message)
+    throw new FileReadError(path, (error as Error).message)
   }
 
   if (required && !fileExists) {
-    throw new ConfigFileReadError(path, 'missing file')
+    throw new FileReadError(path, 'missing file')
   }
 
   if (
@@ -23,7 +23,7 @@ const readFile = (path: string, required = false): Record<string, any> => {
     || Array.isArray(json)
     || json === null
   ) {
-    throw new ConfigFileReadError(path, 'invalid content')
+    throw new FileReadError(path, 'invalid content')
   }
 
   return json as Record<string, any>

package/config/validatePropertyName.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePropertyName = void 0;
-const ConfigPropertyNameError_1 = require("./errors/ConfigPropertyNameError");
+const PropertyNameError_1 = require("./errors/PropertyNameError");
 const propertyNameRegex = /^[a-z](?:[0-9A-Za-z])*$/u;
 const validatePropertyName = (name) => {
     if (!propertyNameRegex.test(name)) {
-        throw new ConfigPropertyNameError_1.ConfigPropertyNameError(name);
+        throw new PropertyNameError_1.PropertyNameError(name);
     }
 };
 exports.validatePropertyName = validatePropertyName;

package/config/validatePropertyName.ts

@@ -1,10 +1,10 @@
-import { ConfigPropertyNameError } from './errors/ConfigPropertyNameError'
+import { PropertyNameError } from './errors/PropertyNameError'
 
 const propertyNameRegex = /^[a-z](?:[0-9A-Za-z])*$/u
 
 const validatePropertyName = (name: string): void => {
   if (!propertyNameRegex.test(name)) {
-    throw new ConfigPropertyNameError(name)
+    throw new PropertyNameError(name)
   }
 }
 

package/{tls/errors/TlsFileReadError.d.ts → env/errors/FileReadError.d.ts}

@@ -1,5 +1,5 @@
 import { BaseError } from '../../error/BaseError';
-declare class TlsFileReadError extends BaseError {
+declare class FileReadError extends BaseError {
     constructor(path: string, message: string);
 }
-export { TlsFileReadError, };
+export { FileReadError, };

package/env/errors/{EnvFileReadError.js → FileReadError.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvFileReadError = void 0;
+exports.FileReadError = void 0;
 const BaseError_1 = require("../../error/BaseError");
-class EnvFileReadError extends BaseError_1.BaseError {
+class FileReadError extends BaseError_1.BaseError {
     constructor(path, message) {
         super(`failed reading file "${path}": ${message}`);
     }
 }
-exports.EnvFileReadError = EnvFileReadError;
+exports.FileReadError = FileReadError;

package/{tls/errors/TlsFileReadError.ts → env/errors/FileReadError.ts}

@@ -1,11 +1,11 @@
 import { BaseError } from '../../error/BaseError'
 
-class TlsFileReadError extends BaseError {
+class FileReadError extends BaseError {
   public constructor(path: string, message: string) {
     super(`failed reading file "${path}": ${message}`)
   }
 }
 
 export {
-  TlsFileReadError,
+  FileReadError,
 }

package/env/readFile.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFile = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const EnvFileReadError_1 = require("./errors/EnvFileReadError");
+const FileReadError_1 = require("./errors/FileReadError");
 const readFile = (path, required = false) => {
     try {
         if (fs_extra_1.default.existsSync(path)) {
@@ -14,10 +14,10 @@ const readFile = (path, required = false) => {
         }
     }
     catch (error) {
-        throw new EnvFileReadError_1.EnvFileReadError(path, error.message);
+        throw new FileReadError_1.FileReadError(path, error.message);
     }
     if (required) {
-        throw new EnvFileReadError_1.EnvFileReadError(path, 'missing file');
+        throw new FileReadError_1.FileReadError(path, 'missing file');
     }
     return {};
 };

package/env/readFile.ts

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv'
 import fs from 'fs-extra'
-import { EnvFileReadError } from './errors/EnvFileReadError'
+import { FileReadError } from './errors/FileReadError'
 import type { Env } from './Env'
 
 const readFile = (path: string, required = false): Env => {
@@ -9,11 +9,11 @@ const readFile = (path: string, required = false): Env => {
       return dotenv.parse(fs.readFileSync(path))
     }
   } catch (error) {
-    throw new EnvFileReadError(path, (error as Error).message)
+    throw new FileReadError(path, (error as Error).message)
   }
 
   if (required) {
-    throw new EnvFileReadError(path, 'missing file')
+    throw new FileReadError(path, 'missing file')
   }
 
   return {}

package/jwt/Jwt.d.ts

@@ -3,15 +3,9 @@ import type { Payload } from './Payload';
 declare class Jwt {
     private readonly algorithm;
     private readonly secret;
-    private readonly issuer;
-    private readonly audience;
-    private readonly expiration;
     constructor(params: {
         algorithm: Algorithm;
         secret: string;
-        issuer: string;
-        audience: string;
-        expiration?: number;
     });
     createToken(payload: Payload): Promise<string>;
     verifyToken<Type extends Payload>(token: string, timestamp: number): Promise<Type | undefined>;

package/jwt/Jwt.js

@@ -6,52 +6,26 @@ const validateSecretLength_1 = require("./validateSecretLength");
 class Jwt {
     algorithm;
     secret;
-    issuer;
-    audience;
-    expiration;
     constructor(params) {
         (0, validateSecretLength_1.validateSecretLength)(params.algorithm, params.secret);
         this.algorithm = params.algorithm;
         this.secret = new TextEncoder().encode(params.secret);
-        this.issuer = params.issuer;
-        this.audience = params.audience;
-        this.expiration = params.expiration;
     }
     async createToken(payload) {
-        const jwt = new jose_1.SignJWT(Object.fromEntries(Object.entries(payload).filter(([key]) => {
-            return !['subject', 'issuedAt', 'id'].includes(key);
-        })));
-        jwt
-            .setProtectedHeader({ typ: 'JWT', alg: this.algorithm })
-            .setIssuer(this.issuer)
-            .setAudience(this.audience)
-            .setSubject(payload.subject)
-            .setIssuedAt(payload.issuedAt);
-        if (this.expiration) {
-            jwt.setExpirationTime(payload.issuedAt + this.expiration);
-        }
-        if (payload.id) {
-            jwt.setJti(payload.id);
-        }
-        return jwt.sign(this.secret);
+        return new jose_1.SignJWT(payload)
+            .setProtectedHeader({
+            typ: 'JWT',
+            alg: this.algorithm,
+        })
+            .sign(this.secret);
     }
     async verifyToken(token, timestamp) {
         try {
-            const { payload: jwt } = await (0, jose_1.jwtVerify)(token, this.secret, {
+            const { payload } = await (0, jose_1.jwtVerify)(token, this.secret, {
                 typ: 'JWT',
-                algorithms: [this.algorithm],
-                audience: this.audience,
                 currentDate: new Date(timestamp * 1000),
             });
-            const payload = Object.fromEntries(Object.entries(jwt).filter(([key]) => {
-                return !['iss', 'aud', 'sub', 'iat', 'exp', 'jti'].includes(key);
-            }));
-            return {
-                subject: jwt.sub,
-                issuedAt: jwt.iat,
-                ...jwt.jti ? { id: jwt.jti } : {},
-                ...payload,
-            };
+            return payload;
         }
         catch (error) {
             return undefined;

package/jwt/Jwt.ts

@@ -8,53 +8,23 @@ class Jwt {
 
   private readonly secret: Uint8Array
 
-  private readonly issuer: string
-
-  private readonly audience: string
-
-  private readonly expiration: number | undefined
-
   public constructor(params: {
     algorithm: Algorithm,
     secret: string,
-    issuer: string,
-    audience: string,
-    expiration?: number,
   }) {
     validateSecretLength(params.algorithm, params.secret)
 
     this.algorithm = params.algorithm
     this.secret = new TextEncoder().encode(params.secret)
-    this.issuer = params.issuer
-    this.audience = params.audience
-    this.expiration = params.expiration
   }
 
   public async createToken(payload: Payload): Promise<string> {
-    const jwt = new SignJWT(
-      Object.fromEntries(
-        Object.entries(payload).filter(([key]) => {
-          return !['subject', 'issuedAt', 'id'].includes(key)
-        }),
-      ),
-    )
-
-    jwt
-      .setProtectedHeader({ typ: 'JWT', alg: this.algorithm })
-      .setIssuer(this.issuer)
-      .setAudience(this.audience)
-      .setSubject(payload.subject)
-      .setIssuedAt(payload.issuedAt)
-
-    if (this.expiration) {
-      jwt.setExpirationTime(payload.issuedAt + this.expiration)
-    }
-
-    if (payload.id) {
-      jwt.setJti(payload.id)
-    }
-
-    return jwt.sign(this.secret)
+    return new SignJWT(payload)
+      .setProtectedHeader({
+        typ: 'JWT',
+        alg: this.algorithm,
+      })
+      .sign(this.secret)
   }
 
   public async verifyToken<Type extends Payload>(
@@ -62,25 +32,12 @@ class Jwt {
     timestamp: number,
   ): Promise<Type | undefined> {
     try {
-      const { payload: jwt } = await jwtVerify(token, this.secret, {
+      const { payload } = await jwtVerify(token, this.secret, {
         typ: 'JWT',
-        algorithms: [this.algorithm],
-        audience: this.audience,
         currentDate: new Date(timestamp * 1000),
       })
 
-      const payload = Object.fromEntries(
-        Object.entries(jwt).filter(([key]) => {
-          return !['iss', 'aud', 'sub', 'iat', 'exp', 'jti'].includes(key)
-        }),
-      )
-
-      return {
-        subject: jwt.sub,
-        issuedAt: jwt.iat,
-        ...jwt.jti ? { id: jwt.jti } : {},
-        ...payload,
-      } as Type
+      return payload as Type
     } catch (error) {
       return undefined
     }

package/jwt/Payload.d.ts

@@ -1,7 +1,11 @@
 interface Payload {
     [key: string]: unknown;
-    subject: string;
-    issuedAt: number;
-    id?: string;
+    iss?: string;
+    aud?: string[];
+    sub?: string;
+    jti?: string;
+    iat?: number;
+    exp?: number;
+    nbf?: number;
 }
 export { type Payload, };

package/jwt/Payload.ts

@@ -1,8 +1,12 @@
 interface Payload {
   [key: string]: unknown,
-  subject: string,
-  issuedAt: number,
-  id?: string,
+  iss?: string,
+  aud?: string[],
+  sub?: string,
+  jti?: string,
+  iat?: number,
+  exp?: number,
+  nbf?: number,
 }
 
 export {

package/jwt/errors/SecretLengthError.d.ts

@@ -0,0 +1,5 @@
+import { BaseError } from '../../error/BaseError';
+declare class SecretLengthError extends BaseError {
+    constructor();
+}
+export { SecretLengthError, };

package/{cipher/errors/CipherSecretLengthError.js → jwt/errors/SecretLengthError.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CipherSecretLengthError = void 0;
+exports.SecretLengthError = void 0;
 const BaseError_1 = require("../../error/BaseError");
-class CipherSecretLengthError extends BaseError_1.BaseError {
+class SecretLengthError extends BaseError_1.BaseError {
     constructor() {
         super('invalid secret length');
     }
 }
-exports.CipherSecretLengthError = CipherSecretLengthError;
+exports.SecretLengthError = SecretLengthError;

package/{cipher/errors/CipherSecretLengthError.ts → jwt/errors/SecretLengthError.ts}

@@ -1,11 +1,11 @@
 import { BaseError } from '../../error/BaseError'
 
-class CipherSecretLengthError extends BaseError {
+class SecretLengthError extends BaseError {
   public constructor() {
     super('invalid secret length')
   }
 }
 
 export {
-  CipherSecretLengthError,
+  SecretLengthError,
 }

package/jwt/validateSecretLength.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSecretLength = void 0;
 const Algorithm_1 = require("./Algorithm");
-const JwtSecretLengthError_1 = require("./errors/JwtSecretLengthError");
+const SecretLengthError_1 = require("./errors/SecretLengthError");
 const minSecretLength = {
     [Algorithm_1.Algorithm.HS256]: 32,
     [Algorithm_1.Algorithm.HS384]: 48,
@@ -10,7 +10,7 @@ const minSecretLength = {
 };
 const validateSecretLength = (algorithm, secret) => {
     if (Buffer.from(secret).length < minSecretLength[algorithm]) {
-        throw new JwtSecretLengthError_1.JwtSecretLengthError();
+        throw new SecretLengthError_1.SecretLengthError();
     }
 };
 exports.validateSecretLength = validateSecretLength;

package/jwt/validateSecretLength.ts

@@ -1,5 +1,5 @@
 import { Algorithm } from './Algorithm'
-import { JwtSecretLengthError } from './errors/JwtSecretLengthError'
+import { SecretLengthError } from './errors/SecretLengthError'
 
 const minSecretLength = {
   [Algorithm.HS256]: 32,
@@ -9,7 +9,7 @@ const minSecretLength = {
 
 const validateSecretLength = (algorithm: Algorithm, secret: string): void => {
   if (Buffer.from(secret).length < minSecretLength[algorithm]) {
-    throw new JwtSecretLengthError()
+    throw new SecretLengthError()
   }
 }
 

package/logger/Level.d.ts

@@ -1,9 +1,10 @@
 declare enum Level {
-    TRACE = 10,
-    DEBUG = 20,
-    INFO = 30,
-    WARN = 40,
-    ERROR = 50,
-    FATAL = 60
+    TRACE = "trace",
+    DEBUG = "debug",
+    INFO = "info",
+    WARN = "warn",
+    ERROR = "error",
+    FATAL = "fatal",
+    OFF = "off"
 }
 export { Level, };

package/logger/Level.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Level = void 0;
 var Level;
 (function (Level) {
-    Level[Level["TRACE"] = 10] = "TRACE";
-    Level[Level["DEBUG"] = 20] = "DEBUG";
-    Level[Level["INFO"] = 30] = "INFO";
-    Level[Level["WARN"] = 40] = "WARN";
-    Level[Level["ERROR"] = 50] = "ERROR";
-    Level[Level["FATAL"] = 60] = "FATAL";
+    Level["TRACE"] = "trace";
+    Level["DEBUG"] = "debug";
+    Level["INFO"] = "info";
+    Level["WARN"] = "warn";
+    Level["ERROR"] = "error";
+    Level["FATAL"] = "fatal";
+    Level["OFF"] = "off";
 })(Level || (exports.Level = Level = {}));

package/logger/Level.ts

@@ -1,10 +1,11 @@
 enum Level {
-  TRACE = 10,
-  DEBUG = 20,
-  INFO = 30,
-  WARN = 40,
-  ERROR = 50,
-  FATAL = 60,
+  TRACE = 'trace',
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error',
+  FATAL = 'fatal',
+  OFF = 'off',
 }
 
 export {

package/logger/Logger.d.ts

@@ -1,10 +1,10 @@
-interface Logger {
-    trace: (message: string, data?: unknown) => void;
-    debug: (message: string, data?: unknown) => void;
-    info: (message: string, data?: unknown) => void;
-    warn: (message: string, data?: unknown) => void;
-    error: (message: string, data?: unknown) => void;
-    fatal: (message: string, data?: unknown) => void;
-    close: () => Promise<void>;
+declare abstract class Logger {
+    abstract trace(message: string, data?: unknown): void;
+    abstract debug(message: string, data?: unknown): void;
+    abstract info(message: string, data?: unknown): void;
+    abstract warn(message: string, data?: unknown): void;
+    abstract error(message: string, data?: unknown): void;
+    abstract fatal(message: string, data?: unknown): void;
+    abstract close(): Promise<void>;
 }
-export { type Logger, };
+export { Logger, };

package/logger/Logger.js

@@ -1,2 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+class Logger {
+}
+exports.Logger = Logger;

package/logger/Logger.ts

@@ -1,13 +1,19 @@
-interface Logger {
-  trace: (message: string, data?: unknown) => void,
-  debug: (message: string, data?: unknown) => void,
-  info: (message: string, data?: unknown) => void,
-  warn: (message: string, data?: unknown) => void,
-  error: (message: string, data?: unknown) => void,
-  fatal: (message: string, data?: unknown) => void,
-  close: () => Promise<void>,
+abstract class Logger {
+  public abstract trace(message: string, data?: unknown): void
+
+  public abstract debug(message: string, data?: unknown): void
+
+  public abstract info(message: string, data?: unknown): void
+
+  public abstract warn(message: string, data?: unknown): void
+
+  public abstract error(message: string, data?: unknown): void
+
+  public abstract fatal(message: string, data?: unknown): void
+
+  public abstract close(): Promise<void>
 }
 
 export {
-  type Logger,
+  Logger,
 }

package/logger/Severity.d.ts

@@ -1,10 +1,9 @@
 declare enum Severity {
-    TRACE = "trace",
-    DEBUG = "debug",
-    INFO = "info",
-    WARN = "warn",
-    ERROR = "error",
-    FATAL = "fatal",
-    OFF = "off"
+    TRACE = 10,
+    DEBUG = 20,
+    INFO = 30,
+    WARN = 40,
+    ERROR = 50,
+    FATAL = 60
 }
 export { Severity, };

package/logger/Severity.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Severity = void 0;
 var Severity;
 (function (Severity) {
-    Severity["TRACE"] = "trace";
-    Severity["DEBUG"] = "debug";
-    Severity["INFO"] = "info";
-    Severity["WARN"] = "warn";
-    Severity["ERROR"] = "error";
-    Severity["FATAL"] = "fatal";
-    Severity["OFF"] = "off";
+    Severity[Severity["TRACE"] = 10] = "TRACE";
+    Severity[Severity["DEBUG"] = 20] = "DEBUG";
+    Severity[Severity["INFO"] = 30] = "INFO";
+    Severity[Severity["WARN"] = 40] = "WARN";
+    Severity[Severity["ERROR"] = 50] = "ERROR";
+    Severity[Severity["FATAL"] = 60] = "FATAL";
 })(Severity || (exports.Severity = Severity = {}));

package/logger/Severity.ts

@@ -1,11 +1,10 @@
 enum Severity {
-  TRACE = 'trace',
-  DEBUG = 'debug',
-  INFO = 'info',
-  WARN = 'warn',
-  ERROR = 'error',
-  FATAL = 'fatal',
-  OFF = 'off',
+  TRACE = 10,
+  DEBUG = 20,
+  INFO = 30,
+  WARN = 40,
+  ERROR = 50,
+  FATAL = 60,
 }
 
 export {