ee-core 2.11.1 → 4.0.0-beta.1

package/utils/helper.js

@@ -2,10 +2,9 @@ const fs = require('fs');
 const mkdirp = require('mkdirp');
 const convert = require('koa-convert');
 const is = require('is-type-of');
-const co = require('./co');
 const path = require('path');
 const chalk = require('chalk');
-const Pargv = require('./pargv');
+const { parseArgv } = require('./pargv');
 
 const _basePath = process.cwd();
 
@@ -17,7 +16,7 @@ const _basePath = process.cwd();
  * @param  {Boolean} isImediate - 是否需要立即调用
  * @param  {type} args - 回调函数传入参数
 */
-exports.fnDebounce = function() {
+function fnDebounce() {
   const fnObject = {};
   let timer;
 
@@ -43,25 +42,19 @@ exports.fnDebounce = function() {
   };
 }
 
-/**
- * 随机10位字符串
- */
-exports.getRandomString = function() {
+// 随机10位字符串
+function getRandomString() {
   return Math.random().toString(36).substring(2);
 };
 
-/**
- * 创建文件夹
- */
-exports.mkdir = function(filepath, opt = {}) {
+// 创建文件夹
+function mkdir(filepath, opt = {}) {
   mkdirp.sync(filepath, opt);
   return
 }
 
-/**
- * 修改文件权限
- */
-exports.chmodPath = function(path, mode) {
+// 修改文件权限
+function chmodPath(path, mode) {
   let files = [];
   if (fs.existsSync(path)) {
     files = fs.readdirSync(path);
@@ -77,10 +70,8 @@ exports.chmodPath = function(path, mode) {
   }
 };
 
-/**
- * 版本号比较
- */
-exports.compareVersion = function (v1, v2) {
+// 版本号比较
+function compareVersion(v1, v2) {
   v1 = v1.split('.')
   v2 = v2.split('.')
   const len = Math.max(v1.length, v2.length)
@@ -106,24 +97,12 @@ exports.compareVersion = function (v1, v2) {
   return 0
 }
 
-/**
- * 执行一个函数
- */
-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) {
+function middleware(fn) {
   return is.generatorFunction(fn) ? convert(fn) : fn;
 }
 
-/**
- * 序列化对象
- */
-exports.stringify = function(obj, ignore = []) {
+// 序列化对象
+function stringify(obj, ignore = []) {
   const result = {};
   Object.keys(obj).forEach(key => {
       if (!ignore.includes(key)) {
@@ -136,7 +115,7 @@ exports.stringify = function(obj, ignore = []) {
 /**
  * 是否有效值
  */
-exports.validValue = function(value) {
+function validValue(value) {
   return (
     value !== undefined &&
     value !== null &&
@@ -144,7 +123,7 @@ exports.validValue = function(value) {
   );
 }
 
-exports.checkConfig = function(prop) {
+function checkConfig(prop) {
   const filepath = path.join(_basePath, prop);
   if (fs.existsSync(filepath)) {
     return true;
@@ -153,7 +132,7 @@ exports.checkConfig = function(prop) {
   return false;
 }
 
-exports.loadConfig = function(prop) {
+function loadConfig(prop) {
   const configFile = prop;
   const filepath = path.join(_basePath, configFile);
   if (!fs.existsSync(filepath)) {
@@ -171,11 +150,11 @@ exports.loadConfig = function(prop) {
   return ret || {};
 };
 
-exports.sleep = function(ms) {
+function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 };
 
-exports.replaceArgsValue = function(argv, key, value) {
+function replaceArgsValue(argv, key, value) {
   key = key + "=";
   for (let i = 0; i < argv.length; i++) {
     let item = argv[i];
@@ -191,8 +170,8 @@ exports.replaceArgsValue = function(argv, key, value) {
   return argv;
 };
 
-exports.getValueFromArgv = function(argv, key) {
-  const argvObj = Pargv(argv);
+function getValueFromArgv(argv, key) {
+  const argvObj = parseArgv(argv);
   if (argvObj.hasOwnProperty(key)) {
     return argvObj[key];
   }
@@ -213,9 +192,26 @@ exports.getValueFromArgv = function(argv, key) {
   return value;
 };
 
-exports.fileIsExist = function(filepath) {
+function fileIsExist(filepath) {
   if (fs.existsSync(filepath) && fs.statSync(filepath).isFile()) {
     return true;
   }
   return false;
+};
+
+module.exports = {
+  fnDebounce,
+  getRandomString,
+  mkdir,
+  chmodPath,
+  compareVersion,
+  middleware,
+  stringify,
+  validValue,
+  checkConfig,
+  loadConfig,
+  sleep,
+  replaceArgsValue,
+  getValueFromArgv,
+  fileIsExist
 };

package/utils/index.js

@@ -5,8 +5,9 @@ const path = require('path');
 const fs = require('fs');
 const { exec, execSync } = require('child_process');
 const { createHash } = require('crypto');
-const Ps = require('../ps');
-const UtilsJson = require('./json');
+const { getBaseDir } = require('../ps');
+const { readSync } = require('./json');
+const is = require('./is');
 
 // machine id
 const { platform } = process;
@@ -16,7 +17,7 @@ const win32RegBinPath = {
 };
 const MachineGuid = {
   darwin: 'ioreg -rd1 -c IOPlatformExpertDevice',
-  win32: `${win32RegBinPath[isWindowsProcessMixedOrNativeArchitecture()]}\\REG.exe ` +
+  win32: `${win32RegBinPath[_isWindowsProcessMixedOrNativeArchitecture()]}\\REG.exe ` +
       'QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography ' +
       '/v MachineGuid',
   linux: '( cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || hostname ) | head -n 1 || :',
@@ -26,8 +27,8 @@ const MachineGuid = {
 /**
  * 获取项目根目录package.json
  */
-exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(Ps.getHomeDir(), 'package.json'));
+function getPackage() {
+  const json = readSync(path.join(getBaseDir(), 'package.json'));
   
   return json;
 };
@@ -36,7 +37,7 @@ exports.getPackage = function() {
  * Get the first proper MAC address
  * @param iface If provided, restrict MAC address fetching to this interface
  */
-exports.getMAC = function(iface) {
+function getMAC(iface) {
   const zeroRegex = /(?:[0]{1,2}[:-]){5}[0]{1,2}/;
   const list = os.networkInterfaces();
   if (iface) {
@@ -70,17 +71,23 @@ exports.getMAC = function(iface) {
 /**
  * Check if the input is a valid MAC address
  */
-exports.isMAC = function(macAddress) {
+function isMAC(macAddress) {
   const macRegex = /(?:[a-z0-9]{1,2}[:-]){5}[a-z0-9]{1,2}/i;
   return macRegex.test(macAddress);
 }
 
-/**
- * is encrypt
- */
-exports.isEncrypt = function(basePath) {
-  const encryptDir = Ps.getEncryptDir(basePath);
-  if (fs.existsSync(encryptDir)) {
+function isFileProtocol(protocol) {
+  return protocol == 'file://';
+}
+
+function isWebProtocol(protocol) {
+  return ['http://', 'https://'].includes(protocol);
+}
+
+function isJsProject(baseDir) {
+  const entryFile1 = path.join(baseDir, 'electron/main.js');
+  const entryFile2 = path.join(baseDir, 'electron/index.js');
+  if (fs.existsSync(entryFile1) || fs.existsSync(entryFile2)) {
     return true;
   }
   return false;
@@ -89,16 +96,16 @@ exports.isEncrypt = function(basePath) {
 /**
  * get machine id
  */
-exports.machineIdSync = function(original) {
-  let id = expose(execSync(MachineGuid[platform]).toString());
-  return original ? id : hash(id);
+function machineIdSync(original) {
+  let id = _expose(execSync(MachineGuid[platform]).toString());
+  return original ? id : _hash(id);
 }
 
 /**
  * get machine id (promise)
  * original <Boolean>, If true return original value of machine id, otherwise return hashed value (sha-256), default: false
  */
-exports.machineId = function(original) {
+function machineId(original) {
   return new Promise((resolve, reject) => {
     return exec(MachineGuid[platform], {}, (err, stdout, stderr) => {
       if (err) {
@@ -106,13 +113,13 @@ exports.machineId = function(original) {
             new Error(`Error while obtaining machine id: ${err.stack}`)
         );
       }
-      let id = expose(stdout.toString());
-      return resolve(original ? id : hash(id));
+      let id = _expose(stdout.toString());
+      return resolve(original ? id : _hash(id));
     });
   });
 }
 
-function isWindowsProcessMixedOrNativeArchitecture() {
+function _isWindowsProcessMixedOrNativeArchitecture() {
   // detect if the node binary is the same arch as the Windows OS.
   // or if this is 32 bit node on 64 bit windows.
   if(process.platform !== 'win32') {
@@ -124,11 +131,11 @@ function isWindowsProcessMixedOrNativeArchitecture() {
   return 'native';
 }
 
-function hash(guid) {
+function _hash(guid) {
   return createHash('sha256').update(guid).digest('hex');
 }
 
-function expose(result) {
+function _expose(result) {
   switch (platform) {
     case 'darwin':
       return result
@@ -156,5 +163,15 @@ function expose(result) {
   }
 }
 
-
+module.exports = {
+  getPackage,
+  getMAC,
+  isMAC,
+  isFileProtocol,
+  isWebProtocol,
+  isJsProject,
+  machineIdSync,
+  machineId,
+  is
+}
 

package/utils/ip.js

@@ -128,7 +128,7 @@ const queryHttps = (version, options) => {
 			try {
 				const gotPromise = hc.request(url, requestOptions);
 				gotPromise.cancel = () => {
-					// todo
+					// ..
 				}
 				cancel = gotPromise.cancel;
 
@@ -178,9 +178,7 @@ const queryAll = (version, options) => {
 	return promise;
 };
 
-/**
- * 查询 public ipv4
- */  
+// 查询 public ipv4  
 function publicIpv4(options) {
   options = {
     ...defaults,
@@ -198,9 +196,7 @@ function publicIpv4(options) {
   return queryAll('v4', options);
 }
 
-/**
- * 查询public ipv6
- */  
+// 查询public ipv6 
 function publicIpv6(options) {
   options = {
     ...defaults,
@@ -218,44 +214,8 @@ function publicIpv6(options) {
   return queryAll('v6', options);
 }
 
-/**
- * todo 未来趋势是ipv6优先，以后再放开
- */  
-const publicIp = createPublicIp(publicIpv4, publicIpv6);
-function createPublicIp(publicIpv4, publicIpv6) {
-	return function publicIp(options) {
-		const ipv4Promise = publicIpv4(options);
-		const ipv6Promise = publicIpv6(options);
-
-		const promise = (async () => {
-			try {
-				const ipv6 = await ipv6Promise;
-				ipv4Promise.cancel();
-				return ipv6;
-			} catch (ipv6Error) {
-				//Log.coreLogger.error('[ee-core] [utils/ip] publicIp ipv6Error:', ipv6Error);
-				try {
-					return await ipv4Promise;
-				} catch (ipv4Error) {
-					//Log.coreLogger.error('[ee-core] [utils/ip] publicIp ipv4Error:', ipv4Error);
-				}
-			}
-		})();
-
-		promise.cancel = () => {
-			ipv4Promise.cancel();
-			ipv6Promise.cancel();
-		};
-
-		return promise;
-	};
-}
-
-const IP = {
-  //publicIp,
+module.exports = {
   publicIpv4,
   publicIpv6
-}
-
-module.exports = IP;
+};
 

package/utils/is.js

@@ -1,146 +1,112 @@
-'use strict'
+'use strict';
 
-const semver = require('semver')
-const gt = semver.gt
-const lt = semver.lt
-const release = require('os').release
+// Checks if we are in renderer process
+function renderer () {
+  return process.type === 'renderer'
+}
+
+// Checks if we are in main process
+function main() {
+  return process.type === 'browser'
+}
+
+// Checks if we are under Mac OS
+function osx() {
+  return process.platform === 'darwin'
+}
+
+// Checks if we are under Mac OS
+function macOS() {
+  return osx()
+}
+
+// Checks if we are under Windows OS
+function windows() {
+  return process.platform === 'win32'
+}
+
+// Checks if we are under Linux OS
+function linux() {
+  return process.platform === 'linux'
+}
+
+// Checks if we are the processor's arch is x86
+function x86() {
+  return process.arch === 'ia32'
+}
+
+// Checks if we are the processor's arch is x64
+function x64() {
+  return process.arch === 'x64'
+}
+
+// Checks if the app is running in a sandbox on macOS
+function sandbox() {
+  return 'APP_SANDBOX_CONTAINER_ID' in process.env
+}
+
+// Checks if the app is running as a Mac App Store build
+function mas() {
+  return process.mas === true
+}
+
+// Checks if the app is running as a Windows Store (appx) build
+function windowsStore() {
+  return process.windowsStore === true
+}
 
-const IS = {
-  // Checks if we are in renderer process
-  renderer() {
-    return process.type === 'renderer'
-  },
-  // Checks if we are in main process
-  main() {
-    return process.type === 'browser'
-  },
-  // Checks if we are under Mac OS
-  osx() {
-    return process.platform === 'darwin'
-  },
-  // Checks if we are under Mac OS
-  macOS() {
-    return this.osx()
-  },
-  // Checks if we are under Windows OS
-  windows() {
-    return process.platform === 'win32'
-  },
-  // Checks if we are under Linux OS
-  linux() {
-    return process.platform === 'linux'
-  },
-  // Checks if we are the processor's arch is x86
-  x86() {
-    return process.arch === 'ia32'
-  },
-  // Checks if we are the processor's arch is x64
-  x64() {
-    return process.arch === 'x64'
-  },
-  // Checks if the app is running in a sandbox on macOS
-  sandbox() {
-    return 'APP_SANDBOX_CONTAINER_ID' in process.env
-  },
-  // Checks if the app is running as a Mac App Store build
-  mas() {
-    return process.mas === true
-  },
-  // Checks if the app is running as a Windows Store (appx) build
-  windowsStore() {
-    return process.windowsStore === true
-  },
-  // checks if all the 'is functions' passed as arguments are true
-  all() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (!isFunctions[i]()) return false
-    }
-    return true
-  },
-  // checks if all the 'is functions' passed as arguments are false
-  none() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (isFunctions[i]()) return false
-    }
-    return true
-  },
-  // returns true if one of the 'is functions' passed as argument is true
-  one() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (isFunctions[i]()) return true
-    }
-    return false
-  },
-  // checks the if the given release is the same of the OS
-  release(requested) {
-    if (this.osx()) {
-      return requested === this._osxRelease()
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return `${actual[0]}.${actual[1]}` === `${requested[0]}.${requested[1]}`
-      }
-      return `${actual[0]}.${actual[1]}.${actual[2]}` === `${requested[0]}.${requested[1]}.${requested[2]}`
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
-  // checks if the given release is greater than the current OS release
-  gtRelease(requested) {
-    if (this.osx()) {
-      return gt(requested, this._osxRelease())
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return gt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
-      }
-      return gt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
-  // checks if the given release is less than the current OS release
-  ltRelease(requested) {
-    if (this.osx()) {
-      return lt(requested, this._osxRelease())
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return lt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
-      }
-      return lt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
+// checks if all the 'is functions' passed as arguments are true
+function all() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (!isFunctions[i]()) return false
+  }
+  return true
+}
+
+// checks if all the 'is functions' passed as arguments are false
+function none() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return false
+  }
+  return true
+}
 
-  // returns the current osx release
-  _osxRelease () {
-    const actual = release().split('.')
-    return `10.${actual[0] - 4}.${actual[1]}`
-  },
-  
+// returns true if one of the 'is functions' passed as argument is true
+function one() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return true
+  }
+  return false
 }
 
-module.exports = IS;
+module.exports = {
+  renderer,
+  main,
+  osx,
+  macOS,
+  windows,
+  linux,
+  x86,
+  x64,
+  sandbox,
+  mas,
+  windowsStore,
+  all,
+  none,
+  one,
+};