fix: remove exception

Koatty · Sep 12, 2023 · e19920d · e19920d
1 parent 90c5ea3
commit e19920d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 230 deletions.
diff --git a/src/handler/code.ts → src/code.ts b/src/handler/code.ts → src/code.ts
@@ -3,7 +3,7 @@
  * @Usage: 
  * @Author: richen
  * @Date: 2021-11-19 00:53:19
- * @LastEditTime: 2023-01-13 10:02:11
+ * @LastEditTime: 2023-09-12 10:46:38
  */
 
 /**

diff --git a/src/exception.ts b/src/exception.ts
diff --git a/src/handler/grpc.ts b/src/handler/grpc.ts
@@ -3,7 +3,7 @@
  * @Usage: 
  * @Author: richen
  * @Date: 2021-11-19 00:23:06
- * @LastEditTime: 2023-07-27 23:32:21
+ * @LastEditTime: 2023-09-12 10:50:17
  */
 import * as Helper from "koatty_lib";
 import { KoattyContext } from "koatty_core";
@@ -12,7 +12,7 @@ import { Exception, isPrevent, StatusCodeConvert } from "koatty_exception";
 import { catcher } from '../catcher';
 import { Span, Tags } from "opentracing";
 import { StatusBuilder } from "@grpc/grpc-js";
-import { GrpcStatusCodeMap, HttpStatusCodeMap } from "./code";
+import { GrpcStatusCodeMap, HttpStatusCodeMap } from "../code";
 
 /**
  * gRPCHandler
@@ -87,35 +87,3 @@ export async function gRPCHandler(ctx: KoattyContext, next: Function, ext?: any)
     clearTimeout(response.timeout);
   }
 }
-
-
-/**
- * gRPC Exception handler
- *
- * @export
- * @param {KoattyContext} ctx
- * @param {Exception} err
- * @returns {*}  {Promise<any>}
- */
-export function gRPCExceptionHandler(ctx: any, err: Exception): Promise<any> {
-  try {
-    let errObj, code = err.code ?? 2;
-    // http status convert to grpc status
-    const status = err.status || ctx.status;
-    if (!err.code && HttpStatusCodeMap.has(status)) {
-      code = StatusCodeConvert(status);
-    }
-    const body = ctx.body || err.message || GrpcStatusCodeMap.get(code) || null;
-
-    if (body) {
-      errObj = new StatusBuilder().withCode(code).withDetails(body).build();
-    } else {
-      errObj = new StatusBuilder().withCode(code).build();
-    }
-    return ctx.rpc.callback(errObj, null);
-  } catch (error) {
-    Logger.Error(error);
-    ctx.rpc.callback(new StatusBuilder().withCode(2).build(), null);
-    return;
-  }
-}
diff --git a/src/handler/http.ts b/src/handler/http.ts
@@ -3,15 +3,15 @@
  * @Usage: 
  * @Author: richen
  * @Date: 2021-11-19 00:14:59
- * @LastEditTime: 2023-07-27 23:30:42
+ * @LastEditTime: 2023-09-12 10:50:06
  */
 import { Helper } from "koatty_lib";
 import { catcher } from "../catcher";
 import { KoattyContext } from "koatty_core";
 import { DefaultLogger as Logger } from "koatty_logger";
 import { Exception, isPrevent } from "koatty_exception";
 import { Span, Tags } from "opentracing";
-import { HttpStatusCode, HttpStatusCodeMap } from "./code";
+import { HttpStatusCode, HttpStatusCodeMap } from "../code";
 
 /**
  * httpHandler
@@ -83,33 +83,3 @@ export async function httpHandler(ctx: KoattyContext, next: Function, ext?: any)
     clearTimeout(response.timeout);
   }
 }
-
-/**
- * HTTP Exception handler
- *
- * @export
- * @param {KoattyContext} ctx
- * @param {Exception} err
- * @returns {*}  
- */
-export function httpExceptionHandler(ctx: any, err: Exception) {
-  try {
-    ctx.status = ctx.status || 500;
-    if (HttpStatusCodeMap.has(err.status)) {
-      ctx.status = <HttpStatusCode>err.status;
-    }
-
-    let contentType = 'application/json';
-    if (ctx.encoding !== false) {
-      contentType = `${contentType}; charset=${ctx.encoding}`;
-    }
-    ctx.type = contentType;
-    const msg = err.message || ctx.message || "";
-    const body = `{"code":${err.code || 1},"message":"${msg}","data":${ctx.body ? JSON.stringify(ctx.body) : (ctx.body || null)}}`;
-    ctx.set("Content-Length", `${Buffer.byteLength(body)}`);
-    return ctx.res.end(body);
-  } catch (error) {
-    Logger.Error(error);
-    return null;
-  }
-}
diff --git a/src/handler/ws.ts b/src/handler/ws.ts
@@ -3,7 +3,7 @@
  * @Usage: 
  * @Author: richen
  * @Date: 2021-11-19 00:24:43
- * @LastEditTime: 2023-07-27 23:32:51
+ * @LastEditTime: 2023-09-12 10:50:14
 */
 import { inspect } from "util";
 import * as Helper from "koatty_lib";
@@ -12,7 +12,7 @@ import { DefaultLogger as Logger } from "koatty_logger";
 import { Exception, isPrevent } from "koatty_exception";
 import { catcher } from "../catcher";
 import { Span, Tags } from "opentracing";
-import { HttpStatusCode, HttpStatusCodeMap } from "./code";
+import { HttpStatusCode, HttpStatusCodeMap } from "../code";
 
 /**
  * wsHandler
@@ -98,25 +98,3 @@ export async function wsHandler(ctx: KoattyContext, next: Function, ext?: any):
 
 }
 
-/**
- * Websocket Exception handler
- *
- * @export
- * @param {KoattyContext} ctx
- * @param {Exception} err
- * @returns {*}  {void}
- */
-export function wsExceptionHandler(ctx: any, err: Exception): void {
-  try {
-    ctx.status = ctx.status || 500;
-    if (HttpStatusCodeMap.has(err.status)) {
-      ctx.status = <HttpStatusCode>err.status;
-    }
-    const msg = err.message || ctx.message || "";
-    const body = `{"code":${err.code || 1},"message":"${msg}","data":${ctx.body ? JSON.stringify(ctx.body) : (ctx.body || null)}}`;
-    return ctx.websocket.send(body);
-  } catch (error) {
-    Logger.Error(error);
-    return null;
-  }
-}
diff --git a/src/index.ts b/src/index.ts
@@ -4,12 +4,9 @@
  * @Author: richen
  * @Date: 2020-11-20 17:37:32
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-08-21 15:45:44
+ * @LastEditTime: 2023-09-12 10:54:06
  * @License: BSD (3-Clause)
  * @Copyright (c) - <richenlin(at)gmail.com>
  */
 
 export * from "./trace";
-export * from "./exception";
-export * from "./utils";
-
diff --git a/src/utils.ts b/src/utils.ts