hono-utils 0.3.8 → 0.4.0

package/dist/index.cjs

@@ -12,30 +12,14 @@ var logger = (details, parentEventIdHeader) => _factory.createMiddleware.call(vo
     details,
     withParentEventId: !!parentEventIdHeader,
     parentEventId: parentEventIdHeader ? _nullishCoalesce(c.req.raw.headers.get(parentEventIdHeader), () => ( void 0)) : void 0,
-    defaultArea: new URL(c.req.raw.url).pathname
+    defaultArea: new URL(c.req.raw.url).pathname,
+    path: new URL(c.req.raw.url).pathname
   });
   c.set("logger", logger2);
   c.set("eventId", logger2.eventId);
   await next();
 });
 
-// src/middleware/withLogger.ts
-
-var withLogger = (name, middleware) => _factory.createMiddleware.call(void 0, async (c, next) => {
-  const logger2 = c.get("logger");
-  if (!logger2) {
-    throw new Error("Logger should be initialized");
-  }
-  const loggerFunctions = logger2.getArea(`middleware:${name}`);
-  await middleware(c, {
-    ...loggerFunctions,
-    eventId: logger2.eventId,
-    parentEventId: logger2.parentEventId,
-    dump: logger2.dump
-  });
-  await next();
-});
-
 // src/middleware/validator.ts
 var _httpexception = require('hono/http-exception');
 var _validator = require('hono/validator');
@@ -13822,19 +13806,31 @@ var jsonValidator = (schema) => _validator.validator.call(void 0, "json", (value
 // src/middleware/isBot.ts
 
 
-var isBot = ({
-  threshold = 49,
-  allowVerifiedBot
+
+var isBot = ({ threshold, allowVerifiedBot, useLogger } = {
+  threshold: 49
 }) => _factory.createMiddleware.call(void 0, async (c, next) => {
-  const botManagement = _optionalChain([c, 'access', _183 => _183.req, 'access', _184 => _184.raw, 'access', _185 => _185.cf, 'optionalAccess', _186 => _186.botManagement]);
+  const logger2 = useLogger ? (_nullishCoalesce(c.get("logger"), () => ( new (0, _hierarchicalarealogger.Logger)({
+    details: {
+      service: "dummy"
+    }
+  })))).getArea("middeware:isBot") : void 0;
+  _optionalChain([logger2, 'optionalAccess', _183 => _183.debug, 'call', _184 => _184("Retrieving bot management data from cloudflare data")]);
+  const botManagement = _optionalChain([c, 'access', _185 => _185.req, 'access', _186 => _186.raw, 'access', _187 => _187.cf, 'optionalAccess', _188 => _188.botManagement]);
   if (!botManagement) {
     throw new Error("botManagement is not available");
   }
-  const score = _nullishCoalesce(_optionalChain([botManagement, 'optionalAccess', _187 => _187.score]), () => ( 54));
-  const verifiedBot = _nullishCoalesce(_optionalChain([botManagement, 'optionalAccess', _188 => _188.verifiedBot]), () => ( false));
+  const score = _nullishCoalesce(_optionalChain([botManagement, 'optionalAccess', _189 => _189.score]), () => ( 54));
+  const verifiedBot = _nullishCoalesce(_optionalChain([botManagement, 'optionalAccess', _190 => _190.verifiedBot]), () => ( false));
   const isBotByScore = score < threshold;
   const isVerifiedAllowed = !!(allowVerifiedBot && verifiedBot);
   const isBot2 = isBotByScore;
+  _optionalChain([logger2, 'optionalAccess', _191 => _191.debug, 'call', _192 => _192("Setting isBot variable in context", {
+    isBotByScore,
+    isVerifiedAllowed,
+    isBot: isBot2
+  })]);
+  _optionalChain([logger2, 'optionalAccess', _193 => _193.info, 'call', _194 => _194("isBot variable set")]);
   c.set("isBot", isBot2);
   if (isBotByScore && !isVerifiedAllowed) {
     throw new (0, _httpexception.HTTPException)(401, { message: "Bot detected" });
@@ -13894,18 +13890,18 @@ var queue = ({
 }) => _factory.createMiddleware.call(void 0, async ({ env, set: set2, get }, next) => {
   const queueEnv = env[name];
   const language = get("language");
-  const logger2 = get("logger");
   if (!queueEnv) {
     throw new Error(
       `Queue environment variable ${name} is not defined`
     );
   }
+  const logger2 = get("logger");
   let parentEventId;
   if (finalizeLogHandler) {
     if (!logger2) {
       throw new Error("Logger should be initialized before queue middleware");
     }
-    parentEventId = logger2.eventId;
+    parentEventId = _optionalChain([logger2, 'optionalAccess', _195 => _195.eventId]);
   }
   const producer = queueHandler.getProducer(queueEnv, {
     parentEventId,
@@ -14045,11 +14041,18 @@ async function hash3({
 }
 
 // src/middleware/clientInfo.ts
-var clientInfo = (config2) => _factory.createMiddleware.call(void 0, async ({ env, req, set: set2 }, next) => {
+
+var clientInfo = (config2) => _factory.createMiddleware.call(void 0, async ({ env, req, set: set2, get }, next) => {
+  const logger2 = _optionalChain([config2, 'optionalAccess', _196 => _196.useLogger]) ? (_nullishCoalesce(get("logger"), () => ( new (0, _hierarchicalarealogger.Logger)({
+    details: {
+      service: "dummy"
+    }
+  })))).getArea("middeware:clientInfo") : void 0;
   if (!req.raw.cf) {
     throw new Error("Cloudflare data is not available");
   }
-  const hashSecret = env[_nullishCoalesce(_optionalChain([config2, 'optionalAccess', _189 => _189.hashSecretBinding]), () => ( "HASH_SECRET"))];
+  _optionalChain([logger2, 'optionalAccess', _197 => _197.debug, 'call', _198 => _198("Retrieving hash secret from environment")]);
+  const hashSecret = env[_nullishCoalesce(_optionalChain([config2, 'optionalAccess', _199 => _199.hashSecretBinding]), () => ( "HASH_SECRET"))];
   if (!hashSecret) {
     throw new Error("Hash secret is not available");
   }
@@ -14067,6 +14070,7 @@ var clientInfo = (config2) => _factory.createMiddleware.call(void 0, async ({ en
     postalCode,
     timezone
   } = req.raw.cf;
+  _optionalChain([logger2, 'optionalAccess', _200 => _200.debug, 'call', _201 => _201("Forming cloudflare client data object")]);
   const cf = {
     latitude,
     longitude,
@@ -14081,6 +14085,7 @@ var clientInfo = (config2) => _factory.createMiddleware.call(void 0, async ({ en
     postalCode,
     timezone
   };
+  _optionalChain([logger2, 'optionalAccess', _202 => _202.debug, 'call', _203 => _203("Parsing user agent")]);
   const userAgent = _nullishCoalesce(req.raw.headers.get("user-agent"), () => ( "Unknown"));
   const parser = new (0, _uaparserjs.UAParser)(userAgent);
   const userAgentParsed = parser.getResult();
@@ -14105,27 +14110,20 @@ var clientInfo = (config2) => _factory.createMiddleware.call(void 0, async ({ en
     },
     cpu: _nullishCoalesce(cpu.architecture, () => ( "Unknown"))
   };
+  _optionalChain([logger2, 'optionalAccess', _204 => _204.debug, 'call', _205 => _205("Getting ip address")]);
   const ip = _nullishCoalesce(req.raw.headers.get("CF-Connecting-IP"), () => ( "127.0.0.1"));
   const clientContent = { ...cf, ...ua, ip };
+  _optionalChain([logger2, 'optionalAccess', _206 => _206.debug, 'call', _207 => _207("Setting client data into context")]);
   set2("client", {
     ...clientContent,
     userAgent,
     securityHash: await sha_exports.hash({
-      input: _nullishCoalesce(_optionalChain([config2, 'optionalAccess', _190 => _190.securityHashString, 'optionalCall', _191 => _191(clientContent)]), () => ( `${ip}${city}${country}${userAgent}`)),
+      input: _nullishCoalesce(_optionalChain([config2, 'optionalAccess', _208 => _208.securityHashString, 'optionalCall', _209 => _209(clientContent)]), () => ( `${ip}${city}${country}${userAgent}`)),
       algorithm: "SHA-512",
       pepper: hashSecret
     })
   });
-  next();
-});
-
-// src/middleware/hydrateVariable.ts
-
-var hydrateVariable = ({
-  variableName,
-  hydrate
-}) => _factory.createMiddleware.call(void 0, async ({ set: set2, env, get }, next) => {
-  set2(variableName, hydrate({ ...env, get }));
+  _optionalChain([logger2, 'optionalAccess', _210 => _210.info, 'call', _211 => _211("Client data variable set")]);
   await next();
 });
 
@@ -14247,30 +14245,31 @@ var createTypedClient = () => {
       headers: options.headers,
       fetch: options.fetch
     });
-    _optionalChain([callbacks, 'optionalAccess', _192 => _192.onStart, 'optionalCall', _193 => _193()]);
+    _optionalChain([callbacks, 'optionalAccess', _212 => _212.onStart, 'optionalCall', _213 => _213()]);
     let responseHeaders = new Headers();
     try {
       const response2 = await fn(client);
       responseHeaders = response2.headers;
       const data = await _client.parseResponse.call(void 0, response2);
-      _optionalChain([callbacks, 'optionalAccess', _194 => _194.onSuccess, 'optionalCall', _195 => _195(data, responseHeaders)]);
+      _optionalChain([callbacks, 'optionalAccess', _214 => _214.onSuccess, 'optionalCall', _215 => _215(data, responseHeaders)]);
       return data;
     } catch (err) {
       let status = 500;
       const { detail, statusCode } = err;
       status = _nullishCoalesce(statusCode, () => ( 500));
       if (!detail) {
-        _optionalChain([options, 'access', _196 => _196.errorHandler, 'optionalCall', _197 => _197(status, {
+        _optionalChain([options, 'access', _216 => _216.errorHandler, 'optionalCall', _217 => _217(status, {
           message: "Fetch malformed"
         })]);
         throw new (0, _httpexception.HTTPException)(status, { message: "Fetch malformed" });
       }
       const { message } = detail;
-      _optionalChain([options, 'access', _198 => _198.errorHandler, 'optionalCall', _199 => _199(status, { ...detail, status })]);
-      _optionalChain([callbacks, 'optionalAccess', _200 => _200.onError, 'optionalCall', _201 => _201(detail, responseHeaders)]);
+      const eventId = _nullishCoalesce(responseHeaders.get("x-event-id"), () => ( void 0));
+      _optionalChain([options, 'access', _218 => _218.errorHandler, 'optionalCall', _219 => _219(status, { ...detail, eventId, status })]);
+      _optionalChain([callbacks, 'optionalAccess', _220 => _220.onError, 'optionalCall', _221 => _221(detail, responseHeaders)]);
       throw new (0, _httpexception.HTTPException)(status, { message });
     } finally {
-      _optionalChain([callbacks, 'optionalAccess', _202 => _202.onEnd, 'optionalCall', _203 => _203()]);
+      _optionalChain([callbacks, 'optionalAccess', _222 => _222.onEnd, 'optionalCall', _223 => _223()]);
     }
   };
 };
@@ -14288,7 +14287,5 @@ var createTypedClient = () => {
 
 
 
-
-
-exports.PBKDF2 = pbkdf2_exports; exports.QueueHandler = QueueHandler; exports.SHA = sha_exports; exports.clientInfo = clientInfo; exports.createTypedClient = createTypedClient; exports.hydrateVariable = hydrateVariable; exports.i18n = i18n; exports.isBot = isBot; exports.jsonValidator = jsonValidator; exports.logger = logger; exports.onError = onError; exports.onNotFound = onNotFound; exports.queue = queue; exports.response = response; exports.withLogger = withLogger;
+exports.PBKDF2 = pbkdf2_exports; exports.QueueHandler = QueueHandler; exports.SHA = sha_exports; exports.clientInfo = clientInfo; exports.createTypedClient = createTypedClient; exports.i18n = i18n; exports.isBot = isBot; exports.jsonValidator = jsonValidator; exports.logger = logger; exports.onError = onError; exports.onNotFound = onNotFound; exports.queue = queue; exports.response = response;
 //# sourceMappingURL=index.cjs.map