express-ext 0.5.18 → 0.6.1

package/src/GenericController.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express"
 import { checkId, create, getStatusCode, update } from "./edit"
-import { handleError, Log } from "./http"
+import { handleError } from "./http"
 import { LoadController } from "./LoadController"
 import { Attribute, Attributes, ErrorMessage } from "./metadata"
 import { resources, StringMap } from "./resources"
@@ -21,13 +21,12 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
   metadata?: Attributes
   returnNumber?: boolean
   constructor(
-    log: Log,
     public service: GenericService<T, ID, number | T | ErrorMessage[]>,
     public build?: Build<T>,
     public validate?: Validate<T>,
     returnNumber?: boolean,
   ) {
-    super(log, service)
+    super(service)
     this.returnNumber = returnNumber
     if (service.metadata) {
       const m = service.metadata()
@@ -45,18 +44,18 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     }
   }
   create(req: Request, res: Response): void {
-    validateAndCreate(req, res, this.service.create, this.log, this.validate, this.build)
+    validateAndCreate(req, res, this.service.create, this.validate, this.build)
   }
   update(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update)
     if (id) {
-      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, undefined, this.build)
+      validateAndUpdate(res, req.body, false, this.service.update, this.validate, undefined, this.build)
     }
   }
   patch(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch)
     if (id && this.service.patch) {
-      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build)
+      validateAndUpdate(res, req.body, true, this.service.patch, this.validate, undefined, this.build)
     }
   }
   delete(req: Request, res: Response): void {
@@ -70,20 +69,12 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
           .then((count) => {
             res.status(getDeleteStatus(count)).json(count).end()
           })
-          .catch((err) => handleError(err, res, this.log))
+          .catch((err) => handleError(err, res))
       }
     }
   }
 }
-export function validateAndCreate<T>(
-  req: Request,
-  res: Response,
-  save: Save<T>,
-  log: Log,
-  validate?: Validate<T>,
-  build?: Build<T>,
-  returnNumber?: boolean,
-): void {
+export function validateAndCreate<T>(req: Request, res: Response, save: Save<T>, validate?: Validate<T>, build?: Build<T>, returnNumber?: boolean): void {
   const obj = req.body
   if (!obj || obj === "") {
     res.status(400).end("The request body cannot be empty.")
@@ -97,12 +88,12 @@ export function validateAndCreate<T>(
             if (build) {
               build(res, obj, true)
             }
-            create(res, obj, save, log, returnNumber)
+            create(res, obj, save, returnNumber)
           }
         })
-        .catch((err) => handleError(err, res, log))
+        .catch((err) => handleError(err, res))
     } else {
-      create(res, obj, save, log, returnNumber)
+      create(res, obj, save, returnNumber)
     }
   }
 }
@@ -111,7 +102,6 @@ export function validateAndUpdate<T>(
   obj: T,
   isPatch: boolean,
   save: Save<T>,
-  log: Log,
   validate?: Validate<T>,
   resource?: StringMap,
   build?: Build<T>,
@@ -126,12 +116,12 @@ export function validateAndUpdate<T>(
           if (build) {
             build(res, obj, false, isPatch)
           }
-          update(res, obj, save, log, returnNumber)
+          update(res, obj, save, returnNumber)
         }
       })
-      .catch((err) => handleError(err, res, log))
+      .catch((err) => handleError(err, res))
   } else {
-    update(res, obj, save, log, returnNumber)
+    update(res, obj, save, returnNumber)
   }
 }
 export function buildAndCheckIdWithBody<T, ID, R>(req: Request, res: Response, keys?: Attribute[], patch?: (obj: T, ctx?: any) => Promise<R>): ID | undefined {

package/src/GenericSearchController.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express"
 import { Build, GenericController, GenericService } from "./GenericController"
-import { handleError, Log } from "./http"
+import { handleError } from "./http"
 import { ErrorMessage } from "./metadata"
 import { resources, StringMap } from "./resources"
 import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from "./search"
@@ -13,7 +13,6 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
   excluding?: string
   array?: string[]
   constructor(
-    log: Log,
     public find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
     service: GenericService<T, ID, number | ErrorMessage[]>,
     config?: SearchConfig,
@@ -22,7 +21,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, service, build, validate)
+    super(service, build, validate)
     this.search = this.search.bind(this)
     this.config = initializeConfig(config)
     if (this.config) {
@@ -41,6 +40,6 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }

package/src/LoadController.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from "express"
-import { attrs, handleError, Log, minimize, queryNumber, respondModel } from "./http"
+import { attrs, handleError, minimize, queryNumber, respondModel } from "./http"
 import { Attribute, Attributes } from "./metadata"
 import { buildAndCheckId, buildKeys } from "./view"
 
@@ -40,7 +40,7 @@ function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | Load<T, ID>, keys?
 export class LoadController<T, ID> {
   protected keys?: Attribute[]
   protected view: Load<T, ID>
-  constructor(protected log: Log, viewService: ViewService<T, ID> | Load<T, ID>, keys?: Attributes | Attribute[] | string[]) {
+  constructor(viewService: ViewService<T, ID> | Load<T, ID>, keys?: Attributes | Attribute[] | string[]) {
     this.load = this.load.bind(this)
     this.view = getViewFunc(viewService)
     this.keys = getKeysFunc(viewService, keys)
@@ -50,14 +50,13 @@ export class LoadController<T, ID> {
     if (id) {
       this.view(id)
         .then((obj) => respondModel(minimize(obj), res))
-        .catch((err) => handleError(err, res, this.log))
+        .catch((err) => handleError(err, res))
     }
   }
 }
 // tslint:disable-next-line:max-classes-per-file
 export class ItemController<T> {
   constructor(
-    protected log: Log,
     private loadData: (keyword: string, max?: number) => Promise<T>,
     name?: string,
     protected param?: boolean,
@@ -88,7 +87,7 @@ export class ItemController<T> {
         const max = queryNumber(req, this.maxName, this.max)
         this.loadData(s, max)
           .then((result) => respondModel(minimize(result), res))
-          .catch((err) => handleError(err, res, this.log))
+          .catch((err) => handleError(err, res))
       }
     }
   }

package/src/LoadSearchController.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from "express"
-import { handleError, Log } from "./http"
+import { handleError } from "./http"
 import { LoadController, ViewService } from "./LoadController"
 import { Attribute, Attributes } from "./metadata"
 import { resources } from "./resources"
@@ -19,7 +19,6 @@ export interface SearchManager {
   load(req: Request, res: Response): void
 }
 export function useSearchController<T, ID, S extends Filter>(
-  log: Log,
   find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
   viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
   array?: string[],
@@ -28,7 +27,7 @@ export function useSearchController<T, ID, S extends Filter>(
   keys?: Attributes | Attribute[] | string[],
   config?: SearchConfig | boolean,
 ): Search {
-  const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers)
+  const c = new LoadSearchController(find, viewService, keys, config, dates, numbers)
   c.array = array
   return c
 }
@@ -43,7 +42,6 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
   excluding?: string
   array?: string[]
   constructor(
-    log: Log,
     public find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
     viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
     keys?: Attributes | Attribute[] | string[],
@@ -51,7 +49,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, viewService, keys)
+    super(viewService, keys)
     this.search = this.search.bind(this)
     if (config) {
       if (typeof config === "boolean") {
@@ -76,7 +74,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export class QueryController<T, ID, S extends Filter> extends LoadController<T, ID> {
@@ -86,8 +84,14 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
   numbers?: string[]
   excluding?: string
   array?: string[]
-  constructor(log: Log, protected query: Query<T, ID, S>, config?: SearchConfig | boolean, dates?: string[], numbers?: string[], array?: string[]) {
-    super(log, query)
+  constructor(
+    protected query: Query<T, ID, S>,
+    config?: SearchConfig | boolean,
+    dates?: string[],
+    numbers?: string[],
+    array?: string[],
+  ) {
+    super(query)
     this.search = this.search.bind(this)
     this.array = array
     if (config) {
@@ -114,7 +118,7 @@ export class QueryController<T, ID, S extends Filter> extends LoadController<T,
     this.query
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export { QueryController as QueryHandler }

package/src/LowCodeController.ts

@@ -16,7 +16,6 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
   excluding?: string
   array?: string[]
   constructor(
-    log: Log,
     public lowCodeService: Service<T, ID, number | ErrorMessage[], S>,
     config?: SearchConfig,
     build?: Build<T>,
@@ -24,7 +23,7 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, lowCodeService, build, validate)
+    super(lowCodeService, build, validate)
     this.search = this.search.bind(this)
     this.config = initializeConfig(config)
     if (this.config) {
@@ -44,7 +43,7 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export { LowcodeController as LowcodeHandler }
@@ -64,7 +63,7 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, lowCodeService, build, validate)
+    super(lowCodeService, build, validate)
     this.search = this.search.bind(this)
     this.config = initializeConfig(config)
     if (this.config) {
@@ -84,6 +83,6 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }

package/src/SearchController.ts

@@ -34,6 +34,6 @@ export class SearchController<T, S extends Filter> {
     const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }

package/src/edit.ts

@@ -62,13 +62,7 @@ export function checkId<T, ID>(obj: T, id: ID, keys?: Attribute[]): boolean {
   }
   return true
 }
-export function create<T>(
-  res: Response,
-  obj: T,
-  insert: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
-  log: (msg: string, ctx?: any) => void,
-  returnNumber?: boolean,
-): void {
+export function create<T>(res: Response, obj: T, insert: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>, returnNumber?: boolean): void {
   insert(obj)
     .then((result) => {
       if (typeof result === "number") {
@@ -89,15 +83,9 @@ export function create<T>(
           .end()
       }
     })
-    .catch((err) => handleError(err, res, log))
+    .catch((err) => handleError(err, res))
 }
-export function update<T>(
-  res: Response,
-  obj: T,
-  save: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>,
-  log: (msg: string, ctx?: any) => void,
-  returnNumber?: boolean,
-): void {
+export function update<T>(res: Response, obj: T, save: (obj: T, ctx?: any) => Promise<number | T | ErrorMessage[]>, returnNumber?: boolean): void {
   save(obj)
     .then((result) => {
       if (typeof result === "number") {
@@ -120,7 +108,7 @@ export function update<T>(
           .end()
       }
     })
-    .catch((err) => handleError(err, res, log))
+    .catch((err) => handleError(err, res))
 }
 export function isTypeError(errs: ErrorMessage[]): boolean {
   if (!errs) {

package/src/http.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from "express"
 import { Attribute } from "./metadata"
+import { resources } from "./resources"
 
 export type Log = (msg: string) => void
 export type LogFunc = Log
@@ -17,12 +18,17 @@ Object.defineProperty(Error.prototype, "toJSON", {
   configurable: true,
   writable: true,
 })
-export function handleError(err: any, res: Response, log?: (msg: string) => void) {
-  if (log) {
-    log(toString(err))
+export function handleError(err: any, res: Response) {
+  if (resources.log) {
+    resources.log(toString(err))
     res.status(500).end("Internal Server Error")
   } else {
-    res.status(500).end(toString(err))
+    if (resources.returnServerError) {
+      res.status(500).end(toString(err))
+    } else {
+      console.error(toString(err))
+      res.status(500).end("Internal Server Error")
+    }
   }
 }
 export const error = handleError

package/src/index.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express"
 import { GenericController } from "./GenericController"
 import { GenericSearchController } from "./GenericSearchController"
 import { HealthController } from "./HealthController"
-import { handleError, Log, query } from "./http"
+import { handleError, query } from "./http"
 import { LoadController } from "./LoadController"
 import { LoadSearchController } from "./LoadSearchController"
 import { LogController } from "./LogController"
@@ -49,7 +49,6 @@ export interface SavedService {
 export class SavedController {
   constructor(
     protected savedService: SavedService,
-    protected log: (msg: string) => void,
     id?: string,
     userId?: string,
   ) {
@@ -77,7 +76,7 @@ export class SavedController {
         const status = result > 0 ? 200 : result === 0 ? 409 : 422
         res.status(status).json(result).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
   remove(req: Request, res: Response) {
     const userId: string = res.locals[this.userId]
@@ -96,7 +95,7 @@ export class SavedController {
         const status = result > 0 ? 200 : 410
         res.status(status).json(result).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export interface FollowService {
@@ -107,7 +106,6 @@ export interface FollowService {
 export class FollowController {
   constructor(
     protected service: FollowService,
-    protected log: Log,
     id?: string,
     userId?: string,
   ) {
@@ -135,7 +133,7 @@ export class FollowController {
         const status = result > 0 ? 200 : 409
         res.status(status).json(result).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
   unfollow(req: Request, res: Response) {
     const userId: string = res.locals[this.userId]
@@ -154,7 +152,7 @@ export class FollowController {
         const status = result > 0 ? 200 : 410
         res.status(status).json(result).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export interface ReactService {
@@ -165,11 +163,10 @@ export interface ReactService {
 // tslint:disable-next-line:max-classes-per-file
 export class UserReactionController {
   constructor(
-    public log: Log,
-    public service: ReactService,
-    public author: string,
+    protected service: ReactService,
+    protected author: string,
     id: string,
-    public reaction: string,
+    protected reaction: string,
   ) {
     this.id = id && id.length > 0 ? id : "id"
     this.react = this.react.bind(this)
@@ -198,7 +195,7 @@ export class UserReactionController {
       .then((count) => {
         res.status(200).json(count).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
   unreact(req: Request, res: Response) {
     const id = req.params.id as string
@@ -221,7 +218,7 @@ export class UserReactionController {
       .then((count) => {
         res.status(200).json(count).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
   checkReaction(req: Request, res: Response) {
     const id = req.params.id as string
@@ -239,7 +236,7 @@ export class UserReactionController {
       .then((count) => {
         res.status(200).json(count).end()
       })
-      .catch((err) => handleError(err, res, this.log))
+      .catch((err) => handleError(err, res))
   }
 }
 export const ReactController = UserReactionController
@@ -326,7 +323,7 @@ export function respond<T>(res: Response, result: number | T | ErrorMessage[], r
       .end()
   }
 }
-export function save<T>(isEdit: boolean, res: Response, obj: T, service: SaveService<T>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean) {
+export function save<T>(isEdit: boolean, res: Response, obj: T, service: SaveService<T>, returnNumber?: boolean) {
   if (!isEdit) {
     service
       .create(obj)
@@ -339,7 +336,7 @@ export function save<T>(isEdit: boolean, res: Response, obj: T, service: SaveSer
           res.status(201).json(obj).end()
         }
       })
-      .catch((err) => handleError(err, res, log))
+      .catch((err) => handleError(err, res))
   } else {
     service
       .update(obj)
@@ -357,7 +354,7 @@ export function save<T>(isEdit: boolean, res: Response, obj: T, service: SaveSer
             .end()
         }
       })
-      .catch((err) => handleError(err, res, log))
+      .catch((err) => handleError(err, res))
   }
 }
 const map: StringMap = {

package/src/resources.ts

@@ -21,6 +21,8 @@ export class resources {
   static fields = "fields"
   static partial = "partial"
   static subPartial = "sub"
+  static log?: (msg: string) => void
+  static returnServerError?: boolean
   static createValidator?: <T>(attributes: Attributes, allowUndefined?: boolean, max?: number) => Validator<T>
   static check: (obj: any, attributes: Attributes, allowUndefined?: boolean, patch?: boolean) => ErrorMessage[]
   static encoding?: BufferEncoding = "utf-8"