express-ext 0.4.0 → 0.4.1

package/src/log.ts

@@ -1,251 +1,255 @@
-import { NextFunction } from 'express';
-import { ParamsDictionary, Request, Response } from 'express-serve-static-core';
-import { ParsedQs } from 'qs';
-import { PassThrough } from 'stream';
-import { resources } from './resources';
+import { NextFunction } from "express"
+import { ParamsDictionary, Request, Response } from "express-serve-static-core"
+import { ParsedQs } from "qs"
+import { PassThrough } from "stream"
+import { resources } from "./resources"
 
 export interface LogConf {
-  log?: boolean;
-  separate?: boolean;
-  skips?: string;
-  request?: string;
-  response?: string;
-  duration?: string;
-  status?: string;
-  size?: string;
+  log?: boolean
+  separate?: boolean
+  skips?: string
+  request?: string
+  response?: string
+  duration?: string
+  status?: string
+  size?: string
 }
 export interface MiddleLog {
-  log?: boolean;
-  separate?: boolean;
-  skips: string[];
-  duration: string;
-  request: string;
-  response: string;
-  status: string;
-  size: string;
+  log?: boolean
+  separate?: boolean
+  skips: string[]
+  duration: string
+  request: string
+  response: string
+  status: string
+  size: string
 }
 export interface SimpleMap {
-  [key: string]: string|number|boolean|Date;
+  [key: string]: string | number | boolean | Date
 }
 export function createConfig(c?: LogConf): MiddleLog {
   if (!c) {
-    return {skips: [], duration: 'duration', request: '', response: '', status: '', size: ''};
+    return { skips: [], duration: "duration", request: "", response: "", status: "", size: "" }
   }
   const l: MiddleLog = {
     log: c.log,
     separate: c.separate,
-    skips: c.skips ? c.skips.split(',') : [],
-    duration: c.duration ? c.duration : 'duration',
-    request: c.request ? c.request : '',
-    response: c.response ? c.response : '',
-    status: c.status ? c.status : '',
-    size: c.size ? c.size : ''
-  };
-  return l;
+    skips: c.skips ? c.skips.split(",") : [],
+    duration: c.duration ? c.duration : "duration",
+    request: c.request ? c.request : "",
+    response: c.response ? c.response : "",
+    status: c.status ? c.status : "",
+    size: c.size ? c.size : "",
+  }
+  return l
 }
 export function skip(skips: string[], url: string): boolean {
   if (skips.length === 0) {
-    return false;
+    return false
   }
-  const u = removeUrlParams(url);
+  const u = removeUrlParams(url)
   for (const s of skips) {
     if (u.endsWith(s)) {
-      return true;
+      return true
     }
   }
-  return false;
+  return false
 }
 export function removeUrlParams(url: string): string {
-  const startParams = url.indexOf('?');
-  return startParams !== -1 ? url.substring(0, startParams) : url;
+  const startParams = url.indexOf("?")
+  return startParams !== -1 ? url.substring(0, startParams) : url
 }
 export interface Middleware {
-  conf: MiddleLog;
+  conf: MiddleLog
 }
-const o = 'OPTIONS';
+const o = "OPTIONS"
 export class MiddlewareLogger {
-  constructor(public write: (msg: string, m?: SimpleMap) => void, conf?: LogConf, public build?: (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, m: SimpleMap) => SimpleMap) {
-    this.log = this.log.bind(this);
-    this.conf = createConfig(conf);
-  }
-  conf: MiddleLog;
+  constructor(
+    public write: (msg: string, m?: SimpleMap) => void,
+    conf?: LogConf,
+    public build?: (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, m: SimpleMap) => SimpleMap,
+  ) {
+    this.log = this.log.bind(this)
+    this.conf = createConfig(conf)
+  }
+  conf: MiddleLog
   log(req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) {
-    const m = req.method;
+    const m = req.method
     if (m !== o && this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
-      const start = process.hrtime();
-      const x = this.conf.request;
-      let r = false;
-      if (m !== 'GET' && m !== 'DELETE') {
-        r = true;
+      const start = process.hrtime()
+      const x = this.conf.request
+      let r = false
+      if (m !== "GET" && m !== "DELETE") {
+        r = true
       }
-      const msg = `${m} ${req.originalUrl}`;
+      const msg = `${m} ${req.originalUrl}`
       if (this.conf.separate && r) {
         if (this.conf.request.length > 0) {
-          const op: SimpleMap = {};
-          op[x] = JSON.stringify(req.body);
+          const op: SimpleMap = {}
+          op[x] = JSON.stringify(req.body)
           if (this.build) {
-            const op2 = this.build(req, op);
-            this.write(msg, op2);
+            const op2 = this.build(req, op)
+            this.write(msg, op2)
           } else {
-            this.write(msg, op);
+            this.write(msg, op)
           }
         }
       }
-      const chunks: Uint8Array[] = [];
-      mapResponseBody(res, chunks);
-      res.on('finish', () => {
-          const duration = getDurationInMilliseconds(start);
-          const op: SimpleMap = {};
-          if (r && !this.conf.separate && this.conf.request.length > 0) {
-            op[x] = JSON.stringify(req.body);
-          }
-          if (this.conf.response.length > 0) {
-            const rsBody = Buffer.concat(chunks).toString(resources.encoding);
-            op[this.conf.response] = rsBody;
-          }
-          if (this.conf.status.length > 0) {
-            op[this.conf.status] = res.statusCode;
-          }
-          if (this.conf.size.length > 0) {
-            if ('_contentLength' in res) {
-              op[this.conf.size] = (res as any)['_contentLength'];
-            } else if (res.hasHeader('content-length')) {
-              const l = res.getHeader('content-length');
-              if (typeof l === 'number' || typeof l === 'string') {
-                op[this.conf.size] = l;
-              }
+      const chunks: Uint8Array[] = []
+      mapResponseBody(res, chunks)
+      res.on("finish", () => {
+        const duration = getDurationInMilliseconds(start)
+        const op: SimpleMap = {}
+        if (r && !this.conf.separate && this.conf.request.length > 0) {
+          op[x] = JSON.stringify(req.body)
+        }
+        if (this.conf.response.length > 0) {
+          const rsBody = Buffer.concat(chunks).toString(resources.encoding)
+          op[this.conf.response] = rsBody
+        }
+        if (this.conf.status.length > 0) {
+          op[this.conf.status] = res.statusCode
+        }
+        if (this.conf.size.length > 0) {
+          if ("_contentLength" in res) {
+            op[this.conf.size] = (res as any)["_contentLength"]
+          } else if (res.hasHeader("content-length")) {
+            const l = res.getHeader("content-length")
+            if (typeof l === "number" || typeof l === "string") {
+              op[this.conf.size] = l
             }
           }
-          op[this.conf.duration] = duration;
-          if (this.build) {
-            const op2 = this.build(req, op);
-            this.write(msg, op2);
-          } else {
-            this.write(msg, op);
-          }
-      });
-      next();
+        }
+        op[this.conf.duration] = duration
+        if (this.build) {
+          const op2 = this.build(req, op)
+          this.write(msg, op2)
+        } else {
+          this.write(msg, op)
+        }
+      })
+      next()
     } else {
-      next();
+      next()
     }
   }
 }
 const mapResponseBody = (res: Response<any, Record<string, any>, number>, chunks: Uint8Array[]) => {
-  const defaultWrite = res.write.bind(res);
-  const defaultEnd = res.end.bind(res);
-  const ps = new PassThrough();
+  const defaultWrite = res.write.bind(res)
+  const defaultEnd = res.end.bind(res)
+  const ps = new PassThrough()
 
-  ps.on('data', (data: any) => chunks.push(data));
+  ps.on("data", (data: any) => chunks.push(data))
 
-  (res as any).write = (...args: any) => {
-      (ps as any).write(...args);
-      (defaultWrite as any)(...args);
-  };
+  ;(res as any).write = (...args: any) => {
+    ;(ps as any).write(...args)
+    ;(defaultWrite as any)(...args)
+  }
 
-  (res as any).end = (...args: any) => {
-      ps.end(...args);
-      defaultEnd(...args);
-  };
-};
-const NS_PER_SEC = 1e9;
-const NS_TO_MS = 1e6;
+  ;(res as any).end = (...args: any) => {
+    ps.end(...args)
+    defaultEnd(...args)
+  }
+}
+const NS_PER_SEC = 1e9
+const NS_TO_MS = 1e6
 const getDurationInMilliseconds = (start: [number, number] | undefined) => {
-  const diff = process.hrtime(start);
-  return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
-};
+  const diff = process.hrtime(start)
+  return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS
+}
 
 // tslint:disable-next-line:max-classes-per-file
 export class MiddlewareController {
   constructor(public logger: Middleware) {
-    this.config = this.config.bind(this);
+    this.config = this.config.bind(this)
   }
   config(req: Request, res: Response) {
-    const obj: MiddleLog = req.body;
-    if (!obj || (obj as any) === '') {
-      return res.status(400).end('The request body cannot be empty');
+    const obj: MiddleLog = req.body
+    if (!obj || (obj as any) === "") {
+      return res.status(400).end("The request body cannot be empty")
     }
     if (!this.logger) {
-      return res.status(503).end('Logger is not available');
+      return res.status(503).end("Logger is not available")
     }
-    let changed = false;
+    let changed = false
     if (obj.log !== undefined) {
-      this.logger.conf.log = obj.log;
-      changed = true;
+      this.logger.conf.log = obj.log
+      changed = true
     }
     if (obj.separate !== undefined) {
-      this.logger.conf.separate = obj.separate;
-      changed = true;
+      this.logger.conf.separate = obj.separate
+      changed = true
     }
     if (Array.isArray(obj.skips)) {
       if (isValidSkips(obj.skips)) {
-        this.logger.conf.skips = obj.skips;
-        changed = true;
+        this.logger.conf.skips = obj.skips
+        changed = true
       }
     }
-    if (typeof obj.duration === 'string' && obj.duration.length > 0) {
-      this.logger.conf.duration = obj.duration;
-      changed = true;
+    if (typeof obj.duration === "string" && obj.duration.length > 0) {
+      this.logger.conf.duration = obj.duration
+      changed = true
     }
-    if (typeof obj.request === 'string') {
-      this.logger.conf.request = obj.request;
-      changed = true;
+    if (typeof obj.request === "string") {
+      this.logger.conf.request = obj.request
+      changed = true
     }
-    if (typeof obj.response === 'string') {
-      this.logger.conf.response = obj.response;
-      changed = true;
+    if (typeof obj.response === "string") {
+      this.logger.conf.response = obj.response
+      changed = true
     }
-    if (typeof obj.status === 'string') {
-      this.logger.conf.status = obj.status;
-      changed = true;
+    if (typeof obj.status === "string") {
+      this.logger.conf.status = obj.status
+      changed = true
     }
-    if (typeof obj.size === 'string') {
-      this.logger.conf.size = obj.size;
-      changed = true;
+    if (typeof obj.size === "string") {
+      this.logger.conf.size = obj.size
+      changed = true
     }
     if (changed) {
-      return res.status(200).json(true).end();
+      return res.status(200).json(true).end()
     } else {
-      return res.status(204).json(false).end();
+      return res.status(204).json(false).end()
     }
   }
 }
 export function isValidSkips(s: string[]): boolean {
   for (const x of s) {
-    if (!(typeof x === 'string')) {
-      return false;
+    if (!(typeof x === "string")) {
+      return false
     }
   }
-  return true;
+  return true
 }
 export function mask(s: string, start: number, end: number, replace: string): string {
   if (start < 0) {
-    start = 0;
+    start = 0
   }
   if (end < 0) {
-    end = 0;
+    end = 0
   }
-  const t = start + end;
+  const t = start + end
   if (t >= s.length) {
-    return replace.repeat(s.length);
+    return replace.repeat(s.length)
   }
-  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end);
+  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end)
 }
 export function margin(s: string, start: number, end: number, replace: string): string {
   if (start >= end) {
-    return '';
+    return ""
   }
   if (start < 0) {
-    start = 0;
+    start = 0
   }
   if (end < 0) {
-    end = 0;
+    end = 0
   }
   if (start >= s.length) {
-    return replace.repeat(s.length);
+    return replace.repeat(s.length)
   }
   if (end >= s.length) {
-    return replace.repeat(start) + s.substr(start);
+    return replace.repeat(start) + s.substr(start)
   }
-  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end);
+  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end)
 }
-export const maskMargin = margin;
+export const maskMargin = margin

package/src/metadata.ts

@@ -1,38 +1,55 @@
-export type Type = 'ObjectId' | 'date' | 'datetime' | 'time'
-    | 'boolean' | 'number' | 'integer' | 'string' | 'text'
-    | 'object' | 'array' | 'binary'
-    | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
-export type Format = 'currency' | 'percentage' | 'email' | 'url' | 'phone' | 'fax' | 'ipv4' | 'ipv6';
+export type Type =
+  | "ObjectId"
+  | "date"
+  | "datetime"
+  | "time"
+  | "boolean"
+  | "number"
+  | "integer"
+  | "string"
+  | "text"
+  | "object"
+  | "array"
+  | "binary"
+  | "primitives"
+  | "booleans"
+  | "numbers"
+  | "integers"
+  | "strings"
+  | "dates"
+  | "datetimes"
+  | "times"
+export type Format = "currency" | "percentage" | "email" | "url" | "phone" | "fax" | "ipv4" | "ipv6"
 
-export type DataType = Type;
-export type FormatType = Format;
+export type DataType = Type
+export type FormatType = Format
 export interface ErrorMessage {
-  field: string;
-  code: string;
-  message?: string;
-  param?: string|number|Date;
-  invalid?: string;
+  field: string
+  code: string
+  message?: string
+  param?: string | number | Date
+  invalid?: string
 }
 
 export interface Model {
-  attributes: Attributes;
+  attributes: Attributes
 }
 
 export interface Attribute {
-  name?: string;
-  type?: Type;
-  format?: Format;
-  required?: boolean;
-  key?: boolean;
-  length?: number;
-  min?: number;
-  max?: number;
-  gt?: number;
-  lt?: number;
-  exp?: RegExp|string;
-  code?: string;
-  typeof?: Attributes;
+  name?: string
+  type?: Type
+  format?: Format
+  required?: boolean
+  key?: boolean
+  length?: number
+  min?: number
+  max?: number
+  gt?: number
+  lt?: number
+  exp?: RegExp | string
+  code?: string
+  typeof?: Attributes
 }
 export interface Attributes {
-  [key: string]: Attribute;
+  [key: string]: Attribute
 }