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

package/tools/replaceDist.js

@@ -1,61 +1,61 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-
-/**
- * 资源替换
- */
-
- module.exports = {
-  
-  /**
-   * 执行
-   */  
-  run () {
-    console.log('[ee-core] [replace_dist] 开始移动资源');
-    const homeDir = process.cwd();
-
-    // argv
-    let distDir = '';
-    for (let i = 0; i < process.argv.length; i++) {
-      let tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--dist_dir=') !== -1) {
-        distDir = tmpArgv.substring(11)
-      }
-    }
- 
-    const fileExist = (filePath) => {
-      try {
-        return fs.statSync(filePath).isFile();
-      } catch (err) {
-        console.error('[ee-core] [replace_dist] ERROR ', err);
-        return false;
-      }
-    };
-    
-    const sourceDir = path.join(homeDir, distDir);
-    const sourceIndexFile = path.join(sourceDir, 'index.html');
-    
-    if (!fileExist(sourceIndexFile)) {
-      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
-      return
-    }
-    
-    // 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, 'public', 'dist');
-
-    // 清空历史资源
-    fs.rmdirSync(eeResourceDir, {recursive: true});
-    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
-
-    fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
-
-    console.log('[ee-core] [replace_dist] 结束');
-  }
-}
-
-
-
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+
+/**
+ * 资源替换
+ */
+
+ module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run () {
+    console.log('[ee-core] [replace_dist] 开始移动资源');
+    const homeDir = process.cwd();
+
+    // argv
+    let distDir = '';
+    for (let i = 0; i < process.argv.length; i++) {
+      let tmpArgv = process.argv[i]
+      if (tmpArgv.indexOf('--dist_dir=') !== -1) {
+        distDir = tmpArgv.substring(11)
+      }
+    }
+ 
+    const fileExist = (filePath) => {
+      try {
+        return fs.statSync(filePath).isFile();
+      } catch (err) {
+        console.error('[ee-core] [replace_dist] ERROR ', err);
+        return false;
+      }
+    };
+    
+    const sourceDir = path.join(homeDir, distDir);
+    const sourceIndexFile = path.join(sourceDir, 'index.html');
+    
+    if (!fileExist(sourceIndexFile)) {
+      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
+      return
+    }
+    
+    // 复制到ee资源目录
+    const eeResourceDir = path.join(homeDir, 'public', 'dist');
+
+    // 清空历史资源
+    fs.rmdirSync(eeResourceDir, {recursive: true});
+    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
+
+    fsPro.copySync(sourceDir, eeResourceDir);
+    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
+
+    console.log('[ee-core] [replace_dist] 结束');
+  }
+}
+
+
+

package/utils/index.js

@@ -1,247 +1,129 @@
-'use strict';
-
-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');
-
-/**
- * 创建文件夹
- */
-exports.mkdir = function (dirpath, dirname) {
-  return utilsCommon.mkdir(dirpath, dirname);
-}
-
-/**
- * 修改文件权限
- */
-exports.chmodPath = function (path, mode) {
-  return utilsCommon.chmodPath(path, mode);
-}
-
-/**
- * 获取项目根目录package.json
- */
-exports.getPackage = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-  const json = utility.readJSONSync(path.join(config.homeDir, 'package.json'));
-  
-  return json;
-};
-
-/**
- * 获取 coredb
- */
-exports.getCoreDB = function() {
-  const coreDB = require('../lib/storage/index').JsonDB.connection('system');
-  return coreDB;
-}
-
-/**
- * 获取 当前环境
- */
-exports.getEnv = function() {
-  const cdb = this.getCoreDB();
-  const env = cdb.getItem('config').env;
-
-  return env;
-}
-
-/**
- * 获取 ee配置
- */
-exports.getEeConfig = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-
-  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
- */
-exports.getAppVersion = function() {
-  const cdb = this.getCoreDB();
-  const v = cdb.getItem('config').appVersion;
-  return v;
-}
-
-/**
- * 获取 exec目录
- */
-exports.getExecDir = function() {
-  const cdb = this.getCoreDB();
-  const execPath = cdb.getItem('config').execDir;
-  return execPath;
-}
-
-/**
- * 获取 插件配置
- */
-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;
-}
-
-/**
- * 获取 socketio port
- */
-exports.getSocketPort = function() {
-  const cdb = this.getCoreDB();
-  const port = cdb.getItem('config').socketServer.port;
-  return parseInt(port);
-}
-
-/**
- * 获取 socket channel
- */
-exports.getSocketChannel = function() {
-  return constant.socketIo.channel;
-}
-
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-  const execDir = config.execDir;
-
-  // 资源路径不同
-  let dir = '';
-  if (config.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;
-}
-
-/**
- * 执行一个函数
- */
-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);
+/**
+ * 该模块不在增加新功能，请使用 /module/utils/index 模块
+ */
+
+const path = require('path');
+const eis = require('electron-is');
+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
+ */
+Copy(UtilsPs)
+.and(UtilsHelper)
+.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;
+}
+
+/**
+ * 获取 socketio port
+ */
+exports.getSocketPort = function() {
+  const cdb = this.getCoreDB();
+  const port = cdb.getItem('config').socketServer.port;
+  return parseInt(port);
+}
+
+/**
+ * 获取 socket channel
+ */
+exports.getSocketChannel = function() {
+  return Constants.socketIo.channel;
+}
+
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const execDir = this.getExecDir();
+
+  // 资源路径不同
+  let dir = '';
+  if (config.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;
 }

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