@jayfong/x-server 2.2.12 → 2.2.14

package/lib/_cjs/services/log.js

@@ -39,17 +39,21 @@ class LogService {
   }
 
   parseLogLineText(text) {
-    const [time, level, title, desc] = text.split(this.separator);
+    const [time, level, title, ...desc] = text.split(this.separator);
     return {
       time: time,
       level: level,
       title: title,
-      desc: JSON.parse(desc)
+      desc: desc.reduce((res, item) => {
+        const i = item.indexOf(':');
+        res[item.substring(0, i)] = item.substring(i + 1);
+        return res;
+      }, {})
     };
   }
 
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss')}${this.separator}${payload.level}${this.separator}${payload.title}${this.separator}${payload.desc ? JSON.stringify(payload.desc) : '{}'}\n`);
+    this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...Object.keys(payload.desc || {}).map(key => `${key}:${payload.desc[key]}`)].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
   }
 
   info(title, desc) {

package/lib/_cjs/services/rate_limit.js

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 exports.RateLimitService = void 0;
 
+var _http_error = require("../core/http_error");
+
 var _x = require("../x");
 
 class RateLimitService {
@@ -27,6 +29,16 @@ class RateLimitService {
     return remainingCount - 1;
   }
 
+  async limitByCountOrFail(options) {
+    const count = await this.limitByCount(options);
+
+    if (count === 0) {
+      throw new _http_error.HttpError.Forbidden(options.message);
+    }
+
+    return count;
+  }
+
 }
 
 exports.RateLimitService = RateLimitService;

package/lib/services/log.js

@@ -26,17 +26,21 @@ export class LogService {
   }
 
   parseLogLineText(text) {
-    const [time, level, title, desc] = text.split(this.separator);
+    const [time, level, title, ...desc] = text.split(this.separator);
     return {
       time: time,
       level: level,
       title: title,
-      desc: JSON.parse(desc)
+      desc: desc.reduce((res, item) => {
+        const i = item.indexOf(':');
+        res[item.substring(0, i)] = item.substring(i + 1);
+        return res;
+      }, {})
     };
   }
 
   log(payload) {
-    this.getLogWriter(this.logFile).write(`${formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss')}${this.separator}${payload.level}${this.separator}${payload.title}${this.separator}${payload.desc ? JSON.stringify(payload.desc) : '{}'}\n`);
+    this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...Object.keys(payload.desc || {}).map(key => `${key}:${payload.desc[key]}`)].join(this.separator).replace(/[\r\n]+/g, ' ')}\n`);
   }
 
   info(title, desc) {

package/lib/services/rate_limit.d.ts

@@ -5,9 +5,13 @@ export interface RateLimitServiceLimitByCountOptions {
     count: number;
     ttl: MsValue;
 }
+export interface RateLimitServiceLimitByCountOrFailOptions extends RateLimitServiceLimitByCountOptions {
+    message?: string;
+}
 export declare class RateLimitService implements BaseService {
     serviceName: string;
     limitByCount(options: RateLimitServiceLimitByCountOptions): Promise<number>;
+    limitByCountOrFail(options: RateLimitServiceLimitByCountOrFailOptions): Promise<number>;
 }
 declare module '../x' {
     interface X {

package/lib/services/rate_limit.js

@@ -1,3 +1,4 @@
+import { HttpError } from "../core/http_error";
 import { x } from "../x";
 export class RateLimitService {
   constructor() {
@@ -21,4 +22,14 @@ export class RateLimitService {
     return remainingCount - 1;
   }
 
+  async limitByCountOrFail(options) {
+    const count = await this.limitByCount(options);
+
+    if (count === 0) {
+      throw new HttpError.Forbidden(options.message);
+    }
+
+    return count;
+  }
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.2.12",
+  "version": "2.2.14",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",