fkg 1.0.6 → 1.0.8

package/README.md

@@ -16,8 +16,9 @@ npm install fkg
 ```javascript
 const fkg = require('fkg');
 const db = new fkg({
-    dir: 'C:\\work',  //数据储存位置，为空时不进行存储
-    dbName: ['user']  //需要数据储存时，数据表名不可为空
+    key:'f31d0353cdf',   //key不为空时，储存的数据会被加密
+    dir: 'C:\\work',     //数据储存位置，为空时不进行存储
+    dbName: ['user']     //需要数据储存时，数据表名不可为空
 });
 const user = db.table('user');
 ```
@@ -33,9 +34,8 @@ user.set('id_2',{account:"wangwu",emai:"1001@qq.com",phone:"13800138002",name:"
 **5. Get user data**
 
 ```javascript
-user.list(10); //默认100条数据
-user.list(50); //默认100条数据
-```
+user.list();   //默认100条数据
+user.list(50); 
 
 **6. Get list data**
 

package/lib/index.js

@@ -1,7 +1,6 @@
 'use strict';
 const {
     isDir,
-    isFile,
     link,
     addDir,
     addJson,
@@ -9,18 +8,29 @@ const {
     delFile,
     readdirSync
 } = require('./utils/fs');
+const {md5,ekey,dkey} = require('rrid');
 const {str,obj,arr} = require('./utils/type');
+const getTime = ()=>{ return new Date().getTime();}
 class fkg {
     constructor(arg) {
-        this.data = {};
-        this.dirs = {};
-        this.dir = null;
-        if(arg&&obj(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 = {};
+                setInterval(() => {
+                    for (const keys in this.setList) {
+                        const {n,id} = this.setList[keys];
+                        let d = this.data[n][id];
+                        if(this.key) d = ekey(JSON.stringify(d),this.key+id);
+                        addJson(link(this.dirs[n],'./'+id),d);
+                        delete this.setList[keys];
+                    }
+                }, 3000);
                 for (let i = 0;i < arg.dbName.length;i++) {
                     const n = arg.dbName[i];
                     this.data[n] = {};
@@ -31,9 +41,14 @@ class fkg {
                         }else{
                             let list = readdirSync(this.dirs[n]);
                             for (let i = 0;i < list.length;i++) {
-                                const value = readJson(link(this.dirs[n],'./'+list[i]));
-                                if(value!==null) this.data[n][list[i]] = value;
+                                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;
                         }
                     }
                 };
@@ -41,18 +56,16 @@ class fkg {
         }
     }
     close(){
+        this.lock = {};
+        this.data = {};
+        this.dirs = {};
         this.dir = null;
-        this.data = null;
-        this.dirs = null;
     }
     table(n) {
         const that = this;
         if(!n||!str(n)) return;
         if(!that.data[n]) that.data[n] = {};
-        if(that.dir&&!that.dirs[n]) {
-            that.dirs[n] = link(that.dir,'./'+n);
-            addDir(that.dirs[n]);
-        }
+        if(!that.lock[n]) that.lock[n] = {};
         return {
             list(page){
                 function getOBJ(obj, n) {
@@ -65,34 +78,39 @@ class fkg {
                 return getOBJ(that.data[n],page>0?page:100);
             },
             clear(){
-                if(that.dir){
+                if(that.dirs[n]){
                     let list = readdirSync(that.dirs[n]);
                     for (let i = 0;i < list.length;i++) {
                         delFile(link(that.dirs[n],'./'+list[i]));
                     };
                     list = null;
                 }
-                that.data[n] = {};
+                delete that.data[n];
+                delete that.lock[n];
                 return true;
             },
             get(id){
-                if(that.dir&&!that.data[n][id]) {
-                    const url = link(that.dirs[n],'./'+id);
-                    if(isFile(url)){
-                        const res = readJson(url);
-                        if(res)  that.data[n][id] = res;
-                    }
+                if(that.lock[n][id]){
+                    const time = getTime();
+                    while (that.lock[n][id]) {
+                        // 等待解锁
+                        if(getTime()-time>3000) {
+                            delete that.lock[n][id];
+                        }
+                    }  
                 }
                 return that.data[n][id];
             },
             set(id,d){
+                that.lock[n][id] = 1;
                 that.data[n][id] = d;
-                if(that.dir) addJson(link(that.dirs[n],'./'+id),d);
+                if(that.dirs[n]) that.setList[n+id] = {n,id};
+                delete that.lock[n][id];
                 return true;
             },
             del(id){
                 delete that.data[n][id];
-                if(that.dir) delFile(link(that.dirs[n],'./'+id));
+                if(that.dirs[n]) delFile(link(that.dirs[n],'./'+id));
                 return true;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fkg",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "description": "Read and set memory key!",
     "main": "lib/index.js",
     "keywords": [
@@ -8,5 +8,8 @@
       "cache"
     ],
     "author": "weduu",
-    "license": "MIT"
+    "license": "MIT",
+    "dependencies": {
+      "rrid": "^1.0.6"
+    }
   }