ee-core 2.12.0 → 4.0.0

package/storage/index.d.ts

@@ -0,0 +1,5 @@
+import { SqliteStorage } from "./sqliteStorage";
+import { Database } from "better-sqlite3";
+
+export { Database };
+export { SqliteStorage };

package/storage/index.js

@@ -1,39 +1,7 @@
-const assert = require('assert');
-const _ = require('lodash');
-const DB = {};
+'use strict';
 
-// jsondb 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
+const { SqliteStorage } = require('./sqliteStorage'); 
 
-DB.connection = function (database, options = {}) {
-  let driver = options.driver || 'jsondb';
-  
-  // 兼容之前api
-  driver = driver == 'lowdb' ? 'jsondb' : driver;
-
-  let opt = options.default || {};
-  if (!_.includes(['jsondb', 'sqlite'], driver)) {
-    assert(database, `db driver ${driver} is not supported`);
-  }
-  if (_.isEmpty(database)) {
-    assert(database, `db name ${database} Cannot be empty`);
-  }
-  let storage;
-  switch (driver)  {
-    case 'jsondb':
-      const JsondbStorage = require('./jsondbStorage');
-      storage = new JsondbStorage(database);
-      break;
-    case 'sqlite':
-      const SqliteStorage = require('./sqliteStorage');
-      storage = new SqliteStorage(database, opt);
-      break;
-    default:
-  }
-
-  return storage;
-}
-
-// 兼容之前的api
-DB.JsonDB = DB;
-
-module.exports = DB;
+module.exports = {
+  SqliteStorage
+};

package/storage/sqliteStorage.d.ts

@@ -0,0 +1,16 @@
+
+import { Database } from "better-sqlite3";
+export declare class SqliteStorage {
+    constructor(name: any, opt?: {});
+    name: string;
+    mode: string;
+    dbDir: string;
+    fileName: string;
+    db: Database;
+    _initDB(opt?: {}): any;
+    _formatFileName(name: string): string;
+    _createDatabaseDir(): string;
+    getMode(name: string): string;
+    getDbDir(): string;
+    getFilePath(): string;
+}

package/storage/sqliteStorage.js

@@ -3,9 +3,9 @@
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-const Database = require('better-sqlite3');
-const Helper = require('../utils/helper');
-const Ps = require('../ps');
+const BSqlite = require('better-sqlite3');
+const { mkdir } = require('../utils/helper');
+const { getDataDir } = require('../ps');
 
 class SqliteStorage {
   constructor (name, opt = {}) {
@@ -13,7 +13,7 @@ class SqliteStorage {
 
     this.name = name;
     this.mode = this.getMode(name);
-    this.storageDir = this._createStorageDir();
+    this.dbDir = this._createDatabaseDir();
     this.fileName = this._formatFileName(name);
     this.db = this._initDB(opt);
   }
@@ -32,11 +32,11 @@ class SqliteStorage {
       dbPath = this.getFilePath();
     }
 
-    const db = new Database(dbPath, options);
+    const db = new BSqlite(dbPath, options);
 
     // 如果是文件类型，判断文件是否创建成功
     if (this.mode != 'memory') {
-      assert(fs.existsSync(dbPath), `error: storage ${dbPath} not exists`);
+      assert(fs.existsSync(dbPath), `error: db ${dbPath} not exists`);
     }
 
     return db;
@@ -57,19 +57,17 @@ class SqliteStorage {
   /**
    * 创建storage目录
    */
-  _createStorageDir () {
-    let storageDir = Ps.getStorageDir();
-
+  _createDatabaseDir () {
+    let dbDir = path.join(getDataDir(), 'db');
     if (this.mode == 'absolute') {
-      storageDir = path.dirname(this.name); 
+      dbDir = path.dirname(this.name); 
     }
 
-    if (!fs.existsSync(storageDir)) {
-      Helper.mkdir(storageDir);
-      Helper.chmodPath(storageDir, '777');
+    if (!fs.existsSync(dbDir)) {
+      mkdir(dbDir, { mode: 0o755 });
     }
 
-    return storageDir;
+    return dbDir;
   }
 
   /**
@@ -84,7 +82,7 @@ class SqliteStorage {
       return mode;
     }
 
-    assert(path.extname(name) == '.db', `error: storage ${name} file ext name must be .db`);
+    assert(path.extname(name) == '.db', `error: db ${name} file ext name must be .db`);
 
     // 路径模式
     name = name.replace(/[/\\]/g, '/');
@@ -105,20 +103,22 @@ class SqliteStorage {
   }
 
   /**
-   * 获取storage目录
+   * 获取 db 文件目录
    */
-  getStorageDir () {
-    return this.storageDir;
+  getDbDir () {
+    return this.dbDir;
   }
 
   /**
    * 获取文件绝对路径
    */
   getFilePath () {
-    const dbFile = path.join(this.storageDir, this.fileName);
+    const dbFile = path.join(this.dbDir, this.fileName);
 
     return dbFile;
   }
 }
 
-module.exports = SqliteStorage;
+module.exports = {
+  SqliteStorage
+};

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "skipLibCheck": true,
+    "allowJs": true,
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "outDir": "types", 
+  },
+  "include": [
+    "index.js", "app", "config", "const", "controller", "core", "cross", "electron", "exception",
+    "html", "jobs", "loader", "log", "message", "ps", "socket", "storage", "utils",
+  ]
+}
+  

package/utils/extend.d.ts

@@ -0,0 +1,2 @@
+export declare function extend(...args: any[]): any;
+export declare function isPlainObject(obj: any): any;

package/utils/extend.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var hasOwn = Object.prototype.hasOwnProperty;
-var toStr = Object.prototype.toString;
+const hasOwn = Object.prototype.hasOwnProperty;
+const toStr = Object.prototype.toString;
 
-var isPlainObject = function isPlainObject(obj) {
+function isPlainObject(obj) {
   if (!obj || toStr.call(obj) !== '[object Object]') {
     return false;
   }
@@ -23,8 +23,8 @@ var isPlainObject = function isPlainObject(obj) {
   return typeof key === 'undefined' || hasOwn.call(obj, key);
 };
 
-module.exports = function extend() {
-  var options, name, src, copy, copyIsArray, clone;
+function extend() {
+  var options, name, src, copy, clone;
   var target = arguments[0];
   var i = 1;
   var length = arguments.length;
@@ -71,3 +71,8 @@ module.exports = function extend() {
   // Return the modified object
   return target;
 };
+
+module.exports = {
+  extend,
+  isPlainObject,
+};

package/utils/helper.d.ts

@@ -0,0 +1,14 @@
+export declare function fnDebounce(): (fn: any, delayTime: any, isImediate: any, args: any) => any;
+export declare function getRandomString(): string;
+export declare function mkdir(filepath: string, opt?: {}): void;
+export declare function chmodPath(path: string, mode: number | string): void;
+export declare function compareVersion(v1: string, v2: string): 0 | 1 | -1;
+export declare function middleware(fn: Function): any;
+export declare function stringify(obj: any, ignore?: any[]): string;
+export declare function validValue(value: any): boolean;
+export declare function checkConfig(prop: any): boolean;
+export declare function loadConfig(prop: any): any;
+export declare function sleep(ms: number): Promise<any>;
+export declare function replaceArgsValue(argv: any, key: any, value: any): any;
+export declare function getValueFromArgv(argv: any, key: any): any;
+export declare function fileIsExist(filepath: string): boolean;

package/utils/helper.js

@@ -2,22 +2,13 @@ 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();
 
-/**
- * fnDebounce
- * 
- * @param  {Function} fn - 回调函数
- * @param  {Time} delayTime - 延迟时间(ms)
- * @param  {Boolean} isImediate - 是否需要立即调用
- * @param  {type} args - 回调函数传入参数
-*/
-exports.fnDebounce = function() {
+function fnDebounce() {
   const fnObject = {};
   let timer;
 
@@ -43,25 +34,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 +62,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 +89,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)) {
@@ -133,10 +104,8 @@ exports.stringify = function(obj, ignore = []) {
   return JSON.stringify(result);
 }
 
-/**
- * 是否有效值
- */
-exports.validValue = function(value) {
+// 是否有效值
+function validValue(value) {
   return (
     value !== undefined &&
     value !== null &&
@@ -144,7 +113,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 +122,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 +140,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 +160,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 +182,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.d.ts

@@ -0,0 +1,10 @@
+export declare function getPackage(): any;
+export declare function getMAC(iface: any): string;
+export declare function isMAC(macAddress: string): boolean;
+export declare function isFileProtocol(protocol: string): boolean;
+export declare function isWebProtocol(protocol: string): boolean;
+export declare function isJsProject(baseDir: string): boolean;
+export declare function machineIdSync(original: boolean): any;
+export declare function machineId(original: boolean): Promise<any>;
+import is = require("./is");
+export { is };

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,27 +17,23 @@ 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 || :',
   freebsd: 'kenv -q smbios.system.uuid || sysctl -n kern.hostuuid'
 };
 
-/**
- * 获取项目根目录package.json
- */
-exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(Ps.getHomeDir(), 'package.json'));
+// 获取项目根目录package.json
+function getPackage() {
+  const json = readSync(path.join(getBaseDir(), 'package.json'));
   
   return json;
 };
 
-/**
- * Get the first proper MAC address
- * @param iface If provided, restrict MAC address fetching to this interface
- */
-exports.getMAC = function(iface) {
+// Get the first proper MAC address
+// iface: If provided, restrict MAC address fetching to this interface
+function getMAC(iface) {
   const zeroRegex = /(?:[0]{1,2}[:-]){5}[0]{1,2}/;
   const list = os.networkInterfaces();
   if (iface) {
@@ -67,38 +64,38 @@ exports.getMAC = function(iface) {
   throw new Error('failed to get the MAC address');
 }
 
-/**
- * Check if the input is a valid MAC address
- */
-exports.isMAC = function(macAddress) {
+// Check if the input is a valid MAC address
+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;
 }
 
-/**
- * get machine id
- */
-exports.machineIdSync = function(original) {
-  let id = expose(execSync(MachineGuid[platform]).toString());
-  return original ? id : hash(id);
+// get machine 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) {
+// get machine id (promise)
+// original <Boolean>, If true return original value of machine id, otherwise return hashed value (sha-256), default: false
+function machineId(original) {
   return new Promise((resolve, reject) => {
     return exec(MachineGuid[platform], {}, (err, stdout, stderr) => {
       if (err) {
@@ -106,13 +103,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 +121,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 +153,15 @@ function expose(result) {
   }
 }
 
-
+module.exports = {
+  getPackage,
+  getMAC,
+  isMAC,
+  isFileProtocol,
+  isWebProtocol,
+  isJsProject,
+  machineIdSync,
+  machineId,
+  is
+}
 

package/utils/ip.d.ts

@@ -0,0 +1,2 @@
+export declare function publicIpv4(options: any): Promise<any>;
+export declare function publicIpv6(options: any): Promise<any>;

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.d.ts

@@ -0,0 +1,14 @@
+export declare function renderer(): boolean;
+export declare function main(): boolean;
+export declare function osx(): boolean;
+export declare function macOS(): boolean;
+export declare function windows(): boolean;
+export declare function linux(): boolean;
+export declare function x86(): boolean;
+export declare function x64(): boolean;
+export declare function sandbox(): boolean;
+export declare function mas(): boolean;
+export declare function windowsStore(): boolean;
+export declare function all(...args: any[]): boolean;
+export declare function none(...args: any[]): boolean;
+export declare function one(...args: any[]): boolean;