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

package/module/utils/json.js

@@ -0,0 +1,72 @@
+const fs = require('fs');
+const path = require('path');
+const mkdirp = require('mkdirp');
+
+exports.strictParse = function (str) {
+  const obj = JSON.parse(str);
+  if (!obj || typeof obj !== 'object') {
+    throw new Error('JSON string is not object');
+  }
+  return obj;
+};
+
+exports.readSync = function(filepath) {
+  if (!fs.existsSync(filepath)) {
+    throw new Error(filepath + ' is not found');
+  }
+  return JSON.parse(fs.readFileSync(filepath));
+};
+
+exports.writeSync = function(filepath, str, options) {
+  options = options || {};
+  if (!('space' in options)) {
+    options.space = 2;
+  }
+
+  mkdirp.sync(path.dirname(filepath));
+  if (typeof str === 'object') {
+    str = JSON.stringify(str, options.replacer, options.space) + '\n';
+  }
+
+  fs.writeFileSync(filepath, str);
+};
+
+exports.read = function(filepath) {
+  return fs.stat(filepath)
+    .then(function(stats) {
+      if (!stats.isFile()) {
+        throw new Error(filepath + ' is not found');
+      }
+      return fs.readFile(filepath);
+    })
+    .then(function(buf) {
+      return JSON.parse(buf);
+    });
+};
+
+exports.write = function(filepath, str, options) {
+  options = options || {};
+  if (!('space' in options)) {
+    options.space = 2;
+  }
+
+  if (typeof str === 'object') {
+    str = JSON.stringify(str, options.replacer, options.space) + '\n';
+  }
+
+  return mkdir(path.dirname(filepath))
+    .then(function() {
+      return fs.writeFile(filepath, str);
+    });
+};
+
+function mkdir(dir) {
+  return new Promise(function(resolve, reject) {
+    mkdirp(dir, function(err) {
+      if (err) {
+        return reject(err);
+      }
+      resolve();
+    });
+  });
+}

package/module/utils/ps.js

@@ -0,0 +1,175 @@
+const path = require('path');
+
+/**
+ * 当前进程的所有env
+ */
+exports.allEnv = function() {
+  return process.env;
+}
+
+/**
+ * 当前环境 - local | prod
+ */
+exports.env = function() {
+  return process.env.EE_SERVER_ENV;
+}
+
+/**
+ * 获取 当前环境
+ */
+exports.getEnv = this.env
+
+/**
+ * 是否为开发环境
+ */
+exports.isDev = function() {
+  if ( process.env.EE_SERVER_ENV === 'development' ||
+    process.env.EE_SERVER_ENV === 'dev' ||
+    process.env.EE_SERVER_ENV === 'local'
+  ) {
+    return true;
+  }
+  
+  if ( process.env.NODE_ENV === 'development' ||
+    process.env.NODE_ENV === 'dev' ||
+    process.env.NODE_ENV === 'local'
+  ) {
+    return true;
+  }
+
+  return false;
+};
+
+/**
+ * 是否为渲染进程
+ */
+exports.isRenderer = function() {
+  return (typeof process === 'undefined' ||
+    !process ||
+    process.type === 'renderer');
+};
+
+/**
+ * 是否为主进程
+ */
+exports.isMain = function() {
+  return ( typeof process !== 'undefined' &&
+    process.type === 'browser');
+};
+
+/**
+ * 是否为node子进程
+ */
+exports.isForkedChild = function() {
+  return (Number(process.env.ELECTRON_RUN_AS_NODE) === 1);
+};
+
+/**
+ * 当前进程类型
+ */
+exports.processType = function() {
+  let type = '';
+  if (this.isMain()) {
+    type = 'browser';
+  } else if (this.isRenderer()) {
+    type = 'renderer';
+  } else if (this.isForkedChild()) {
+    type = 'child';
+  }
+
+  return type;
+};
+
+/**
+ * 获取数据存储路径
+ */
+exports.getHomeDir = function () {
+  return process.env.EE_HOME;
+}
+
+/**
+ * 获取数据存储路径
+ */
+exports.getStorageDir = function () {
+  const storageDir = path.join(this.getRootDir(), 'data');
+  return storageDir;
+}
+
+/**
+ * 获取日志存储路径 
+ */
+exports.getLogDir = function () {
+  const dir = path.join(this.getRootDir(), 'logs');
+  return dir;
+}
+
+/**
+ * 获取root目录  (dev-项目根目录，pro-app user data目录)
+ */
+exports.getRootDir = function () {
+  const appDir = this.isDev() ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
+  return appDir;
+}
+
+/**
+ * 获取 base目录
+ */
+exports.getBaseDir = function() {
+  return process.env.EE_BASE_DIR;
+}
+
+/**
+ * 获取 appUserData目录
+ */
+exports.getAppUserDataDir = function() {
+  return process.env.EE_APP_USER_DATA;
+}
+
+/**
+ * 获取数据存储路径
+ */
+exports.getHomeDir = function () {
+  return process.env.EE_HOME;
+}
+
+/**
+ * 获取 exec目录
+ */
+exports.getExecDir = function() {
+  return process.env.EE_EXEC_DIR;
+}
+
+/**
+ * 获取操作系统用户目录
+ */
+exports.getUserHomeDir = function () {
+  return process.env.EE_USER_HOME;
+}
+
+/**
+ * 获取主进程端口
+ */
+exports.getMainPort = function () {
+  return process.env.EE_MAIN_PORT;
+}
+
+/**
+ * 获取内置socket端口
+ */
+exports.getSocketPort = function () {
+  return process.env.EE_SOCKET_PORT;
+}
+
+/**
+ * 获取内置http端口
+ */
+exports.getHttpPort = function () {
+  return process.env.EE_HTTP_PORT;
+}
+
+/**
+ * 是否打包
+ */
+exports.isPackaged = function () {
+  return process.env.EE_IS_PACKAGED;
+}

package/{utils → module/utils}/wrap.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const assert = require('assert');
 const is = require('is-type-of');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.5.2-beta.2",
+  "version": "2.0.0-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,6 @@
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "globby": "^10.0.0",
-    "graceful-fs": "^4.1.3",
     "humanize-ms": "^1.2.1",
     "is-type-of": "^1.2.1",
     "javascript-obfuscator": "^4.0.0",
@@ -35,14 +34,11 @@
     "koa-static": "^5.0.0",
     "koa2-cors": "^2.0.6",
     "lodash": "^4.17.21",
-    "lowdb": "^1.0.0",
+    "mkdirp": "^2.1.3",
     "path-to-regexp": "^6.2.0",
-    "pify": "^6.1.0",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
-    "steno": "^0.4.1",
-    "urllib": "^2.38.0",
-    "utility": "^1.17.0"
+    "urllib": "^2.38.0"
   },
   "devDependencies": {}
 }

package/tools/encrypt.js

@@ -5,9 +5,9 @@ const fs = require('fs');
 const fsPro = require('fs-extra');
 const is = require('is-type-of');
 const bytenode = require('bytenode');
-const utility = require('utility');
 const crypto = require('crypto');
 const JavaScriptObfuscator = require('javascript-obfuscator');
+const utilsJson = require('../module/utils/json');
 
 class Encrypt {
   constructor() {
@@ -86,7 +86,7 @@ class Encrypt {
         const content = {
           nameMap: {}
         };
-        utility.writeJSONSync(this.tmpFile, content);
+        utilsJson.writeSync(this.tmpFile, content);
       }
     }
 

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