@bgord/bun 1.4.12 → 1.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",
@@ -28,8 +28,8 @@
     "@types/nodemailer": "7.0.4",
     "@types/yazl": "3.3.0",
     "cspell": "9.4.0",
-    "knip": "5.73.3",
-    "lefthook": "2.0.9",
+    "knip": "5.73.4",
+    "lefthook": "2.0.11",
     "only-allow": "1.2.2",
     "sharp": "0.34.5",
     "shellcheck": "4.1.0",

package/readme.md

@@ -71,7 +71,7 @@ src/
 ├── encryption-key.vo.ts
 ├── encryption-noop.adapter.ts
 ├── encryption.port.ts
-├── env-validator.service.ts
+├── environment-validator.service.ts
 ├── etag-extractor.middleware.ts
 ├── event-bus-like.types.ts
 ├── event-envelope.ts
@@ -239,11 +239,13 @@ src/
 ├── setup.service.ts
 ├── shield-api-key.adapter.ts
 ├── shield-auth.middleware.ts
+├── shield-basic-auth.adapter.ts
 ├── shield-captcha-hcaptcha-local.adapter.ts
 ├── shield-captcha-hcaptcha.adapter.ts
 ├── shield-captcha-recaptcha.adapter.ts
 ├── shield-noop.adapter.ts
 ├── shield-rate-limit.adapter.ts
+├── shield-timeout.adapter.ts
 ├── shield.port.ts
 ├── simulated-error.middleware.ts
 ├── slower.middleware.ts

package/src/basic-auth.service.ts

@@ -1,15 +1,14 @@
 import type { BasicAuthPasswordType } from "./basic-auth-password.vo";
 import type { BasicAuthUsernameType } from "./basic-auth-username.vo";
 
+type BasicAuthConfigType = { username: BasicAuthUsernameType; password: BasicAuthPasswordType };
+
 export class BasicAuth {
-  static toHeaderValue(
-    username: BasicAuthUsernameType,
-    password: BasicAuthPasswordType,
-  ): { authorization: string } {
-    return { authorization: `Basic ${btoa(`${username}:${password}`)}` };
+  static toHeaderValue(config: BasicAuthConfigType): { authorization: string } {
+    return { authorization: `Basic ${btoa(`${config.username}:${config.password}`)}` };
   }
 
-  static toHeader(username: BasicAuthUsernameType, password: BasicAuthPasswordType): Headers {
-    return new Headers(BasicAuth.toHeaderValue(username, password));
+  static toHeader(config: BasicAuthConfigType): Headers {
+    return new Headers(BasicAuth.toHeaderValue(config));
   }
 }

package/src/{env-validator.service.ts → environment-validator.service.ts}

@@ -5,6 +5,8 @@ type NodeEnvironmentEnumType = z.infer<typeof NodeEnvironment>;
 type AnyZodSchema = z.ZodSchema<any, any>;
 type EnvironmentValidatorConfig = { type: unknown; schema: AnyZodSchema };
 
+export type EnvironmentResultType<SchemaType> = SchemaType & { type: NodeEnvironmentEnumType };
+
 export const EnvironmentValidatorError = { Invalid: "environment.validator.invalid" } as const;
 
 export class EnvironmentValidator<SchemaType> {
@@ -24,7 +26,7 @@ export class EnvironmentValidator<SchemaType> {
     throw new Error(EnvironmentValidatorError.Invalid);
   }
 
-  load(): SchemaType & { type: NodeEnvironmentEnumType } {
+  load(): EnvironmentResultType<SchemaType> {
     return { ...this.schema.parse(process.env), type: this.type };
   }
 }

package/src/index.ts

@@ -43,7 +43,7 @@ export * from "./encryption.port";
 export * from "./encryption-bun.adapter";
 export * from "./encryption-key.vo";
 export * from "./encryption-noop.adapter";
-export * from "./env-validator.service";
+export * from "./environment-validator.service";
 export * from "./etag-extractor.middleware";
 export * from "./event.types";
 export * from "./event-bus-like.types";
@@ -161,11 +161,13 @@ export * from "./setup.service";
 export * from "./shield.port";
 export * from "./shield-api-key.adapter";
 export * from "./shield-auth.middleware";
+export * from "./shield-basic-auth.adapter";
 export * from "./shield-captcha-hcaptcha.adapter";
 export * from "./shield-captcha-hcaptcha-local.adapter";
 export * from "./shield-captcha-recaptcha.adapter";
 export * from "./shield-noop.adapter";
 export * from "./shield-rate-limit.adapter";
+export * from "./shield-timeout.adapter";
 export * from "./simulated-error.middleware";
 export * from "./slower.middleware";
 export * from "./static-files.service";

package/src/logger-winston-local.adapter.ts

@@ -10,31 +10,12 @@ export class LoggerWinstonLocalAdapter {
   constructor(private readonly config: LoggerWinstonLocalAdapterConfigType) {}
 
   create(level: LogLevelEnum): LoggerPort {
-    const coloredConsoleTransport = new winston.transports.Console({
-      format: winston.format.combine(
-        winston.format.colorize({ all: true }),
-        winston.format.printf((info) => {
-          const {
-            level,
-            message,
-            timestamp,
-            [Symbol.for("level")]: _level,
-            [Symbol.for("message")]: _message,
-            ...rest
-          } = info;
-
-          return JSON.stringify({ level, message, ...rest, timestamp }, null, 2);
-        }),
-      ),
-    });
-
     return new LoggerWinstonAdapter({
       app: this.config.app,
       environment: NodeEnvironmentEnum.local,
       level,
       redactor: this.config.redactor,
-      transports: [coloredConsoleTransport],
-      formats: [],
+      formats: [winston.format.prettyPrint()],
       filePath: null,
     });
   }

package/src/logger-winston.adapter.ts

@@ -21,7 +21,7 @@ export class LoggerWinstonAdapter implements LoggerPort {
 
   constructor(options: WinstonLoggerOptions) {
     const format = winston.format.combine(
-      winston.format((log) => options.redactor.redact(log))(),
+      winston.format((info) => options.redactor.redact(info))(),
       winston.format.errors({ stack: true }),
       winston.format.timestamp(),
       winston.format.json(),
@@ -35,7 +35,7 @@ export class LoggerWinstonAdapter implements LoggerPort {
       handleExceptions: true,
       handleRejections: true,
       format,
-      transports: options.transports ?? [],
+      transports: [new winston.transports.Console(), ...(options.transports ?? [])],
     });
 
     this.filePath = options.filePath;

package/src/shield-basic-auth.adapter.ts

@@ -0,0 +1,17 @@
+import { basicAuth } from "hono/basic-auth";
+import { createMiddleware } from "hono/factory";
+import type { BasicAuthPasswordType } from "./basic-auth-password.vo";
+import type { BasicAuthUsernameType } from "./basic-auth-username.vo";
+import type { ShieldPort } from "./shield.port";
+
+type ShieldBasicAuthConfigType = { username: BasicAuthUsernameType; password: BasicAuthPasswordType };
+
+export class ShieldBasicAuthAdapter implements ShieldPort {
+  private readonly basicAuth;
+
+  constructor(config: ShieldBasicAuthConfigType) {
+    this.basicAuth = basicAuth(config);
+  }
+
+  verify = createMiddleware(async (c, next) => this.basicAuth(c, next));
+}

package/src/shield-timeout.adapter.ts

@@ -0,0 +1,19 @@
+import type * as tools from "@bgord/tools";
+import { createMiddleware } from "hono/factory";
+import { HTTPException } from "hono/http-exception";
+import { timeout } from "hono/timeout";
+import type { ShieldPort } from "./shield.port";
+
+export const RequestTimeoutError = new HTTPException(408, { message: "request_timeout_error" });
+
+type ShieldTimeoutConfigType = { duration: tools.Duration };
+
+export class ShieldTimeoutAdapter implements ShieldPort {
+  private readonly timeout;
+
+  constructor(config: ShieldTimeoutConfigType) {
+    this.timeout = timeout(config.duration.ms, RequestTimeoutError);
+  }
+
+  verify = createMiddleware(async (c, next) => this.timeout(c, next));
+}

package/dist/env-validator.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"env-validator.service.d.ts","sourceRoot":"","sources":["../src/env-validator.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAC/D,KAAK,YAAY,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC1C,KAAK,0BAA0B,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AAE1E,eAAO,MAAM,yBAAyB;;CAAwD,CAAC;AAE/F,qBAAa,oBAAoB,CAAC,UAAU;IAC1C,IAAI,EAAE,uBAAuB,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAEjB,MAAM,EAAE,0BAA0B;IAa9C,IAAI,IAAI,UAAU,GAAG;QAAE,IAAI,EAAE,uBAAuB,CAAA;KAAE;CAGvD"}

package/dist/env-validator.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"env-validator.service.js","sourceRoot":"","sources":["../src/env-validator.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMrD,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,OAAO,EAAE,+BAA+B,EAAW,CAAC;AAE/F,MAAM,OAAO,oBAAoB;IAC/B,IAAI,CAA0B;IAC9B,MAAM,CAAuB;IAE7B,YAAY,MAAkC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE5B,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAI;QACF,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAChE,CAAC;CACF"}