mm_cachebase 1.4.4 → 1.4.5

package/index.js

@@ -14,7 +14,7 @@ class CacheBase {
 	 */
 	constructor() {
 		// 缓存的字典
-		this.list = [];
+		this.dict = {};
 		// 到期通知函数
 		this.func;
 		/*
@@ -35,6 +35,22 @@ class CacheBase {
 		}
 		*/
 	}
+
+	get list() {
+		var list = [];
+		for (var key in this.dict) {
+			list.push(this.dict[key]);
+		}
+		return list;
+	}
+
+	set list(lt) {
+		this.dict = {};
+		for (var i = 0; i < lt.length; i++) {
+			var o = lt;
+			this.dict[o.name] = o;
+		}
+	}
 }
 
 /**
@@ -43,11 +59,9 @@ class CacheBase {
  * @return {String} 对象
  */
 CacheBase.prototype.getObj = function(key) {
-	var obj = this.list.getObj({
-		name: key
-	});
+	var obj = this.dict[key];
 	if (obj && obj.expires) {
-		var cha = Date.parse(obj.expires) - Date.parse(new Date());
+		var cha = obj.expires - new Date().stamp();
 		if (cha < 1) {
 			this.delObj(key);
 			obj = undefined;
@@ -61,9 +75,7 @@ CacheBase.prototype.getObj = function(key) {
  * @return {Number} 成功返回1，否则返回0
  */
 CacheBase.prototype.delObj = function(key) {
-	this.list.del({
-		name: key
-	}, true);
+	delete this.dict[key];
 	return 1;
 };
 
@@ -73,16 +85,16 @@ CacheBase.prototype.delObj = function(key) {
  * @return {Number} 成功返回1，否则返回0
  */
 CacheBase.prototype.addObj = function(obj) {
-	obj.id = obj.name.md5();
+	// obj.id = obj.name.md5();
 	var maxAge = obj.maxAge;
 	if (maxAge > 0) {
 		// 如果maxAge大于0则设置缓存时长
-		obj.expires = new Date().addSeconds(maxAge).toUTCString();
+		obj.expires = new Date().addSeconds(maxAge).stamp();
 	} else {
 		obj.maxAge = -1;
 		obj.expires = null;
 	}
-	this.list.push(obj);
+	this.dict[obj.name] = obj;
 	return 1;
 };
 
@@ -111,7 +123,7 @@ CacheBase.prototype.ttl = async function(key, maxAge) {
 			} else if (maxAge > 0) {
 				// 如果maxAge大于0则设置缓存时长
 				obj.maxAge = maxAge;
-				obj.expires = new Date().addSeconds(maxAge).toUTCString();
+				obj.expires = new Date().addSeconds(maxAge).stamp();
 			} else if (maxAge < 0) {
 				// 如果maxAge小于0则设置缓存时长为永久
 				obj.maxAge = -1;
@@ -330,19 +342,20 @@ CacheBase.prototype.clear = async function(key) {
 	var _this = this;
 	return new Promise((resolve, reject) => {
 		if (key) {
-			for (var i = this.list.length - 1; i >= 0; i--) {
-				if (this.list[i].name.has(key)) {
-					_this.delObj(this.list[i].name);
+			var keys = Object.keys(this.dict);
+			for (var i = 0; i < keys.length; i++) {
+				var name = keys[i];
+				if (name.has(key)) {
+					_this.delObj(name);
 				}
 			}
 		} else {
-			for (var i = this.list.length - 1; i >= 0; i--) {
-				_this.delObj(this.list[i].name);
-			}
+			this.dict = {};
 		}
 		resolve(1);
 	});
 };
+
 /**
  * @description 排序
  * @param {String} key 键
@@ -366,6 +379,7 @@ CacheBase.prototype.sort = async function(key, way, obj_key) {
 		}
 	});
 };
+
 /**
  * @description 获取所有键名
  * @param {String} key 键 支持*号, 前面加*表示后面名称一致, 前后加*表示包含名称, 后面加*表示前面名称一致
@@ -375,13 +389,22 @@ CacheBase.prototype.keys = async function(key) {
 	var _this = this;
 	return new Promise((resolve, reject) => {
 		if (key) {
-			var list = _this.list.search(key, 'name');
+			var keys = Object.keys(this.dict);
+			var list = [];
+			for (var i = 0; i < keys.length; i++) {
+				var name = keys[i];
+				if (name.has(key)) {
+					list.push(name);
+				}
+			}
 			resolve(list.toArr('name'));
 		} else {
-			resolve(_this.list.toArr('name'));
+			var keys = Object.keys(this.dict);
+			resolve(keys);
 		}
 	});
 };
+
 /**
  * @description 修改数组缓存
  * @param {String} key 键
@@ -511,4 +534,4 @@ CacheBase.prototype.notity = function(obj) {
 };
 
 // 导出CacheBase函数
-module.exports = CacheBase;
+module.exports = CacheBase;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_cachebase",
-    "version": "1.4.4",
+    "version": "1.4.5",
     "description": "这是超级美眉cachebase帮助函数模块，一个简单的内存缓存",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -10,6 +10,12 @@ async function test() {
 	// await cache.set("d", "十五", 10);
 	// bl = await cache.set("age1", 10, 10);
 	bl = await cache.set("age", 13, 10);
+	setTimeout(async () => {
+		console.log(await cache.get("age"));
+	}, 9000);
+	setTimeout(async () => {
+		console.log(await cache.get("age"));
+	}, 10000);
 	// bl = await cache.addInt("age", -12);
 	// bl = await cache.add("age", 15, 5);
 	// console.log(bl);
@@ -26,18 +32,21 @@ async function test() {
 
 	// msg = await cache.setrange("a", 4, "asd");
 	// console.log(msg);
-	var len = await cache.addStr("a", "丰");
-	// console.log("追加文本" + len);
+	var str = await cache.addStr("a", "丰");
+	console.log("追加文本" + str);
 	// var bl = await cache.has("a");
 	// console.log("是否存在" + bl);
 
 	var num = await cache.add("arr", ['第三', '第四'], 8);
 	bl = await cache.list_clear("arr", ['第三', '第四', '第w']); // 清空数组,并重新增加成员
-	// console.log("清空数组" + bl);
+	console.log("清空数组" + bl);
 	// 
 	// num = await cache.list_set("arr", ['第一', '第三', '第二'], 8);
 	num = await cache.list_add("arr", '第s');
 	console.log("设置数组" + num);
+	var arr = await cache.list_get("arr", 0);
+	console.log("查到数组", arr)
+
 	// time = await cache.ttl("arr");
 	// console.log(time);
 	// bl = await cache.ttl("arr", -1);
@@ -46,7 +55,7 @@ async function test() {
 	// console.log(time);
 
 	var bl = await cache.list_has("arr", '第一');
-	console.log(bl);
+	console.log("包含", bl);
 	// await cache.sort("arr", 'asc');
 	// var ar = await cache.list_get("arr", 2);
 	// console.log(ar);
@@ -57,12 +66,13 @@ async function test() {
 	// ret = await cache.clear(); // 清空缓存
 	// console.log(ret);
 	var ret = await cache.getrange("a", 2, 3);
-	console.log(ret);
+	console.log("这是？", ret);
 	// var arr = await cache.keys("a*");
 	// console.log(arr);
 	// ret = await cache.clear('a*'); // 清空缓存
 	// console.log(ret);
-	console.log(cache.list);
+	console.log("存储的数据字典", cache.dict);
+	console.log("存储的数据列表", cache.list);
 	// cache.dispose() // 销毁资源
 }
 test();