ee-core 4.1.5 → 5.0.0-beta.2

package/socket/socketServer.js

@@ -1,82 +0,0 @@
-'use strict';
-
-const debug = require('debug')('ee-core:socket:socketServer');
-const is = require('is-type-of');
-const { Server } = require('socket.io');
-const { coreLogger } = require('../log');
-const { getConfig } = require('../config');
-const { SocketIO } = require('../const/channel');
-const { getController } = require('../controller');
-const { getPort } = require('../utils/port');
-
-/**
- * socket server
- */
-class SocketServer {
-  constructor () {
-    const { socketServer, mainServer } = getConfig();
-    this.config = socketServer;
-    this.channelSeparator = mainServer.channelSeparator;
-    this.socket = undefined;
-    this.io = undefined;
-    this.init();
-  }
-
-  async init() {
-    if (this.config.enable == false) {
-      return;
-    }
-
-    const port = await getPort({port: parseInt(this.config.port)});
-    if (!port) {
-      throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
-    }
-    coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
-
-    process.env.EE_SOCKET_PORT = port;
-    this.config.port = port;
-    this.io = new Server(port, this.config);
-    this.connect();
-  }
-
-  connect () {
-    const controller = getController();
-    this.io.on('connection', (socket) => {
-      const channel = this.config.channel || SocketIO.partySoftware;
-      this.socket = socket;
-      socket.on(channel, async (message, callback) => {
-        coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
-
-        try {
-          // find function
-          const cmd = message.cmd;
-          const args = message.args;
-          let fn = null;
-          debug('[socket] channel %s', cmd);
-          if (is.string(cmd)) {
-            const actions = cmd.split(this.channelSeparator);
-            debug('[findFn] channel %o', actions);
-            let obj = { controller };
-            actions.forEach(key => {
-              obj = obj[key];
-              if (!obj) throw new Error(`class or function '${key}' not exists`);
-            });
-            fn = obj;
-          }
-          if (!fn) throw new Error('function not exists');
-
-          const result = await fn.call(controller, args);
-          if (callback) {
-            callback(result);
-          }
-        } catch (err) {
-          coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
-        }
-      });
-    });
-  }
-}
-
-module.exports = {
-  SocketServer,
-};

package/storage/index.d.ts

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

package/storage/index.js

@@ -1,7 +0,0 @@
-'use strict';
-
-const { SqliteStorage } = require('./sqliteStorage'); 
-
-module.exports = {
-  SqliteStorage
-};

package/storage/sqliteStorage.d.ts

@@ -1,16 +0,0 @@
-
-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

@@ -1,124 +0,0 @@
-'use strict';
-
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-const BSqlite = require('better-sqlite3');
-const { mkdir } = require('../utils/helper');
-const { getDataDir } = require('../ps');
-
-class SqliteStorage {
-  constructor (name, opt = {}) {
-    assert(name, `db name ${name} Cannot be empty`);
-
-    this.name = name;
-    this.mode = this.getMode(name);
-    this.dbDir = this._createDatabaseDir();
-    this.fileName = this._formatFileName(name);
-    this.db = this._initDB(opt);
-  }
-
-  /**
-   * 初始化db
-   */
-  _initDB (opt = {}) {
-    let options = Object.assign({
-      timeout: 5000,
-    }, opt);
-
-    // 存储类型：db文件、内存(:memory:)
-    let dbPath = this.name;
-    if (this.mode != 'memory') {
-      dbPath = this.getFilePath();
-    }
-
-    const db = new BSqlite(dbPath, options);
-
-    // 如果是文件类型，判断文件是否创建成功
-    if (this.mode != 'memory') {
-      assert(fs.existsSync(dbPath), `error: db ${dbPath} not exists`);
-    }
-
-    return db;
-  }
-
-  /**
-   * 获取文件名
-   */
-  _formatFileName (name) {
-    let fileName = name;
-    if (this.mode != 'memory') {
-      fileName = path.basename(name);
-    }
-
-    return fileName;
-  }
-
-  /**
-   * 创建storage目录
-   */
-  _createDatabaseDir () {
-    let dbDir = path.join(getDataDir(), 'db');
-    if (this.mode == 'absolute') {
-      dbDir = path.dirname(this.name); 
-    }
-
-    if (!fs.existsSync(dbDir)) {
-      mkdir(dbDir, { mode: 0o755 });
-    }
-
-    return dbDir;
-  }
-
-  /**
-   * 获取file path 模式
-   */
-  getMode (name) {
-    let mode = '';
-
-    // 内存模式
-    if (name == ':memory:') {
-      mode = 'memory';
-      return mode;
-    }
-
-    assert(path.extname(name) == '.db', `error: db ${name} file ext name must be .db`);
-
-    // 路径模式
-    name = name.replace(/[/\\]/g, '/');
-    if (name.indexOf('/') !== -1) {
-      const isAbsolute = path.isAbsolute(name);
-      if (isAbsolute) {
-        mode = 'absolute';
-      } else {
-        mode = 'relative';
-      }
-      return mode;
-    }
-
-    // 仅文件名
-    mode = 'onlyName';
-
-    return mode;
-  }
-
-  /**
-   * 获取 db 文件目录
-   */
-  getDbDir () {
-    return this.dbDir;
-  }
-
-  /**
-   * 获取文件绝对路径
-   */
-  getFilePath () {
-    const dbFile = path.join(this.dbDir, this.fileName);
-
-    return dbFile;
-  }
-}
-
-module.exports = {
-  SqliteStorage
-};

package/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "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

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

package/utils/extend.js

@@ -1,78 +0,0 @@
-'use strict';
-
-const hasOwn = Object.prototype.hasOwnProperty;
-const toStr = Object.prototype.toString;
-
-function isPlainObject(obj) {
-  if (!obj || toStr.call(obj) !== '[object Object]') {
-    return false;
-  }
-
-  var hasOwnConstructor = hasOwn.call(obj, 'constructor');
-  var hasIsPrototypeOf = obj.constructor && obj.constructor.prototype && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
-  // Not own constructor property must be Object
-  if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
-    return false;
-  }
-
-  // Own properties are enumerated firstly, so to speed up,
-  // if last one is own, then all properties are own.
-  var key;
-  for (key in obj) { /**/ }
-
-  return typeof key === 'undefined' || hasOwn.call(obj, key);
-};
-
-function extend() {
-  var options, name, src, copy, clone;
-  var target = arguments[0];
-  var i = 1;
-  var length = arguments.length;
-  var deep = false;
-
-  // Handle a deep copy situation
-  if (typeof target === 'boolean') {
-    deep = target;
-    target = arguments[1] || {};
-    // skip the boolean and the target
-    i = 2;
-  } else if ((typeof target !== 'object' && typeof target !== 'function') || target == null) {
-    target = {};
-  }
-
-  for (; i < length; ++i) {
-    options = arguments[i];
-    // Only deal with non-null/undefined values
-    if (options == null) continue;
-
-    // Extend the base object
-    for (name in options) {
-      if (name === '__proto__') continue;
-
-      src = target[name];
-      copy = options[name];
-
-      // Prevent never-ending loop
-      if (target === copy) continue;
-
-      // Recurse if we're merging plain objects
-      if (deep && copy && isPlainObject(copy)) {
-        clone = src && isPlainObject(src) ? src : {};
-        // Never move original objects, clone them
-        target[name] = extend(deep, clone, copy);
-
-      // Don't bring in undefined values
-      } else if (typeof copy !== 'undefined') {
-        target[name] = copy;
-      }
-    }
-  }
-
-  // Return the modified object
-  return target;
-};
-
-module.exports = {
-  extend,
-  isPlainObject,
-};

package/utils/helper.d.ts

@@ -1,14 +0,0 @@
-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

@@ -1,207 +0,0 @@
-const fs = require('fs');
-const mkdirp = require('mkdirp');
-const convert = require('koa-convert');
-const is = require('is-type-of');
-const path = require('path');
-const chalk = require('chalk');
-const { parseArgv } = require('./pargv');
-
-const _basePath = process.cwd();
-
-function fnDebounce() {
-  const fnObject = {};
-  let timer;
-
-  return (fn, delayTime, isImediate, args) => {
-    const setTimer = () => {
-      timer = setTimeout(() => {
-        fn(args);
-        clearTimeout(timer);
-        delete fnObject[fn];
-      }, delayTime);
-
-      fnObject[fn] = { delayTime, timer };
-    };
-
-    if (!delayTime || isImediate) return fn(args);
-
-    if (fnObject[fn]) {
-      clearTimeout(timer);
-      setTimer(fn, delayTime, args);
-    } else {
-      setTimer(fn, delayTime, args);
-    }
-  };
-}
-
-// 随机10位字符串
-function getRandomString() {
-  return Math.random().toString(36).substring(2);
-};
-
-// 创建文件夹
-function mkdir(filepath, opt = {}) {
-  mkdirp.sync(filepath, opt);
-  return
-}
-
-// 修改文件权限
-function chmodPath(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);
-  }
-};
-
-// 版本号比较
-function compareVersion(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
-}
-
-function middleware(fn) {
-  return is.generatorFunction(fn) ? convert(fn) : fn;
-}
-
-// 序列化对象
-function stringify(obj, ignore = []) {
-  const result = {};
-  Object.keys(obj).forEach(key => {
-      if (!ignore.includes(key)) {
-      result[key] = obj[key];
-      }
-  });
-  return JSON.stringify(result);
-}
-
-// 是否有效值
-function validValue(value) {
-  return (
-    value !== undefined &&
-    value !== null &&
-    value !== ''
-  );
-}
-
-function checkConfig(prop) {
-  const filepath = path.join(_basePath, prop);
-  if (fs.existsSync(filepath)) {
-    return true;
-  }
-  
-  return false;
-}
-
-function loadConfig(prop) {
-  const configFile = prop;
-  const filepath = path.join(_basePath, configFile);
-  if (!fs.existsSync(filepath)) {
-    const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
-    throw new Error(errorTips)
-  }
-  const obj = require(filepath);
-  if (!obj) return obj;
-
-  let ret = obj;
-  if (is.function(obj) && !is.class(obj)) {
-    ret = obj();
-  }
-
-  return ret || {};
-};
-
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-};
-
-function replaceArgsValue(argv, key, value) {
-  key = key + "=";
-  for (let i = 0; i < argv.length; i++) {
-    let item = argv[i];
-    let pos = item.indexOf(key);
-    if (pos !== -1) {
-      pos = pos + key.length;
-      let tmpStr = item.substring(0, pos);
-      argv[i] = tmpStr + value;
-      break;
-    }
-  }
-
-  return argv;
-};
-
-function getValueFromArgv(argv, key) {
-  const argvObj = parseArgv(argv);
-  if (argvObj.hasOwnProperty(key)) {
-    return argvObj[key];
-  }
-
-  // match search
-  key = key + "=";
-  let value;
-  for (let i = 0; i < argv.length; i++) {
-    let item = argv[i];
-    let pos = item.indexOf(key);
-    if (pos !== -1) {
-      pos = pos + key.length;
-      value = item.substring(pos);
-      break;
-    }
-  }
-
-  return value;
-};
-
-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

@@ -1,11 +0,0 @@
-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>;
-export declare function getPlatform(delimiter?: string, isDiffArch?: boolean): string;
-import is = require("./is");
-export { is };