log error - show tags and meta

prohazko2 · prohazko2 · commit f6dc1930701a · 2021-03-12T19:28:33.000+03:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/index.js b/index.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-const { unique, only } = require('./src/filter');
+const { unique, only } = require('./dist/misc');
 
 module.exports = Object.assign({}, {
   node: require('./src/node'),
@@ -25,7 +25,7 @@ module.exports = Object.assign({}, {
   traverse: require('./src/traverse'),
   template: require('./src/template'),
   log: require('./src/log'),
-  api: require('./src/api'),
+  api: require('./dist/api'),
   unique,
   only
 });
diff --git a/lib/api.ts b/lib/api.ts
@@ -1,7 +1,5 @@
-//import { resolve, parse } from "url";
-//import { join } from "path";
-
-import { unique } from './misc.ts';
+import { unique } from './misc';
+import statusCodes from './codes';
 
 export type ItemId = string;
 
@@ -27,6 +25,15 @@ export type ApiErrorHelper = {
   links?: string[];
 };
 
+export type KVM = { [k: string]: string };
+
+export type RequestOptions<T = unknown> = {
+  url: string;
+  method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
+  headers?: KVM;
+  body?: T;
+};
+
 export class ApiError extends Error {
   jti: string = '';
   url: string = '';
@@ -75,6 +82,13 @@ export class ApiError extends Error {
     this.url = url;
     return this;
   }
+
+  static fromJson(opts: RequestOptions, json: ApiError, statusCode = 500) {
+    return new ApiError(json.message)
+      .withCode(statusCode)
+      .withTags(json.tags)
+      .withUrl(opts.url);
+  }
 }
 
 export class NginxError extends ApiError {
@@ -85,42 +99,87 @@ export class NginxError extends ApiError {
     return this;
   }
 
-  static fromHtml(resp = '', statusCode = 500) {
+  static fromHtml(opts: RequestOptions, resp = '', statusCode = 500) {
     let [, title = 'Unknown nginx errror'] = /<title>(.*?)<\/title>/gi.exec(resp) || [];
     title = title.replace(statusCode.toString(), '').trim();
 
-    // return new NginxError(http.STATUS_CODES[statusCode])
-    //   .withCode(statusCode)
-    //   .withTitle(title);
+    return new NginxError(statusCodes[statusCode])
+      .withCode(statusCode)
+      .withTitle(title)
+      .withUrl(opts.url);
   }
 }
 
-type KVM = { [k: string]: string };
+export function nodeReq<Q = unknown, S = unknown>(opts: RequestOptions<Q>): Promise<S> {
+  const { protocol, hostname, port, pathname } = new URL(opts.url);
 
-export interface RequestOptions {
-  method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
-  headers?: KVM;
-}
+  const proto = protocol === 'https:' ? require('https') : require('http');
 
-export async function req<T, U = unknown>(
-  url: string,
-  opts: RequestOptions = {},
-  data?: U
-) {
-  const resp = await fetch(url, {
+  const options = {
+    method: 'GET',
+    host: hostname,
+    port: +port,
+    path: pathname,
     ...opts
+  };
+
+  if (!port) {
+    options.port = protocol === 'https:' ? 443 : 80;
+  }
+
+  return new Promise((resolve, reject) => {
+    const req = proto.request(options, (res) => {
+      let resp = '';
+      res.on('data', (chunk) => (resp += chunk.toString()));
+      res.on('end', () => {
+        try {
+          /*
+           * most nginx upstream errors should be handled by ingress default-backend
+           * but who knows ...
+           */
+          if (resp.startsWith('<html>') && resp.includes('nginx')) {
+            return reject(NginxError.fromHtml(opts, resp, res.statusCode));
+          }
+          const json = JSON.parse(resp);
+          if (res.statusCode >= 400) {
+            return reject(ApiError.fromJson(opts, json, res.statusCode));
+          }
+          resolve(json);
+        } catch (err) {
+          console.log(resp);
+          reject(err);
+        }
+      });
+    });
+
+    req.on('error', (err) => reject(err));
+
+    if (opts.body) {
+      let send = opts.body as any;
+      if (typeof send === 'object') {
+        send = JSON.stringify(opts.body);
+      }
+      req.write(send);
+    }
+    req.end();
   });
+}
 
-  const json = await resp.json();
+export async function req<Q = unknown, S = unknown>(opts: RequestOptions<Q>): Promise<S> {
+  if (typeof fetch !== 'function') {
+    return nodeReq(opts);
+  }
 
-  console.log('.xxx', resp.status);
+  const resp = await fetch(opts.url, {
+    headers: opts.headers,
+    method: opts.method || 'GET',
+    body: <any>opts.body || null
+  });
 
-  if (resp.status >= 300) {
-    throw new ApiError(json.message)
-      .withHelper(json.helper)
-      .withTags(json.tags)
-      .withCode(resp.status)
-      .withUrl(url);
+  const json = await resp.json();
+
+  if (resp.status >= 400) {
+    throw ApiError.fromJson(opts, json, resp.status);
   }
 
   return json;
@@ -158,28 +217,33 @@ export class Client {
   get<T = unknown>(path: string, query = {}): Promise<T> {
     const url = new URL(path, this.url);
     const headers = this.getDefaultHeaders();
-    return req(url.toString(), { method: 'GET', headers });
+    return req({ url: url.toString(), method: 'GET', headers });
   }
 
   post<T = unknown>(path: string, data: Partial<T> = {}): Promise<T> {
     const url = new URL(path, this.url);
     const headers = this.getDefaultHeaders();
-    return req(url.toString(), { method: 'POST', headers }, data);
+    return req({ url: url.toString(), method: 'POST', headers, body: data });
   }
 
   patch<T = unknown>(path: string, data: Partial<T> = {}): Promise<T> {
     const url = new URL(path, this.url);
     const headers = this.getDefaultHeaders();
-    return req(url.toString(), { method: 'PATCH', headers }, data);
+    return req({ url: url.toString(), method: 'PATCH', headers, body: data });
   }
 
   delete<T = unknown>(path: string): Promise<T> {
     const url = new URL(path, this.url);
     const headers = this.getDefaultHeaders();
-    return req(url.toString(), { method: 'DELETE', headers });
+    return req({ url: url.toString(), method: 'DELETE', headers });
   }
 
   with(opts: ClientOpts = {}) {
     return new Client({ ...(this._opts || {}), ...opts });
   }
 }
+
+export default new Client({
+  url: process.env['RIC_URL'] || 'https://dev.rightech.io/',
+  token: process.env['RIC_TOKEN']
+});
diff --git a/lib/codes.ts b/lib/codes.ts
@@ -0,0 +1,65 @@
+export default {
+  '100': 'Continue',
+  '101': 'Switching Protocols',
+  '102': 'Processing',
+  '103': 'Early Hints',
+  '200': 'OK',
+  '201': 'Created',
+  '202': 'Accepted',
+  '203': 'Non-Authoritative Information',
+  '204': 'No Content',
+  '205': 'Reset Content',
+  '206': 'Partial Content',
+  '207': 'Multi-Status',
+  '208': 'Already Reported',
+  '226': 'IM Used',
+  '300': 'Multiple Choices',
+  '301': 'Moved Permanently',
+  '302': 'Found',
+  '303': 'See Other',
+  '304': 'Not Modified',
+  '305': 'Use Proxy',
+  '307': 'Temporary Redirect',
+  '308': 'Permanent Redirect',
+  '400': 'Bad Request',
+  '401': 'Unauthorized',
+  '402': 'Payment Required',
+  '403': 'Forbidden',
+  '404': 'Not Found',
+  '405': 'Method Not Allowed',
+  '406': 'Not Acceptable',
+  '407': 'Proxy Authentication Required',
+  '408': 'Request Timeout',
+  '409': 'Conflict',
+  '410': 'Gone',
+  '411': 'Length Required',
+  '412': 'Precondition Failed',
+  '413': 'Payload Too Large',
+  '414': 'URI Too Long',
+  '415': 'Unsupported Media Type',
+  '416': 'Range Not Satisfiable',
+  '417': 'Expectation Failed',
+  '418': "I'm a Teapot",
+  '421': 'Misdirected Request',
+  '422': 'Unprocessable Entity',
+  '423': 'Locked',
+  '424': 'Failed Dependency',
+  '425': 'Unordered Collection',
+  '426': 'Upgrade Required',
+  '428': 'Precondition Required',
+  '429': 'Too Many Requests',
+  '431': 'Request Header Fields Too Large',
+  '451': 'Unavailable For Legal Reasons',
+  '500': 'Internal Server Error',
+  '501': 'Not Implemented',
+  '502': 'Bad Gateway',
+  '503': 'Service Unavailable',
+  '504': 'Gateway Timeout',
+  '505': 'HTTP Version Not Supported',
+  '506': 'Variant Also Negotiates',
+  '507': 'Insufficient Storage',
+  '508': 'Loop Detected',
+  '509': 'Bandwidth Limit Exceeded',
+  '510': 'Not Extended',
+  '511': 'Network Authentication Required'
+};
diff --git a/lib/index.ts b/lib/index.ts
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rightech/utils",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "",
   "main": "index.js",
   "private": false,
@@ -29,6 +29,7 @@
   "typings": "index.d.ts",
   "devDependencies": {
     "ts-loader": "^8.0.17",
+    "typescript": "^4.2.3",
     "webpack": "^5.24.2",
     "webpack-cli": "^4.5.0"
   }
diff --git a/src/log.js b/src/log.js
@@ -75,7 +75,15 @@ function summary(message) {
   }
   if (message instanceof Error) {
     const joiner = colors.red('* ');
-    return message.stack.split('  at').join(joiner);
+    let [msg, ...rest] =  message.stack.split('  at');
+    msg = msg.trim();
+    if (message.tags && message.tags.length) {
+      msg = `${msg} ${JSON.stringify(message.tags)}`
+    }
+    if (message.more) {
+      msg = `${msg} with ${JSON.stringify(message.more)}`
+    }
+    return [`${msg}\n  `, ...rest].join(joiner);
   }
   return inspect(message);
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,6 +7,7 @@
     "resolveJsonModule": true,
     "moduleResolution": "node",
     "target": "ES2020",
+    "module": "commonjs",
     "lib": ["es5", "es2020", "dom"],
     "allowJs": true,
     "baseUrl": "."

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,15 @@ function summary(message) {`
`75`	`75`	`}`
`76`	`76`	`if (message instanceof Error) {`
`77`	`77`	`const joiner = colors.red('* ');`
`78`		`- return message.stack.split(' at').join(joiner);`
	`78`	`+ let [msg, ...rest] = message.stack.split(' at');`
	`79`	`+ msg = msg.trim();`
	`80`	`+ if (message.tags && message.tags.length) {`
	`81`	+ msg = `${msg} ${JSON.stringify(message.tags)}`
	`82`	`+ }`
	`83`	`+ if (message.more) {`
	`84`	+ msg = `${msg} with ${JSON.stringify(message.more)}`
	`85`	`+ }`
	`86`	+ return [`${msg}\n `, ...rest].join(joiner);
`79`	`87`	`}`
`80`	`88`	`return inspect(message);`
`81`	`89`	`}`