ee-core 1.2.8-beta.2 → 1.2.8

package/lib/storage/index.js

@@ -4,24 +4,24 @@ const assert = require('assert');
 const _ = require('lodash');
 const JsonDB = {};
 
-JsonDB.connection = function (database, type = 'lowdb') {
-  // todo sqlite
-  if (!_.includes(['lowdb'], type)) {
-    assert(database, `db type ${type} is not supported`);
+JsonDB.connection = function (database, options = {}) {
+  let driver = options.driver || 'lowdb';
+  let opt = options.default || {};
+  if (!_.includes(['lowdb', 'sqlite'], driver)) {
+    assert(database, `db driver ${driver} is not supported`);
   }
   if (_.isEmpty(database)) {
     assert(database, `db name ${database} Cannot be empty`);
   }
   let storage;
-  switch (type)  {
+  switch (driver)  {
     case 'lowdb':
       const LowdbStorage = require('./lowdbStorage');
       storage = new LowdbStorage(database);
       break;
     case 'sqlite':
-      // todo
       const SqliteStorage = require('./sqliteStorage');
-      storage = new SqliteStorage(database);
+      storage = new SqliteStorage(database, opt);
       break;
     default:  
   }

package/lib/storage/sqliteStorage.js

@@ -3,7 +3,6 @@
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-const constant = require('../constant');
 const Database = require('better-sqlite3');
 const utilsCommon = require('../../utils/common');
 
@@ -13,9 +12,6 @@ class SqliteStorage {
 
     this.name = name;
 
-    // 数据库key列表
-    this.storageKey = constant.storageKey;
-
     const storageDir = utilsCommon.getStorageDir();
     if (!fs.existsSync(storageDir)) {
       utilsCommon.mkdir(storageDir);
@@ -31,7 +27,6 @@ class SqliteStorage {
   initDB (name, opt = {}) {
     let options = Object.assign({
       timeout: 5000,
-      verbose: console.log
     }, opt);
 
     // 存储类型：db文件、内存(:memory:)
@@ -40,11 +35,12 @@ class SqliteStorage {
       name = this.getFilePath(name);
       isFileDB = true;
     }
+
     const db = new Database(name, options);
 
     // 如果是文件类型，判断文件是否创建成功
     if (isFileDB) {
-      assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
+      assert(fs.existsSync(name), `error: storage ${name} not exists`);
     }
 
     return db;
@@ -58,20 +54,6 @@ class SqliteStorage {
     const dbFile = path.join(storageDir, name);
     return dbFile;
   }
-
-  /**
-   * 为指定的 name 设置一个对应的值
-   */
-  setItem (key, value) {
-  }
-  
-  /**
-   * 根据指定的名字 name 获取对应的值
-   */
-  getItem (key) {
-  }   
-
-
 }
 
 module.exports = SqliteStorage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.8-beta.2",
+  "version": "1.2.8",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
+    "better-sqlite3": "^7.6.0",
     "co": "^4.6.0",
     "debug": "^4.3.3",
     "depd": "^2.0.0",
@@ -37,7 +38,6 @@
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
     "uglify-js": "^3.14.5",
-    "unzip-crx-3": "^0.2.0",
     "urllib": "^2.38.0",
     "utility": "^1.17.0"
   },