@jayfong/x-server 2.2.10 → 2.2.11

package/lib/_cjs/services/log.js

@@ -1,36 +1,76 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 exports.__esModule = true;
 exports.LogService = void 0;
 
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _path = _interopRequireDefault(require("path"));
+
 var _date = require("vtils/date");
 
+var _vtils = require("vtils");
+
+var _x = require("../x");
+
 class LogService {
   constructor() {
     this.serviceName = 'log';
-  }
+    this.separator = '\t\t\t';
+    this.getLogWriter = (0, _vtils.memoize)(logFile => {
+      _fsExtra.default.ensureFileSync(logFile);
 
-  log(level, message, data) {
-    if (data) {
-      Object.keys(data).forEach(key => {
-        message = message.replaceAll(`{${key}}`, data[key]);
+      return _fsExtra.default.createWriteStream(logFile, {
+        flags: 'a'
       });
-    }
+    }, logFile => logFile);
+  }
+
+  get logFile() {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = now.getMonth() + 1;
+    return _path.default.join(_x.x.dataDir, `log/${year}/${month}.log`);
+  }
+
+  parseLogLineText(text) {
+    const [time, level, title, desc] = text.split(this.separator);
+    return {
+      time: time,
+      level: level,
+      title: title,
+      desc: JSON.parse(desc)
+    };
+  }
 
-    message = message.replace(/[\r\n]+/g, ' ');
-    console.log(`[${(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss')}] ${level.toUpperCase()} - ${message}`);
+  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`);
   }
 
-  error(message, ...[data]) {
-    this.log('error', message, data);
+  info(title, desc) {
+    this.log({
+      level: 'info',
+      title,
+      desc
+    });
   }
 
-  info(message, ...[data]) {
-    this.log('info', message, data);
+  success(title, desc) {
+    this.log({
+      level: 'success',
+      title,
+      desc
+    });
   }
 
-  success(message, ...[data]) {
-    this.log('success', message, data);
+  error(title, desc) {
+    this.log({
+      level: 'error',
+      title,
+      desc
+    });
   }
 
 }

package/lib/_cjs/x.js

@@ -1,8 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 exports.__esModule = true;
 exports.x = void 0;
 
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _os = _interopRequireDefault(require("os"));
+
+var _path = _interopRequireDefault(require("path"));
+
 var _dispose = require("./services/dispose");
 
 var _log = require("./services/log");
@@ -11,6 +19,7 @@ const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = {
   appId: env.APP_ID,
   env: env,
+  dataDir: _path.default.join(_os.default.homedir(), `.xs/${env.APP_ID}`),
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore
@@ -19,6 +28,9 @@ const x = {
   }
 };
 exports.x = x;
+
+_fsExtra.default.ensureDirSync(x.dataDir);
+
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
 }), new _log.LogService());

package/lib/services/log.d.ts

@@ -1,16 +1,26 @@
 import { BaseService } from './base';
-declare type InferKeyword<T extends string> = T extends `${string}{${infer X}}${infer Y}` ? [X, ...InferKeyword<Y>] : [];
 export declare type LogServiceLevel = 'error' | 'info' | 'success';
+export declare type LogServicePayload = {
+    level: LogServiceLevel;
+    title: string;
+    desc?: Record<string, any>;
+};
+export declare type LogServicePayloadWithTime = LogServicePayload & {
+    time: string;
+};
 export declare class LogService implements BaseService {
     serviceName: string;
+    private separator;
+    private get logFile();
+    private getLogWriter;
+    parseLogLineText(text: string): LogServicePayloadWithTime;
     private log;
-    error<T extends string, X extends InferKeyword<T>, D extends X extends Array<infer K> ? Record<K, any> : {}>(message: T, ...[data]: T extends `${string}{${string}}${string}` ? [D] : [undefined]): void;
-    info<T extends string, X extends InferKeyword<T>, D extends X extends Array<infer K> ? Record<K, any> : {}>(message: T, ...[data]: T extends `${string}{${string}}${string}` ? [D] : [undefined]): void;
-    success<T extends string, X extends InferKeyword<T>, D extends X extends Array<infer K> ? Record<K, any> : {}>(message: T, ...[data]: T extends `${string}{${string}}${string}` ? [D] : [undefined]): void;
+    info(title: string, desc?: Record<string, any>): void;
+    success(title: string, desc?: Record<string, any>): void;
+    error(title: string, desc?: Record<string, any>): void;
 }
 declare module '../x' {
     interface X {
         log: LogService;
     }
 }
-export {};

package/lib/services/log.js

@@ -1,30 +1,63 @@
+import fs from 'fs-extra';
+import path from 'path';
 import { formatDate } from 'vtils/date';
+import { memoize } from 'vtils';
+import { x } from "../x";
 export class LogService {
   constructor() {
     this.serviceName = 'log';
+    this.separator = '\t\t\t';
+    this.getLogWriter = memoize(logFile => {
+      fs.ensureFileSync(logFile);
+      return fs.createWriteStream(logFile, {
+        flags: 'a'
+      });
+    }, logFile => logFile);
   }
 
-  log(level, message, data) {
-    if (data) {
-      Object.keys(data).forEach(key => {
-        message = message.replaceAll(`{${key}}`, data[key]);
-      });
-    }
+  get logFile() {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = now.getMonth() + 1;
+    return path.join(x.dataDir, `log/${year}/${month}.log`);
+  }
+
+  parseLogLineText(text) {
+    const [time, level, title, desc] = text.split(this.separator);
+    return {
+      time: time,
+      level: level,
+      title: title,
+      desc: JSON.parse(desc)
+    };
+  }
 
-    message = message.replace(/[\r\n]+/g, ' ');
-    console.log(`[${formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss')}] ${level.toUpperCase()} - ${message}`);
+  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`);
   }
 
-  error(message, ...[data]) {
-    this.log('error', message, data);
+  info(title, desc) {
+    this.log({
+      level: 'info',
+      title,
+      desc
+    });
   }
 
-  info(message, ...[data]) {
-    this.log('info', message, data);
+  success(title, desc) {
+    this.log({
+      level: 'success',
+      title,
+      desc
+    });
   }
 
-  success(message, ...[data]) {
-    this.log('success', message, data);
+  error(title, desc) {
+    this.log({
+      level: 'error',
+      title,
+      desc
+    });
   }
 
 }

package/lib/x.d.ts

@@ -5,6 +5,7 @@ import './services/log';
 export interface X {
     readonly appId: string;
     readonly env: NodeJS.ProcessEnv;
+    readonly dataDir: string;
     readonly register: (...services: BaseService[]) => void;
 }
 export declare const x: X;

package/lib/x.js

@@ -1,9 +1,13 @@
+import fs from 'fs-extra';
+import os from 'os';
+import path from 'path';
 import { DisposeService } from "./services/dispose";
 import { LogService } from "./services/log";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
   appId: env.APP_ID,
   env: env,
+  dataDir: path.join(os.homedir(), `.xs/${env.APP_ID}`),
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore
@@ -11,6 +15,7 @@ export const x = {
     }
   }
 };
+fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
 }), new LogService());

package/package.json

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