ee-core 1.4.1-beta.2 → 1.5.0-beta.1

package/core/lib/loader/mixin/controller.js

@@ -47,7 +47,7 @@ module.exports = {
     const controllerBase = opt.directory;
 
     this.loadToApp(controllerBase, 'controller', opt);
-    this.options.logger.info('[ee:loader] Controller loaded: %s', controllerBase);
+    this.options.logger.info('[ee-core:loader] Controller loaded: %s', controllerBase);
     this.timing.end('Load Controller');
   },
 

package/lib/baseApp.js

@@ -29,8 +29,6 @@ class BaseApp extends EeAppCore {
 
     // TODO 这个不行，要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
     //this.coreDB = this.getCoreDB();
- 
-    this.coreLogger.info('[ee-core:baseApp] start loaded lib modules');
 
   }
 

package/lib/constant.js

@@ -1,26 +1,7 @@
 module.exports = {
-  autoLaunch: {
-    LOGIN_SETTING_OPTIONS: {
-      // For Windows
-      args: [
-        '--opened-at-login=1'
-      ]
-    }
-  },
   storageKey: {
     cache: 'cache',
   },
-  ipcChannels: {
-    appMessage: 'app.message',
-    appUpdater: 'app.updater'
-  },
-  appUpdaterStatus: {
-    error: -1,
-    available: 1,
-    noAvailable: 2,
-    downloading: 3,
-    downloaded: 4,
-  },
   socketIo: {
     channel: {
       partySoftware: 'c1',

package/lib/eeApp.js

@@ -194,7 +194,6 @@ class EeApp extends BaseApp {
       return;
     }
 
-    const protocol = 'http://';
     const developmentModeConfig = this.config.developmentMode;
     const selectMode = developmentModeConfig.default;
     const modeInfo = developmentModeConfig.mode[selectMode];
@@ -210,6 +209,7 @@ class EeApp extends BaseApp {
     }
 
     // 单页应用
+    const protocol = modeInfo.protocol || 'http://';
     url = protocol + modeInfo.hostname + ':' + modeInfo.port;
     if (this.config.env !== 'prod') {
       this.loadMainUrl('spa', url);

package/lib/storage/sqliteStorage.js

@@ -11,47 +11,116 @@ class SqliteStorage {
     assert(name, `db name ${name} Cannot be empty`);
 
     this.name = name;
+    this.mode = this.getMode(name);
 
-    const storageDir = utilsCommon.getStorageDir();
-    if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
-    }
+    const storageDir = this._createStorageDir();
+    this.storageDir = storageDir;
+
+    const fileName = this._formatFileName(name);
+    this.fileName = fileName;
 
-    this.db = this.initDB(name, opt);
+    this.db = this._initDB(opt);
   }
 
   /**
    * 初始化db
    */
-  initDB (name, opt = {}) {
+  _initDB (opt = {}) {
     let options = Object.assign({
       timeout: 5000,
     }, opt);
 
     // 存储类型：db文件、内存(:memory:)
-    let isFileDB = false;
-    if (path.extname(name) == '.db') {
-      name = this.getFilePath(name);
-      isFileDB = true;
+    let dbPath = this.name;
+    if (this.mode != 'memory') {
+      dbPath = this.getFilePath();
     }
 
-    const db = new Database(name, options);
+    const db = new Database(dbPath, options);
 
     // 如果是文件类型，判断文件是否创建成功
-    if (isFileDB) {
-      assert(fs.existsSync(name), `error: storage ${name} not exists`);
+    if (this.mode != 'memory') {
+      assert(fs.existsSync(dbPath), `error: storage ${dbPath} not exists`);
     }
 
     return db;
   }
 
+  /**
+   * 获取文件名
+   */
+  _formatFileName (name) {
+    let fileName = name;
+    if (this.mode != 'memory') {
+      fileName = path.basename(name);
+    }
+
+    return fileName;
+  }
+
+  /**
+   * 创建storage目录
+   */
+  _createStorageDir () {
+    let storageDir = utilsCommon.getStorageDir();
+
+    if (this.mode == 'absolute') {
+      storageDir = path.dirname(this.name); 
+    }
+
+    if (!fs.existsSync(storageDir)) {
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
+    }
+
+    return storageDir;
+  }
+
+  /**
+   * 获取file path 模式
+   */
+  getMode (name) {
+    let mode = '';
+
+    // 内存模式
+    if (name == ':memory:') {
+      mode = 'memory';
+      return mode;
+    }
+
+    assert(path.extname(name) == '.db', `error: storage ${name} file ext name must be .db`);
+
+    // 路径模式
+    name = name.replace(/[/\\]/g, '/');
+    if (name.indexOf('/') !== -1) {
+      const isAbsolute = path.isAbsolute(name);
+      if (isAbsolute) {
+        mode = 'absolute';
+      } else {
+        mode = 'relative';
+      }
+      return mode;
+    }
+
+    // 仅文件名
+    mode = 'onlyName';
+
+    return mode;
+  }
+
+  /**
+   * 获取storage目录
+   */
+  getStorageDir () {
+    return this.storageDir;
+  }
+
   /**
    * 获取文件绝对路径
    */
-  getFilePath (name) {
-    const storageDir = utilsCommon.getStorageDir();
-    const dbFile = path.join(storageDir, name);
+  getFilePath () {
+    const dbFile = path.join(this.storageDir, this.fileName);
+
     return dbFile;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.4.1-beta.2",
+  "version": "1.5.0-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {