hono-utils 0.2.0 → 0.3.0

package/dist/index.d.cts

@@ -1,11 +1,12 @@
 import * as hono from 'hono';
-import { Env, Context, ErrorHandler, NotFoundHandler } from 'hono';
+import { Env, Context, ErrorHandler, NotFoundHandler, Hono } from 'hono';
 import { Logger, Details } from 'hierarchical-area-logger';
 import * as hono_utils_http_status from 'hono/utils/http-status';
-import { ContentfulStatusCode, SuccessStatusCode, ClientErrorStatusCode } from 'hono/utils/http-status';
+import { ContentfulStatusCode, SuccessStatusCode, ClientErrorStatusCode, StatusCode } from 'hono/utils/http-status';
 import z$1, { z, ZodObject } from 'zod';
 import { Message, MessageBatch, Queue } from '@cloudflare/workers-types';
 import * as hono_utils_types from 'hono/utils/types';
+import { hc, ClientResponse } from 'hono/client';
 
 type HonoLoggerVariables = {
     logger: Logger;
@@ -354,8 +355,24 @@ declare namespace sha {
   export { sha_generateSalt as generateSalt, sha_hash as hash };
 }
 
-declare const onError: ErrorHandler;
+declare const onError: <Bindings extends Record<string, unknown>, Variables extends Record<string, unknown>>(parseError?: (err: Error, env: Bindings, get: <K extends keyof Variables>(key: K) => Variables[K]) => Promise<string>) => ErrorHandler;
 
 declare const onNotFound: NotFoundHandler;
 
-export { type ContextFn, type HonoI18nVariables, type HonoIsBotVariables, type HonoLanguageVariables, type HonoLoggerVariables, type HonoResponseVariables, type MessageHandlers, pbkdf2 as PBKDF2, QueueHandler, sha as SHA, type WrappableMiddleware, i18n, isBot, jsonValidator, logger, onError, onNotFound, queue, response, withLogger };
+type ErrorBody = Record<string, unknown>;
+interface TypedClientCallbacks {
+    onStart?: () => void;
+    onSuccess?: (parsedData: unknown, headers: Headers) => void;
+    onError?: (parsedData: unknown, headers: Headers) => void;
+    onEnd?: () => void;
+    errorHandler?: (status: StatusCode | number, body?: ErrorBody) => never;
+}
+interface CreateTypedClientOptions {
+    url: string;
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    fetch?: typeof fetch;
+    callbacks?: TypedClientCallbacks;
+}
+declare const createTypedClient: <TApp extends Hono<any, any, any>>(options: CreateTypedClientOptions) => <TSuccessData>(fn: (c: ReturnType<typeof hc<TApp>>) => Promise<ClientResponse<TSuccessData>>) => Promise<TSuccessData>;
+
+export { type ContextFn, type CreateTypedClientOptions, type HonoI18nVariables, type HonoIsBotVariables, type HonoLanguageVariables, type HonoLoggerVariables, type HonoResponseVariables, type MessageHandlers, pbkdf2 as PBKDF2, QueueHandler, sha as SHA, type WrappableMiddleware, createTypedClient, i18n, isBot, jsonValidator, logger, onError, onNotFound, queue, response, withLogger };

package/dist/index.d.ts

@@ -1,11 +1,12 @@
 import * as hono from 'hono';
-import { Env, Context, ErrorHandler, NotFoundHandler } from 'hono';
+import { Env, Context, ErrorHandler, NotFoundHandler, Hono } from 'hono';
 import { Logger, Details } from 'hierarchical-area-logger';
 import * as hono_utils_http_status from 'hono/utils/http-status';
-import { ContentfulStatusCode, SuccessStatusCode, ClientErrorStatusCode } from 'hono/utils/http-status';
+import { ContentfulStatusCode, SuccessStatusCode, ClientErrorStatusCode, StatusCode } from 'hono/utils/http-status';
 import z$1, { z, ZodObject } from 'zod';
 import { Message, MessageBatch, Queue } from '@cloudflare/workers-types';
 import * as hono_utils_types from 'hono/utils/types';
+import { hc, ClientResponse } from 'hono/client';
 
 type HonoLoggerVariables = {
     logger: Logger;
@@ -354,8 +355,24 @@ declare namespace sha {
   export { sha_generateSalt as generateSalt, sha_hash as hash };
 }
 
-declare const onError: ErrorHandler;
+declare const onError: <Bindings extends Record<string, unknown>, Variables extends Record<string, unknown>>(parseError?: (err: Error, env: Bindings, get: <K extends keyof Variables>(key: K) => Variables[K]) => Promise<string>) => ErrorHandler;
 
 declare const onNotFound: NotFoundHandler;
 
-export { type ContextFn, type HonoI18nVariables, type HonoIsBotVariables, type HonoLanguageVariables, type HonoLoggerVariables, type HonoResponseVariables, type MessageHandlers, pbkdf2 as PBKDF2, QueueHandler, sha as SHA, type WrappableMiddleware, i18n, isBot, jsonValidator, logger, onError, onNotFound, queue, response, withLogger };
+type ErrorBody = Record<string, unknown>;
+interface TypedClientCallbacks {
+    onStart?: () => void;
+    onSuccess?: (parsedData: unknown, headers: Headers) => void;
+    onError?: (parsedData: unknown, headers: Headers) => void;
+    onEnd?: () => void;
+    errorHandler?: (status: StatusCode | number, body?: ErrorBody) => never;
+}
+interface CreateTypedClientOptions {
+    url: string;
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    fetch?: typeof fetch;
+    callbacks?: TypedClientCallbacks;
+}
+declare const createTypedClient: <TApp extends Hono<any, any, any>>(options: CreateTypedClientOptions) => <TSuccessData>(fn: (c: ReturnType<typeof hc<TApp>>) => Promise<ClientResponse<TSuccessData>>) => Promise<TSuccessData>;
+
+export { type ContextFn, type CreateTypedClientOptions, type HonoI18nVariables, type HonoIsBotVariables, type HonoLanguageVariables, type HonoLoggerVariables, type HonoResponseVariables, type MessageHandlers, pbkdf2 as PBKDF2, QueueHandler, sha as SHA, type WrappableMiddleware, createTypedClient, i18n, isBot, jsonValidator, logger, onError, onNotFound, queue, response, withLogger };

package/dist/index.js

@@ -14120,14 +14120,18 @@ var defaultMessageMap = {
 };
 
 // src/router/onError.ts
-var onError = (err, { json: json2, var: { logger: logger2 } }) => {
+var onError = (parseError) => async (err, { json: json2, env, get }) => {
   try {
-    const { error: error48 } = logger2.getArea(`error`);
-    error48(err.message, err);
     const status = "status" in err ? err.status : 500;
-    return json2({ message: err.message }, status);
-  } catch (err2) {
-    console.error(err2);
+    return json2(
+      {
+        message: !parseError ? err.message : await parseError(err, env, get)
+      },
+      status
+    );
+  } catch (error48) {
+    console.error("Failed on error handler:", err);
+    console.error("Failed to parse error:", error48);
     return json2({ message: defaultMessageMap.internalError }, 500);
   }
 };
@@ -14141,10 +14145,52 @@ var onNotFound = async (c) => {
     404
   );
 };
+
+// src/client/createTypedClient.ts
+import { hc } from "hono/client";
+import { parseResponse, DetailedError } from "hono/client";
+import { HTTPException as HTTPException4 } from "hono/http-exception";
+var createTypedClient = (options) => {
+  const client = hc(options.url, {
+    headers: options.headers,
+    fetch: options.fetch
+  });
+  const rpcClient = async (fn) => {
+    options.callbacks?.onStart?.();
+    let responseHeaders = new Headers();
+    try {
+      const response2 = await fn(client);
+      responseHeaders = response2.headers;
+      const data = await parseResponse(response2);
+      options.callbacks?.onSuccess?.(data, responseHeaders);
+      return data;
+    } catch (err) {
+      const errorBody = { message: err.message };
+      let status = 500;
+      if (err instanceof DetailedError) {
+        const { detail, statusCode } = err;
+        status = statusCode ?? 500;
+        if (!detail) {
+          options.callbacks?.errorHandler?.(500, {
+            message: "Fetch malformed"
+          });
+          throw new HTTPException4(500, { message: "Fetch malformed" });
+        }
+      }
+      options.callbacks?.onError?.(errorBody, responseHeaders);
+      options.callbacks?.errorHandler?.(status, errorBody);
+      throw new HTTPException4(status, errorBody);
+    } finally {
+      options.callbacks?.onEnd?.();
+    }
+  };
+  return rpcClient;
+};
 export {
   pbkdf2_exports as PBKDF2,
   QueueHandler,
   sha_exports as SHA,
+  createTypedClient,
   i18n,
   isBot,
   jsonValidator,