@bgord/bun 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bgord/bun",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "license": "MIT",
   "type": "module",
   "author": "Bartosz Gordon",

package/readme.md

@@ -237,14 +237,16 @@ src/
 ├── secret-manager.port.ts
 ├── secret.vo.ts
 ├── setup.service.ts
-├── shield-api-key.middleware.ts
+├── shield-api-key-noop.adapter.ts
+├── shield-api-key.adapter.ts
 ├── shield-auth.middleware.ts
 ├── shield-captcha-hcaptcha-local.adapter.ts
 ├── shield-captcha-hcaptcha.adapter.ts
 ├── shield-captcha-noop.adapter.ts
 ├── shield-captcha-recaptcha.adapter.ts
-├── shield-captcha.port.ts
-├── shield-rate-limit.middleware.ts
+├── shield-rate-limit-noop.adapter.ts
+├── shield-rate-limit.adapter.ts
+├── shield.port.ts
 ├── simulated-error.middleware.ts
 ├── slower.middleware.ts
 ├── static-files.service.ts

package/src/index.ts

@@ -158,14 +158,16 @@ export * from "./secret.vo";
 export * from "./secret-manager.port";
 export * from "./secret-manager-noop.adapter";
 export * from "./setup.service";
-export * from "./shield-api-key.middleware";
+export * from "./shield.port";
+export * from "./shield-api-key.adapter";
+export * from "./shield-api-key-noop.adapter";
 export * from "./shield-auth.middleware";
-export * from "./shield-captcha.port";
 export * from "./shield-captcha-hcaptcha.adapter";
 export * from "./shield-captcha-hcaptcha-local.adapter";
 export * from "./shield-captcha-noop.adapter";
 export * from "./shield-captcha-recaptcha.adapter";
-export * from "./shield-rate-limit.middleware";
+export * from "./shield-rate-limit.adapter";
+export * from "./shield-rate-limit-noop.adapter";
 export * from "./simulated-error.middleware";
 export * from "./slower.middleware";
 export * from "./static-files.service";

package/src/shield-api-key-noop.adapter.ts

@@ -0,0 +1,8 @@
+import { createMiddleware } from "hono/factory";
+import type { ShieldPort } from "./shield.port";
+
+export class ShieldApiKeyAdapterNoop implements ShieldPort {
+  verify = createMiddleware(async (_c, next) => {
+    return next();
+  });
+}

package/src/{shield-api-key.middleware.ts → shield-api-key.adapter.ts}

@@ -1,18 +1,19 @@
 import type * as tools from "@bgord/tools";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
+import type { ShieldPort } from "./shield.port";
 
 type ApiKeyShieldConfigType = { API_KEY: tools.ApiKeyType };
 
 export const AccessDeniedApiKeyError = new HTTPException(403, { message: "access_denied_api_key" });
 
-export class ShieldApiKey {
+export class ShieldApiKeyAdapter implements ShieldPort {
   static readonly HEADER_NAME = "bgord-api-key";
 
   constructor(private readonly config: ApiKeyShieldConfigType) {}
 
   verify = createMiddleware(async (c, next) => {
-    if (c.req.header(ShieldApiKey.HEADER_NAME) === this.config.API_KEY) return next();
+    if (c.req.header(ShieldApiKeyAdapter.HEADER_NAME) === this.config.API_KEY) return next();
 
     throw AccessDeniedApiKeyError;
   });

package/src/shield-captcha-hcaptcha-local.adapter.ts

@@ -2,13 +2,13 @@ import hcaptcha from "hcaptcha";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import type { HCaptchaSecretKeyType } from "./hcaptcha-secret-key.vo";
-import type { ShieldCaptchaPort } from "./shield-captcha.port";
+import type { ShieldPort } from "./shield.port";
 
 export const AccessDeniedHcaptchaLocalError = new HTTPException(403, {
   message: "access_denied_hcaptcha_local",
 });
 
-export class ShieldCaptchaHcaptchaLocalAdapter implements ShieldCaptchaPort {
+export class ShieldCaptchaHcaptchaLocalAdapter implements ShieldPort {
   constructor(private readonly secretKey: HCaptchaSecretKeyType) {}
 
   verify = createMiddleware(async (_c, next) => {

package/src/shield-captcha-hcaptcha.adapter.ts

@@ -2,11 +2,11 @@ import hcaptcha from "hcaptcha";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import type { HCaptchaSecretKeyType } from "./hcaptcha-secret-key.vo";
-import type { ShieldCaptchaPort } from "./shield-captcha.port";
+import type { ShieldPort } from "./shield.port";
 
 export const AccessDeniedHcaptchaError = new HTTPException(403, { message: "access_denied_hcaptcha" });
 
-export class ShieldCaptchaHcaptchaAdapter implements ShieldCaptchaPort {
+export class ShieldCaptchaHcaptchaAdapter implements ShieldPort {
   constructor(private readonly secretKey: HCaptchaSecretKeyType) {}
 
   verify = createMiddleware(async (c, next) => {

package/src/shield-captcha-noop.adapter.ts

@@ -1,6 +1,6 @@
 import { createMiddleware } from "hono/factory";
-import type { ShieldCaptchaPort } from "./shield-captcha.port";
+import type { ShieldPort } from "./shield.port";
 
-export class ShieldCaptchaNoopAdapter implements ShieldCaptchaPort {
+export class ShieldCaptchaNoopAdapter implements ShieldPort {
   verify = createMiddleware(async (_c, next) => next());
 }

package/src/shield-captcha-recaptcha.adapter.ts

@@ -1,14 +1,14 @@
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import type { RecaptchaSecretKeyType } from "./recaptcha-secret-key.vo";
-import type { ShieldCaptchaPort } from "./shield-captcha.port";
+import type { ShieldPort } from "./shield.port";
 
 export type RecaptchaVerifierConfigType = { secretKey: RecaptchaSecretKeyType };
 export type RecaptchaResultType = { success: boolean; score: number };
 
 export const AccessDeniedRecaptchaError = new HTTPException(403, { message: "access_denied_recaptcha" });
 
-export class ShieldCaptchaRecaptchaAdapter implements ShieldCaptchaPort {
+export class ShieldCaptchaRecaptchaAdapter implements ShieldPort {
   constructor(private readonly config: RecaptchaVerifierConfigType) {}
 
   verify = createMiddleware(async (c, next) => {

package/src/shield-rate-limit-noop.adapter.ts

@@ -0,0 +1,8 @@
+import { createMiddleware } from "hono/factory";
+import type { ShieldPort } from "./shield.port";
+
+export class ShieldRateLimitNoopAdapter implements ShieldPort {
+  verify = createMiddleware(async (_c, next) => {
+    return next();
+  });
+}

package/src/{shield-rate-limit.middleware.ts → shield-rate-limit.adapter.ts}

@@ -4,6 +4,7 @@ import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import type { ClockPort } from "./clock.port";
 import type { RateLimitStorePort } from "./rate-limit-store.port";
+import type { ShieldPort } from "./shield.port";
 
 type SubjectResolver = (c: Context) => string;
 type RateLimitShieldOptionsType = { enabled: boolean; store: RateLimitStorePort; subject: SubjectResolver };
@@ -15,25 +16,30 @@ export const UserSubjectResolver: SubjectResolver = (c) => c.get("user")?.id ??
 
 export const TooManyRequestsError = new HTTPException(429, { message: "app.too_many_requests" });
 
-export const ShieldRateLimit = (options: RateLimitShieldOptionsType, deps: Dependencies) => {
-  return createMiddleware(async (c, next) => {
-    if (!options.enabled) return next();
+export class ShieldRateLimitAdapter implements ShieldPort {
+  constructor(
+    private readonly options: RateLimitShieldOptionsType,
+    private readonly deps: Dependencies,
+  ) {}
 
-    const subject = options.subject(c);
+  verify = createMiddleware(async (c, next) => {
+    if (!this.options.enabled) return next();
 
-    let limiter = await options.store.get(subject);
+    const subject = this.options.subject(c);
+
+    let limiter = await this.options.store.get(subject);
 
     if (!limiter) {
-      limiter = new tools.RateLimiter(options.store.ttl);
-      options.store.set(subject, limiter);
+      limiter = new tools.RateLimiter(this.options.store.ttl);
+      this.options.store.set(subject, limiter);
     }
 
-    const check = limiter.verify(deps.Clock.now());
+    const check = limiter.verify(this.deps.Clock.now());
 
     if (!check.allowed) throw TooManyRequestsError;
 
-    options.store.set(subject, limiter);
+    this.options.store.set(subject, limiter);
 
     return next();
   });
-};
+}

package/src/{shield-captcha.port.ts → shield.port.ts}

@@ -1,5 +1,5 @@
 import type { MiddlewareHandler } from "hono";
 
-export interface ShieldCaptchaPort {
+export interface ShieldPort {
   verify: MiddlewareHandler;
 }

package/dist/shield-api-key.middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-api-key.middleware.d.ts","sourceRoot":"","sources":["../src/shield-api-key.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,KAAK,sBAAsB,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC,UAAU,CAAA;CAAE,CAAC;AAE5D,eAAO,MAAM,uBAAuB,eAA+D,CAAC;AAEpG,qBAAa,YAAY;IAGX,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,MAAM,CAAC,QAAQ,CAAC,WAAW,mBAAmB;gBAEjB,MAAM,EAAE,sBAAsB;IAE3D,MAAM,8DAIH;CACJ"}

package/dist/shield-api-key.middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-api-key.middleware.js","sourceRoot":"","sources":["../src/shield-api-key.middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;AAEpG,MAAM,OAAO,YAAY;IAGM;IAF7B,MAAM,CAAU,WAAW,GAAG,eAAe,CAAC;IAE9C,YAA6B,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;IAAG,CAAC;IAE/D,MAAM,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QAC1C,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,IAAI,EAAE,CAAC;QAElF,MAAM,uBAAuB,CAAC;IAChC,CAAC,CAAC,CAAC"}

package/dist/shield-captcha.port.d.ts

@@ -1,5 +0,0 @@
-import type { MiddlewareHandler } from "hono";
-export interface ShieldCaptchaPort {
-    verify: MiddlewareHandler;
-}
-//# sourceMappingURL=shield-captcha.port.d.ts.map

package/dist/shield-captcha.port.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-captcha.port.d.ts","sourceRoot":"","sources":["../src/shield-captcha.port.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,iBAAiB,CAAC;CAC3B"}

package/dist/shield-captcha.port.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=shield-captcha.port.js.map

package/dist/shield-captcha.port.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-captcha.port.js","sourceRoot":"","sources":["../src/shield-captcha.port.ts"],"names":[],"mappings":""}

package/dist/shield-rate-limit.middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-rate-limit.middleware.d.ts","sourceRoot":"","sources":["../src/shield-rate-limit.middleware.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,KAAK,eAAe,GAAG,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;AAC9C,KAAK,0BAA0B,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,CAAC;AAE5G,KAAK,YAAY,GAAG;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEzC,eAAO,MAAM,mBAAmB,EAAE,eAA8B,CAAC;AACjE,eAAO,MAAM,mBAAmB,EAAE,eAAoD,CAAC;AAEvF,eAAO,MAAM,oBAAoB,eAA+D,CAAC;AAEjG,eAAO,MAAM,eAAe,GAAI,SAAS,0BAA0B,EAAE,MAAM,YAAY,gEAqBtF,CAAC"}

package/dist/shield-rate-limit.middleware.js

@@ -1,24 +0,0 @@
-import * as tools from "@bgord/tools";
-import { createMiddleware } from "hono/factory";
-import { HTTPException } from "hono/http-exception";
-export const AnonSubjectResolver = () => "anon";
-export const UserSubjectResolver = (c) => c.get("user")?.id ?? "anon";
-export const TooManyRequestsError = new HTTPException(429, { message: "app.too_many_requests" });
-export const ShieldRateLimit = (options, deps) => {
-    return createMiddleware(async (c, next) => {
-        if (!options.enabled)
-            return next();
-        const subject = options.subject(c);
-        let limiter = await options.store.get(subject);
-        if (!limiter) {
-            limiter = new tools.RateLimiter(options.store.ttl);
-            options.store.set(subject, limiter);
-        }
-        const check = limiter.verify(deps.Clock.now());
-        if (!check.allowed)
-            throw TooManyRequestsError;
-        options.store.set(subject, limiter);
-        return next();
-    });
-};
-//# sourceMappingURL=shield-rate-limit.middleware.js.map

package/dist/shield-rate-limit.middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"shield-rate-limit.middleware.js","sourceRoot":"","sources":["../src/shield-rate-limit.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASpD,MAAM,CAAC,MAAM,mBAAmB,GAAoB,GAAG,EAAE,CAAC,MAAM,CAAC;AACjE,MAAM,CAAC,MAAM,mBAAmB,GAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,MAAM,CAAC;AAEvF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;AAEjG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAmC,EAAE,IAAkB,EAAE,EAAE;IACzF,OAAO,gBAAgB,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO,IAAI,EAAE,CAAC;QAEpC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEnC,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAE/C,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,MAAM,oBAAoB,CAAC;QAE/C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEpC,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}