ee-core 1.5.2-beta.1 → 2.0.0-beta.1

package/module/storage/jsondb/adapters/FileSync.js

@@ -0,0 +1,32 @@
+const Base = require('./Base')
+const fs = require('fs')
+
+class FileSync extends Base {
+  
+  read() {
+    if (fs.existsSync(this.source)) {
+      // Read database
+      try {
+        const data = fs.readFileSync(this.source, {encoding: 'utf8'})
+
+        // Handle blank file
+        return data ? this.deserialize(data) : this.defaultValue
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          e.message = `Malformed JSON in file: ${this.source}\n${e.message}`
+        }
+        throw e
+      }
+    } else {
+      // Initialize
+      fs.writeFileSync(this.source, this.serialize(this.defaultValue))
+      return this.defaultValue
+    }
+  }
+
+  write(data) {
+    return fs.writeFileSync(this.source, this.serialize(data))
+  }
+}
+
+module.exports = FileSync

package/{lib/storage/lowdb → module/storage/jsondb}/main.js

@@ -1,46 +1,42 @@
-const lodash = require('lodash')
-const isPromise = require('is-promise')
-
-module.exports = function(adapter) {
-  if (typeof adapter !== 'object') {
-    throw new Error(
-      'An adapter must be provided, see https://github.com/typicode/lowdb/#usage'
-    )
-  }
-
-  // Create a fresh copy of lodash
-  const _ = lodash.runInContext()
-  const db = _.chain({})
-
-  // Add write function to lodash
-  // Calls save before returning result
-  _.prototype.write = _.wrap(_.prototype.value, function(func) {
-    const funcRes = func.apply(this)
-    return db.write(funcRes)
-  })
-
-  function plant(state) {
-    db.__wrapped__ = state
-    return db
-  }
-
-  // Lowdb API
-  // Expose _ for mixins
-  db._ = _
-
-  db.read = () => {
-    const r = adapter.read()
-    return isPromise(r) ? r.then(plant) : plant(r)
-  }
-
-  db.write = returnValue => {
-    const w = adapter.write(db.getState())
-    return isPromise(w) ? w.then(() => returnValue) : returnValue
-  }
-
-  db.getState = () => db.__wrapped__
-
-  db.setState = state => plant(state)
-
-  return db.read()
-}
+const lodash = require('lodash');
+const assert = require('assert');
+const is = require('is-type-of');
+
+module.exports = function(adapter) {
+  assert(typeof adapter === 'object', 'An adapter must be provided');
+
+  // Create a fresh copy of lodash
+  const _ = lodash.runInContext()
+  const db = _.chain({})
+
+  // Add write function to lodash
+  // Calls save before returning result
+  _.prototype.write = _.wrap(_.prototype.value, function(func) {
+    const funcRes = func.apply(this)
+    return db.write(funcRes)
+  })
+
+  function plant(state) {
+    db.__wrapped__ = state
+    return db
+  }
+
+  // Expose _ for mixins
+  db._ = _
+
+  db.read = () => {
+    const r = adapter.read()
+    return is.promise(r) ? r.then(plant) : plant(r)
+  }
+
+  db.write = returnValue => {
+    const w = adapter.write(db.getState())
+    return is.promise(w) ? w.then(() => returnValue) : returnValue
+  }
+
+  db.getState = () => db.__wrapped__
+
+  db.setState = state => plant(state)
+
+  return db.read()
+}

package/{lib/storage/lowdbStorage.js → module/storage/jsondbStorage.js}

@@ -1,99 +1,98 @@
-'use strict';
-
-const assert = require('assert');
-const fs = require('fs');
-const path = require('path');
-const lowdb = require('./lowdb/main');
-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;
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const Jsondb = require('./jsondb/main');
+const FileSync = require('./jsondb/adapters/FileSync');
+const _ = require('lodash');
+const Constants = require('../const');
+const Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
+
+class JsondbStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+
+    // 数据库key列表
+    this.storageKey = Constants.storageKey;
+
+    const storageDir = Ps.getStorageDir();
+    if (!fs.existsSync(storageDir)) {
+      Helper.mkdir(storageDir);
+      Helper.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 = Jsondb(adapter);
+
+    assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
+
+    return db;
+  }
+
+  /**
+   * 获取db文件名
+   */
+  getFileName (name) {
+    return name + ".json";
+  }
+
+  /**
+   * 获取文件绝对路径
+   */
+  getFilePath (name) {
+    const storageDir = Ps.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 = JsondbStorage;

package/{lib → module}/storage/sqliteStorage.js

@@ -1,128 +1,124 @@
-'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 Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
+
+class SqliteStorage {
+  constructor (name, opt = {}) {
+    assert(name, `db name ${name} Cannot be empty`);
+
+    this.name = name;
+    this.mode = this.getMode(name);
+    this.storageDir = this._createStorageDir();
+    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 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 = Ps.getStorageDir();
+
+    if (this.mode == 'absolute') {
+      storageDir = path.dirname(this.name); 
+    }
+
+    if (!fs.existsSync(storageDir)) {
+      Helper.mkdir(storageDir);
+      Helper.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;