fkg 1.1.2 → 1.1.3

package/bin/fkg

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../lib/comm');

package/index.js

@@ -0,0 +1,3 @@
+'use strict';
+const client = require('./lib/client');
+module.exports = client;

package/lib/client/index.js

@@ -0,0 +1,4 @@
+'use strict';
+module.exports = {
+	console.log('100');
+};

package/lib/comm.js

@@ -0,0 +1,18 @@
+'use strict';
+fkgConmm();
+async function fkgConmm() {
+    const arg = process.argv;
+    const {version} = require('../package.json');
+    if (arg.length < 3) console.log(version);
+    if (arg.length > 2) {
+        const arr = require('./json/command.json');
+        const name = arg[2].toLowerCase(); // 字母转小写
+        if (name=='-v') {
+            console.log(version);
+        } else if(arr.includes(name)){
+            await require('./order/'+name)(arg.slice(3)); 
+        }else {
+            console.log(`Command '${name}' doesn't exist!`);
+        }
+    }
+}

package/lib/json/command.json

@@ -0,0 +1 @@
+["init","user","run"]

package/lib/order/add.js

@@ -0,0 +1,67 @@
+'use strict';
+const {md5} = require('rrid');
+const oss = require('oss-sdk');
+const logs = require('../utils/logs');
+const input = require('../utils/input');
+module.exports = async(arg)=>{
+	let code;
+	if(arg[0]) {
+		code = arg[0];
+	}else{
+		const arr = await input('Enter security code：');
+		if(arr.length===0){
+			logs.r('Unknown error');
+			return;
+		}else{
+			code = arr[0];
+		}
+	}
+	const file = oss.file(process.cwd());
+	let data = await file.get('config');
+	if(data===null){
+		logs.r('Configuration file missing')
+	}else{
+		try{
+			data = JSON.parse(data);
+		}catch(err){
+			logs.r(err);
+			return;
+		}
+		if(!data.addTime||!data.key) {
+			logs.r('bad configuration file')
+		}else{
+			try{
+				const keys = md5(data.addTime+code+data.addTime);
+				if(keys===data.key){
+					// Add administrator
+					const user = await input('Account Name：','Account Password：');
+					if(!user[0]||!user[1]){
+						logs.g('Account password cannot be empty');
+					}else{
+						const dirs = oss.dir(process.cwd());
+						if(await dirs.ok('account')){
+							const info = {};
+							info.database = [];
+							info.addTime = Date.now();
+							data.key = md5(info.addTime+user[0]+user[1]+data.addTime);
+							const addRes = await file.add('account/'+md5(user[0]),JSON.stringify(info));
+							if(addRes){
+								logs.g('Added successfully');
+								logs.y('Please remember your account password');
+							}else{
+								logs.r('Failed to add');
+								logs.r('Unknown error');
+							}
+						}else{
+							logs.r('Important folder lost');
+						}
+					}
+				}else{
+					logs.r('Wrong security code');
+				}
+			}catch(err){
+				logs.r(err);
+			}
+		}
+	}
+}

package/lib/order/init.js

@@ -0,0 +1,52 @@
+'use strict';
+const {md5} = require('rrid');
+const oss = require('oss-sdk');
+const logs = require('../utils/logs');
+module.exports = async(arg)=>{
+	const dbPath = process.cwd();
+	const dbDir = oss.dir(dbPath);
+	if(await dbDir.ok()){
+		const list = await dbDir.list();
+		if(list.length===0){
+			// Initialization started
+			logs.g('The security code must consist of no less than 8 strings');
+			const input = require('../utils/input')
+			const arr =  await input('ecurity code ：','Confirm code ：');
+			if(arr.length===2){
+				if(arr[0].length<8){
+					logs.r('The security code contains less than 8 strings');
+				}else{
+					if(arr[0]===arr[1]){
+						const addres = dbDir.add('cache','account','database');
+						if(addres){
+							// Configuration file creation
+							const data = {};
+							data.addTime = Date.now();
+							data.key = md5(data.addTime+arr[0]+data.addTime);
+							const file = oss.file(dbPath);
+							const fileRes = await file.add('config',JSON.stringify(data));
+							if(fileRes){
+								logs.g('Initialization completed');
+								logs.g('Remember the security code');
+							}else{
+								logs.g('Unknown error');
+								await dbDir.clear();
+							}
+						}else{
+							logs.r('Failed to create file');
+							await dbDir.clear();
+						}
+					}else{
+						logs.r('Inconsistent content input')
+					}
+				}
+			}else{
+				logs.r('Unknown error')
+			}
+		}else{
+			logs.r('Not an empty directory');
+		}
+	}else{
+		logs.r('Directory does not exist');
+	}	
+}

package/lib/order/user.js

@@ -0,0 +1,15 @@
+'use strict';
+const logs = require('../utils/logs');
+module.exports = (arg)=>{
+	if(arg[0]===undefined) {
+		logs.r('Please enter parameters');
+	}else if(arg[0]==='add'){
+		//Add Account 
+		require('./add')(arg.slice(1))
+	}else if(arg[0]==='dele') {
+		//Dele Account 
+	}else if(arg[0]==='edit') {
+		//Edit Account 
+		
+	}
+}

package/lib/utils/input.js

@@ -0,0 +1,35 @@
+const logs = require('./logs')
+const readline = require('readline');
+module.exports = (...arg) => {
+	let arr = [];
+	return new Promise(async (resolve) => {
+		if (arg.length > 0) {
+			try{
+				const ps = readline.createInterface({
+				    input: process.stdin,  // 输入源：终端标准输入
+				    output: process.stdout // 输出源：终端标准输出
+				});
+				process.stdin.setEncoding('utf8');
+				const inputs = (text)=>{
+					return new Promise((resolves) => {
+						ps.question('\033[33m'+text, (answer) => {
+							console.log('\033[0m');
+							resolves(answer);
+						});
+					});
+				}
+				for (let i = 0; i < arg.length; i++) {
+					arr.push(await inputs(arg[i]));
+					if(arg.length-1===i) ps.close();
+				}
+				resolve(arr);
+			}catch(err){
+				logs.r(err);
+				resolve(arr);
+			}
+		} else {
+			resolve(arr);
+			logs.r('Please enter parameters');
+		}
+	})
+}

package/lib/utils/logs.js

@@ -0,0 +1,43 @@
+const logs = (d)=> {console.log(d);}
+module.exports = {
+    b(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[30m'+d[i]+'\033[0m');
+		}
+    },
+    r(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[31m'+d[i]+'\033[0m');
+		}
+    },
+    g(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[32m'+d[i]+'\033[0m');
+		}		
+    },
+    y(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[33m'+d[i]+'\033[0m');
+		}
+    },
+    blue(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[34m'+d[i]+'\033[0m');
+		}
+    },
+    p(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[35m'+d[i]+'\033[0m');
+		}
+    },
+    sblue(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[36m'+d[i]+'\033[0m');
+		}
+    },
+    w(...d){
+		for (var i = 0; i < d.length; i++) {
+			logs('\033[37m'+d[i]+'\033[0m');
+		}
+    }
+}

package/package.json

@@ -1,19 +1,32 @@
 {
-    "name": "fkg",
-    "version": "1.1.2",
-    "description": "Read and set memory key!",
-    "main": "lib/index.js",
-    "keywords": [
-      "db",
-      "key",
-      "disk",
-      "data",
-      "cache",
-      "database"
-    ],
-    "author": "weduu",
-    "license": "MIT",
-    "dependencies": {
-      "rrid": "^1.0.6"
-    }
-  }
+	"name": "fkg",
+	"version": "1.1.3",
+	"description": "Read and set memory key!",
+	"main": "lib/index.js",
+	"bin": {
+		"fkg": "bin/fkg"
+	},
+	"keywords": [
+		"db",
+		"key",
+		"disk",
+		"data",
+		"cache",
+		"database"
+	],
+	"author": "weduu",
+	"license": "MIT",
+	"engines": {
+		"node": ">=v22.22.1"
+	},
+	"files": [
+		"lib/",
+		"bin/",
+		"index.js",
+		"README.md"
+	],
+	"dependencies": {
+		"oss-sdk": "^1.0.3",
+		"rrid": "^1.0.6"
+	}
+}

package/README.md

@@ -1,57 +0,0 @@
-## Quickstart 
-====================
-
-### To Create cache service...
-======================================
-
-**1. Install**
-
-```shell
-npm install fkg
-```
-
-
-**2. Create server**
-
-```javascript
-const fkg = require('fkg');
-const db = fkg({
-    dir:'D:\\work',        //数据储存位置，为空时不进行存储
-    key:'exgeg2233',       //key不为空时，储存的数据会被加密
-    db:['user','name']     //db必须存在,且必须为数组
-});
-```
-
-**3. Create user data**
-```javascript
-const data = {name:'xxx'};
-db.user.add('id_1',data);   //数据储存在本地
-db.user.set('id_2',data);   //数据储存在缓存
-```
-
-**5. Get user data**
-
-```javascript
-db.user.list();             //获取user表缓存和本地数据键值
-```
-
-**6. Get list data**
-
-```javascript
-db.user.get('id_1');       //获取user表中指定缓存
-db.user.get('id_2');       //获取不到缓存，会获取本地数据
-```
-
-**7. Delete user data**
-
-```javascript
-db.user.clear();            //清空user表中所有的缓存
-db.user.kill();             //清空user表中所有的本地数据
-db.user.del('id_1');        //删除user表中指定缓存和本地数据
-```
-
-
-
-
-
-

package/lib/index.js

@@ -1,108 +0,0 @@
-'use strict';
-module.exports = (arg)=>{
-    const fs = require('./utils/fs');
-    const {md5,ekey,dkey} = require('rrid');
-    const {str,obj,arr} = require('./utils/type');
-    if(arg&&obj(arg)) { 
-        let io = {};
-        let dirs = {};
-        let datas = {};
-        if(arg.dir&&fs.isDir(arg.dir)) {
-            arg.dir = fs.link(arg.dir,'./data');
-            if(!fs.isDir(arg.dir)) fs.addDir(arg.dir);
-        }else{
-            delete arg.dir;
-        }
-        if(arg.db&&arr(arg.db)){
-            if(arg.db.length>0){
-                for (let i = 0;i < arg.db.length;i++) {
-                    const n = arg.db[i];
-                    if(!str(n)){
-                        console.log(`The db.${n} is not string`);
-                        return;
-                    }
-                    if(arg.dir) {
-                        dirs[n] = fs.link(arg.dir,'./'+n);
-                        if(!fs.isDir(dirs[n])) fs.addDir(dirs[n]);
-                    }
-                };
-            }else{
-                console.log("The length of 'db' is not 0");
-                return;
-            }
-        }else{
-            console.log('The db is array');
-            return;
-        }
-        if(arg.key&&str(arg.key)) {
-            arg.key = md5(arg.key+'fkg');
-        }else{
-            delete arg.key;
-        }
-        const def = (n) => {
-            return {
-                set(id,data){
-                    if(!id||!str(id)||!data) return false;
-                    datas[n][id] = data;
-                    return true;
-                },
-                add(id,data){
-                    if(!id||!str(id)||!data||!arg.dir) return false;
-                    if(arg.key) data = ekey(JSON.stringify(data),arg.key+id);
-                    return fs.addJson(fs.link(dirs[n],'./'+id),data);
-                },
-                get(id){
-                    if(!id||!str(id)) return null;
-                    let ids = datas[n][id];
-                    if(!ids&&arg.dir){
-                        const url = fs.link(dirs[n],'./'+id);
-                        if(fs.isFile(url)){
-                            ids = fs.readJson(url);
-                            if(ids&&arg.key) ids = JSON.parse(dkey(ids,arg.key+id));
-                        }
-                    } 
-                    return ids;
-                },
-                list(){
-                    let arr = Object.keys(datas[n]);
-                    if(arg.dir) arr = [...arr,...fs.readdirSync(dirs[n])];
-                    return arr;
-                },
-                del(id){
-                    let res = true;
-                    if(!id||!str(id)) return false;
-                    if(datas[n][id]) delete datas[n][id];
-                    if(arg.dir){
-                        const url = fs.link(dirs[n],'./'+id);
-                        if(fs.isFile(url)) res = fs.delFile(url);
-                        if(!res) return res;
-                    }
-                    return res;
-                },
-                clear(){
-                    datas[n] = {}
-                    return true;
-                },
-                kill(){
-                    if(arg.dir){
-                        const list = fs.readdirSync(dirs[n]);
-                        for (let i = 0;i < list.length;i++) {
-                            fs.delFile(fs.link(dirs[n],'./'+list[i]));
-                        };
-                        return true;
-                    }else{
-                        return false;
-                    }
-                }
-            }
-        }
-        for (let i = 0;i < arg.db.length;i++) {
-            const n = arg.db[i];
-            datas[n] = {};
-            io[n] = def(n);
-        };
-        return io;
-    }else{
-        console.log('Missing parameters');
-    }
-}

package/lib/utils/fs.js

@@ -1,146 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const isDir = (url) => {
-    if (fs.existsSync(url)) {
-        const stat = fs.statSync(url);
-        return stat.isDirectory();
-    } else {
-        return false;
-    }
-}
-const addFile = (url, data)=>{
-    try {
-        fs.writeFileSync(url, data,{encoding:'utf8'});
-        return true;
-    } catch (err) {
-        return false;
-    }
-}
-module.exports = {
-    isDir,
-    addFile,
-    link(...args){
-        return path.resolve(...args)
-    },
-    isFile(url) {
-        if (fs.existsSync(url)) {
-            const stats = fs.statSync(url);
-            return stats.isFile();
-        } else {
-            return false;
-        }
-    },
-    addJson(url,data){
-        return addFile(url,JSON.stringify(data));
-    },
-    file(url){
-        try {
-            return fs.statSync(url)
-        } catch (error) {
-            return false
-        }
-    },
-    readJson(url){
-        try {
-            return JSON.parse(fs.readFileSync(url));
-        } catch (error) {
-            return null
-        }
-    },
-    readFile(url) {
-        return new Promise((resolve) => {
-            fs.readFile(url, 'utf8', (err, data) => {
-                if (err) {
-                    resolve(null);
-                }else{
-                    resolve(data) ;              
-                }
-            });
-        })
-    },
-    readdirSync(url){
-        try {
-            return fs.readdirSync(url);
-        } catch (error) {
-            return []
-        }
-    },
-    dirFile(paths) {
-        let obj = {};
-        obj[paths] = 'dir';
-        const arrFile = (url) => {
-            const item = fs.readdirSync(url);
-            if (item.length > 0) {
-                let dir = [];
-                item.forEach(e => {
-                    const ets = path.resolve(url, e);
-                    if (isDir(ets)) {
-                        dir.push(ets);
-                        obj[ets] = 'dir';
-                    } else {
-                        obj[ets] = 'file';
-                    }
-                });
-                for (let i = 0; i < dir.length; i++) {
-                    arrFile(dir[i]);
-                };
-            }
-        }
-        arrFile(paths);
-        return obj;
-    },
-    addDir(url) {
-        try {
-            fs.mkdirSync(url);
-            return true;
-        } catch (error) {
-            return false
-        }
-    },
-    mkdirSync(url) {
-        return fs.mkdirSync(url);
-    },
-    delFile(url) {
-        try {
-            fs.unlinkSync(url);
-            return true
-        } catch (error) {
-            return false
-        }
-    },
-    getSize(obj) {
-        let size = 0;
-        for (const key in obj) {
-            if (obj[key] === 'file') {
-                size += fs.statSync(key).size;
-            }
-        }
-        return size
-    },
-    copyFile(old, news, def) {
-        return new Promise((resolve) => {
-            // 创建可读流来读取源文件
-            const oldStream = fs.createReadStream(old);
-            // 创建可写流来写入目标文件
-            const newStream = fs.createWriteStream(news);
-            // 使用管道将源文件的流复制到目标文件流中
-            oldStream.pipe(newStream);
-            // 处理错误和结束事件
-            oldStream.on('data', (data) => {
-                if (def) def(data.length);
-            })
-            oldStream.on('error', () => {
-                newStream.close();
-                resolve(false);
-            });
-            newStream.on('error', () => {
-                oldStream.close();
-                resolve(false);
-            });
-            // 当源文件流结束时，表示复制完成，可以处理结束事件
-            oldStream.on('end', () => {
-                resolve(true);
-            });
-        })
-    }
-}

package/lib/utils/type.js

@@ -1,45 +0,0 @@
-'use strict';
-const conf = {
-    n:/^[1-9]\d*$/,
-    ip:/^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){6}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^::([\da-fA-F]{1,4}:){0,4}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:):([\da-fA-F]{1,4}:){0,3}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){2}:([\da-fA-F]{1,4}:){0,2}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){3}:([\da-fA-F]{1,4}:){0,1}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){4}:((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){7}[\da-fA-F]{1,4}$|^:((:[\da-fA-F]{1,4}){1,6}|:)$|^[\da-fA-F]{1,4}:((:[\da-fA-F]{1,4}){1,5}|:)$|^([\da-fA-F]{1,4}:){2}((:[\da-fA-F]{1,4}){1,4}|:)$|^([\da-fA-F]{1,4}:){3}((:[\da-fA-F]{1,4}){1,3}|:)$|^([\da-fA-F]{1,4}:){4}((:[\da-fA-F]{1,4}){1,2}|:)$|^([\da-fA-F]{1,4}:){5}:([\da-fA-F]{1,4})?$|^([\da-fA-F]{1,4}:){6}:$/,
-    domain:/^([a-zA-Z0-9]([a-zA-Z0-9-_]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,11}$/, //域名
-};
-module.exports = {
-    ip(d){
-        // 验证ipv4 ipv6
-        return conf.ip.test(d);
-    },
-    domain(d){
-        // 验证域名
-        return conf.domain.test(d);
-    },
-    host(d){
-        // 验证主机host
-        return d=='localhost'||conf.ip.test(d)||conf.domain.test(d);
-    },
-    number(d) {
-        return typeof d=='number'&&conf.n.test(d);
-    },
-    port(d){
-        return 0<=d&&d<=65536&&conf.n.test(d);
-    },
-    str(d){
-        return typeof(d)=='string';
-    },
-    arr(d){
-        return Object.prototype.toString.call(d) === '[object Array]';
-    },
-    def(d){
-        return typeof d === 'function';
-    },
-    reg(d){
-        try {
-            return Object.prototype.toString.call(d) === '[object RegExp]';
-        } catch (error) {
-            return false;
-        }
-    },
-    obj(d){
-        return Object.prototype.toString.call(d) === '[object Object]';
-    }
-}