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

package/utils/index.js

@@ -1,35 +1,28 @@
-'use strict';
+/**
+ * 该模块不在增加新功能，请使用 /module/utils/index 模块
+ */
 
 const path = require('path');
-const constant = require('../lib/constant');
-const convert = require('koa-convert');
-const is = require('is-type-of');
-const co = require('co');
-const utility = require('utility');
 const eis = require('electron-is');
-const utilsCommon = require('./common');
+const UtilsJson = require('../module/utils/json');
+const UtilsPs = require('../module/utils/ps');
+const UtilsHelper = require('../module/utils/helper');
+const Copy = require('../module/utils/copyto');
+const Storage = require('../module/storage');
+const Constants = require('../module/const');
 
 /**
- * 创建文件夹
+ * other module
  */
-exports.mkdir = function (dirpath, dirname) {
-  return utilsCommon.mkdir(dirpath, dirname);
-}
-
-/**
- * 修改文件权限
- */
-exports.chmodPath = function (path, mode) {
-  return utilsCommon.chmodPath(path, mode);
-}
+Copy(UtilsPs)
+.and(UtilsHelper)
+.to(exports);
 
 /**
  * 获取项目根目录package.json
  */
 exports.getPackage = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-  const json = utility.readJSONSync(path.join(config.homeDir, 'package.json'));
+  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
   
   return json;
 };
@@ -38,20 +31,10 @@ exports.getPackage = function() {
  * 获取 coredb
  */
 exports.getCoreDB = function() {
-  const coreDB = require('../lib/storage/index').JsonDB.connection('system');
+  const coreDB = Storage.connection('system');
   return coreDB;
 }
 
-/**
- * 获取 当前环境
- */
-exports.getEnv = function() {
-  const cdb = this.getCoreDB();
-  const env = cdb.getItem('config').env;
-
-  return env;
-}
-
 /**
  * 获取 ee配置
  */
@@ -62,75 +45,6 @@ exports.getEeConfig = function() {
   return config;
 }
 
-/**
- * 获取 数据库存储路径
- */
-exports.getStorageDir = function() {
-  const cdb = this.getCoreDB();
-  const env = cdb.getItem('config').env;
-
-  const appDir = env === 'local' || env === 'unittest' ? this.getHomeDir() : this.getAppUserDataDir();
-  const storageDir = path.join(appDir, 'data');
-
-  return storageDir;
-}
-
-/**
- * 获取 应用程序数据目录 (开发环境时，为项目根目录)
- */
-exports.getAppUserDataDir = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-  const env = config.env;
-  const dir = env === 'local' || env === 'unittest' ? config.homeDir : config.appUserDataDir;
-  return dir;
-}
-
-/**
- * 获取 日志目录
- */
-exports.getLogDir = function() {
-  const cdb = this.getCoreDB();
-  const logPath = cdb.getItem('config').logger.dir;
-  return logPath;
-}
-
-/**
- * 获取 home目录
- */
-exports.getHomeDir = function() {
-  const cdb = this.getCoreDB();
-  const homePath = cdb.getItem('config').homeDir;
-  return homePath;
-}
-
-/**
- * 获取 base目录
- */
-exports.getBaseDir = function() {
-  const cdb = this.getCoreDB();
-  const basePath = cdb.getItem('config').baseDir;
-  return basePath;
-}
-
-/**
- * 获取 root目录
- */
-exports.getRootDir = function() {
-  const cdb = this.getCoreDB();
-  const rootPath = cdb.getItem('config').root;
-  return rootPath;
-}
-
-/**
- * 获取 appUserData目录
- */
-exports.getAppUserDataDir = function() {
-  const cdb = this.getCoreDB();
-  const dataPath = cdb.getItem('config').appUserDataDir;
-  return dataPath;
-}
-
 /**
  * 获取 app version
  */
@@ -140,15 +54,6 @@ exports.getAppVersion = function() {
   return v;
 }
 
-/**
- * 获取 exec目录
- */
-exports.getExecDir = function() {
-  const cdb = this.getCoreDB();
-  const execPath = cdb.getItem('config').execDir;
-  return execPath;
-}
-
 /**
  * 获取 插件配置
  */
@@ -198,16 +103,14 @@ exports.getSocketPort = function() {
  * 获取 socket channel
  */
 exports.getSocketChannel = function() {
-  return constant.socketIo.channel;
+  return Constants.socketIo.channel;
 }
 
 /**
  * 获取 额外资源目录
  */
 exports.getExtraResourcesDir = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-  const execDir = config.execDir;
+  const execDir = this.getExecDir();
 
   // 资源路径不同
   let dir = '';
@@ -223,25 +126,4 @@ exports.getExtraResourcesDir = function() {
     dir = path.join(execDir, "build", "extraResources");
   }
   return dir;
-}
-
-/**
- * 执行一个函数
- */
-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;
-}
-
-/**
- * 版本号比较
- */
-exports.compareVersion = function (v1, v2) {
-  return utilsCommon.compareVersion(v1, v2);
 }

package/lib/logger.js

@@ -1,47 +0,0 @@
-'use strict';
-
-const debug = require('debug')('ee-core:logger');
-const Loggers = require('egg-logger').EggLoggers;
-const assert = require('assert');
-
-class Logger {
-  constructor (config) {
-    debug('Loaded logger');
-    assert(Object.keys(config).length != 0, `logger config is null`);
-    this.eggLogger = this.init(config);
-  }
-
-  /**
-   * 单例
-   */
-  static getInstance (config = {}) {
-    if (typeof this.instance === 'object') {
-      return this.instance.eggLogger;
-    }
-
-    this.instance = new Logger(config);
-
-    // 返回egg-logger实例
-    return this.instance.eggLogger;
-  }
-
-  /**
-   * 初始化模块
-   */
-  init(config) {
-    const loggerConfig = config.logger;
-    loggerConfig.type = 'application'; // application、agent
-
-    if (config.env === 'prod' && loggerConfig.level === 'DEBUG' && !loggerConfig.allowDebugAtProd) {
-      loggerConfig.level = 'INFO';
-    }
-
-    const loggers = new Loggers(config);
-
-    loggers.coreLogger.info('[ee-core:logger] init all loggers with options: %j', loggerConfig);
-
-    return loggers;
-  };
-}
-
-module.exports = Logger;

package/lib/socket/start.js

@@ -1,22 +0,0 @@
-'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/lowdb/adapters/Base.js

@@ -1,15 +0,0 @@
-const stringify = require('./_stringify')
-
-class Base {
-  constructor(
-    source,
-    { defaultValue = {}, serialize = stringify, deserialize = JSON.parse } = {}
-  ) {
-    this.source = source
-    this.defaultValue = defaultValue
-    this.serialize = serialize
-    this.deserialize = deserialize
-  }
-}
-
-module.exports = Base

package/lib/storage/lowdb/adapters/FileAsync.js

@@ -1,41 +0,0 @@
-// Not using async/await on purpose to avoid adding regenerator-runtime
-// to lowdb dependencies
-const fs = require('graceful-fs')
-const pify = require('pify')
-const steno = require('steno')
-const Base = require('./Base')
-
-const readFile = pify(fs.readFile)
-const writeFile = pify(steno.writeFile)
-
-class FileAsync extends Base {
-  read() {
-    // fs.exists is deprecated but not fs.existsSync
-    if (fs.existsSync(this.source)) {
-      // Read database
-      return readFile(this.source, 'utf-8')
-        .then(data => {
-          // Handle blank file
-          const trimmed = data.trim()
-          return trimmed ? this.deserialize(trimmed) : this.defaultValue
-        })
-        .catch(e => {
-          if (e instanceof SyntaxError) {
-            e.message = `Malformed JSON in file: ${this.source}\n${e.message}`
-          }
-          throw e
-        })
-    } else {
-      // Initialize
-      return writeFile(this.source, this.serialize(this.defaultValue)).then(
-        () => this.defaultValue
-      )
-    }
-  }
-
-  write(data) {
-    return writeFile(this.source, this.serialize(data))
-  }
-}
-
-module.exports = FileAsync

package/lib/storage/lowdb/adapters/FileSync.js

@@ -1,39 +0,0 @@
-const fs = require('graceful-fs')
-const Base = require('./Base')
-const fileSystem = require('fs')
-
-//const readFile = fs.readFileSync
-const writeFile = fs.writeFileSync
-
-// Same code as in FileAsync, minus `await`
-class FileSync extends Base {
-  read() {
-    // fs.exists is deprecated but not fs.existsSync
-    if (fs.existsSync(this.source)) {
-      // Read database
-      try {
-        // 使用 fileSystem的readFileSync
-        //const data = readFile(this.source, 'utf-8').trim()
-        const data = fileSystem.readFileSync(this.source, {encoding: 'utf-8'})
-
-        // 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
-      writeFile(this.source, this.serialize(this.defaultValue))
-      return this.defaultValue
-    }
-  }
-
-  write(data) {
-    return writeFile(this.source, this.serialize(data))
-  }
-}
-
-module.exports = FileSync

package/lib/storage/lowdb/adapters/LocalStorage.js

@@ -1,20 +0,0 @@
-/* global localStorage */
-const Base = require('./Base')
-
-class LocalStorage extends Base {
-  read() {
-    const data = localStorage.getItem(this.source)
-    if (data) {
-      return this.deserialize(data)
-    } else {
-      localStorage.setItem(this.source, this.serialize(this.defaultValue))
-      return this.defaultValue
-    }
-  }
-
-  write(data) {
-    localStorage.setItem(this.source, this.serialize(data))
-  }
-}
-
-module.exports = LocalStorage

package/lib/storage/lowdb/adapters/Memory.js

@@ -1,8 +0,0 @@
-const Base = require('./Base')
-
-module.exports = class Memory extends Base {
-  read() {
-    return this.defaultValue
-  }
-  write() {}
-}

package/lib/storage/lowdb/adapters/_stringify.js

@@ -1,4 +0,0 @@
-// Pretty stringify
-module.exports = function stringify(obj) {
-  return JSON.stringify(obj, null, 2)
-}

package/lib/storage/lowdb/common.js

@@ -1,33 +0,0 @@
-const isPromise = require('./isPromise')
-
-const init = (db, key, adapter) => {
-  db.read = () => {
-    const r = adapter.read()
-
-    return isPromise(r) ? r.then(db.plant) : db.plant(r)
-  }
-
-  db.write = (value = db.getState()) => {
-    const w = adapter.write(db.getState())
-
-    return isPromise(w) ? w.then(() => value) : value
-  }
-
-  db.plant = state => {
-    db[key] = state
-    return db
-  }
-
-  db.getState = () => db[key]
-
-  db.setState = state => {
-    db.plant(state)
-    return db
-  }
-
-  return db.read()
-}
-
-module.exports = {
-  init
-}

package/lib/storage/lowdb/fp.js

@@ -1,23 +0,0 @@
-const flow = require('lodash/flow')
-const get = require('lodash/get')
-const set = require('lodash/set')
-const common = require('./common')
-
-module.exports = function(adapter) {
-  function db(path, defaultValue) {
-    function getValue(funcs) {
-      const result = get(db.getState(), path, defaultValue)
-      return flow(funcs)(result)
-    }
-
-    getValue.write = (...funcs) => {
-      const result = getValue(...funcs)
-      set(db.getState(), path, result)
-      return db.write()
-    }
-
-    return getValue
-  }
-
-  return common.init(db, '__state__', adapter)
-}

package/lib/storage/lowdb/isPromise.js

@@ -1,6 +0,0 @@
-module.exports = isPromise;
-module.exports.default = isPromise;
-
-function isPromise(obj) {
-  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
-}

package/lib/storage/lowdb/nano.js

@@ -1,5 +0,0 @@
-const common = require('./common')
-
-module.exports = function(adapter) {
-  return common.init({}, '__state__', adapter)
-}

package/utils/common.js

@@ -1,91 +0,0 @@
-'use strict';
-
-/**
- * ee-core使用
- */
-
-const fs = require('fs');
-const path = require('path');
-
-/**
- * 版本号比较
- */
-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.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;
-}