ee-core 1.2.7-beta.3 → 1.2.8-beta.2

package/config/config.default.js

@@ -214,6 +214,9 @@ module.exports = appInfo => {
     port: 7071, // 默认端口（如果端口被使用，则随机获取一个）
     cors: {
       origin: "*"
+    },
+    body: {
+      multipart: true, // 文件类型
     }
   };  
 

package/lib/socket/httpServer.js

@@ -3,8 +3,8 @@
 const assert = require('assert');
 const is = require('is-type-of');
 const Koa = require('koa');
-const BodyParser = require('koa-bodyparser');
 const cors = require('koa2-cors');
+const koaBody = require('koa-body');
 
 /**
  * http server
@@ -12,9 +12,9 @@ const cors = require('koa2-cors');
 class HttpServer {
   constructor (app) {
     this.app = app;
-    const options = this.app.config.httpServer;
+    this.options = this.app.config.httpServer;
 
-    if (!options.enable) {
+    if (!this.options.enable) {
       return;
     }
 
@@ -29,16 +29,14 @@ class HttpServer {
    */
   create () {
     const self = this;
-    const httpServer = this.app.config.httpServer;
+    const httpServer = this.options;
     const url = httpServer.protocol + httpServer.host + ':' + httpServer.port;
     const corsOptions = httpServer.cors;
 
     const koaApp = new Koa();
-    const bodyparser= new BodyParser();
-
     koaApp
       .use(cors(corsOptions))
-      .use(bodyparser)
+      .use(koaBody(httpServer.body))
       .use(async (ctx, next) => {
         ctx.eeApp = self.app;
         await next();

package/lib/socket/socketServer.js

@@ -7,7 +7,7 @@ const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
 
 /**
- * 类文件，顶部new egglogger 后，出现代码无法正常加载
+ * socket server
  */
 class SocketServer {
   constructor (app) {

package/lib/storage/index.js

@@ -1,19 +1,31 @@
 'use strict';
 
+const assert = require('assert');
+const _ = require('lodash');
 const JsonDB = {};
 
-JsonDB.connection = function (database) {
+JsonDB.connection = function (database, type = 'lowdb') {
+  // todo sqlite
+  if (!_.includes(['lowdb'], type)) {
+    assert(database, `db type ${type} is not supported`);
+  }
+  if (_.isEmpty(database)) {
+    assert(database, `db name ${database} Cannot be empty`);
+  }
+  let storage;
+  switch (type)  {
+    case 'lowdb':
+      const LowdbStorage = require('./lowdbStorage');
+      storage = new LowdbStorage(database);
+      break;
+    case 'sqlite':
+      // todo
+      const SqliteStorage = require('./sqliteStorage');
+      storage = new SqliteStorage(database);
+      break;
+    default:  
+  }
 
-  // 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;
 }
 

package/lib/storage/lowdbStorage.js

@@ -7,6 +7,7 @@ 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 = {}) {
@@ -17,10 +18,10 @@ class LowdbStorage {
     // 数据库key列表
     this.storageKey = constant.storageKey;
 
-    const storageDir = this.getStorageDir();
+    const storageDir = utilsCommon.getStorageDir();
     if (!fs.existsSync(storageDir)) {
-      this.mkdir(storageDir);
-      this.chmodPath(storageDir, '777');
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
     }
 
     this.db = this.table(name);
@@ -49,24 +50,14 @@ class LowdbStorage {
   }
 
   /**
-   * 获取db文件名
+   * 获取文件绝对路径
    */
   getFilePath (name) {
-    const storageDir = this.getStorageDir();
+    const storageDir = utilsCommon.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 设置一个对应的值
    */
@@ -103,42 +94,6 @@ class LowdbStorage {
   
     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);
-    }
-  };
 }
 
 module.exports = LowdbStorage;

package/lib/storage/sqliteStorage.js

@@ -0,0 +1,77 @@
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const constant = require('../constant');
+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;
+
+    // 数据库key列表
+    this.storageKey = constant.storageKey;
+
+    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,
+      verbose: console.log
+    }, 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(dbFile), `error: storage ${dbFile} not exists`);
+    }
+
+    return db;
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath (name) {
+    const storageDir = utilsCommon.getStorageDir();
+    const dbFile = path.join(storageDir, name);
+    return dbFile;
+  }
+
+  /**
+   * 为指定的 name 设置一个对应的值
+   */
+  setItem (key, value) {
+  }
+  
+  /**
+   * 根据指定的名字 name 获取对应的值
+   */
+  getItem (key) {
+  }   
+
+
+}
+
+module.exports = SqliteStorage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.7-beta.3",
+  "version": "1.2.8-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "humanize-ms": "^1.2.1",
     "is-type-of": "^1.2.1",
     "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
+    "koa-body": "^5.0.0",
     "koa-convert": "^2.0.0",
     "koa-static": "^5.0.0",
     "koa2-cors": "^2.0.6",

package/utils/common.js

@@ -1,3 +1,11 @@
+'use strict';
+
+/**
+ * ee-core使用
+ */
+
+const fs = require('fs');
+const path = require('path');
 
 /**
  * 版本号比较
@@ -28,3 +36,56 @@ exports.compareVersion = function (v1, v2) {
   return 0
 }
 
+/**
+ * 创建文件夹
+ */
+exports.mkdir = function(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);
+    }
+  }
+};
+
+/**
+ * 修改文件权限
+ */
+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.getStorageDir = function () {
+  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;
+}

package/utils/index.js

@@ -7,6 +7,7 @@ const convert = require('koa-convert');
 const is = require('is-type-of');
 const co = require('co');
 const utility = require('utility');
+const eis = require('electron-is');
 
 /**
  * 创建文件夹
@@ -151,7 +152,7 @@ exports.getExtraResourcesDir = function() {
     // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
     // windows和MacOs不一样
     dir = path.join(execDir, "resources", "extraResources");
-    if (is.macOS()) {
+    if (eis.macOS()) {
       dir = path.join(execDir, "..", "Resources", "extraResources");
     }
   } else {

package/lib/storage/appStorage.js

@@ -1,14 +0,0 @@
-'use strict';
-
-class AppStorage  {
-  constructor() {
-    const Storage = require('./storage');
-    const sObj = Storage.getInstance('appData');
-
-    for (const attr of sObj) {
-      Object.assign(UserStorage.prototype, attr);
-    }
-  }
-}
-
-module.exports = AppStorage;