ee-core 1.5.2-beta.2 → 2.0.0-beta.1

package/{lib → module}/socket/socketServer.js

@@ -2,9 +2,10 @@
 
 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');
+const Storage = require('../storage');
+const Constants = require('../const');
 
 /**
  * socket server
@@ -33,7 +34,7 @@ class SocketServer {
     const self = this;
     this.consoleLogger.info('[ee-core:socket:server] connection .....');
     this.io.on('connection', (socket) => {
-      const channel = constant.socketIo.channel.partySoftware;
+      const channel = Constants.socketIo.channel.partySoftware;
       socket.on(channel, async (message, callback) => {
         self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
@@ -63,7 +64,7 @@ class SocketServer {
   }
 
   getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
+    const coreDB = Storage.connection('system');
     return coreDB;
   }
 

package/module/socket/start.js

@@ -0,0 +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);
+
+}
+

package/{lib → module}/storage/index.js

@@ -1,13 +1,11 @@
-'use strict';
-
 const assert = require('assert');
 const _ = require('lodash');
-const JsonDB = {};
+const DB = {};
 
-JsonDB.connection = function (database, options = {}) {
-  let driver = options.driver || 'lowdb';
+DB.connection = function (database, options = {}) {
+  let driver = options.driver || 'jsondb';
   let opt = options.default || {};
-  if (!_.includes(['lowdb', 'sqlite'], driver)) {
+  if (!_.includes(['jsondb', 'lowdb', 'sqlite'], driver)) {
     assert(database, `db driver ${driver} is not supported`);
   }
   if (_.isEmpty(database)) {
@@ -15,20 +13,23 @@ JsonDB.connection = function (database, options = {}) {
   }
   let storage;
   switch (driver)  {
-    case 'lowdb':
-      const LowdbStorage = require('./lowdbStorage');
-      storage = new LowdbStorage(database);
+    case 'jsondb':
+      const JsondbStorage = require('./jsondbStorage');
+      storage = new JsondbStorage(database);
       break;
     case 'sqlite':
       const SqliteStorage = require('./sqliteStorage');
       storage = new SqliteStorage(database, opt);
       break;
     default:  
+      const JsondbStorage = require('./jsondbStorage');
+      storage = new JsondbStorage(database);
   }
 
   return storage;
 }
 
-module.exports = {
-  JsonDB
-};
+// 兼容之前的api
+DB.JsonDB = DB;
+
+module.exports = DB;

package/module/storage/jsondb/adapters/Base.js

@@ -0,0 +1,14 @@
+class Base {
+  constructor(source) {
+    this.source = source
+    this.defaultValue = {}
+    this.serialize = this._stringify
+    this.deserialize = JSON.parse
+  }
+
+  _stringify(obj) {
+    return JSON.stringify(obj, null, 2)
+  }
+}
+
+module.exports = Base

package/module/storage/jsondb/adapters/FileSync.js

@@ -0,0 +1,32 @@
+const Base = require('./Base')
+const fs = require('fs')
+
+class FileSync extends Base {
+  
+  read() {
+    if (fs.existsSync(this.source)) {
+      // Read database
+      try {
+        const data = fs.readFileSync(this.source, {encoding: 'utf8'})
+
+        // Handle blank file
+        return data ? this.deserialize(data) : this.defaultValue
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          e.message = `Malformed JSON in file: ${this.source}\n${e.message}`
+        }
+        throw e
+      }
+    } else {
+      // Initialize
+      fs.writeFileSync(this.source, this.serialize(this.defaultValue))
+      return this.defaultValue
+    }
+  }
+
+  write(data) {
+    return fs.writeFileSync(this.source, this.serialize(data))
+  }
+}
+
+module.exports = FileSync

package/{lib/storage/lowdb → module/storage/jsondb}/main.js

@@ -1,12 +1,9 @@
-const lodash = require('lodash')
-const isPromise = require('./isPromise')
+const lodash = require('lodash');
+const assert = require('assert');
+const is = require('is-type-of');
 
 module.exports = function(adapter) {
-  if (typeof adapter !== 'object') {
-    throw new Error(
-      'An adapter must be provided, see https://github.com/typicode/lowdb/#usage'
-    )
-  }
+  assert(typeof adapter === 'object', 'An adapter must be provided');
 
   // Create a fresh copy of lodash
   const _ = lodash.runInContext()
@@ -24,18 +21,17 @@ module.exports = function(adapter) {
     return db
   }
 
-  // Lowdb API
   // Expose _ for mixins
   db._ = _
 
   db.read = () => {
     const r = adapter.read()
-    return isPromise(r) ? r.then(plant) : plant(r)
+    return is.promise(r) ? r.then(plant) : plant(r)
   }
 
   db.write = returnValue => {
     const w = adapter.write(db.getState())
-    return isPromise(w) ? w.then(() => returnValue) : returnValue
+    return is.promise(w) ? w.then(() => returnValue) : returnValue
   }
 
   db.getState = () => db.__wrapped__

package/{lib/storage/lowdbStorage.js → module/storage/jsondbStorage.js}

@@ -1,27 +1,26 @@
-'use strict';
-
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-const lowdb = require('./lowdb/main');
-const FileSync = require('./lowdb/adapters/FileSync');
+const Jsondb = require('./jsondb/main');
+const FileSync = require('./jsondb/adapters/FileSync');
 const _ = require('lodash');
-const constant = require('../constant');
-const utilsCommon = require('../../utils/common');
+const Constants = require('../const');
+const Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
 
-class LowdbStorage {
+class JsondbStorage {
   constructor (name, opt = {}) {
     assert(name, `db name ${name} Cannot be empty`);
 
     this.name = name;
 
     // 数据库key列表
-    this.storageKey = constant.storageKey;
+    this.storageKey = Constants.storageKey;
 
-    const storageDir = utilsCommon.getStorageDir();
+    const storageDir = Ps.getStorageDir();
     if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
+      Helper.mkdir(storageDir);
+      Helper.chmodPath(storageDir, '777');
     }
 
     this.db = this.table(name);
@@ -35,7 +34,7 @@ class LowdbStorage {
 
     const dbFile = this.getFilePath(name);
     const adapter = new FileSync(dbFile);
-    const db = lowdb(adapter);
+    const db = Jsondb(adapter);
 
     assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
 
@@ -53,7 +52,7 @@ class LowdbStorage {
    * 获取文件绝对路径
    */
   getFilePath (name) {
-    const storageDir = utilsCommon.getStorageDir();
+    const storageDir = Ps.getStorageDir();
     const dbFile = path.join(storageDir, this.getFileName(name));
     return dbFile;
   }
@@ -96,4 +95,4 @@ class LowdbStorage {
   }   
 }
 
-module.exports = LowdbStorage;
+module.exports = JsondbStorage;

package/{lib → module}/storage/sqliteStorage.js

@@ -4,7 +4,8 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 const Database = require('better-sqlite3');
-const utilsCommon = require('../../utils/common');
+const Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
 
 class SqliteStorage {
   constructor (name, opt = {}) {
@@ -12,13 +13,8 @@ class SqliteStorage {
 
     this.name = name;
     this.mode = this.getMode(name);
-
-    const storageDir = this._createStorageDir();
-    this.storageDir = storageDir;
-
-    const fileName = this._formatFileName(name);
-    this.fileName = fileName;
-
+    this.storageDir = this._createStorageDir();
+    this.fileName = this._formatFileName(name);
     this.db = this._initDB(opt);
   }
 
@@ -62,15 +58,15 @@ class SqliteStorage {
    * 创建storage目录
    */
   _createStorageDir () {
-    let storageDir = utilsCommon.getStorageDir();
+    let storageDir = Ps.getStorageDir();
 
     if (this.mode == 'absolute') {
       storageDir = path.dirname(this.name); 
     }
 
     if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
+      Helper.mkdir(storageDir);
+      Helper.chmodPath(storageDir, '777');
     }
 
     return storageDir;

package/module/utils/copyto.js

@@ -0,0 +1,161 @@
+/*!
+ * copy-to - index.js
+ * Copyright(c) 2014 dead_horse <dead_horse@qq.com>
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * slice() reference.
+ */
+
+var slice = Array.prototype.slice;
+
+/**
+ * Expose copy
+ *
+ * ```
+ * copy({foo: 'nar', hello: 'copy'}).to({hello: 'world'});
+ * copy({foo: 'nar', hello: 'copy'}).toCover({hello: 'world'});
+ * ```
+ *
+ * @param {Object} src
+ * @return {Copy}
+ */
+
+module.exports = Copy;
+
+
+/**
+ * Copy
+ * @param {Object} src
+ * @param {Boolean} withAccess
+ */
+
+function Copy(src, withAccess) {
+  if (!(this instanceof Copy)) return new Copy(src, withAccess);
+  this.src = src;
+  this._withAccess = withAccess;
+}
+
+/**
+ * copy properties include getter and setter
+ * @param {[type]} val [description]
+ * @return {[type]} [description]
+ */
+
+Copy.prototype.withAccess = function (w) {
+  this._withAccess = w !== false;
+  return this;
+};
+
+/**
+ * pick keys in src
+ *
+ * @api: public
+ */
+
+Copy.prototype.pick = function(keys) {
+  if (!Array.isArray(keys)) {
+    keys = slice.call(arguments);
+  }
+  if (keys.length) {
+    this.keys = keys;
+  }
+  return this;
+};
+
+/**
+ * copy src to target,
+ * do not cover any property target has
+ * @param {Object} to
+ *
+ * @api: public
+ */
+
+Copy.prototype.to = function(to) {
+  to = to || {};
+
+  if (!this.src) return to;
+  var keys = this.keys || Object.keys(this.src);
+
+  if (!this._withAccess) {
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      if (to[key] !== undefined) continue;
+      to[key] = this.src[key];
+    }
+    return to;
+  }
+
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    if (!notDefined(to, key)) continue;
+    var getter = this.src.__lookupGetter__(key);
+    var setter = this.src.__lookupSetter__(key);
+    if (getter) to.__defineGetter__(key, getter);
+    if (setter) to.__defineSetter__(key, setter);
+
+    if (!getter && !setter) {
+      to[key] = this.src[key];
+    }
+  }
+  return to;
+};
+
+/**
+ * copy src to target,
+ * override any property target has
+ * @param {Object} to
+ *
+ * @api: public
+ */
+
+Copy.prototype.toCover = function(to) {
+  var keys = this.keys || Object.keys(this.src);
+
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    delete to[key];
+    var getter = this.src.__lookupGetter__(key);
+    var setter = this.src.__lookupSetter__(key);
+    if (getter) to.__defineGetter__(key, getter);
+    if (setter) to.__defineSetter__(key, setter);
+
+    if (!getter && !setter) {
+      to[key] = this.src[key];
+    }
+  }
+};
+
+Copy.prototype.override = Copy.prototype.toCover;
+
+/**
+ * append another object to src
+ * @param {Obj} obj
+ * @return {Copy}
+ */
+
+Copy.prototype.and = function (obj) {
+  var src = {};
+  this.to(src);
+  this.src = obj;
+  this.to(src);
+  this.src = src;
+
+  return this;
+};
+
+/**
+ * check obj[key] if not defiend
+ * @param {Object} obj
+ * @param {String} key
+ * @return {Boolean}
+ */
+
+function notDefined(obj, key) {
+  return obj[key] === undefined
+    && obj.__lookupGetter__(key) === undefined
+    && obj.__lookupSetter__(key) === undefined;
+}

package/module/utils/helper.js

@@ -0,0 +1,117 @@
+const fs = require('fs');
+const path = require('path');
+const mkdirp = require('mkdirp');
+const convert = require('koa-convert');
+const is = require('is-type-of');
+const co = require('co');
+
+/**
+ * fnDebounce
+ * 
+ * @param  {Function} fn - 回调函数
+ * @param  {Time} delayTime - 延迟时间(ms)
+ * @param  {Boolean} isImediate - 是否需要立即调用
+ * @param  {type} args - 回调函数传入参数
+*/
+exports.fnDebounce = function() {
+  const fnObject = {};
+  let timer;
+
+  return (fn, delayTime, isImediate, args) => {
+    const setTimer = () => {
+      timer = setTimeout(() => {
+        fn(args);
+        clearTimeout(timer);
+        delete fnObject[fn];
+      }, delayTime);
+
+      fnObject[fn] = { delayTime, timer };
+    };
+
+    if (!delayTime || isImediate) return fn(args);
+
+    if (fnObject[fn]) {
+      clearTimeout(timer);
+      setTimer(fn, delayTime, args);
+    } else {
+      setTimer(fn, delayTime, args);
+    }
+  };
+}
+
+/**
+ * 随机10位字符串
+ */
+exports.getRandomString = function() {
+  return Math.random().toString(36).substring(2);
+};
+
+/**
+ * 创建文件夹
+ */
+exports.mkdir = function(filepath) {
+  mkdirp.sync(path.dirname(filepath));
+  return
+}
+
+/**
+ * 修改文件权限
+ */
+exports.chmodPath = function(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);
+  }
+};
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+
+/**
+ * 执行一个函数
+ */
+exports.callFn = async function (fn, args, ctx) {
+  args = args || [];
+  if (!is.function(fn)) return;
+  if (is.generatorFunction(fn)) fn = co.wrap(fn);
+  return ctx ? fn.call(ctx, ...args) : fn(...args);
+}
+
+exports.middleware = function (fn) {
+  return is.generatorFunction(fn) ? convert(fn) : fn;
+}

package/module/utils/index.js

@@ -0,0 +1,120 @@
+const path = require('path');
+const eis = require('electron-is');
+const Storage = require('../storage');
+const Constants = require('../const');
+const Ps = require('./ps');
+const Helper = require('./helper');
+const UtilsJson = require('./json');
+const Copy = require('./copyto');
+
+/**
+ * other module
+ */
+Copy(Ps)
+.and(Helper)
+.to(exports);
+
+/**
+ * 获取项目根目录package.json
+ */
+exports.getPackage = function() {
+  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
+  
+  return json;
+};
+
+/**
+ * 获取 coredb
+ */
+exports.getCoreDB = function() {
+  const coreDB = Storage.connection('system');
+  return coreDB;
+}
+
+/**
+ * 获取 ee配置
+ */
+exports.getEeConfig = function() {
+  const cdb = this.getCoreDB();
+  const config = cdb.getItem('config');
+
+  return config;
+}
+
+/**
+ * 获取 app version
+ */
+exports.getAppVersion = function() {
+  const cdb = this.getCoreDB();
+  const v = cdb.getItem('config').appVersion;
+  return v;
+}
+
+/**
+ * 获取 插件配置
+ */
+exports.getAddonConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').addons;
+  return cfg;
+}
+
+/**
+ * 获取 mainServer配置
+ */
+exports.getMainServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').mainServer;
+  return cfg;
+}
+
+/**
+ * 获取 httpServer配置
+ */
+exports.getHttpServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').httpServer;
+  return cfg;
+}
+
+/**
+ * 获取 socketServer配置
+ */
+exports.getSocketServerConfig = function() {
+  const cdb = this.getCoreDB();
+  const cfg = cdb.getItem('config').socketServer;
+  return cfg;
+}
+
+/**
+ * 获取 socket channel
+ */
+exports.getSocketChannel = function() {
+  return Constants.socketIo.channel;
+}
+
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const execDir = this.getExecDir();
+  const isPackaged = this.isPackaged();
+
+
+  // 资源路径不同
+  let dir = '';
+  if (isPackaged) {
+    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
+    // windows和MacOs不一样
+    dir = path.join(execDir, "resources", "extraResources");
+    if (eis.macOS()) {
+      dir = path.join(execDir, "..", "Resources", "extraResources");
+    }
+  } else {
+    // 打包前
+    dir = path.join(execDir, "build", "extraResources");
+  }
+  return dir;
+}
+
+