ee-core 1.5.0 → 1.5.1

package/lib/storage/lowdbStorage.js

@@ -1,99 +1,99 @@
-'use strict';
-
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-const lowdb = require('lowdb');
-const FileSync = require('lowdb/adapters/FileSync');
-const _ = require('lodash');
-const constant = require('../constant');
-const utilsCommon = require('../../utils/common');
-
-class LowdbStorage {
-  constructor (name, opt = {}) {
-    assert(name, `db name ${name} Cannot be empty`);
-
-    this.name = name;
-
-    // 数据库key列表
-    this.storageKey = constant.storageKey;
-
-    const storageDir = utilsCommon.getStorageDir();
-    if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
-    }
-
-    this.db = this.table(name);
-  }
-
-  /**
-   * 创建 table
-   */
-  table (name) {
-    assert(name, 'table name is required');
-
-    const dbFile = this.getFilePath(name);
-    const adapter = new FileSync(dbFile);
-    const db = lowdb(adapter);
-
-    assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
-
-    return db;
-  }
-
-  /**
-   * 获取db文件名
-   */
-  getFileName (name) {
-    return name + ".json";
-  }
-
-  /**
-   * 获取文件绝对路径
-   */
-  getFilePath (name) {
-    const storageDir = utilsCommon.getStorageDir();
-    const dbFile = path.join(storageDir, this.getFileName(name));
-    return dbFile;
-  }
-
-  /**
-   * 为指定的 name 设置一个对应的值
-   */
-  setItem (key, value) {
-    assert(_.isString(key), `key must be a string`);
-    assert(key.length != 0, `key cannot be empty`);
-    assert(!this.storageKey.hasOwnProperty(key), `${key} is not allowed`);
-
-    let cacheKey = this.storageKey.cache;
-    if (!this.db.has(cacheKey).value()) {
-      this.db.set(cacheKey, {}).write();
-    }
-
-    let keyId = cacheKey + "." + key; 
-    this.db
-      .set(keyId, value)
-      .write();
-  
-    return true;
-  }
-  
-  /**
-   * 根据指定的名字 name 获取对应的值
-   */
-  getItem (key) {
-    assert(_.isString(key), `key must be a string`);
-    assert(key.length != 0, `key cannot be empty`);
-
-    let cacheKey = this.storageKey.cache;
-    let keyId = cacheKey + "." + key; 
-    const data = this.db
-      .get(keyId)
-      .value();
-  
-    return data;
-  }   
-}
-
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const lowdb = require('lowdb');
+const FileSync = require('lowdb/adapters/FileSync');
+const _ = require('lodash');
+const constant = require('../constant');
+const utilsCommon = require('../../utils/common');
+
+class LowdbStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+
+    // 数据库key列表
+    this.storageKey = constant.storageKey;
+
+    const storageDir = utilsCommon.getStorageDir();
+    if (!fs.existsSync(storageDir)) {
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
+    }
+
+    this.db = this.table(name);
+  }
+
+  /**
+   * 创建 table
+   */
+  table (name) {
+    assert(name, 'table name is required');
+
+    const dbFile = this.getFilePath(name);
+    const adapter = new FileSync(dbFile);
+    const db = lowdb(adapter);
+
+    assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
+
+    return db;
+  }
+
+  /**
+   * 获取db文件名
+   */
+  getFileName (name) {
+    return name + ".json";
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath (name) {
+    const storageDir = utilsCommon.getStorageDir();
+    const dbFile = path.join(storageDir, this.getFileName(name));
+    return dbFile;
+  }
+
+  /**
+   * 为指定的 name 设置一个对应的值
+   */
+  setItem (key, value) {
+    assert(_.isString(key), `key must be a string`);
+    assert(key.length != 0, `key cannot be empty`);
+    assert(!this.storageKey.hasOwnProperty(key), `${key} is not allowed`);
+
+    let cacheKey = this.storageKey.cache;
+    if (!this.db.has(cacheKey).value()) {
+      this.db.set(cacheKey, {}).write();
+    }
+
+    let keyId = cacheKey + "." + key; 
+    this.db
+      .set(keyId, value)
+      .write();
+  
+    return true;
+  }
+  
+  /**
+   * 根据指定的名字 name 获取对应的值
+   */
+  getItem (key) {
+    assert(_.isString(key), `key must be a string`);
+    assert(key.length != 0, `key cannot be empty`);
+
+    let cacheKey = this.storageKey.cache;
+    let keyId = cacheKey + "." + key; 
+    const data = this.db
+      .get(keyId)
+      .value();
+  
+    return data;
+  }   
+}
+
 module.exports = LowdbStorage;

package/lib/storage/sqliteStorage.js

@@ -1,128 +1,128 @@
-'use strict';
-
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-const Database = require('better-sqlite3');
-const utilsCommon = require('../../utils/common');
-
-class SqliteStorage {
-  constructor (name, opt = {}) {
-    assert(name, `db name ${name} Cannot be empty`);
-
-    this.name = name;
-    this.mode = this.getMode(name);
-
-    const storageDir = this._createStorageDir();
-    this.storageDir = storageDir;
-
-    const fileName = this._formatFileName(name);
-    this.fileName = fileName;
-
-    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 Database(dbPath, options);
-
-    // 如果是文件类型，判断文件是否创建成功
-    if (this.mode != 'memory') {
-      assert(fs.existsSync(dbPath), `error: storage ${dbPath} not exists`);
-    }
-
-    return db;
-  }
-
-  /**
-   * 获取文件名
-   */
-  _formatFileName (name) {
-    let fileName = name;
-    if (this.mode != 'memory') {
-      fileName = path.basename(name);
-    }
-
-    return fileName;
-  }
-
-  /**
-   * 创建storage目录
-   */
-  _createStorageDir () {
-    let storageDir = utilsCommon.getStorageDir();
-
-    if (this.mode == 'absolute') {
-      storageDir = path.dirname(this.name); 
-    }
-
-    if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
-    }
-
-    return storageDir;
-  }
-
-  /**
-   * 获取file path 模式
-   */
-  getMode (name) {
-    let mode = '';
-
-    // 内存模式
-    if (name == ':memory:') {
-      mode = 'memory';
-      return mode;
-    }
-
-    assert(path.extname(name) == '.db', `error: storage ${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;
-  }
-
-  /**
-   * 获取storage目录
-   */
-  getStorageDir () {
-    return this.storageDir;
-  }
-
-  /**
-   * 获取文件绝对路径
-   */
-  getFilePath () {
-    const dbFile = path.join(this.storageDir, this.fileName);
-
-    return dbFile;
-  }
-}
-
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const Database = require('better-sqlite3');
+const utilsCommon = require('../../utils/common');
+
+class SqliteStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+    this.mode = this.getMode(name);
+
+    const storageDir = this._createStorageDir();
+    this.storageDir = storageDir;
+
+    const fileName = this._formatFileName(name);
+    this.fileName = fileName;
+
+    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 Database(dbPath, options);
+
+    // 如果是文件类型，判断文件是否创建成功
+    if (this.mode != 'memory') {
+      assert(fs.existsSync(dbPath), `error: storage ${dbPath} not exists`);
+    }
+
+    return db;
+  }
+
+  /**
+   * 获取文件名
+   */
+  _formatFileName (name) {
+    let fileName = name;
+    if (this.mode != 'memory') {
+      fileName = path.basename(name);
+    }
+
+    return fileName;
+  }
+
+  /**
+   * 创建storage目录
+   */
+  _createStorageDir () {
+    let storageDir = utilsCommon.getStorageDir();
+
+    if (this.mode == 'absolute') {
+      storageDir = path.dirname(this.name); 
+    }
+
+    if (!fs.existsSync(storageDir)) {
+      utilsCommon.mkdir(storageDir);
+      utilsCommon.chmodPath(storageDir, '777');
+    }
+
+    return storageDir;
+  }
+
+  /**
+   * 获取file path 模式
+   */
+  getMode (name) {
+    let mode = '';
+
+    // 内存模式
+    if (name == ':memory:') {
+      mode = 'memory';
+      return mode;
+    }
+
+    assert(path.extname(name) == '.db', `error: storage ${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;
+  }
+
+  /**
+   * 获取storage目录
+   */
+  getStorageDir () {
+    return this.storageDir;
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath () {
+    const dbFile = path.join(this.storageDir, this.fileName);
+
+    return dbFile;
+  }
+}
+
 module.exports = SqliteStorage;

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "ee-core",
-  "version": "1.5.0",
-  "description": "ee core",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "bin": {
-    "ee-core": "./bin/tools.js"
-  },
-  "dependencies": {
-    "agentkeepalive": "^4.2.0",
-    "bytenode": "^1.3.6",
-    "co": "^4.6.0",
-    "debug": "^4.3.3",
-    "depd": "^2.0.0",
-    "egg-errors": "^2.3.0",
-    "egg-logger": "^2.7.1",
-    "electron-is": "^3.0.0",
-    "electron-updater": "^4.6.1",
-    "extend2": "^1.0.1",
-    "fs-extra": "^10.0.0",
-    "get-port": "^5.1.1",
-    "globby": "^10.0.0",
-    "humanize-ms": "^1.2.1",
-    "is-type-of": "^1.2.1",
-    "koa": "^2.13.4",
-    "koa-body": "^5.0.0",
-    "koa-convert": "^2.0.0",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "lodash": "^4.17.21",
-    "lowdb": "^1.0.0",
-    "path-to-regexp": "^6.2.0",
-    "socket.io": "^4.4.1",
-    "socket.io-client": "^4.4.1",
-    "javascript-obfuscator": "^4.0.0",
-    "urllib": "^2.38.0",
-    "utility": "^1.17.0"
-  },
-  "devDependencies": {}
-}
+{
+  "name": "ee-core",
+  "version": "1.5.1",
+  "description": "ee core",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "bin": {
+    "ee-core": "./bin/tools.js"
+  },
+  "dependencies": {
+    "agentkeepalive": "^4.2.0",
+    "bytenode": "^1.3.6",
+    "co": "^4.6.0",
+    "debug": "^4.3.3",
+    "depd": "^2.0.0",
+    "egg-errors": "^2.3.0",
+    "egg-logger": "^2.7.1",
+    "electron-is": "^3.0.0",
+    "electron-updater": "^4.6.1",
+    "extend2": "^1.0.1",
+    "fs-extra": "^10.0.0",
+    "get-port": "^5.1.1",
+    "globby": "^10.0.0",
+    "humanize-ms": "^1.2.1",
+    "is-type-of": "^1.2.1",
+    "koa": "^2.13.4",
+    "koa-body": "^5.0.0",
+    "koa-convert": "^2.0.0",
+    "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
+    "lodash": "^4.17.21",
+    "lowdb": "^1.0.0",
+    "path-to-regexp": "^6.2.0",
+    "socket.io": "^4.4.1",
+    "socket.io-client": "^4.4.1",
+    "javascript-obfuscator": "^4.0.0",
+    "urllib": "^2.38.0",
+    "utility": "^1.17.0"
+  },
+  "devDependencies": {}
+}