@bgord/bun 1.6.0 → 1.6.1

package/dist/{visitor-id-hash.adapter.d.ts → visitor-id-client.adapter.d.ts}

@@ -4,11 +4,11 @@ import type { VisitorIdPort } from "./visitor-id.port";
 type Dependencies = {
     HashContent: HashContentPort;
 };
-export declare class VisitorIdHashAdapter implements VisitorIdPort {
+export declare class VisitorIdClientAdapter implements VisitorIdPort {
     private readonly client;
     private readonly deps;
     constructor(client: Client, deps: Dependencies);
     get(): Promise<import("./hash.vo").Hash>;
 }
 export {};
-//# sourceMappingURL=visitor-id-hash.adapter.d.ts.map
+//# sourceMappingURL=visitor-id-client.adapter.d.ts.map

package/dist/visitor-id-client.adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"visitor-id-client.adapter.d.ts","sourceRoot":"","sources":["../src/visitor-id-client.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,KAAK,YAAY,GAAG;IAAE,WAAW,EAAE,eAAe,CAAA;CAAE,CAAC;AAErD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBADJ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY;IAG/B,GAAG;CAOV"}

package/dist/{visitor-id-hash.adapter.js → visitor-id-client.adapter.js}

@@ -1,4 +1,4 @@
-export class VisitorIdHashAdapter {
+export class VisitorIdClientAdapter {
     client;
     deps;
     constructor(client, deps) {
@@ -11,4 +11,4 @@ export class VisitorIdHashAdapter {
         return this.deps.HashContent.hash(value);
     }
 }
-//# sourceMappingURL=visitor-id-hash.adapter.js.map
+//# sourceMappingURL=visitor-id-client.adapter.js.map

package/dist/visitor-id-client.adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"visitor-id-client.adapter.js","sourceRoot":"","sources":["../src/visitor-id-client.adapter.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,sBAAsB;IAEd;IACA;IAFnB,YACmB,MAAc,EACd,IAAkB;QADlB,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAc;IAClC,CAAC;IAEJ,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAExC,MAAM,KAAK,GAAG,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF"}

package/package.json

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

package/readme.md

@@ -54,7 +54,6 @@ src/
 ├── certificate-inspector-tls.adapter.ts
 ├── certificate-inspector.port.ts
 ├── checksum.service.ts
-├── client-from-hono.adapter.ts
 ├── client.vo.ts
 ├── clock-fixed.adapter.ts
 ├── clock-system.adapter.ts
@@ -277,8 +276,7 @@ src/
 ├── translations.service.ts
 ├── uptime.service.ts
 ├── uuid.vo.ts
-├── visitor-id-hash-hono.adapter.ts
-├── visitor-id-hash.adapter.ts
+├── visitor-id-client.adapter.ts
 ├── visitor-id.port.ts
 └── weak-etag-extractor.middleware.ts
 ```

package/src/client.vo.ts

@@ -1,3 +1,6 @@
+import type { Context } from "hono";
+import { getConnInfo } from "hono/bun";
+
 export type ClientIpType = string;
 export type ClientUaType = string;
 export type ClientType = { ip: ClientIpType; ua: ClientUaType };
@@ -5,10 +8,21 @@ export type ClientType = { ip: ClientIpType; ua: ClientUaType };
 export class Client {
   private constructor(private readonly value: ClientType) {}
 
-  static from(ip: ClientIpType | null | undefined, ua: ClientUaType | null | undefined): Client {
+  static fromParts(ip: ClientIpType | null | undefined, ua: ClientUaType | null | undefined): Client {
     return new Client({ ip: ip ?? "anon", ua: ua ?? "anon" });
   }
 
+  static fromHonoContext(context: Context): Client {
+    const info = getConnInfo(context);
+
+    const ip =
+      context.req.header("x-real-ip") || context.req.header("x-forwarded-for") || info?.remote?.address;
+
+    const ua = context.req.header("user-agent");
+
+    return Client.fromParts(ip, ua);
+  }
+
   toJSON(): ClientType {
     return this.value;
   }

package/src/http-logger.middleware.ts

@@ -2,7 +2,7 @@ import * as tools from "@bgord/tools";
 import { createMiddleware } from "hono/factory";
 import { CacheSourceEnum } from "./cache-resolver.port";
 import { CacheResponse } from "./cache-response.middleware";
-import { ClientFromHonoAdapter } from "./client-from-hono.adapter";
+import { Client } from "./client.vo";
 import type { ClockPort } from "./clock.port";
 import type { LoggerPort } from "./logger.port";
 
@@ -45,7 +45,7 @@ export class HttpLogger {
       }
 
       const correlationId = context.get("requestId");
-      const client = ClientFromHonoAdapter.extract(context).toJSON();
+      const client = Client.fromHonoContext(context).toJSON();
 
       const httpRequestBeforeMetadata = {
         params: context.req.param(),

package/src/index.ts

@@ -28,7 +28,6 @@ export * from "./certificate-inspector-noop.adapter";
 export * from "./certificate-inspector-tls.adapter";
 export * from "./checksum.service";
 export * from "./client.vo";
-export * from "./client-from-hono.adapter";
 export * from "./clock.port";
 export * from "./clock-fixed.adapter";
 export * from "./clock-system.adapter";
@@ -197,6 +196,5 @@ export * from "./translations.service";
 export * from "./uptime.service";
 export * from "./uuid.vo";
 export * from "./visitor-id.port";
-export * from "./visitor-id-hash.adapter";
-export * from "./visitor-id-hash-hono.adapter";
+export * from "./visitor-id-client.adapter";
 export * from "./weak-etag-extractor.middleware";

package/src/{visitor-id-hash.adapter.ts → visitor-id-client.adapter.ts}

@@ -4,7 +4,7 @@ import type { VisitorIdPort } from "./visitor-id.port";
 
 type Dependencies = { HashContent: HashContentPort };
 
-export class VisitorIdHashAdapter implements VisitorIdPort {
+export class VisitorIdClientAdapter implements VisitorIdPort {
   constructor(
     private readonly client: Client,
     private readonly deps: Dependencies,

package/dist/client-from-hono.adapter.d.ts

@@ -1,6 +0,0 @@
-import type { Context } from "hono";
-import { Client } from "./client.vo";
-export declare class ClientFromHonoAdapter {
-    static extract(context: Context): Client;
-}
-//# sourceMappingURL=client-from-hono.adapter.d.ts.map

package/dist/client-from-hono.adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client-from-hono.adapter.d.ts","sourceRoot":"","sources":["../src/client-from-hono.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,qBAAa,qBAAqB;IAChC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;CAUzC"}

package/dist/client-from-hono.adapter.js

@@ -1,11 +0,0 @@
-import { getConnInfo } from "hono/bun";
-import { Client } from "./client.vo";
-export class ClientFromHonoAdapter {
-    static extract(context) {
-        const info = getConnInfo(context);
-        const ip = context.req.header("x-real-ip") || context.req.header("x-forwarded-for") || info?.remote?.address;
-        const ua = context.req.header("user-agent");
-        return Client.from(ip, ua);
-    }
-}
-//# sourceMappingURL=client-from-hono.adapter.js.map

package/dist/client-from-hono.adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client-from-hono.adapter.js","sourceRoot":"","sources":["../src/client-from-hono.adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,qBAAqB;IAChC,MAAM,CAAC,OAAO,CAAC,OAAgB;QAC7B,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAElC,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC;QAEpG,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAE5C,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;CACF"}

package/dist/visitor-id-hash-hono.adapter.d.ts

@@ -1,13 +0,0 @@
-import type { Context } from "hono";
-import type { HashContentPort } from "./hash-content.port";
-import type { VisitorIdPort } from "./visitor-id.port";
-type Dependencies = {
-    HashContent: HashContentPort;
-};
-export declare class VisitorIdHashHonoAdapter implements VisitorIdPort {
-    private readonly delegate;
-    constructor(context: Context, deps: Dependencies);
-    get(): Promise<import("./hash.vo").Hash>;
-}
-export {};
-//# sourceMappingURL=visitor-id-hash-hono.adapter.d.ts.map

package/dist/visitor-id-hash-hono.adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visitor-id-hash-hono.adapter.d.ts","sourceRoot":"","sources":["../src/visitor-id-hash-hono.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,KAAK,YAAY,GAAG;IAAE,WAAW,EAAE,eAAe,CAAA;CAAE,CAAC;AAErD,qBAAa,wBAAyB,YAAW,aAAa;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;gBAEpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY;IAI1C,GAAG;CAGV"}

package/dist/visitor-id-hash-hono.adapter.js

@@ -1,12 +0,0 @@
-import { ClientFromHonoAdapter } from "./client-from-hono.adapter";
-import { VisitorIdHashAdapter } from "./visitor-id-hash.adapter";
-export class VisitorIdHashHonoAdapter {
-    delegate;
-    constructor(context, deps) {
-        this.delegate = new VisitorIdHashAdapter(ClientFromHonoAdapter.extract(context), deps);
-    }
-    async get() {
-        return this.delegate.get();
-    }
-}
-//# sourceMappingURL=visitor-id-hash-hono.adapter.js.map

package/dist/visitor-id-hash-hono.adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"visitor-id-hash-hono.adapter.js","sourceRoot":"","sources":["../src/visitor-id-hash-hono.adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE,MAAM,OAAO,wBAAwB;IAClB,QAAQ,CAAuB;IAEhD,YAAY,OAAgB,EAAE,IAAkB;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAoB,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IACzF,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;CACF"}

package/dist/visitor-id-hash.adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visitor-id-hash.adapter.d.ts","sourceRoot":"","sources":["../src/visitor-id-hash.adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,KAAK,YAAY,GAAG;IAAE,WAAW,EAAE,eAAe,CAAA;CAAE,CAAC;AAErD,qBAAa,oBAAqB,YAAW,aAAa;IAEtD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBADJ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,YAAY;IAG/B,GAAG;CAOV"}

package/dist/visitor-id-hash.adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"visitor-id-hash.adapter.js","sourceRoot":"","sources":["../src/visitor-id-hash.adapter.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,oBAAoB;IAEZ;IACA;IAFnB,YACmB,MAAc,EACd,IAAkB;QADlB,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAc;IAClC,CAAC;IAEJ,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAExC,MAAM,KAAK,GAAG,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF"}

package/src/client-from-hono.adapter.ts

@@ -1,16 +0,0 @@
-import type { Context } from "hono";
-import { getConnInfo } from "hono/bun";
-import { Client } from "./client.vo";
-
-export class ClientFromHonoAdapter {
-  static extract(context: Context): Client {
-    const info = getConnInfo(context);
-
-    const ip =
-      context.req.header("x-real-ip") || context.req.header("x-forwarded-for") || info?.remote?.address;
-
-    const ua = context.req.header("user-agent");
-
-    return Client.from(ip, ua);
-  }
-}

package/src/visitor-id-hash-hono.adapter.ts

@@ -1,19 +0,0 @@
-import type { Context } from "hono";
-import { ClientFromHonoAdapter } from "./client-from-hono.adapter";
-import type { HashContentPort } from "./hash-content.port";
-import type { VisitorIdPort } from "./visitor-id.port";
-import { VisitorIdHashAdapter } from "./visitor-id-hash.adapter";
-
-type Dependencies = { HashContent: HashContentPort };
-
-export class VisitorIdHashHonoAdapter implements VisitorIdPort {
-  private readonly delegate: VisitorIdHashAdapter;
-
-  constructor(context: Context, deps: Dependencies) {
-    this.delegate = new VisitorIdHashAdapter(ClientFromHonoAdapter.extract(context), deps);
-  }
-
-  async get() {
-    return this.delegate.get();
-  }
-}