ee-core 4.1.3 → 4.1.4

package/socket/ipcServer.js

@@ -1,106 +1,106 @@
-'use strict';
-
-const debug = require('debug')('ee-core:socket:ipcServer');
-const is = require('is-type-of');
-const { ipcMain } = require('electron');
-const { coreLogger } = require('../log');
-const { getController } = require('../controller');
-const { EXPORTS } = require('../core/loader/file_loader');
-const { getConfig } = require('../config');
-
-class IpcServer {
-  constructor () {
-    const { mainServer } = getConfig();
-    this.channelSeparator = mainServer.channelSeparator;
-    this.directory = 'controller';
-    this.init();
-  }
-  init() {
-    const controller = getController();
-    this.loop(controller, this.directory);
-  }
-
-  loop(obj, pathname) {
-    const keys = Object.keys(obj);
-    // debug("[loop] keys: %j", keys);
-    for (const key of keys) {
-      if (key === 'constructor') {
-        continue;
-      }
-      let subObj = obj[key];
-      let propertyChain = pathname + '.' + key;
-      if (subObj && subObj[EXPORTS] === true) {
-        this.register(subObj, propertyChain);
-      } else if (typeof subObj === 'object') {
-        // 如果子对象依然是对象，则递归调用继续判断
-        this.loop(subObj, propertyChain);
-      }
-    }
-  }
-
-  register(exportObj, propertyChain) {
-    const controller = getController();
-    const keys = Object.keys(exportObj);
-    for (const key of keys) {
-      // Supports two types of routing separators
-      // channel: controller.file.function | controller/file/function
-      const tmpChannel = `${propertyChain}.${key}`;
-      const channel = tmpChannel.split('.').join(this.channelSeparator);
-      debug('[register] channel %s', channel);
-
-      // send/on model
-      ipcMain.on(channel, async (event, params) => {
-        try {
-          const fn = this.findFn(controller, channel);
-          const result = await fn.call(controller, params, event);
-
-          event.returnValue = result;
-          event.reply(`${channel}`, result);
-        } catch(e) {
-          coreLogger.error('[ee-core] [socket/IpcServer] send/on throw error:', e);
-        }
-      });
-
-      // invoke/handle model
-      ipcMain.handle(channel, async (event, params) => {
-        try {
-          const fn = this.findFn(controller, channel);
-          const result = await fn.call(controller, params, event);
-
-          return result;
-        } catch(e) {
-          coreLogger.error('[ee-core] [socket/IpcServer] invoke/handle throw error:', e);
-        }
-      });
-    }
-  }
-
-  findFn (controller, c) {
-    try {
-      // 找函数
-      const cmd = c;
-      let fn = null;
-      if (is.string(cmd)) {
-        const actions = cmd.split(this.channelSeparator);
-        debug('[findFn] channel %o', actions);
-        let obj = { controller };
-        actions.forEach(key => {
-          obj = obj[key];
-          if (!obj) throw new Error(`class or function '${key}' not exists`);
-        });
-        fn = obj;
-      }
-      if (!fn) throw new Error('function not exists');
-      
-      return fn;
-    } catch (err) {
-      coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
-    }
-    return null;
-  }
-
-}
-
-module.exports = {
-  IpcServer
+'use strict';
+
+const debug = require('debug')('ee-core:socket:ipcServer');
+const is = require('is-type-of');
+const { ipcMain } = require('electron');
+const { coreLogger } = require('../log');
+const { getController } = require('../controller');
+const { EXPORTS } = require('../core/loader/file_loader');
+const { getConfig } = require('../config');
+
+class IpcServer {
+  constructor () {
+    const { mainServer } = getConfig();
+    this.channelSeparator = mainServer.channelSeparator;
+    this.directory = 'controller';
+    this.init();
+  }
+  init() {
+    const controller = getController();
+    this.loop(controller, this.directory);
+  }
+
+  loop(obj, pathname) {
+    const keys = Object.keys(obj);
+    // debug("[loop] keys: %j", keys);
+    for (const key of keys) {
+      if (key === 'constructor') {
+        continue;
+      }
+      let subObj = obj[key];
+      let propertyChain = pathname + '.' + key;
+      if (subObj && subObj[EXPORTS] === true) {
+        this.register(subObj, propertyChain);
+      } else if (typeof subObj === 'object') {
+        // 如果子对象依然是对象，则递归调用继续判断
+        this.loop(subObj, propertyChain);
+      }
+    }
+  }
+
+  register(exportObj, propertyChain) {
+    const controller = getController();
+    const keys = Object.keys(exportObj);
+    for (const key of keys) {
+      // Supports two types of routing separators
+      // channel: controller.file.function | controller/file/function
+      const tmpChannel = `${propertyChain}.${key}`;
+      const channel = tmpChannel.split('.').join(this.channelSeparator);
+      debug('[register] channel %s', channel);
+
+      // send/on model
+      ipcMain.on(channel, async (event, params) => {
+        try {
+          const fn = this.findFn(controller, channel);
+          const result = await fn.call(controller, params, event);
+
+          event.returnValue = result;
+          event.reply(`${channel}`, result);
+        } catch(e) {
+          coreLogger.error('[ee-core] [socket/IpcServer] send/on throw error:', e);
+        }
+      });
+
+      // invoke/handle model
+      ipcMain.handle(channel, async (event, params) => {
+        try {
+          const fn = this.findFn(controller, channel);
+          const result = await fn.call(controller, params, event);
+
+          return result;
+        } catch(e) {
+          coreLogger.error('[ee-core] [socket/IpcServer] invoke/handle throw error:', e);
+        }
+      });
+    }
+  }
+
+  findFn (controller, c) {
+    try {
+      // 找函数
+      const cmd = c;
+      let fn = null;
+      if (is.string(cmd)) {
+        const actions = cmd.split(this.channelSeparator);
+        debug('[findFn] channel %o', actions);
+        let obj = { controller };
+        actions.forEach(key => {
+          obj = obj[key];
+          if (!obj) throw new Error(`class or function '${key}' not exists`);
+        });
+        fn = obj;
+      }
+      if (!fn) throw new Error('function not exists');
+      
+      return fn;
+    } catch (err) {
+      coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
+    }
+    return null;
+  }
+
+}
+
+module.exports = {
+  IpcServer
 };

package/socket/socketServer.d.ts

@@ -1,10 +1,10 @@
-import { Server } from "socket.io";
-import { DefaultEventsMap } from "socket.io/dist/typed-events";
-export declare class SocketServer {
-    socket: import("socket.io").Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
-    io: Server<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
-    config: any;
-    init(): Promise<void>;
-    connect(): void;
-}
-
+import { Server } from "socket.io";
+import { DefaultEventsMap } from "socket.io/dist/typed-events";
+export declare class SocketServer {
+    socket: import("socket.io").Socket<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
+    io: Server<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
+    config: any;
+    init(): Promise<void>;
+    connect(): void;
+}
+

package/socket/socketServer.js

@@ -1,82 +1,82 @@
-'use strict';
-
-const debug = require('debug')('ee-core:socket:socketServer');
-const is = require('is-type-of');
-const { Server } = require('socket.io');
-const { coreLogger } = require('../log');
-const { getConfig } = require('../config');
-const { SocketIO } = require('../const/channel');
-const { getController } = require('../controller');
-const { getPort } = require('../utils/port');
-
-/**
- * socket server
- */
-class SocketServer {
-  constructor () {
-    const { socketServer, mainServer } = getConfig();
-    this.config = socketServer;
-    this.channelSeparator = mainServer.channelSeparator;
-    this.socket = undefined;
-    this.io = undefined;
-    this.init();
-  }
-
-  async init() {
-    if (this.config.enable == false) {
-      return;
-    }
-
-    const port = await getPort({port: parseInt(this.config.port)});
-    if (!port) {
-      throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
-    }
-    coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
-
-    process.env.EE_SOCKET_PORT = port;
-    this.config.port = port;
-    this.io = new Server(port, this.config);
-    this.connect();
-  }
-
-  connect () {
-    const controller = getController();
-    this.io.on('connection', (socket) => {
-      const channel = this.config.channel || SocketIO.partySoftware;
-      this.socket = socket;
-      socket.on(channel, async (message, callback) => {
-        coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
-
-        try {
-          // find function
-          const cmd = message.cmd;
-          const args = message.args;
-          let fn = null;
-          debug('[socket] channel %s', cmd);
-          if (is.string(cmd)) {
-            const actions = cmd.split(this.channelSeparator);
-            debug('[findFn] channel %o', actions);
-            let obj = { controller };
-            actions.forEach(key => {
-              obj = obj[key];
-              if (!obj) throw new Error(`class or function '${key}' not exists`);
-            });
-            fn = obj;
-          }
-          if (!fn) throw new Error('function not exists');
-
-          const result = await fn.call(controller, args);
-          if (callback) {
-            callback(result);
-          }
-        } catch (err) {
-          coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
-        }
-      });
-    });
-  }
-}
-
-module.exports = {
-  SocketServer,
+'use strict';
+
+const debug = require('debug')('ee-core:socket:socketServer');
+const is = require('is-type-of');
+const { Server } = require('socket.io');
+const { coreLogger } = require('../log');
+const { getConfig } = require('../config');
+const { SocketIO } = require('../const/channel');
+const { getController } = require('../controller');
+const { getPort } = require('../utils/port');
+
+/**
+ * socket server
+ */
+class SocketServer {
+  constructor () {
+    const { socketServer, mainServer } = getConfig();
+    this.config = socketServer;
+    this.channelSeparator = mainServer.channelSeparator;
+    this.socket = undefined;
+    this.io = undefined;
+    this.init();
+  }
+
+  async init() {
+    if (this.config.enable == false) {
+      return;
+    }
+
+    const port = await getPort({port: parseInt(this.config.port)});
+    if (!port) {
+      throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
+    }
+    coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
+
+    process.env.EE_SOCKET_PORT = port;
+    this.config.port = port;
+    this.io = new Server(port, this.config);
+    this.connect();
+  }
+
+  connect () {
+    const controller = getController();
+    this.io.on('connection', (socket) => {
+      const channel = this.config.channel || SocketIO.partySoftware;
+      this.socket = socket;
+      socket.on(channel, async (message, callback) => {
+        coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+
+        try {
+          // find function
+          const cmd = message.cmd;
+          const args = message.args;
+          let fn = null;
+          debug('[socket] channel %s', cmd);
+          if (is.string(cmd)) {
+            const actions = cmd.split(this.channelSeparator);
+            debug('[findFn] channel %o', actions);
+            let obj = { controller };
+            actions.forEach(key => {
+              obj = obj[key];
+              if (!obj) throw new Error(`class or function '${key}' not exists`);
+            });
+            fn = obj;
+          }
+          if (!fn) throw new Error('function not exists');
+
+          const result = await fn.call(controller, args);
+          if (callback) {
+            callback(result);
+          }
+        } catch (err) {
+          coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
+        }
+      });
+    });
+  }
+}
+
+module.exports = {
+  SocketServer,
 };

package/storage/index.d.ts

@@ -1,5 +1,5 @@
-import { SqliteStorage } from "./sqliteStorage";
-import { Database } from "better-sqlite3";
-
-export { Database };
+import { SqliteStorage } from "./sqliteStorage";
+import { Database } from "better-sqlite3";
+
+export { Database };
 export { SqliteStorage };

package/storage/index.js

@@ -1,7 +1,7 @@
-'use strict';
-
-const { SqliteStorage } = require('./sqliteStorage'); 
-
-module.exports = {
-  SqliteStorage
+'use strict';
+
+const { SqliteStorage } = require('./sqliteStorage'); 
+
+module.exports = {
+  SqliteStorage
 };

package/storage/sqliteStorage.d.ts

@@ -1,16 +1,16 @@
-
-import { Database } from "better-sqlite3";
-export declare class SqliteStorage {
-    constructor(name: any, opt?: {});
-    name: string;
-    mode: string;
-    dbDir: string;
-    fileName: string;
-    db: Database;
-    _initDB(opt?: {}): any;
-    _formatFileName(name: string): string;
-    _createDatabaseDir(): string;
-    getMode(name: string): string;
-    getDbDir(): string;
-    getFilePath(): string;
-}
+
+import { Database } from "better-sqlite3";
+export declare class SqliteStorage {
+    constructor(name: any, opt?: {});
+    name: string;
+    mode: string;
+    dbDir: string;
+    fileName: string;
+    db: Database;
+    _initDB(opt?: {}): any;
+    _formatFileName(name: string): string;
+    _createDatabaseDir(): string;
+    getMode(name: string): string;
+    getDbDir(): string;
+    getFilePath(): string;
+}