@bgord/bun 1.18.9 → 1.18.10

package/dist/hcaptcha-secret-key.vo.d.ts

@@ -1,8 +1,8 @@
 import * as v from "valibot";
-export declare const HCaptchaSecretKeyError: {
-    Type: string;
-    Length: string;
+export declare const HcaptchaSecretKeyError: {
+    readonly Type: "hcaptcha.secret.key.type";
+    readonly InvalidFormat: "hcaptcha.secret.key.invalid.format";
 };
-export declare const HCaptchaSecretKey: v.SchemaWithPipe<readonly [v.StringSchema<string>, v.LengthAction<string, 35, string>, v.BrandAction<string, "HCaptchaSecretKey">]>;
+export declare const HCaptchaSecretKey: v.SchemaWithPipe<readonly [v.StringSchema<"hcaptcha.secret.key.type">, v.RegexAction<string, "hcaptcha.secret.key.invalid.format">, v.BrandAction<string, "HcaptchaSecretKey">]>;
 export type HCaptchaSecretKeyType = v.InferOutput<typeof HCaptchaSecretKey>;
 //# sourceMappingURL=hcaptcha-secret-key.vo.d.ts.map

package/dist/hcaptcha-secret-key.vo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hcaptcha-secret-key.vo.d.ts","sourceRoot":"","sources":["../src/hcaptcha-secret-key.vo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,eAAO,MAAM,sBAAsB;IACjC,IAAI;IACJ,MAAM;CACP,CAAC;AAEF,eAAO,MAAM,iBAAiB,qIAK7B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"hcaptcha-secret-key.vo.d.ts","sourceRoot":"","sources":["../src/hcaptcha-secret-key.vo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,eAAO,MAAM,sBAAsB;aACjC,IAAI,EAAE,0BAA0B;aAChC,aAAa,EAAE,oCAAoC;CAC3C,CAAC;AAKX,eAAO,MAAM,iBAAiB,kLAK7B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/dist/hcaptcha-secret-key.vo.js

@@ -1,9 +1,11 @@
 import * as v from "valibot";
-export const HCaptchaSecretKeyError = {
+export const HcaptchaSecretKeyError = {
     Type: "hcaptcha.secret.key.type",
-    Length: "hcaptcha.secret.key.length",
+    InvalidFormat: "hcaptcha.secret.key.invalid.format",
 };
-export const HCaptchaSecretKey = v.pipe(v.string(HCaptchaSecretKeyError.Type), v.length(35, HCaptchaSecretKeyError.Length), 
+// 0x followed by 40 hex chars (standard) or ES_ followed by 32 hex chars (Enterprise)
+const CHARS_WHITELIST = /^(0x[a-fA-F0-9]{40}|ES_[a-fA-F0-9]{32})$/;
+export const HCaptchaSecretKey = v.pipe(v.string(HcaptchaSecretKeyError.Type), v.regex(CHARS_WHITELIST, HcaptchaSecretKeyError.InvalidFormat), 
 // Stryker disable next-line StringLiteral
-v.brand("HCaptchaSecretKey"));
+v.brand("HcaptchaSecretKey"));
 //# sourceMappingURL=hcaptcha-secret-key.vo.js.map

package/dist/hcaptcha-secret-key.vo.js.map

@@ -1 +1 @@
-{"version":3,"file":"hcaptcha-secret-key.vo.js","sourceRoot":"","sources":["../src/hcaptcha-secret-key.vo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,IAAI,EAAE,0BAA0B;IAChC,MAAM,EAAE,4BAA4B;CACrC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CACrC,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,EACrC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,sBAAsB,CAAC,MAAM,CAAC;AAC3C,0CAA0C;AAC1C,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAC7B,CAAC"}
+{"version":3,"file":"hcaptcha-secret-key.vo.js","sourceRoot":"","sources":["../src/hcaptcha-secret-key.vo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,IAAI,EAAE,0BAA0B;IAChC,aAAa,EAAE,oCAAoC;CAC3C,CAAC;AAEX,sFAAsF;AACtF,MAAM,eAAe,GAAG,0CAA0C,CAAC;AAEnE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CACrC,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,EACrC,CAAC,CAAC,KAAK,CAAC,eAAe,EAAE,sBAAsB,CAAC,aAAa,CAAC;AAC9D,0CAA0C;AAC1C,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAC7B,CAAC"}

package/dist/shield-hcaptcha-hono-local.strategy.d.ts

@@ -1,12 +1,13 @@
 import type { MiddlewareHandler } from "hono";
-import type { HCaptchaSecretKeyType } from "./hcaptcha-secret-key.vo";
 import type { MiddlewareHonoPort } from "./middleware-hono.port";
 export declare const ShieldHcaptchaLocalStrategyError: {
     Rejected: string;
 };
 export declare class ShieldHcaptchaLocalHonoStrategy implements MiddlewareHonoPort {
     private readonly strategy;
-    constructor(secretKey: HCaptchaSecretKeyType);
+    private static readonly SECRET_KEY_LOCAL;
+    private static readonly TOKEN_LOCAL;
+    constructor();
     handle(): MiddlewareHandler;
 }
 //# sourceMappingURL=shield-hcaptcha-hono-local.strategy.d.ts.map

package/dist/shield-hcaptcha-hono-local.strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shield-hcaptcha-hono-local.strategy.d.ts","sourceRoot":"","sources":["../src/shield-hcaptcha-hono-local.strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,eAAO,MAAM,gCAAgC;IAAK,QAAQ;CAAoC,CAAC;AAE/F,qBAAa,+BAAgC,YAAW,kBAAkB;IACxE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAElD,YAAY,SAAS,EAAE,qBAAqB,EAE3C;IAED,MAAM,IAAI,iBAAiB,CAK1B;CACF"}
+{"version":3,"file":"shield-hcaptcha-hono-local.strategy.d.ts","sourceRoot":"","sources":["../src/shield-hcaptcha-hono-local.strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,eAAO,MAAM,gCAAgC;IAAK,QAAQ;CAAoC,CAAC;AAE/F,qBAAa,+BAAgC,YAAW,kBAAkB;IACxE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAElD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAGtC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAA0C;IAE7E,cAEC;IAED,MAAM,IAAI,iBAAiB,CAK1B;CACF"}

package/dist/shield-hcaptcha-hono-local.strategy.js

@@ -1,14 +1,18 @@
 import { HTTPException } from "hono/http-exception";
+import * as v from "valibot";
+import { HCaptchaSecretKey } from "./hcaptcha-secret-key.vo";
 import { ShieldHcaptchaStrategy } from "./shield-hcaptcha.strategy";
 export const ShieldHcaptchaLocalStrategyError = { Rejected: "shield.hcaptcha.local.rejected" };
 export class ShieldHcaptchaLocalHonoStrategy {
     strategy;
-    constructor(secretKey) {
-        this.strategy = new ShieldHcaptchaStrategy(secretKey);
+    static SECRET_KEY_LOCAL = v.parse(HCaptchaSecretKey, "0x0000000000000000000000000000000000000000");
+    static TOKEN_LOCAL = "10000000-aaaa-bbbb-cccc-000000000001";
+    constructor() {
+        this.strategy = new ShieldHcaptchaStrategy(ShieldHcaptchaLocalHonoStrategy.SECRET_KEY_LOCAL);
     }
     handle() {
         return async (_c, next) => {
-            if (await this.strategy.evaluate("10000000-aaaa-bbbb-cccc-000000000001"))
+            if (await this.strategy.evaluate(ShieldHcaptchaLocalHonoStrategy.TOKEN_LOCAL))
                 return next();
             throw new HTTPException(403, { message: ShieldHcaptchaLocalStrategyError.Rejected });
         };

package/dist/shield-hcaptcha-hono-local.strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"shield-hcaptcha-hono-local.strategy.js","sourceRoot":"","sources":["../src/shield-hcaptcha-hono-local.strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,QAAQ,EAAE,gCAAgC,EAAE,CAAC;AAE/F,MAAM,OAAO,+BAA+B;IACzB,QAAQ,CAAyB;IAElD,YAAY,SAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACJ,OAAO,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;YACxB,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,sCAAsC,CAAC;gBAAE,OAAO,IAAI,EAAE,CAAC;YACxF,MAAM,IAAI,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,gCAAgC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"shield-hcaptcha-hono-local.strategy.js","sourceRoot":"","sources":["../src/shield-hcaptcha-hono-local.strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,QAAQ,EAAE,gCAAgC,EAAE,CAAC;AAE/F,MAAM,OAAO,+BAA+B;IACzB,QAAQ,CAAyB;IAE1C,MAAM,CAAU,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAChD,iBAAiB,EACjB,4CAA4C,CAC7C,CAAC;IAEM,MAAM,CAAU,WAAW,GAAG,sCAAsC,CAAC;IAE7E;QACE,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CAAC,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IAC/F,CAAC;IAED,MAAM;QACJ,OAAO,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;YACxB,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,+BAA+B,CAAC,WAAW,CAAC;gBAAE,OAAO,IAAI,EAAE,CAAC;YAC7F,MAAM,IAAI,aAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,gCAAgC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC;IACJ,CAAC;CACF"}

package/package.json

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

package/src/hcaptcha-secret-key.vo.ts

@@ -1,15 +1,18 @@
 import * as v from "valibot";
 
-export const HCaptchaSecretKeyError = {
+export const HcaptchaSecretKeyError = {
   Type: "hcaptcha.secret.key.type",
-  Length: "hcaptcha.secret.key.length",
-};
+  InvalidFormat: "hcaptcha.secret.key.invalid.format",
+} as const;
+
+// 0x followed by 40 hex chars (standard) or ES_ followed by 32 hex chars (Enterprise)
+const CHARS_WHITELIST = /^(0x[a-fA-F0-9]{40}|ES_[a-fA-F0-9]{32})$/;
 
 export const HCaptchaSecretKey = v.pipe(
-  v.string(HCaptchaSecretKeyError.Type),
-  v.length(35, HCaptchaSecretKeyError.Length),
+  v.string(HcaptchaSecretKeyError.Type),
+  v.regex(CHARS_WHITELIST, HcaptchaSecretKeyError.InvalidFormat),
   // Stryker disable next-line StringLiteral
-  v.brand("HCaptchaSecretKey"),
+  v.brand("HcaptchaSecretKey"),
 );
 
 export type HCaptchaSecretKeyType = v.InferOutput<typeof HCaptchaSecretKey>;

package/src/shield-hcaptcha-hono-local.strategy.ts

@@ -1,6 +1,7 @@
 import type { MiddlewareHandler } from "hono";
 import { HTTPException } from "hono/http-exception";
-import type { HCaptchaSecretKeyType } from "./hcaptcha-secret-key.vo";
+import * as v from "valibot";
+import { HCaptchaSecretKey } from "./hcaptcha-secret-key.vo";
 import type { MiddlewareHonoPort } from "./middleware-hono.port";
 import { ShieldHcaptchaStrategy } from "./shield-hcaptcha.strategy";
 
@@ -9,13 +10,20 @@ export const ShieldHcaptchaLocalStrategyError = { Rejected: "shield.hcaptcha.loc
 export class ShieldHcaptchaLocalHonoStrategy implements MiddlewareHonoPort {
   private readonly strategy: ShieldHcaptchaStrategy;
 
-  constructor(secretKey: HCaptchaSecretKeyType) {
-    this.strategy = new ShieldHcaptchaStrategy(secretKey);
+  private static readonly SECRET_KEY_LOCAL = v.parse(
+    HCaptchaSecretKey,
+    "0x0000000000000000000000000000000000000000",
+  );
+
+  private static readonly TOKEN_LOCAL = "10000000-aaaa-bbbb-cccc-000000000001";
+
+  constructor() {
+    this.strategy = new ShieldHcaptchaStrategy(ShieldHcaptchaLocalHonoStrategy.SECRET_KEY_LOCAL);
   }
 
   handle(): MiddlewareHandler {
     return async (_c, next) => {
-      if (await this.strategy.evaluate("10000000-aaaa-bbbb-cccc-000000000001")) return next();
+      if (await this.strategy.evaluate(ShieldHcaptchaLocalHonoStrategy.TOKEN_LOCAL)) return next();
       throw new HTTPException(403, { message: ShieldHcaptchaLocalStrategyError.Rejected });
     };
   }