ee-core 4.1.3 → 4.1.4

package/storage/sqliteStorage.js

@@ -1,124 +1,124 @@
-'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
+'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 +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",
-  ]
-}
+{
+  "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 +1,2 @@
-export declare function extend(...args: any[]): any;
-export declare function isPlainObject(obj: any): any;
+export declare function extend(...args: any[]): any;
+export declare function isPlainObject(obj: any): any;

package/utils/extend.js

@@ -1,78 +1,78 @@
-'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,
+'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 +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;
+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;