arri 0.0.28 → 0.0.30

package/dist/shared/{arri.74885d3a.mjs → arri.7d8427d5.mjs}

@@ -1,5 +1,5 @@
 import { Type, TypeGuard } from '@sinclair/typebox';
-import { createError, eventHandler, isPreflightRequest, readValidatedBody, getValidatedQuery, setResponseHeader, send, createRouter, createApp, sendError } from 'h3';
+import { createError, eventHandler, isPreflightRequest, readValidatedBody, getValidatedQuery, setResponseHeader, send, createRouter, createApp, getQuery, readBody, sendError } from 'h3';
 import { ValueErrorType } from '@sinclair/typebox/errors';
 import { Value } from '@sinclair/typebox/value';
 
@@ -519,95 +519,110 @@ function getRpcResponseDefinition(rpcName, procedure) {
   }
   return name;
 }
-function registerRpc(router, path, procedure, middleware) {
+function registerRpc(router, path, procedure, middleware, opts) {
   const httpMethod = procedure.method ?? "post";
   const handler = eventHandler(async (event) => {
     const context = {
-      event
+      type: "procedure",
+      params: void 0
     };
     if (isPreflightRequest(event)) {
       return "ok";
     }
-    if (middleware.length) {
-      await Promise.all(middleware.map((m) => m(context)));
-    }
-    if (procedure.params) {
-      switch (httpMethod) {
-        case "get":
-        case "head": {
-          const parsedParams = await getValidatedQuery(
-            event,
-            typeboxSafeValidate(procedure.params, true)
-          );
-          if (!parsedParams.success) {
-            const errorParts = [];
-            for (const err of parsedParams.errors) {
-              const propName = err.path.split("/");
-              propName.shift();
-              if (!errorParts.includes(propName.join("."))) {
-                errorParts.push(propName.join("."));
+    try {
+      if (middleware.length) {
+        await Promise.all(middleware.map((m) => m(context, event)));
+      }
+      if (procedure.params) {
+        switch (httpMethod) {
+          case "get":
+          case "head": {
+            const parsedParams = await getValidatedQuery(
+              event,
+              typeboxSafeValidate(procedure.params, true)
+            );
+            if (!parsedParams.success) {
+              const errorParts = [];
+              for (const err of parsedParams.errors) {
+                const propName = err.path.split("/");
+                propName.shift();
+                if (!errorParts.includes(propName.join("."))) {
+                  errorParts.push(propName.join("."));
+                }
               }
+              throw defineError(400, {
+                statusMessage: `Missing or invalid url query parameters: [${errorParts.join(
+                  ","
+                )}]`,
+                data: parsedParams.errors
+              });
             }
-            throw defineError(400, {
-              statusMessage: `Missing or invalid url query parameters: [${errorParts.join(
-                ","
-              )}]`,
-              data: parsedParams.errors
-            });
+            context.params = parsedParams.value;
+            break;
           }
-          context.params = parsedParams.value;
-          break;
-        }
-        case "delete":
-        case "patch":
-        case "post":
-        case "put": {
-          const parsedParams = await readValidatedBody(
-            event,
-            typeboxSafeValidate(procedure.params)
-          );
-          if (!parsedParams.success) {
-            let isObjectError = false;
-            const errorParts = [];
-            for (const err of parsedParams.errors) {
-              if (err.type === ValueErrorType.Object) {
-                isObjectError = true;
+          case "delete":
+          case "patch":
+          case "post":
+          case "put": {
+            const parsedParams = await readValidatedBody(
+              event,
+              typeboxSafeValidate(procedure.params)
+            );
+            if (!parsedParams.success) {
+              let isObjectError = false;
+              const errorParts = [];
+              for (const err of parsedParams.errors) {
+                if (err.type === ValueErrorType.Object) {
+                  isObjectError = true;
+                }
+                const propName = err.path.split("/");
+                propName.shift();
+                if (!errorParts.includes(propName.join("."))) {
+                  errorParts.push(propName.join("."));
+                }
               }
-              const propName = err.path.split("/");
-              propName.shift();
-              if (!errorParts.includes(propName.join("."))) {
-                errorParts.push(propName.join("."));
+              if (isObjectError) {
+                throw defineError(400, {
+                  statusMessage: `Invalid request body. Expected object.`
+                });
               }
-            }
-            if (isObjectError) {
               throw defineError(400, {
-                statusMessage: `Invalid request body. Expected object.`
+                statusMessage: `Invalid request body. Affected properties [${errorParts.join(
+                  ", "
+                )}]`,
+                data: parsedParams.errors
               });
             }
-            throw defineError(400, {
-              statusMessage: `Invalid request body. Affected properties [${errorParts.join(
-                ", "
-              )}]`,
-              data: parsedParams.errors
-            });
+            context.params = parsedParams.value;
+            break;
           }
-          context.params = parsedParams.value;
-          break;
+          default:
+            break;
         }
       }
-    }
-    const response = await procedure.handler(context);
-    if (typeof response === "object") {
-      setResponseHeader(event, "Content-Type", "application/json");
-      await send(event, JSON.stringify(response));
-    } else {
-      await send(event, response);
-    }
-    if (procedure.postHandler) {
+      const response = await procedure.handler(context, event);
       context.response = response;
-      await procedure.postHandler(context);
+      if (opts.onBeforeResponse) {
+        await opts.onBeforeResponse(context, event);
+      }
+      if (typeof response === "object") {
+        setResponseHeader(event, "Content-Type", "application/json");
+        await send(event, JSON.stringify(response));
+      } else {
+        await send(event, response ?? "");
+      }
+      if (opts.onAfterResponse) {
+        await opts.onAfterResponse(context, event);
+      }
+      if (procedure.postHandler) {
+        await procedure.postHandler(context, event);
+      }
+    } catch (err) {
+      if (opts.onError) {
+        await opts.onError(err, context, event);
+      }
     }
-    return null;
+    return "";
   });
   switch (httpMethod) {
     case "get":
@@ -636,55 +651,70 @@ function defineRoute(config) {
   return config;
 }
 const defineMiddleware = (middleware) => middleware;
-function registerRoute(router, route, middleware, prefix) {
-  const handler = async (event) => {
+function registerRoute(router, route, middleware, prefix, opts) {
+  const handler = eventHandler(async (event) => {
     const context = {
-      event
+      type: "route",
+      params: event.context.params,
+      query: void 0,
+      body: void 0
     };
-    if (middleware.length) {
-      for (const m of middleware) {
-        await m(context);
+    try {
+      if (middleware.length) {
+        for (const m of middleware) {
+          await m(context, event);
+        }
       }
-    }
-    if (route.query) {
-      const result = await getValidatedQuery(
-        event,
-        typeboxSafeValidate(route.query)
-      );
-      if (!result.success) {
-        throw errorResponseFromValidationErrors(
-          result.errors,
-          "Missing or invalid query parameters"
+      if (route.query) {
+        const result = await getValidatedQuery(
+          event,
+          typeboxSafeValidate(route.query)
         );
+        if (!result.success) {
+          throw errorResponseFromValidationErrors(
+            result.errors,
+            "Missing or invalid query parameters"
+          );
+        }
+        context.query = result.value;
       }
-      context.query = result.value;
-    }
-    if (route.body && route.method !== "get" && route.method !== "head") {
-      const result = await readValidatedBody(
-        event,
-        typeboxSafeValidate(route.body)
-      );
-      if (!result.success) {
-        throw errorResponseFromValidationErrors(
-          result.errors,
-          "Missing or invalid body parameters"
+      if (route.body && route.method !== "get" && route.method !== "head") {
+        const result = await readValidatedBody(
+          event,
+          typeboxSafeValidate(route.body)
         );
+        if (!result.success) {
+          throw errorResponseFromValidationErrors(
+            result.errors,
+            "Missing or invalid body parameters"
+          );
+        }
+        context.body = result.value;
       }
-      context.body = result.value;
-    }
-    const response = await route.handler(context);
-    if (typeof response === "object") {
-      setResponseHeader(event, "Content-Type", "application/json");
-      await send(event, JSON.stringify(response));
-    } else {
-      await send(event, response);
-    }
-    if (route.postHandler) {
+      const response = await route.handler(context, event);
       context.response = response;
-      await route.postHandler(context);
+      if (opts?.onBeforeResponse) {
+        await opts.onBeforeResponse(context, event);
+      }
+      if (typeof response === "object") {
+        setResponseHeader(event, "Content-Type", "application/json");
+        await send(event, JSON.stringify(response));
+      } else {
+        await send(event, response ?? "");
+      }
+      if (opts?.onAfterResponse) {
+        await opts.onAfterResponse(context, event);
+      }
+      if (route.postHandler) {
+        await route.postHandler(context, event);
+      }
+    } catch (err) {
+      if (opts?.onError) {
+        await opts.onError(err, context, event);
+      }
     }
-    return null;
-  };
+    return "";
+  });
   const finalPath = (prefix ? `/${prefix}${route.path}` : route.path).split("//").join("/");
   switch (route.method) {
     case "get":
@@ -717,7 +747,7 @@ var __publicField = (obj, key, value) => {
 const DEV_ENDPOINT_ROOT = `/__arri_dev__`;
 const DEV_DEFINITION_ENDPOINT = `${DEV_ENDPOINT_ROOT}/definition`;
 class Arri {
-  constructor(opts) {
+  constructor(opts = {}) {
     __publicField(this, "__isArri__", true);
     __publicField(this, "h3App");
     __publicField(this, "h3Router", createRouter());
@@ -727,36 +757,71 @@ class Arri {
     __publicField(this, "procedures", {});
     __publicField(this, "models", {});
     __publicField(this, "middlewares", []);
+    __publicField(this, "onAfterResponse");
+    __publicField(this, "onBeforeResponse");
+    __publicField(this, "onError");
     this.appInfo = opts?.appInfo;
     this.h3App = createApp({
       debug: opts?.debug,
-      onAfterResponse: opts?.onAfterResponse,
-      onBeforeResponse: opts?.onBeforeResponse,
-      onError: async (err, event) => {
-        if (opts?.onError) {
-          await opts.onError(err, event);
-        }
-        sendError(event, err);
-      },
-      onRequest: async (event) => {
-        if (opts?.onRequest) {
-          await opts.onRequest(event);
-        }
-      }
+      onRequest: opts?.onRequest
     });
+    this.onError = opts.onError;
+    this.onAfterResponse = opts.onAfterResponse;
+    this.onBeforeResponse = opts.onBeforeResponse;
     this.rpcRoutePrefix = opts?.rpcRoutePrefix ?? "";
     this.rpcDefinitionPath = opts?.rpcDefinitionPath ?? "__definition";
-    this.h3Router.get(
-      this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
-      eventHandler((_) => this.getAppDefinition())
-    );
     this.h3App.use(this.h3Router);
+    this.registerRoute({
+      path: this.rpcRoutePrefix ? `/${this.rpcRoutePrefix}/${this.rpcDefinitionPath}`.split("//").join("/") : `/${this.rpcDefinitionPath}`,
+      method: "get",
+      handler: () => this.getAppDefinition()
+    });
     if (process.env.ARRI_DEV_MODE === "true") {
-      this.h3Router.get(
-        DEV_DEFINITION_ENDPOINT,
-        eventHandler((_) => this.getAppDefinition())
-      );
+      this.registerRoute({
+        path: DEV_DEFINITION_ENDPOINT,
+        method: "get",
+        handler: () => this.getAppDefinition()
+      });
     }
+    this.h3Router.use(
+      "/**",
+      eventHandler(async (event) => {
+        const error = defineError(404);
+        const query = getQuery(event);
+        const disallowedBodyMethods = ["GET", "HEAD", "OPTION"];
+        const canBody = !disallowedBodyMethods.includes(event.method);
+        const context = {
+          type: "route",
+          params: event.context.params,
+          query,
+          // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
+          body: canBody ? await readBody(event).catch((_) => void 0) : void 0
+        };
+        try {
+          if (this.middlewares.length) {
+            for (const m of this.middlewares) {
+              await m(context, event);
+            }
+          }
+        } catch (_) {
+        }
+        if (this.onError) {
+          await this.onError(
+            error,
+            {
+              type: "route",
+              params: void 0,
+              query: void 0,
+              body: void 0
+            },
+            event
+          );
+        }
+        if (!event.handled) {
+          sendError(event, error);
+        }
+      })
+    );
   }
   registerMiddleware(middleware) {
     this.middlewares.push(middleware);
@@ -776,7 +841,11 @@ class Arri {
         this.models[responseName] = procedure.response;
       }
     }
-    registerRpc(this.h3Router, path, procedure, this.middlewares);
+    registerRpc(this.h3Router, path, procedure, this.middlewares, {
+      onError: this.onError,
+      onAfterResponse: this.onAfterResponse,
+      onBeforeResponse: this.onBeforeResponse
+    });
   }
   registerRoute(route) {
     registerRoute(this.h3Router, route, this.middlewares);

package/dist/shared/{arri.7f1296ca.mjs → arri.edccaab8.mjs}

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';
-import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.74885d3a.mjs';
+import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.7d8427d5.mjs';
 
 function defineClientGeneratorPlugin(plugin) {
   return plugin;