@shware/http 0.2.17 → 0.2.19

package/dist/__tests__/ip.test.cjs

@@ -24,6 +24,9 @@ describe("extractIpAddress", () => {
       "2001:db8:85a3::8a2e:370:7334"
       // remove leading zeros
     );
+    expect((0, import_ip.extractIpAddress)("2404:7ac0:614d:bba7:cf41:992e:98e:9186:60704")).toBe(
+      "2404:7ac0:614d:bba7:cf41:992e:98e:9186"
+    );
   });
   it("should return null if the ip address is not valid", () => {
     expect((0, import_ip.extractIpAddress)(null)).toBeNull();

package/dist/__tests__/ip.test.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/__tests__/ip.test.ts"],"sourcesContent":["import { extractIpAddress } from '../utils/ip';\n\ndescribe('extractIpAddress', () => {\n  it('should extract the ipv4 address from the request', () => {\n    expect(extractIpAddress('127.0.0.1')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1:8080')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080/path')).toBe('127.0.0.1');\n  });\n\n  it('should extract the ipv6 address from the request', () => {\n    expect(extractIpAddress('::1')).toBe('::1');\n    expect(extractIpAddress('[::1]:8080')).toBe('::1');\n\n    expect(extractIpAddress('2001:0db8:85a3:0000:0000:8a2e:0370:7334')).toBe(\n      '2001:0db8:85a3:0000:0000:8a2e:0370:7334'\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80/path')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n  });\n\n  it('should return null if the ip address is not valid', () => {\n    expect(extractIpAddress(null)).toBeNull();\n    expect(extractIpAddress(undefined)).toBeNull();\n    expect(extractIpAddress('invalid')).toBeNull();\n    expect(extractIpAddress('example.com')).toBeNull();\n  });\n});\n"],"mappings":";;;AAAA,gBAAiC;AAEjC,SAAS,oBAAoB,MAAM;AACjC,KAAG,oDAAoD,MAAM;AAC3D,eAAO,4BAAiB,WAAW,CAAC,EAAE,KAAK,WAAW;AACtD,eAAO,4BAAiB,aAAa,CAAC,EAAE,KAAK,aAAa;AAC1D,eAAO,4BAAiB,gBAAgB,CAAC,EAAE,KAAK,WAAW;AAC3D,eAAO,4BAAiB,kBAAkB,CAAC,EAAE,KAAK,aAAa;AAC/D,eAAO,4BAAiB,qBAAqB,CAAC,EAAE,KAAK,WAAW;AAAA,EAClE,CAAC;AAED,KAAG,oDAAoD,MAAM;AAC3D,eAAO,4BAAiB,KAAK,CAAC,EAAE,KAAK,KAAK;AAC1C,eAAO,4BAAiB,YAAY,CAAC,EAAE,KAAK,KAAK;AAEjD,eAAO,4BAAiB,yCAAyC,CAAC,EAAE;AAAA,MAClE;AAAA,IACF;AACA,eAAO,4BAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA;AAAA,IACF;AACA,eAAO,4BAAiB,mDAAmD,CAAC,EAAE;AAAA,MAC5E;AAAA;AAAA,IACF;AAAA,EACF,CAAC;AAED,KAAG,qDAAqD,MAAM;AAC5D,eAAO,4BAAiB,IAAI,CAAC,EAAE,SAAS;AACxC,eAAO,4BAAiB,MAAS,CAAC,EAAE,SAAS;AAC7C,eAAO,4BAAiB,SAAS,CAAC,EAAE,SAAS;AAC7C,eAAO,4BAAiB,aAAa,CAAC,EAAE,SAAS;AAAA,EACnD,CAAC;AACH,CAAC;","names":[]}
+{"version":3,"sources":["../../src/__tests__/ip.test.ts"],"sourcesContent":["import { extractIpAddress } from '../utils/ip';\n\ndescribe('extractIpAddress', () => {\n  it('should extract the ipv4 address from the request', () => {\n    expect(extractIpAddress('127.0.0.1')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1:8080')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080/path')).toBe('127.0.0.1');\n  });\n\n  it('should extract the ipv6 address from the request', () => {\n    expect(extractIpAddress('::1')).toBe('::1');\n    expect(extractIpAddress('[::1]:8080')).toBe('::1');\n\n    expect(extractIpAddress('2001:0db8:85a3:0000:0000:8a2e:0370:7334')).toBe(\n      '2001:0db8:85a3:0000:0000:8a2e:0370:7334'\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80/path')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n\n    expect(extractIpAddress('2404:7ac0:614d:bba7:cf41:992e:98e:9186:60704')).toBe(\n      '2404:7ac0:614d:bba7:cf41:992e:98e:9186'\n    );\n  });\n\n  it('should return null if the ip address is not valid', () => {\n    expect(extractIpAddress(null)).toBeNull();\n    expect(extractIpAddress(undefined)).toBeNull();\n    expect(extractIpAddress('invalid')).toBeNull();\n    expect(extractIpAddress('example.com')).toBeNull();\n  });\n});\n"],"mappings":";;;AAAA,gBAAiC;AAEjC,SAAS,oBAAoB,MAAM;AACjC,KAAG,oDAAoD,MAAM;AAC3D,eAAO,4BAAiB,WAAW,CAAC,EAAE,KAAK,WAAW;AACtD,eAAO,4BAAiB,aAAa,CAAC,EAAE,KAAK,aAAa;AAC1D,eAAO,4BAAiB,gBAAgB,CAAC,EAAE,KAAK,WAAW;AAC3D,eAAO,4BAAiB,kBAAkB,CAAC,EAAE,KAAK,aAAa;AAC/D,eAAO,4BAAiB,qBAAqB,CAAC,EAAE,KAAK,WAAW;AAAA,EAClE,CAAC;AAED,KAAG,oDAAoD,MAAM;AAC3D,eAAO,4BAAiB,KAAK,CAAC,EAAE,KAAK,KAAK;AAC1C,eAAO,4BAAiB,YAAY,CAAC,EAAE,KAAK,KAAK;AAEjD,eAAO,4BAAiB,yCAAyC,CAAC,EAAE;AAAA,MAClE;AAAA,IACF;AACA,eAAO,4BAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA;AAAA,IACF;AACA,eAAO,4BAAiB,mDAAmD,CAAC,EAAE;AAAA,MAC5E;AAAA;AAAA,IACF;AAEA,eAAO,4BAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA,IACF;AAAA,EACF,CAAC;AAED,KAAG,qDAAqD,MAAM;AAC5D,eAAO,4BAAiB,IAAI,CAAC,EAAE,SAAS;AACxC,eAAO,4BAAiB,MAAS,CAAC,EAAE,SAAS;AAC7C,eAAO,4BAAiB,SAAS,CAAC,EAAE,SAAS;AAC7C,eAAO,4BAAiB,aAAa,CAAC,EAAE,SAAS;AAAA,EACnD,CAAC;AACH,CAAC;","names":[]}

package/dist/__tests__/ip.test.mjs

@@ -22,6 +22,9 @@ describe("extractIpAddress", () => {
       "2001:db8:85a3::8a2e:370:7334"
       // remove leading zeros
     );
+    expect(extractIpAddress("2404:7ac0:614d:bba7:cf41:992e:98e:9186:60704")).toBe(
+      "2404:7ac0:614d:bba7:cf41:992e:98e:9186"
+    );
   });
   it("should return null if the ip address is not valid", () => {
     expect(extractIpAddress(null)).toBeNull();

package/dist/__tests__/ip.test.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/__tests__/ip.test.ts"],"sourcesContent":["import { extractIpAddress } from '../utils/ip';\n\ndescribe('extractIpAddress', () => {\n  it('should extract the ipv4 address from the request', () => {\n    expect(extractIpAddress('127.0.0.1')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1:8080')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080/path')).toBe('127.0.0.1');\n  });\n\n  it('should extract the ipv6 address from the request', () => {\n    expect(extractIpAddress('::1')).toBe('::1');\n    expect(extractIpAddress('[::1]:8080')).toBe('::1');\n\n    expect(extractIpAddress('2001:0db8:85a3:0000:0000:8a2e:0370:7334')).toBe(\n      '2001:0db8:85a3:0000:0000:8a2e:0370:7334'\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80/path')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n  });\n\n  it('should return null if the ip address is not valid', () => {\n    expect(extractIpAddress(null)).toBeNull();\n    expect(extractIpAddress(undefined)).toBeNull();\n    expect(extractIpAddress('invalid')).toBeNull();\n    expect(extractIpAddress('example.com')).toBeNull();\n  });\n});\n"],"mappings":";AAAA,SAAS,wBAAwB;AAEjC,SAAS,oBAAoB,MAAM;AACjC,KAAG,oDAAoD,MAAM;AAC3D,WAAO,iBAAiB,WAAW,CAAC,EAAE,KAAK,WAAW;AACtD,WAAO,iBAAiB,aAAa,CAAC,EAAE,KAAK,aAAa;AAC1D,WAAO,iBAAiB,gBAAgB,CAAC,EAAE,KAAK,WAAW;AAC3D,WAAO,iBAAiB,kBAAkB,CAAC,EAAE,KAAK,aAAa;AAC/D,WAAO,iBAAiB,qBAAqB,CAAC,EAAE,KAAK,WAAW;AAAA,EAClE,CAAC;AAED,KAAG,oDAAoD,MAAM;AAC3D,WAAO,iBAAiB,KAAK,CAAC,EAAE,KAAK,KAAK;AAC1C,WAAO,iBAAiB,YAAY,CAAC,EAAE,KAAK,KAAK;AAEjD,WAAO,iBAAiB,yCAAyC,CAAC,EAAE;AAAA,MAClE;AAAA,IACF;AACA,WAAO,iBAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA;AAAA,IACF;AACA,WAAO,iBAAiB,mDAAmD,CAAC,EAAE;AAAA,MAC5E;AAAA;AAAA,IACF;AAAA,EACF,CAAC;AAED,KAAG,qDAAqD,MAAM;AAC5D,WAAO,iBAAiB,IAAI,CAAC,EAAE,SAAS;AACxC,WAAO,iBAAiB,MAAS,CAAC,EAAE,SAAS;AAC7C,WAAO,iBAAiB,SAAS,CAAC,EAAE,SAAS;AAC7C,WAAO,iBAAiB,aAAa,CAAC,EAAE,SAAS;AAAA,EACnD,CAAC;AACH,CAAC;","names":[]}
+{"version":3,"sources":["../../src/__tests__/ip.test.ts"],"sourcesContent":["import { extractIpAddress } from '../utils/ip';\n\ndescribe('extractIpAddress', () => {\n  it('should extract the ipv4 address from the request', () => {\n    expect(extractIpAddress('127.0.0.1')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080')).toBe('127.0.0.1');\n    expect(extractIpAddress('192.168.0.1:8080')).toBe('192.168.0.1');\n    expect(extractIpAddress('127.0.0.1:8080/path')).toBe('127.0.0.1');\n  });\n\n  it('should extract the ipv6 address from the request', () => {\n    expect(extractIpAddress('::1')).toBe('::1');\n    expect(extractIpAddress('[::1]:8080')).toBe('::1');\n\n    expect(extractIpAddress('2001:0db8:85a3:0000:0000:8a2e:0370:7334')).toBe(\n      '2001:0db8:85a3:0000:0000:8a2e:0370:7334'\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n    expect(extractIpAddress('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80/path')).toBe(\n      '2001:db8:85a3::8a2e:370:7334' // remove leading zeros\n    );\n\n    expect(extractIpAddress('2404:7ac0:614d:bba7:cf41:992e:98e:9186:60704')).toBe(\n      '2404:7ac0:614d:bba7:cf41:992e:98e:9186'\n    );\n  });\n\n  it('should return null if the ip address is not valid', () => {\n    expect(extractIpAddress(null)).toBeNull();\n    expect(extractIpAddress(undefined)).toBeNull();\n    expect(extractIpAddress('invalid')).toBeNull();\n    expect(extractIpAddress('example.com')).toBeNull();\n  });\n});\n"],"mappings":";AAAA,SAAS,wBAAwB;AAEjC,SAAS,oBAAoB,MAAM;AACjC,KAAG,oDAAoD,MAAM;AAC3D,WAAO,iBAAiB,WAAW,CAAC,EAAE,KAAK,WAAW;AACtD,WAAO,iBAAiB,aAAa,CAAC,EAAE,KAAK,aAAa;AAC1D,WAAO,iBAAiB,gBAAgB,CAAC,EAAE,KAAK,WAAW;AAC3D,WAAO,iBAAiB,kBAAkB,CAAC,EAAE,KAAK,aAAa;AAC/D,WAAO,iBAAiB,qBAAqB,CAAC,EAAE,KAAK,WAAW;AAAA,EAClE,CAAC;AAED,KAAG,oDAAoD,MAAM;AAC3D,WAAO,iBAAiB,KAAK,CAAC,EAAE,KAAK,KAAK;AAC1C,WAAO,iBAAiB,YAAY,CAAC,EAAE,KAAK,KAAK;AAEjD,WAAO,iBAAiB,yCAAyC,CAAC,EAAE;AAAA,MAClE;AAAA,IACF;AACA,WAAO,iBAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA;AAAA,IACF;AACA,WAAO,iBAAiB,mDAAmD,CAAC,EAAE;AAAA,MAC5E;AAAA;AAAA,IACF;AAEA,WAAO,iBAAiB,8CAA8C,CAAC,EAAE;AAAA,MACvE;AAAA,IACF;AAAA,EACF,CAAC;AAED,KAAG,qDAAqD,MAAM;AAC5D,WAAO,iBAAiB,IAAI,CAAC,EAAE,SAAS;AACxC,WAAO,iBAAiB,MAAS,CAAC,EAAE,SAAS;AAC7C,WAAO,iBAAiB,SAAS,CAAC,EAAE,SAAS;AAC7C,WAAO,iBAAiB,aAAa,CAAC,EAAE,SAAS;AAAA,EACnD,CAAC;AACH,CAAC;","names":[]}

package/dist/hono/handler.cjs

@@ -27,7 +27,7 @@ var import_status = require("../status.cjs");
 var import_detail = require("../detail.cjs");
 function errorHandler(error, c) {
   const requestId = c.get("requestId");
-  const servingData = `${c.req.method}: ${c.req.url}`;
+  const servingData = `${c.req.method}: ${c.req.path}`;
   const details = import_detail.Details.new().requestInfo({ requestId, servingData });
   if (error instanceof import_status.StatusError) {
     error.body?.error?.details?.push(...details.list);

package/dist/hono/handler.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hono/handler.ts"],"sourcesContent":["import type { Context } from 'hono';\nimport type { HTTPResponseError, Bindings } from 'hono/types';\nimport type { ContentfulStatusCode } from 'hono/utils/http-status';\nimport type { RequestIdVariables } from 'hono/request-id';\nimport { Status, StatusError } from '../status';\nimport { Details } from '../detail';\n\ntype Env = {\n  Variables: RequestIdVariables;\n  Bindings?: Bindings;\n};\n\nexport function errorHandler<E extends Env = any>(\n  error: Error | HTTPResponseError,\n  c: Context<E>\n): Response | Promise<Response> {\n  const requestId = c.get('requestId');\n  const servingData = `${c.req.method}: ${c.req.url}`;\n  const details = Details.new().requestInfo({ requestId, servingData });\n\n  if (error instanceof StatusError) {\n    error.body?.error?.details?.push(...details.list);\n    return c.json(error.body, error.status as ContentfulStatusCode);\n  }\n\n  console.error(error);\n  return Status.internal('Unknown error').response(details);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,oBAAoC;AACpC,oBAAwB;AAOjB,SAAS,aACd,OACA,GAC8B;AAC9B,QAAM,YAAY,EAAE,IAAI,WAAW;AACnC,QAAM,cAAc,GAAG,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,GAAG;AACjD,QAAM,UAAU,sBAAQ,IAAI,EAAE,YAAY,EAAE,WAAW,YAAY,CAAC;AAEpE,MAAI,iBAAiB,2BAAa;AAChC,UAAM,MAAM,OAAO,SAAS,KAAK,GAAG,QAAQ,IAAI;AAChD,WAAO,EAAE,KAAK,MAAM,MAAM,MAAM,MAA8B;AAAA,EAChE;AAEA,UAAQ,MAAM,KAAK;AACnB,SAAO,qBAAO,SAAS,eAAe,EAAE,SAAS,OAAO;AAC1D;","names":[]}
+{"version":3,"sources":["../../src/hono/handler.ts"],"sourcesContent":["import type { Context } from 'hono';\nimport type { HTTPResponseError, Bindings } from 'hono/types';\nimport type { ContentfulStatusCode } from 'hono/utils/http-status';\nimport type { RequestIdVariables } from 'hono/request-id';\nimport { Status, StatusError } from '../status';\nimport { Details } from '../detail';\n\ntype Env = {\n  Variables: RequestIdVariables;\n  Bindings?: Bindings;\n};\n\nexport function errorHandler<E extends Env = any>(\n  error: Error | HTTPResponseError,\n  c: Context<E>\n): Response | Promise<Response> {\n  const requestId = c.get('requestId');\n  const servingData = `${c.req.method}: ${c.req.path}`;\n  const details = Details.new().requestInfo({ requestId, servingData });\n\n  if (error instanceof StatusError) {\n    error.body?.error?.details?.push(...details.list);\n    return c.json(error.body, error.status as ContentfulStatusCode);\n  }\n\n  console.error(error);\n  return Status.internal('Unknown error').response(details);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,oBAAoC;AACpC,oBAAwB;AAOjB,SAAS,aACd,OACA,GAC8B;AAC9B,QAAM,YAAY,EAAE,IAAI,WAAW;AACnC,QAAM,cAAc,GAAG,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,IAAI;AAClD,QAAM,UAAU,sBAAQ,IAAI,EAAE,YAAY,EAAE,WAAW,YAAY,CAAC;AAEpE,MAAI,iBAAiB,2BAAa;AAChC,UAAM,MAAM,OAAO,SAAS,KAAK,GAAG,QAAQ,IAAI;AAChD,WAAO,EAAE,KAAK,MAAM,MAAM,MAAM,MAA8B;AAAA,EAChE;AAEA,UAAQ,MAAM,KAAK;AACnB,SAAO,qBAAO,SAAS,eAAe,EAAE,SAAS,OAAO;AAC1D;","names":[]}

package/dist/hono/handler.mjs

@@ -3,7 +3,7 @@ import { Status, StatusError } from "../status.mjs";
 import { Details } from "../detail.mjs";
 function errorHandler(error, c) {
   const requestId = c.get("requestId");
-  const servingData = `${c.req.method}: ${c.req.url}`;
+  const servingData = `${c.req.method}: ${c.req.path}`;
   const details = Details.new().requestInfo({ requestId, servingData });
   if (error instanceof StatusError) {
     error.body?.error?.details?.push(...details.list);

package/dist/hono/handler.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hono/handler.ts"],"sourcesContent":["import type { Context } from 'hono';\nimport type { HTTPResponseError, Bindings } from 'hono/types';\nimport type { ContentfulStatusCode } from 'hono/utils/http-status';\nimport type { RequestIdVariables } from 'hono/request-id';\nimport { Status, StatusError } from '../status';\nimport { Details } from '../detail';\n\ntype Env = {\n  Variables: RequestIdVariables;\n  Bindings?: Bindings;\n};\n\nexport function errorHandler<E extends Env = any>(\n  error: Error | HTTPResponseError,\n  c: Context<E>\n): Response | Promise<Response> {\n  const requestId = c.get('requestId');\n  const servingData = `${c.req.method}: ${c.req.url}`;\n  const details = Details.new().requestInfo({ requestId, servingData });\n\n  if (error instanceof StatusError) {\n    error.body?.error?.details?.push(...details.list);\n    return c.json(error.body, error.status as ContentfulStatusCode);\n  }\n\n  console.error(error);\n  return Status.internal('Unknown error').response(details);\n}\n"],"mappings":";AAIA,SAAS,QAAQ,mBAAmB;AACpC,SAAS,eAAe;AAOjB,SAAS,aACd,OACA,GAC8B;AAC9B,QAAM,YAAY,EAAE,IAAI,WAAW;AACnC,QAAM,cAAc,GAAG,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,GAAG;AACjD,QAAM,UAAU,QAAQ,IAAI,EAAE,YAAY,EAAE,WAAW,YAAY,CAAC;AAEpE,MAAI,iBAAiB,aAAa;AAChC,UAAM,MAAM,OAAO,SAAS,KAAK,GAAG,QAAQ,IAAI;AAChD,WAAO,EAAE,KAAK,MAAM,MAAM,MAAM,MAA8B;AAAA,EAChE;AAEA,UAAQ,MAAM,KAAK;AACnB,SAAO,OAAO,SAAS,eAAe,EAAE,SAAS,OAAO;AAC1D;","names":[]}
+{"version":3,"sources":["../../src/hono/handler.ts"],"sourcesContent":["import type { Context } from 'hono';\nimport type { HTTPResponseError, Bindings } from 'hono/types';\nimport type { ContentfulStatusCode } from 'hono/utils/http-status';\nimport type { RequestIdVariables } from 'hono/request-id';\nimport { Status, StatusError } from '../status';\nimport { Details } from '../detail';\n\ntype Env = {\n  Variables: RequestIdVariables;\n  Bindings?: Bindings;\n};\n\nexport function errorHandler<E extends Env = any>(\n  error: Error | HTTPResponseError,\n  c: Context<E>\n): Response | Promise<Response> {\n  const requestId = c.get('requestId');\n  const servingData = `${c.req.method}: ${c.req.path}`;\n  const details = Details.new().requestInfo({ requestId, servingData });\n\n  if (error instanceof StatusError) {\n    error.body?.error?.details?.push(...details.list);\n    return c.json(error.body, error.status as ContentfulStatusCode);\n  }\n\n  console.error(error);\n  return Status.internal('Unknown error').response(details);\n}\n"],"mappings":";AAIA,SAAS,QAAQ,mBAAmB;AACpC,SAAS,eAAe;AAOjB,SAAS,aACd,OACA,GAC8B;AAC9B,QAAM,YAAY,EAAE,IAAI,WAAW;AACnC,QAAM,cAAc,GAAG,EAAE,IAAI,MAAM,KAAK,EAAE,IAAI,IAAI;AAClD,QAAM,UAAU,QAAQ,IAAI,EAAE,YAAY,EAAE,WAAW,YAAY,CAAC;AAEpE,MAAI,iBAAiB,aAAa;AAChC,UAAM,MAAM,OAAO,SAAS,KAAK,GAAG,QAAQ,IAAI;AAChD,WAAO,EAAE,KAAK,MAAM,MAAM,MAAM,MAA8B;AAAA,EAChE;AAEA,UAAQ,MAAM,KAAK;AACnB,SAAO,OAAO,SAAS,eAAe,EAAE,SAAS,OAAO;AAC1D;","names":[]}

package/dist/utils/ip.cjs

@@ -27,6 +27,16 @@ var import_net = require("net");
 function extractIpAddress(ip) {
   if (!ip) return null;
   if ((0, import_net.isIPv4)(ip) || (0, import_net.isIPv6)(ip)) return ip;
+  if (ip.includes(".") && ip.includes(":")) {
+    const [address] = ip.split(":");
+    if ((0, import_net.isIPv4)(address)) return address;
+  }
+  if (!ip.includes("[") && !ip.includes("]") && !ip.includes(".") && ip.includes(":")) {
+    const parts = ip.split(":");
+    parts.pop();
+    const address = parts.join(":");
+    if ((0, import_net.isIPv6)(address)) return address;
+  }
   try {
     const url = new URL(`https://${ip}`);
     const hostname = url.hostname.replace("[", "").replace("]", "");

package/dist/utils/ip.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/ip.ts"],"sourcesContent":["import { isIPv4, isIPv6 } from 'net';\n\nexport function extractIpAddress(ip: string | undefined | null): string | null {\n  if (!ip) return null;\n  if (isIPv4(ip) || isIPv6(ip)) return ip;\n  try {\n    const url = new URL(`https://${ip}`);\n    const hostname = url.hostname.replace('[', '').replace(']', '');\n    if (isIPv4(hostname) || isIPv6(hostname)) return hostname;\n    return null;\n  } catch (_) {\n    return null;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAA+B;AAExB,SAAS,iBAAiB,IAA8C;AAC7E,MAAI,CAAC,GAAI,QAAO;AAChB,UAAI,mBAAO,EAAE,SAAK,mBAAO,EAAE,EAAG,QAAO;AACrC,MAAI;AACF,UAAM,MAAM,IAAI,IAAI,WAAW,EAAE,EAAE;AACnC,UAAM,WAAW,IAAI,SAAS,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE;AAC9D,YAAI,mBAAO,QAAQ,SAAK,mBAAO,QAAQ,EAAG,QAAO;AACjD,WAAO;AAAA,EACT,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../src/utils/ip.ts"],"sourcesContent":["import { isIPv4, isIPv6 } from 'net';\n\nexport function extractIpAddress(ip: string | undefined | null): string | null {\n  if (!ip) return null;\n  if (isIPv4(ip) || isIPv6(ip)) return ip;\n  if (ip.includes('.') && ip.includes(':')) {\n    const [address] = ip.split(':');\n    if (isIPv4(address)) return address;\n  }\n  if (!ip.includes('[') && !ip.includes(']') && !ip.includes('.') && ip.includes(':')) {\n    const parts = ip.split(':');\n    parts.pop();\n    const address = parts.join(':');\n    if (isIPv6(address)) return address;\n  }\n\n  try {\n    const url = new URL(`https://${ip}`);\n    const hostname = url.hostname.replace('[', '').replace(']', '');\n    if (isIPv4(hostname) || isIPv6(hostname)) return hostname;\n    return null;\n  } catch (_) {\n    return null;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAA+B;AAExB,SAAS,iBAAiB,IAA8C;AAC7E,MAAI,CAAC,GAAI,QAAO;AAChB,UAAI,mBAAO,EAAE,SAAK,mBAAO,EAAE,EAAG,QAAO;AACrC,MAAI,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,GAAG;AACxC,UAAM,CAAC,OAAO,IAAI,GAAG,MAAM,GAAG;AAC9B,YAAI,mBAAO,OAAO,EAAG,QAAO;AAAA,EAC9B;AACA,MAAI,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,GAAG;AACnF,UAAM,QAAQ,GAAG,MAAM,GAAG;AAC1B,UAAM,IAAI;AACV,UAAM,UAAU,MAAM,KAAK,GAAG;AAC9B,YAAI,mBAAO,OAAO,EAAG,QAAO;AAAA,EAC9B;AAEA,MAAI;AACF,UAAM,MAAM,IAAI,IAAI,WAAW,EAAE,EAAE;AACnC,UAAM,WAAW,IAAI,SAAS,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE;AAC9D,YAAI,mBAAO,QAAQ,SAAK,mBAAO,QAAQ,EAAG,QAAO;AACjD,WAAO;AAAA,EACT,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/utils/ip.mjs

@@ -3,6 +3,16 @@ import { isIPv4, isIPv6 } from "net";
 function extractIpAddress(ip) {
   if (!ip) return null;
   if (isIPv4(ip) || isIPv6(ip)) return ip;
+  if (ip.includes(".") && ip.includes(":")) {
+    const [address] = ip.split(":");
+    if (isIPv4(address)) return address;
+  }
+  if (!ip.includes("[") && !ip.includes("]") && !ip.includes(".") && ip.includes(":")) {
+    const parts = ip.split(":");
+    parts.pop();
+    const address = parts.join(":");
+    if (isIPv6(address)) return address;
+  }
   try {
     const url = new URL(`https://${ip}`);
     const hostname = url.hostname.replace("[", "").replace("]", "");

package/dist/utils/ip.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/ip.ts"],"sourcesContent":["import { isIPv4, isIPv6 } from 'net';\n\nexport function extractIpAddress(ip: string | undefined | null): string | null {\n  if (!ip) return null;\n  if (isIPv4(ip) || isIPv6(ip)) return ip;\n  try {\n    const url = new URL(`https://${ip}`);\n    const hostname = url.hostname.replace('[', '').replace(']', '');\n    if (isIPv4(hostname) || isIPv6(hostname)) return hostname;\n    return null;\n  } catch (_) {\n    return null;\n  }\n}\n"],"mappings":";AAAA,SAAS,QAAQ,cAAc;AAExB,SAAS,iBAAiB,IAA8C;AAC7E,MAAI,CAAC,GAAI,QAAO;AAChB,MAAI,OAAO,EAAE,KAAK,OAAO,EAAE,EAAG,QAAO;AACrC,MAAI;AACF,UAAM,MAAM,IAAI,IAAI,WAAW,EAAE,EAAE;AACnC,UAAM,WAAW,IAAI,SAAS,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE;AAC9D,QAAI,OAAO,QAAQ,KAAK,OAAO,QAAQ,EAAG,QAAO;AACjD,WAAO;AAAA,EACT,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../src/utils/ip.ts"],"sourcesContent":["import { isIPv4, isIPv6 } from 'net';\n\nexport function extractIpAddress(ip: string | undefined | null): string | null {\n  if (!ip) return null;\n  if (isIPv4(ip) || isIPv6(ip)) return ip;\n  if (ip.includes('.') && ip.includes(':')) {\n    const [address] = ip.split(':');\n    if (isIPv4(address)) return address;\n  }\n  if (!ip.includes('[') && !ip.includes(']') && !ip.includes('.') && ip.includes(':')) {\n    const parts = ip.split(':');\n    parts.pop();\n    const address = parts.join(':');\n    if (isIPv6(address)) return address;\n  }\n\n  try {\n    const url = new URL(`https://${ip}`);\n    const hostname = url.hostname.replace('[', '').replace(']', '');\n    if (isIPv4(hostname) || isIPv6(hostname)) return hostname;\n    return null;\n  } catch (_) {\n    return null;\n  }\n}\n"],"mappings":";AAAA,SAAS,QAAQ,cAAc;AAExB,SAAS,iBAAiB,IAA8C;AAC7E,MAAI,CAAC,GAAI,QAAO;AAChB,MAAI,OAAO,EAAE,KAAK,OAAO,EAAE,EAAG,QAAO;AACrC,MAAI,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,GAAG;AACxC,UAAM,CAAC,OAAO,IAAI,GAAG,MAAM,GAAG;AAC9B,QAAI,OAAO,OAAO,EAAG,QAAO;AAAA,EAC9B;AACA,MAAI,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC,GAAG,SAAS,GAAG,KAAK,CAAC,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,GAAG,GAAG;AACnF,UAAM,QAAQ,GAAG,MAAM,GAAG;AAC1B,UAAM,IAAI;AACV,UAAM,UAAU,MAAM,KAAK,GAAG;AAC9B,QAAI,OAAO,OAAO,EAAG,QAAO;AAAA,EAC9B;AAEA,MAAI;AACF,UAAM,MAAM,IAAI,IAAI,WAAW,EAAE,EAAE;AACnC,UAAM,WAAW,IAAI,SAAS,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE;AAC9D,QAAI,OAAO,QAAQ,KAAK,OAAO,QAAQ,EAAG,QAAO;AACjD,WAAO;AAAA,EACT,SAAS,GAAG;AACV,WAAO;AAAA,EACT;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shware/http",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "private": false,
   "type": "module",
   "scripts": {