ee-core 1.2.7 → 1.2.8-beta.4

package/lib/socket/socketServer.js

@@ -1,77 +1,77 @@
-'use strict';
-
-const assert = require('assert');
-const { Server } = require('socket.io');
-const constant = require('../constant');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
-const is = require('is-type-of');
-
-/**
- * 类文件，顶部new egglogger 后，出现代码无法正常加载
- */
-class SocketServer {
-  constructor (app) {
-    this.app = app;
-    const options = this.app.config.socketServer;
-    this.consoleLogger = new EggConsoleLogger();
-
-    if (!options.enable) {
-      return;
-    }
-
-    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
-    assert(typeof port === 'number', 'socekt port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
-
-    // let opt = Object.assign({}, options);
-    // delete opt.enable;
-    this.io = new Server(port, options);
-    this.connec();
-  }
-
-  connec () {
-    const self = this;
-    this.consoleLogger.info('[ee-core:socket:server] connection .....');
-    this.io.on('connection', (socket) => {
-      const channel = constant.socketIo.channel.partySoftware;
-      socket.on(channel, async (message, callback) => {
-        self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
-
-        try {
-          // 找函数
-          const cmd = message.cmd;
-          const args = message.params;
-          let fn = null;
-          if (is.string(cmd)) {
-            const actions = cmd.split('.');
-            let obj = self.app;
-            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(self.app, args);
-          callback(result);
-        } catch (err) {
-          self.app.console.error('[ee-core:socket:server] throw error:', err);
-        }
-      });
-    });
-  }
-
-  getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
-    return coreDB;
-  }
-
-  getSocketPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').socketServer.port;
-    return port;
-  }
-}
-
+'use strict';
+
+const assert = require('assert');
+const { Server } = require('socket.io');
+const constant = require('../constant');
+const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
+const is = require('is-type-of');
+
+/**
+ * socket server
+ */
+class SocketServer {
+  constructor (app) {
+    this.app = app;
+    const options = this.app.config.socketServer;
+    this.consoleLogger = new EggConsoleLogger();
+
+    if (!options.enable) {
+      return;
+    }
+
+    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
+    assert(typeof port === 'number', 'socekt port required, and must be a number');
+    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
+
+    // let opt = Object.assign({}, options);
+    // delete opt.enable;
+    this.io = new Server(port, options);
+    this.connec();
+  }
+
+  connec () {
+    const self = this;
+    this.consoleLogger.info('[ee-core:socket:server] connection .....');
+    this.io.on('connection', (socket) => {
+      const channel = constant.socketIo.channel.partySoftware;
+      socket.on(channel, async (message, callback) => {
+        self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+
+        try {
+          // 找函数
+          const cmd = message.cmd;
+          const args = message.params;
+          let fn = null;
+          if (is.string(cmd)) {
+            const actions = cmd.split('.');
+            let obj = self.app;
+            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(self.app, args);
+          callback(result);
+        } catch (err) {
+          self.app.console.error('[ee-core:socket:server] throw error:', err);
+        }
+      });
+    });
+  }
+
+  getCoreDB () {
+    const coreDB = require('../storage/index').JsonDB.connection('system');
+    return coreDB;
+  }
+
+  getSocketPort () {
+    const cdb = this.getCoreDB();
+    const port = cdb.getItem('config').socketServer.port;
+    return port;
+  }
+}
+
 module.exports = SocketServer;

package/lib/socket/start.js

@@ -1,22 +1,22 @@
-'use strict';
-
-const socketServer = require('./socketServer');
-const ipcServer = require('./ipcServer');
-const httpServer = require('./httpServer');
-
-/**
- * server
- */
- module.exports = (app) => {
-
-  // 启动 socket server
-  new socketServer(app);
-
-  // 启动 http server
-  new httpServer(app);  
-
-  // 启动 electron ipc server
-  new ipcServer(app);
-
-}
-
+'use strict';
+
+const socketServer = require('./socketServer');
+const ipcServer = require('./ipcServer');
+const httpServer = require('./httpServer');
+
+/**
+ * server
+ */
+ module.exports = (app) => {
+
+  // 启动 socket server
+  new socketServer(app);
+
+  // 启动 http server
+  new httpServer(app);  
+
+  // 启动 electron ipc server
+  new ipcServer(app);
+
+}
+

package/lib/storage/index.js

@@ -1,22 +1,34 @@
-'use strict';
-
-const JsonDB = {};
-
-JsonDB.connection = function (database) {
-
-  // console.log('this::::::', this);
-  // todo
-  // if (typeof this.instance === 'object') {
-  //   return this.instance;
-  // }
-
-  const LowdbStorage = require('./lowdbStorage');
-  const storage = new LowdbStorage(database);
-
-  // this.instance = storage;
-  return storage;
-}
-
-module.exports = {
-  JsonDB
+'use strict';
+
+const assert = require('assert');
+const _ = require('lodash');
+const JsonDB = {};
+
+JsonDB.connection = function (database, options = {}) {
+  let driver = options.driver || 'lowdb';
+  let opt = options.default || {};
+  if (!_.includes(['lowdb', 'sqlite'], driver)) {
+    assert(database, `db driver ${driver} is not supported`);
+  }
+  if (_.isEmpty(database)) {
+    assert(database, `db name ${database} Cannot be empty`);
+  }
+  let storage;
+  switch (driver)  {
+    case 'lowdb':
+      const LowdbStorage = require('./lowdbStorage');
+      storage = new LowdbStorage(database);
+      break;
+    case 'sqlite':
+      const SqliteStorage = require('./sqliteStorage');
+      storage = new SqliteStorage(database, opt);
+      break;
+    default:  
+  }
+
+  return storage;
+}
+
+module.exports = {
+  JsonDB
 };

package/lib/storage/lowdbStorage.js

@@ -1,144 +1,99 @@
-'use strict';
-
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-const lowdb = require('lowdb');
-const FileSync = require('lowdb/adapters/FileSync');
-const _ = require('lodash');
-const constant = require('../constant');
-
-class LowdbStorage {
-  constructor (name, opt = {}) {
-    assert(name, `db name ${name} Cannot be empty`);
-
-    this.name = name;
-
-    // 数据库key列表
-    this.storageKey = constant.storageKey;
-
-    const storageDir = this.getStorageDir();
-    if (!fs.existsSync(storageDir)) {
-      this.mkdir(storageDir);
-      this.chmodPath(storageDir, '777');
-    }
-
-    this.db = this.table(name);
-  }
-
-  /**
-   * 创建 table
-   */
-  table (name) {
-    assert(name, 'table name is required');
-
-    const dbFile = this.getFilePath(name);
-    const adapter = new FileSync(dbFile);
-    const db = lowdb(adapter);
-
-    assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
-
-    return db;
-  }
-
-  /**
-   * 获取db文件名
-   */
-  getFileName (name) {
-    return name + ".json";
-  }
-
-  /**
-   * 获取db文件名
-   */
-  getFilePath (name) {
-    const storageDir = this.getStorageDir();
-    const dbFile = path.join(storageDir, this.getFileName(name));
-    return dbFile;
-  }
-
-  /**
-   * 获取数据存储路径
-   */
-  getStorageDir () {
-    let env = process.env.EE_SERVER_ENV;
-    const appDir = env === 'local' || env === 'unittest' ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
-    const storageDir = path.join(appDir, 'data');
-    return storageDir;
-  }
-
-  /**
-   * 为指定的 name 设置一个对应的值
-   */
-  setItem (key, value) {
-    assert(_.isString(key), `key must be a string`);
-    assert(key.length != 0, `key cannot be empty`);
-    assert(!this.storageKey.hasOwnProperty(key), `${key} is not allowed`);
-
-    let cacheKey = this.storageKey.cache;
-    if (!this.db.has(cacheKey).value()) {
-      this.db.set(cacheKey, {}).write();
-    }
-
-    let keyId = cacheKey + "." + key; 
-    this.db
-      .set(keyId, value)
-      .write();
-  
-    return true;
-  }
-  
-  /**
-   * 根据指定的名字 name 获取对应的值
-   */
-  getItem (key) {
-    assert(_.isString(key), `key must be a string`);
-    assert(key.length != 0, `key cannot be empty`);
-
-    let cacheKey = this.storageKey.cache;
-    let keyId = cacheKey + "." + key; 
-    const data = this.db
-      .get(keyId)
-      .value();
-  
-    return data;
-  }   
-
-  mkdir (dirpath, dirname) {
-    if (typeof dirname === 'undefined') {
-      if (fs.existsSync(dirpath)) {
-        return;
-      }
-      this.mkdir(dirpath, path.dirname(dirpath));
-    } else {
-      if (dirname !== path.dirname(dirpath)) {
-        this.mkdir(dirpath);
-        return;
-      }
-      if (fs.existsSync(dirname)) {
-        fs.mkdirSync(dirpath);
-      } else {
-        this.mkdir(dirname, path.dirname(dirname));
-        fs.mkdirSync(dirpath);
-      }
-    }
-  };
-  
-  chmodPath (path, mode) {
-    let files = [];
-    if (fs.existsSync(path)) {
-      files = fs.readdirSync(path);
-      files.forEach((file, index) => {
-        const curPath = path + '/' + file;
-        if (fs.statSync(curPath).isDirectory()) {
-          this.chmodPath(curPath, mode);
-        } else {
-          fs.chmodSync(curPath, mode);
-        }
-      });
-      fs.chmodSync(path, mode);
-    }
-  };
-}
-
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const lowdb = require('lowdb');
+const FileSync = require('lowdb/adapters/FileSync');
+const _ = require('lodash');
+const constant = require('../constant');
+const utilsCommon = require('../../utils/common');
+
+class LowdbStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+
+    // 数据库key列表
+    this.storageKey = constant.storageKey;
+
+    const storageDir = utilsCommon.getStorageDir();
+    if (!fs.existsSync(storageDir)) {
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
+    }
+
+    this.db = this.table(name);
+  }
+
+  /**
+   * 创建 table
+   */
+  table (name) {
+    assert(name, 'table name is required');
+
+    const dbFile = this.getFilePath(name);
+    const adapter = new FileSync(dbFile);
+    const db = lowdb(adapter);
+
+    assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
+
+    return db;
+  }
+
+  /**
+   * 获取db文件名
+   */
+  getFileName (name) {
+    return name + ".json";
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath (name) {
+    const storageDir = utilsCommon.getStorageDir();
+    const dbFile = path.join(storageDir, this.getFileName(name));
+    return dbFile;
+  }
+
+  /**
+   * 为指定的 name 设置一个对应的值
+   */
+  setItem (key, value) {
+    assert(_.isString(key), `key must be a string`);
+    assert(key.length != 0, `key cannot be empty`);
+    assert(!this.storageKey.hasOwnProperty(key), `${key} is not allowed`);
+
+    let cacheKey = this.storageKey.cache;
+    if (!this.db.has(cacheKey).value()) {
+      this.db.set(cacheKey, {}).write();
+    }
+
+    let keyId = cacheKey + "." + key; 
+    this.db
+      .set(keyId, value)
+      .write();
+  
+    return true;
+  }
+  
+  /**
+   * 根据指定的名字 name 获取对应的值
+   */
+  getItem (key) {
+    assert(_.isString(key), `key must be a string`);
+    assert(key.length != 0, `key cannot be empty`);
+
+    let cacheKey = this.storageKey.cache;
+    let keyId = cacheKey + "." + key; 
+    const data = this.db
+      .get(keyId)
+      .value();
+  
+    return data;
+  }   
+}
+
 module.exports = LowdbStorage;

package/lib/storage/sqliteStorage.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const Database = require('better-sqlite3');
+const utilsCommon = require('../../utils/common');
+
+class SqliteStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+
+    const storageDir = utilsCommon.getStorageDir();
+    if (!fs.existsSync(storageDir)) {
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
+    }
+
+    this.db = this.initDB(name, opt);
+  }
+
+  /**
+   * 初始化db
+   */
+  initDB (name, opt = {}) {
+    let options = Object.assign({
+      timeout: 5000,
+    }, opt);
+
+    // 存储类型：db文件、内存(:memory:)
+    let isFileDB = false;
+    if (path.extname(name) == '.db') {
+      name = this.getFilePath(name);
+      isFileDB = true;
+    }
+
+    const db = new Database(name, options);
+
+    // 如果是文件类型，判断文件是否创建成功
+    if (isFileDB) {
+      assert(fs.existsSync(name), `error: storage ${name} not exists`);
+    }
+
+    return db;
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath (name) {
+    const storageDir = utilsCommon.getStorageDir();
+    const dbFile = path.join(storageDir, name);
+    return dbFile;
+  }
+}
+
+module.exports = SqliteStorage;

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "ee-core",
-  "version": "1.2.7",
-  "description": "ee core",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "bin": {
-    "ee-core": "./bin/tools.js"
-  },
-  "dependencies": {
-    "agentkeepalive": "^4.2.0",
-    "co": "^4.6.0",
-    "debug": "^4.3.3",
-    "depd": "^2.0.0",
-    "egg-errors": "^2.3.0",
-    "egg-logger": "^2.7.1",
-    "electron-is": "^3.0.0",
-    "electron-updater": "^4.6.1",
-    "extend2": "^1.0.1",
-    "fs-extra": "^10.0.0",
-    "get-port": "^5.1.1",
-    "globby": "^10.0.0",
-    "humanize-ms": "^1.2.1",
-    "is-type-of": "^1.2.1",
-    "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
-    "koa-convert": "^2.0.0",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "lodash": "^4.17.21",
-    "lowdb": "^1.0.0",
-    "path-to-regexp": "^6.2.0",
-    "socket.io": "^4.4.1",
-    "socket.io-client": "^4.4.1",
-    "uglify-js": "^3.14.5",
-    "unzip-crx-3": "^0.2.0",
-    "urllib": "^2.38.0",
-    "utility": "^1.17.0"
-  },
-  "devDependencies": {}
-}
+{
+  "name": "ee-core",
+  "version": "1.2.8-beta.4",
+  "description": "ee core",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "bin": {
+    "ee-core": "./bin/tools.js"
+  },
+  "dependencies": {
+    "agentkeepalive": "^4.2.0",
+    "better-sqlite3": "^7.6.0",
+    "co": "^4.6.0",
+    "debug": "^4.3.3",
+    "depd": "^2.0.0",
+    "egg-errors": "^2.3.0",
+    "egg-logger": "^2.7.1",
+    "electron-is": "^3.0.0",
+    "electron-updater": "^4.6.1",
+    "extend2": "^1.0.1",
+    "fs-extra": "^10.0.0",
+    "get-port": "^5.1.1",
+    "globby": "^10.0.0",
+    "humanize-ms": "^1.2.1",
+    "is-type-of": "^1.2.1",
+    "koa": "^2.13.4",
+    "koa-body": "^5.0.0",
+    "koa-convert": "^2.0.0",
+    "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
+    "lodash": "^4.17.21",
+    "lowdb": "^1.0.0",
+    "path-to-regexp": "^6.2.0",
+    "socket.io": "^4.4.1",
+    "socket.io-client": "^4.4.1",
+    "uglify-js": "^3.14.5",
+    "urllib": "^2.38.0",
+    "utility": "^1.17.0"
+  },
+  "devDependencies": {}
+}