@ruiapp/rapid-core 0.5.1 → 0.5.2

package/dist/index.js

@@ -999,7 +999,6 @@ function mergeHeaders(target, source) {
     else if (lodash.isObject(source)) {
         Object.entries(source).forEach(([key, value]) => target.set(key, value));
     }
-    return target;
 }
 function newResponse(options) {
     return new Response(options.body, {
@@ -1008,6 +1007,7 @@ function newResponse(options) {
     });
 }
 class RapidResponse {
+    // TODO: remove this field.
     #response;
     status;
     body;
@@ -1027,13 +1027,16 @@ class RapidResponse {
         if (headers) {
             mergeHeaders(responseHeaders, headers);
         }
-        this.#response = newResponse({ body, status: status || 200, headers: responseHeaders });
+        this.status = status || 200;
+        this.body = body;
+        this.#response = newResponse({ body, status: this.status, headers: responseHeaders });
     }
     redirect(location, status) {
         this.headers.set("Location", location);
+        this.status = status || 302;
         this.#response = newResponse({
             headers: this.headers,
-            status: status || 302,
+            status: this.status,
         });
     }
     getResponse() {
@@ -4161,19 +4164,27 @@ class RapidServer {
         const rapidRequest = new RapidRequest(this, request);
         await rapidRequest.parseBody();
         const routeContext = new RouteContext(this, rapidRequest);
+        const { response } = routeContext;
         try {
             await this.#pluginManager.onPrepareRouteContext(routeContext);
             await this.#buildedRoutes(routeContext, next);
         }
         catch (ex) {
             this.#logger.error("handle request error:", ex);
-            routeContext.response.json({
+            response.json({
                 error: {
                     message: ex.message || ex,
                 },
             }, 500);
         }
-        return routeContext.response.getResponse();
+        if (!response.status && !response.body) {
+            response.json({
+                error: {
+                    message: "No route handler was found to handle this request.",
+                },
+            }, 404);
+        }
+        return response.getResponse();
     }
     async beforeRunRouteActions(handlerContext) {
         await this.#pluginManager.beforeRunRouteActions(handlerContext);
@@ -4989,7 +5000,13 @@ async function handler$q(plugin, ctx, options) {
             routeContext,
         });
         if (!entity) {
-            throw new Error(`${options.namespace}.${options.singularCode} with id "${id}" was not found.`);
+            ctx.routerContext.response.json({
+                error: {
+                    message: `${options.namespace}.${options.singularCode} with id "${id}" was not found.`,
+                },
+            }, 404);
+            // routerContext.json() function will not be called if the ctx.output is null or undefined.
+            return;
         }
         return entity;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/response.ts

@@ -15,7 +15,6 @@ function mergeHeaders(target: Headers, source: HeadersInit) {
   } else if (isObject(source)) {
     Object.entries(source).forEach(([key, value]) => target.set(key, value));
   }
-  return target;
 }
 
 interface NewResponseOptions {
@@ -32,6 +31,7 @@ function newResponse(options: NewResponseOptions) {
 }
 
 export class RapidResponse {
+  // TODO: remove this field.
   #response: Response;
   status: number;
   body: BodyInit;
@@ -53,14 +53,17 @@ export class RapidResponse {
     if (headers) {
       mergeHeaders(responseHeaders, headers);
     }
-    this.#response = newResponse({ body, status: status || 200, headers: responseHeaders });
+    this.status = status || 200;
+    this.body = body;
+    this.#response = newResponse({ body, status: this.status, headers: responseHeaders });
   }
 
   redirect(location: string, status?: HttpStatus) {
     this.headers.set("Location", location);
+    this.status = status || 302;
     this.#response = newResponse({
       headers: this.headers,
-      status: status || 302,
+      status: this.status,
     });
   }
 

package/src/plugins/dataManage/actionHandlers/findCollectionEntityById.ts

@@ -14,7 +14,16 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
       routeContext,
     });
     if (!entity) {
-      throw new Error(`${options.namespace}.${options.singularCode} with id "${id}" was not found.`);
+      ctx.routerContext.response.json(
+        {
+          error: {
+            message: `${options.namespace}.${options.singularCode} with id "${id}" was not found.`,
+          },
+        },
+        404,
+      );
+      // routerContext.json() function will not be called if the ctx.output is null or undefined.
+      return;
     }
     return entity;
   });

package/src/server.ts

@@ -400,13 +400,14 @@ export class RapidServer implements IRpdServer {
     const rapidRequest = new RapidRequest(this, request);
     await rapidRequest.parseBody();
     const routeContext: RouteContext = new RouteContext(this, rapidRequest);
+    const { response } = routeContext;
 
     try {
       await this.#pluginManager.onPrepareRouteContext(routeContext);
       await this.#buildedRoutes(routeContext, next);
     } catch (ex) {
       this.#logger.error("handle request error:", ex);
-      routeContext.response.json(
+      response.json(
         {
           error: {
             message: ex.message || ex,
@@ -415,7 +416,18 @@ export class RapidServer implements IRpdServer {
         500,
       );
     }
-    return routeContext.response.getResponse();
+
+    if (!response.status && !response.body) {
+      response.json(
+        {
+          error: {
+            message: "No route handler was found to handle this request.",
+          },
+        },
+        404,
+      );
+    }
+    return response.getResponse();
   }
 
   async beforeRunRouteActions(handlerContext: ActionHandlerContext) {