node-karin 0.11.13 → 0.11.15

package/lib/render/client_even.js

@@ -1,153 +1,156 @@
-import fs from 'fs'
-import axios from 'axios'
-import WebSocket from 'ws'
-import { render } from './app.js'
-import { RenderBase } from './base.js'
-import { createHash, randomUUID } from 'crypto'
-import { listener } from '../core/index.js'
-import { logger } from '../utils/index.js'
+import fs from 'fs';
+import axios from 'axios';
+import WebSocket from 'ws';
+import { render } from './app.js';
+import { RenderBase } from './base.js';
+import { createHash, randomUUID } from 'crypto';
+import { listener } from '../core/index.js';
+import { logger } from '../utils/index.js';
 export class RenderClientEven extends RenderBase {
-  url
-  type
-  id
-  index
-  retry
-  reg
-  ws
-  constructor (url) {
-    super()
-    this.url = url
-    this.type = 'image'
-    this.id = 'puppeteer'
-    this.index = 0
-    this.retry = 0
-    this.reg = new RegExp(`(${process.cwd().replace(/\\/g, '\\\\')}|${process.cwd().replace(/\\/g, '/')})`, 'g')
-  }
-
-  /**
+    url;
+    type;
+    id;
+    index;
+    retry;
+    reg;
+    ws;
+    constructor(url) {
+        super();
+        this.url = url;
+        this.type = 'image';
+        this.id = 'puppeteer';
+        this.index = 0;
+        this.retry = 0;
+        this.reg = new RegExp(`(${process.cwd().replace(/\\/g, '\\\\')}|${process.cwd().replace(/\\/g, '/')})`, 'g');
+    }
+    /**
      * 初始化
      */
-  async start () {
-    try {
-      const response = await axios.head(this.url)
-      if (response.status === 200) {
-        logger.mark(`[渲染器:${this.id}][WebSocket] 注册渲染器：${logger.green(this.url)}`)
+    async start() {
         try {
-          this.index = render.app({ id: this.id, type: this.type, render: this.render.bind(this) })
-        } catch (error) {
-          logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
+            const response = await axios.head(this.url);
+            if (response.status === 200) {
+                logger.mark(`[渲染器:${this.id}][WebSocket] 注册渲染器：${logger.green(this.url)}`);
+                try {
+                    this.index = render.app({ id: this.id, type: this.type, render: this.render.bind(this) });
+                }
+                catch (error) {
+                    logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error);
+                }
+            }
+            else {
+                logger.error(`[渲染器:${this.id}] 注册渲染器失败：渲染器发生错误`);
+            }
+        }
+        catch (error) {
+            logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error);
         }
-      } else {
-        logger.error(`[渲染器:${this.id}] 注册渲染器失败：渲染器发生错误`)
-      }
-    } catch (error) {
-      logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
     }
-  }
-
-  /**
+    /**
      * 创建连接
      */
-  async link () {
-    return new Promise((resolve, reject) => {
-      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-        return resolve()
-      }
-      /** 连接ws */
-      this.ws = new WebSocket(this.url)
-      /** 建立连接 */
-      this.ws.on('open', () => {
-        logger.mark(`[渲染器:${this.id}][WebSocket] 建立连接：${logger.green(this.url)}`)
-        /** 监听消息 */
-        this.ws.on('message', data => this.message(data.toString()))
-        resolve()
-      })
-      /** 监听断开 */
-      this.ws.once('close', async () => {
-        /** 停止监听 */
-        this.ws.removeAllListeners()
-      })
-      /** 监听错误 */
-      this.ws.on('error', async (e) => {
-        this.ws.close()
-      })
-    })
-  }
-
-  /**
+    async link() {
+        return new Promise((resolve, reject) => {
+            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                return resolve();
+            }
+            /** 连接ws */
+            this.ws = new WebSocket(this.url);
+            /** 建立连接 */
+            this.ws.on('open', () => {
+                logger.mark(`[渲染器:${this.id}][WebSocket] 建立连接：${logger.green(this.url)}`);
+                /** 监听消息 */
+                this.ws.on('message', data => this.message(data.toString()));
+                resolve();
+            });
+            /** 监听断开 */
+            this.ws.once('close', async () => {
+                /** 停止监听 */
+                this.ws.removeAllListeners();
+            });
+            /** 监听错误 */
+            this.ws.on('error', async (e) => {
+                this.ws.close();
+            });
+        });
+    }
+    /**
      * 接受消息
      */
-  async message (str) {
-    const data = JSON.parse(str)
-    switch (data.action) {
-      /** 静态文件 */
-      case 'static': {
-        const filePath = decodeURIComponent(data.params.file)
-        logger.debug(`[渲染器:${this.id}][正向WS] 访问静态文件：${filePath}`)
-        const file = fs.readFileSync('.' + filePath)
-        const md5 = createHash('md5').update(file).digest('hex')
-        const params = data.params.md5?.includes(md5)
-          ? { echo: data.echo, action: 'static', status: 'ok', data: { verifiedMd5: md5 } }
-          : { echo: data.echo, action: 'static', status: 'ok', data: { file } }
-        return this.ws.send(JSON.stringify(params))
-      }
-      /** 渲染结果 */
-      case 'renderRes': {
-        listener.emit(data.echo, data)
-        break
-      }
-      /** 超时 */
-      case 'timeout': {
-        logger.debug(`[渲染器:${this.id}][正向WS] 处理超时`)
-        break
-      }
-      /** 未知数据 */
-      default: {
-        logger.warn(`[渲染器:${this.id}] 收到未知数据：`, data)
-      }
+    async message(str) {
+        const data = JSON.parse(str);
+        switch (data.action) {
+            /** 静态文件 */
+            case 'static': {
+                const filePath = decodeURIComponent(data.params.file);
+                logger.debug(`[渲染器:${this.id}][正向WS] 访问静态文件：${filePath}`);
+                const file = fs.readFileSync('.' + filePath);
+                const md5 = createHash('md5').update(file).digest('hex');
+                const params = data.params.md5?.includes(md5)
+                    ? { echo: data.echo, action: 'static', status: 'ok', data: { verifiedMd5: md5 } }
+                    : { echo: data.echo, action: 'static', status: 'ok', data: { file } };
+                return this.ws.send(JSON.stringify(params));
+            }
+            /** 渲染结果 */
+            case 'renderRes': {
+                listener.emit(data.echo, data);
+                break;
+            }
+            /** 超时 */
+            case 'timeout': {
+                logger.debug(`[渲染器:${this.id}][正向WS] 处理超时`);
+                break;
+            }
+            /** 未知数据 */
+            default: {
+                logger.warn(`[渲染器:${this.id}] 收到未知数据：`, data);
+            }
+        }
     }
-  }
-
-  /**
+    /**
      * 渲染标准方法
      * @param options 渲染参数
      */
-  async render (options) {
-    /** 渲染模板 */
-    let file = options.file
-    let action = 'renderHtml'
-    if (options.file.includes('http') || options.vue) {
-      action = 'render'
-    } else {
-      file = this.dealTpl(options)
-      /** 判断是本地karin-puppeteer还是远程 */
-      if (!/127\.0\.0\.1|localhost/.test(this.url)) {
-        file = fs.readFileSync(file, 'utf-8').replace(this.reg, '')
-      } else {
-        action = 'render'
-        file = 'file://' + file
-      }
-    }
-    if (!file) {
-      logger.error(`[渲染器:${this.id}:${this.index}] 渲染文件不存在：${options.file}`)
-      return ''
+    async render(options) {
+        /** 渲染模板 */
+        let file = options.file;
+        let action = 'renderHtml';
+        if (options.file.includes('http') || options.vue) {
+            action = 'render';
+        }
+        else {
+            file = this.dealTpl(options);
+            /** 判断是本地karin-puppeteer还是远程 */
+            if (!/127\.0\.0\.1|localhost/.test(this.url)) {
+                file = fs.readFileSync(file, 'utf-8').replace(this.reg, '');
+            }
+            else {
+                action = 'render';
+                file = 'file://' + file;
+            }
+        }
+        if (!file) {
+            logger.error(`[渲染器:${this.id}:${this.index}] 渲染文件不存在：${options.file}`);
+            return '';
+        }
+        /** 编码 */
+        file = encodeURIComponent(file);
+        const data = options;
+        const echo = randomUUID();
+        /** 移除掉模板参数 */
+        if (data.data)
+            delete data.data;
+        data.file = file;
+        const req = JSON.stringify({ echo, action, data });
+        logger.debug(`[渲染器:${this.id}:${this.index}][正向WS] 请求：${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`);
+        await this.link();
+        this.ws.send(req);
+        return new Promise((resolve, reject) => {
+            listener.once(echo, (data) => {
+                if (data.ok)
+                    return resolve(data.data);
+                reject(new Error(JSON.stringify(data)));
+            });
+        });
     }
-    /** 编码 */
-    file = encodeURIComponent(file)
-    const data = options
-    const echo = randomUUID()
-    /** 移除掉模板参数 */
-    if (data.data) { delete data.data }
-    data.file = file
-    const req = JSON.stringify({ echo, action, data })
-    logger.debug(`[渲染器:${this.id}:${this.index}][正向WS] 请求：${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`)
-    await this.link()
-    this.ws.send(req)
-    return new Promise((resolve, reject) => {
-      listener.once(echo, (data) => {
-        if (data.ok) { return resolve(data.data) }
-        reject(new Error(JSON.stringify(data)))
-      })
-    })
-  }
 }

package/lib/render/http.js

@@ -1,51 +1,50 @@
-import axios from 'axios'
-import { RenderBase } from './base.js'
-import logger from '../utils/core/logger.js'
+import axios from 'axios';
+import { RenderBase } from './base.js';
+import logger from '../utils/core/logger.js';
 export class HttpRenderer extends RenderBase {
-  id
-  host
-  url
-  token
-  /**
+    id;
+    host;
+    url;
+    token;
+    /**
      * 构造函数
      * @param host - 静态服务器地址
      * @param url - 渲染接口
      * @param token - token
      */
-  constructor (host, url, token) {
-    super()
-    this.id = 'puppeteer'
-    this.host = host
-    this.url = url
-    this.token = token
-  }
-
-  /**
+    constructor(host, url, token) {
+        super();
+        this.id = 'puppeteer';
+        this.host = host;
+        this.url = url;
+        this.token = token;
+    }
+    /**
      * 渲染
      */
-  async render (options) {
-    const name = options.name || 'render'
-    let file = options.file
-    /** 非http渲染模板并转为http静态资源 */
-    if (!options.file.includes('http') && !options.vue) {
-      const isLocalhost = this.host.includes('127.0.0.1') || this.host.includes('localhost')
-      file = this.dealTpl(options, isLocalhost)
-      if (!file) {
-        logger.error(`[渲染器:${this.id}] 模板文件不存在：${name}`)
-        return ''
-      }
-      options.file = isLocalhost ? 'file://' + file : `${this.host}/api/renderHtml?html=${file}`
-    }
-    delete options.data
-    const data = options
-    const headers = {
-      Authorization: this.token,
-    }
-    logger.debug(`[渲染器:${this.id}][POST] \n请求:${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`)
-    const res = await axios({ method: 'post', url: this.url, headers, data })
-    if (res.status === 200 && res.data.ok) {
-      return res.data.data
+    async render(options) {
+        const name = options.name || 'render';
+        let file = options.file;
+        /** 非http渲染模板并转为http静态资源 */
+        if (!options.file.includes('http') && !options.vue) {
+            const isLocalhost = this.host.includes('127.0.0.1') || this.host.includes('localhost');
+            file = this.dealTpl(options, isLocalhost);
+            if (!file) {
+                logger.error(`[渲染器:${this.id}] 模板文件不存在：${name}`);
+                return '';
+            }
+            options.file = isLocalhost ? 'file://' + file : `${this.host}/api/renderHtml?html=${file}`;
+        }
+        delete options.data;
+        const data = options;
+        const headers = {
+            Authorization: this.token,
+        };
+        logger.debug(`[渲染器:${this.id}][POST] \n请求:${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`);
+        const res = await axios({ method: 'post', url: this.url, headers, data });
+        if (res.status === 200 && res.data.ok) {
+            return res.data.data;
+        }
+        throw new Error(`渲染失败：${JSON.stringify(res.data)}`);
     }
-    throw new Error(`渲染失败：${JSON.stringify(res.data)}`)
-  }
 }

package/lib/render/index.js

@@ -1,6 +1,6 @@
-export * from './app.js'
-export * from './base.js'
-export * from './client.js'
-export * from './http.js'
-export * from './server.js'
-export * from './wormhole.js'
+export * from './app.js';
+export * from './base.js';
+export * from './client.js';
+export * from './http.js';
+export * from './server.js';
+export * from './wormhole.js';

package/lib/render/server.js

@@ -1,96 +1,101 @@
-import { render } from './app.js'
-import { RenderBase } from './base.js'
-import { randomUUID } from 'crypto'
-import { logger } from '../utils/index.js'
-import { listener } from '../core/index.js'
+import { render } from './app.js';
+import { RenderBase } from './base.js';
+import { randomUUID } from 'crypto';
+import { logger } from '../utils/index.js';
+import { listener } from '../core/index.js';
 class Puppeteer extends RenderBase {
-  socket
-  id
-  type
-  host
-  url
-  index
-  constructor () {
-    super()
-    this.id = 0
-    this.index = 0
-    this.type = ''
-    this.host = ''
-    this.url = ''
-  }
-
-  async server (socket, request) {
-    this.socket = socket
-    this.id = request.headers['renderer-id']
-    this.type = request.headers['renderer-type']
-    /** 注册渲染器 */
-    this.host = request.headers.host
-    this.url = `ws://${this.host + request.url}`
-    logger.info(`[渲染器:${this.id}] 收到新的连接请求：` + logger.green(this.url))
-    /** 监听上报事件 */
-    this.socket.on('message', data => {
-      const json = JSON.parse(data.toString())
-      if (json.echo) {
-        listener.emit(json.echo, json)
-      } else if (json.action === 'heartbeat') {
-        logger.debug(`[渲染器:${this.id}] 收到心跳：${this.url}`)
-      } else {
-        logger.warn(`[渲染器:${this.id}] 收到未知数据：`, data)
-      }
-    })
-    /** 监听断开 */
-    this.socket.on('close', () => {
-      logger.warn(`[渲染器:${this.id}] 连接断开：${this.url}`)
-      /** 卸载渲染器 */
-      this.index && render.unapp(this.index)
-      this.index = 0
-    })
-    /** 注册渲染器 */
-    try {
-      const index = render.app({
-        id: this.id,
-        type: this.type,
-        render: this.render.bind(this),
-      })
-      this.index = index
-    } catch (error) {
-      logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error)
-      /** 断开连接 */
-      this.socket.close()
+    socket;
+    id;
+    type;
+    host;
+    url;
+    index;
+    constructor() {
+        super();
+        this.id = 0;
+        this.index = 0;
+        this.type = '';
+        this.host = '';
+        this.url = '';
     }
-  }
-
-  /**
+    async server(socket, request) {
+        this.socket = socket;
+        this.id = request.headers['renderer-id'];
+        this.type = request.headers['renderer-type'];
+        /** 注册渲染器 */
+        this.host = request.headers.host;
+        this.url = `ws://${this.host + request.url}`;
+        logger.info(`[渲染器:${this.id}] 收到新的连接请求：` + logger.green(this.url));
+        /** 监听上报事件 */
+        this.socket.on('message', data => {
+            const json = JSON.parse(data.toString());
+            if (json.echo) {
+                listener.emit(json.echo, json);
+            }
+            else if (json.action === 'heartbeat') {
+                logger.debug(`[渲染器:${this.id}] 收到心跳：${this.url}`);
+            }
+            else {
+                logger.warn(`[渲染器:${this.id}] 收到未知数据：`, data);
+            }
+        });
+        /** 监听断开 */
+        this.socket.on('close', () => {
+            logger.warn(`[渲染器:${this.id}] 连接断开：${this.url}`);
+            /** 卸载渲染器 */
+            this.index && render.unapp(this.index);
+            this.index = 0;
+        });
+        /** 注册渲染器 */
+        try {
+            const index = render.app({
+                id: this.id,
+                type: this.type,
+                render: this.render.bind(this),
+            });
+            this.index = index;
+        }
+        catch (error) {
+            logger.error(`[渲染器:${this.id}] 注册渲染器失败：`, error);
+            /** 断开连接 */
+            this.socket.close();
+        }
+    }
+    /**
      * 渲染模板
      * @param options 模板参数
      */
-  async render (options) {
-    /** 渲染模板 */
-    let file = ''
-    if (options.file.includes('http') || options.vue) {
-      file = options.file
-    } else {
-      file = 'file://' + this.dealTpl(options)
+    async render(options) {
+        /** 渲染模板 */
+        let file = '';
+        if (options.file.includes('http') || options.vue) {
+            file = options.file;
+        }
+        else {
+            file = 'file://' + this.dealTpl(options);
+        }
+        if (!file)
+            throw new Error(`[渲染器:${this.id}] 模板文件不存在：${options.name}`);
+        const echo = randomUUID();
+        const action = 'render';
+        const data = options;
+        /** 移除掉模板参数 */
+        if (data.data)
+            delete data.data;
+        data.file = file;
+        logger.debug(`[渲染器:${this.id}][反向WS] \n请求:${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`);
+        this.socket.send(JSON.stringify({ echo, action, data }));
+        return new Promise((resolve, reject) => {
+            listener.once(echo, data => {
+                if (data.ok)
+                    return resolve(data.data);
+                reject(new Error(JSON.stringify(data)));
+            });
+        });
     }
-    if (!file) { throw new Error(`[渲染器:${this.id}] 模板文件不存在：${options.name}`) }
-    const echo = randomUUID()
-    const action = 'render'
-    const data = options
-    /** 移除掉模板参数 */
-    if (data.data) { delete data.data }
-    data.file = file
-    logger.debug(`[渲染器:${this.id}][反向WS] \n请求:${this.url} \nhtml: ${options.file} \ndata: ${JSON.stringify(data)}`)
-    this.socket.send(JSON.stringify({ echo, action, data }))
-    return new Promise((resolve, reject) => {
-      listener.once(echo, data => {
-        if (data.ok) { return resolve(data.data) }
-        reject(new Error(JSON.stringify(data)))
-      })
-    })
-  }
 }
 export const RenderServer = {
-  type: 'render',
-  path: '/puppeteer',
-  adapter: Puppeteer,
-}
+    type: 'render',
+    path: '/puppeteer',
+    adapter: Puppeteer,
+};