fkg 1.0.9 → 1.1.1

package/README.md

@@ -15,27 +15,26 @@ npm install fkg
 
 ```javascript
 const fkg = require('fkg');
-const db = new fkg({
-    key:'f31d0353cdf',   //key不为空时，储存的数据会被加密
-    dir: 'C:\\work',     //数据储存位置，为空时不进行存储
-    dbName: ['user']     //需要数据储存时，数据表名不可为空
-});
-const user = db.table('user');
+const dir = 'C:\\work';      //数据储存位置，为空时不进行本地存储
+const key = 'f31d0353cdf';   //key不为空时，数据会被加密储存
+// const db = new fkg();
+// const db = new fkg(dir);
+const db = new fkg({dir,key});
+const user = db.io('user');
 ```
 
 **3. Add user data**
 
 ```javascript
-user.set('id_1',{account:"zhangsan",emai:"1000@qq.com",phone:"13800138000",name:"张三"});
-user.set('id_2',{account:"wangwu",emai:"1001@qq.com",phone:"13800138002",name:"王五"});
-...
+uset.add('id_1',{account:"wabngwu",password:"******"});  //数据储存在本地
+user.set('id_2',{account:"zhangsan",password:"******"}); //数据储存在缓存
 ```
 
 **5. Get user data**
 
 ```javascript
-user.list();   //默认100条数据
-user.list(50); 
+user.list();   //获取本地和缓存数据键值
+```
 
 **6. Get list data**
 

package/lib/index.js

@@ -2,6 +2,7 @@
 const {
     link,
     isDir,
+    isFile,
     addDir,
     addJson,
     delFile,
@@ -9,57 +10,17 @@ const {
     readdirSync
 } = require('./utils/fs');
 const {md5,ekey,dkey} = require('rrid');
-const {str,obj,arr} = require('./utils/type');
+const {str,obj} = require('./utils/type');
 class fkg {
     constructor(arg) {
         this.close();
-        if(arg&&obj(arg)) { 
-            if(arg.dir&&isDir(arg.dir)){
-                this.dir = link(arg.dir,'./data');
-                if(!isDir(this.dir)) addDir(this.dir);
-            }
-            if(arg.key&&str(arg.key)) this.key = md5(arg.key+'fkg');
-            if(arg.dbName&&arr(arg.dbName)&&arr.length>0){
-                this.setList = {};
-                const timer = setInterval(() => {
-                    if(!this.dir) {
-                        clearInterval(timer);
-                        return;
-                    }
-                    for (const keys in this.setList) {
-                        const {n,id,s} = this.setList[keys];
-                        if(s){
-                            let d = this.data[n][id];
-                            if(this.key) d = ekey(JSON.stringify(d),this.key+id);
-                            addJson(link(this.dirs[n],'./'+id),d);
-                        }else{
-                            delFile(link(this.dirs[n],'./'+id));
-                        }
-                        delete this.setList[keys];
-                    }
-                }, 3000);
-                for (let i = 0;i < arg.dbName.length;i++) {
-                    const n = arg.dbName[i];
-                    this.data[n] = {};
-                    if(this.dir) {
-                        this.dirs[n] = link(this.dir,'./'+n);
-                        if(!isDir(this.dirs[n])) {
-                            addDir(this.dirs[n]);
-                        }else{
-                            let list = readdirSync(this.dirs[n]);
-                            for (let i = 0;i < list.length;i++) {
-                                const id = list[i];
-                                let value = readJson(link(this.dirs[n],'./'+id));
-                                if(value) {
-                                    if(this.key) value = JSON.parse(dkey(value,this.key+id));
-                                    this.data[n][id] = value;
-                                }
-                            };
-                            list = null;
-                        }
-                    }
-                };
+        if(arg) { 
+            if(str(arg)&&isDir(arg)) this.dir = link(arg,'./data');
+            if(obj(arg)){
+                if(arg.dir&&isDir(arg.dir)) this.dir = link(arg.dir,'./data');
+                if(arg.key&&str(arg.key)) this.key = md5(arg.key+'fkg');
             }
+            if(this.dir&&!isDir(this.dir)) addDir(this.dir);
         }
     }
     close(){
@@ -67,20 +28,52 @@ class fkg {
         this.dirs = {};
         this.dir = null;
     }
-    table(n) {
+    io(n) {
         const that = this;
         if(!n||!str(n)) return;
         if(!that.data[n]) that.data[n] = {};
         return {
-            list(page){
-                function getOBJ(obj, n) {
-                    const keys = Object.keys(obj);
-                    return keys.slice(0, n).reduce((result, key) => {
-                      result[key] = obj[key];
-                      return result;
-                    },{});
+            set(id,data){
+                if(!id||!str(id)||!data) return false;
+                that.data[n][id] = data;
+                return true;
+            },
+            add(id,data){
+                if(!id||!str(id)||!data||!that.dir) return false;
+                if(!that.dirs[n]) {
+                    that.dirs[n] = link(that.dir,'./'+n);
+                    if(!isDir(that.dirs[n])) addDir(that.dirs[n]);
                 }
-                return getOBJ(that.data[n],page>0?page:100);
+                if(that.key) data = ekey(JSON.stringify(data),that.key+id);
+                return addJson(link(that.dirs[n],'./'+id),data);
+            },
+            get(id){
+                if(!id||!str(id)) return null;
+                let ids = that.data[n][id];
+                if(!ids&&that.dirs[n]){
+                    const url = link(that.dirs[n],'./'+id);
+                    if(isFile(url)){
+                        ids = readJson(url);
+                        if(ids&&that.key) ids = JSON.parse(dkey(ids,that.key+id));
+                    }
+                } 
+                return ids;
+            },
+            list(){
+                let arr = Object.keys(that.data[n]);
+                if(that.dirs[n]) arr = [...arr,...readdirSync(that.dirs[n])];
+                return arr;
+            },
+            del(id){
+                if(!id||!str(id)) return false;
+                let res = true;
+                if(that.dirs[n]){
+                    const url = link(that.dirs[n],'./'+id);
+                    if(isFile(url)) res = delFile(url);
+                    if(!res) return res;
+                }
+                delete that.data[n][id];
+                return res;
             },
             clear(){
                 if(that.dirs[n]){
@@ -92,19 +85,6 @@ class fkg {
                 }
                 delete that.data[n];
                 return true;
-            },
-            get(id){
-                return that.data[n][id];
-            },
-            set(id,d){
-                if(that.dirs[n]) that.setList[n+id] = {n,id,s:1};
-                that.data[n][id] = d;
-                return true;
-            },
-            del(id){
-                delete that.data[n][id];
-                if(that.dirs[n]) that.setList[n+id] = {n,id,s:0};
-                return true;
             }
         }
     }

package/lib/utils/fs.js

@@ -59,7 +59,11 @@ module.exports = {
         })
     },
     readdirSync(url){
-        return fs.readdirSync(url);
+        try {
+            return fs.readdirSync(url);
+        } catch (error) {
+            return []
+        }
     },
     dirFile(paths) {
         let obj = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fkg",
-    "version": "1.0.9",
+    "version": "1.1.1",
     "description": "Read and set memory key!",
     "main": "lib/index.js",
     "keywords": [