cgserver 8.3.6 → 8.4.1

package/README.md

@@ -1,23 +1,3 @@
-7.0.568
-1、serverconfig的命名变化
-2、IServerConfig去掉webserver配置
-6.6.5
-1、mongomanager可单独初始化
-6.6.5
-1、mongoaccountservice增加登录时间和ip
-6.5.8
-1、修改编译bug
-6.5.7
-1、debug标志又cgserver处命令行处理，默认为false
-6.5.7
-1、增加配置debug，是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
-6.5.6
-1、增加一点服务器事件，目前cgserver只支持start
-6.5.5
-1、修改GLog的输出，控制台的输出由FrameworkConfig控制，console_level(默认0) -1都不输出，0仅输出error，1都输出
-6.5.3
-1、增加账号状态EAccountState
-6.5.3
-1、事件分发器GEventTool添加emit
-6.5.2
-1、添加事件分发器GEventTool
+8.4.1
+1、更新所有库到最新版
+2、暴力升级redis接口注意修改

package/dist/lib/Framework/Database/RedisManager.js

@@ -9,12 +9,9 @@ class RedisManager {
     get redis() {
         return this._redis;
     }
-    _resis_init_succ = false;
     _redisCfg = null;
-    constructor() {
-    }
     async init(redisCfg) {
-        return new Promise((resolve) => {
+        let p = new Promise((resolve) => {
             if (!redisCfg || !redisCfg.open) {
                 resolve(null);
                 return;
@@ -24,8 +21,8 @@ class RedisManager {
                 return;
             }
             this._redisCfg = redisCfg;
-            Log_1.GLog.info("begin conect redis=" + JSON.stringify(redisCfg));
-            this._redis = redis.createClient(redisCfg.port, redisCfg.host, { parser: "javascript", return_buffers: false, connect_timeout: 3000, password: redisCfg.password });
+            Log_1.GLog.info("begin connect redis=" + JSON.stringify(redisCfg));
+            this._redis = redis.createClient(redisCfg);
             this._redis.on("connect", () => {
                 this.onConnect();
                 resolve(null);
@@ -33,376 +30,24 @@ class RedisManager {
             this._redis.on("end", this.onEnd.bind(this));
             this._redis.on("error", this.onError.bind(this));
         });
+        let ret = await p;
+        for (let key in this._redis) {
+            if (typeof this._redis[key] == "function") {
+                this[key] = this._redis[key].bind(this._redis);
+            }
+        }
+        return ret;
     }
     onConnect() {
-        if (this._redisCfg.database) {
-            this._redis.select(this._redisCfg.database);
-        }
-        this._resis_init_succ = true;
         Log_1.GLog.info("redis has connected!");
     }
     onEnd() {
-        this._resis_init_succ = false;
         this._redis = null;
         this.init(this._redisCfg); //重连
     }
     onError(err) {
-        Log_1.GLog.info("Error connected=" + this._redis.connected + ": " + err);
-    }
-    expire(key, seconds) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.expire(key, seconds, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    incr(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.incr(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    set(key, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.set(key, value, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    get(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.get(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    /**
-     *
-     * @param key
-     * @param cb 有表示异步
-     */
-    del(key, cb) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.del(key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hset(h, key, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hset(h, key, value, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hget(h, key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hget(h, key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    hdel(key, sub_key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hdel(key, sub_key, (err, reply) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(reply);
-            });
-        });
-    }
-    /**
-     * hash值，能转换位整数的就自动转换为整数
-     * @param h key
-     */
-    hgetall(h) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hgetall(h, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                    resolve(replys);
-                    return;
-                }
-                let value = {};
-                for (let k in replys) {
-                    let v = replys[k];
-                    let iv = parseInt(v);
-                    if (v == "" + iv) {
-                        value[k] = iv;
-                    }
-                    else {
-                        value[k] = v;
-                    }
-                }
-                if (!replys) {
-                    value = null;
-                }
-                resolve(value);
-            });
-        });
-    }
-    /**
-     *
-     * @param h
-     * @param array
-     */
-    hmset(h, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.hmset(h, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    lpush(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.lpush(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    lrange(key, start, end) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            if (!this._redis) {
-                return null;
-            }
-            if (!start) {
-                start = 0;
-            }
-            if (!end) {
-                end = -1;
-            }
-            this._redis.lrange(key, start, end, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    ltrim(key, start, end) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            if (!this._redis) {
-                return null;
-            }
-            if (!start) {
-                start = 0;
-            }
-            if (!end) {
-                end = -1;
-            }
-            this._redis.ltrim(key, start, end, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    sadd(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.sadd(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    smembers(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.smembers(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    srem(key, array) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.srem(key, array, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    keys(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.keys(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    multi() {
-        if (!this._redis) {
-            return null;
-        }
-        return this._redis.multi();
-    }
-    exists(key) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.exists(key, (err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    exec(multi) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis || !multi) {
-                resolve(null);
-                return;
-            }
-            multi.exec((err, replys) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(replys);
-            });
-        });
-    }
-    publish(channel, value) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.publish(channel, value, (err, num) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(num);
-            });
-        });
-    }
-    subscribe(channel) {
-        return new Promise((resolve, reject) => {
-            if (!this._redis) {
-                resolve(null);
-                return;
-            }
-            this._redis.subscribe(channel, (err, msg) => {
-                if (err) {
-                    Log_1.GLog.error(err);
-                }
-                resolve(msg);
-            });
-        });
-    }
-    on(message, cb) {
-        if (!this._redis) {
-            return;
-        }
-        this._redis.on(message, cb);
+        Log_1.GLog.info("Error connected=" + this._redis + ": " + err);
     }
 }
 exports.RedisManager = RedisManager;
-exports.GRedisMgr = new RedisManager();
+exports.GRedisMgr = (new RedisManager());

package/dist/types/Framework/Database/MongoBaseService.d.ts

@@ -26,14 +26,14 @@ export declare class MongoBaseService<T> {
             id: number;
             des: string;
         };
-        rs: mongo.UpdateResult;
+        rs: mongo.UpdateResult<mongo.BSON.Document>;
     }>;
     updateMany(model: any, where?: {}): Promise<{
         errcode: {
             id: number;
             des: string;
         };
-        rs: mongo.BSON.Document | mongo.UpdateResult;
+        rs: mongo.BSON.Document | mongo.UpdateResult<mongo.BSON.Document>;
     }>;
     insert(model: T): Promise<{
         errcode: {

package/dist/types/Framework/Database/MongoManager.d.ts

@@ -120,14 +120,14 @@ declare class MongoManager {
             id: number;
             des: string;
         };
-        rs: mongo.UpdateResult;
+        rs: mongo.UpdateResult<mongo.BSON.Document>;
     }>;
     updateMany(collection: string, model: any, where?: {}, upsert?: boolean): Promise<{
         errcode: {
             id: number;
             des: string;
         };
-        rs: mongo.BSON.Document | mongo.UpdateResult;
+        rs: mongo.BSON.Document | mongo.UpdateResult<mongo.BSON.Document>;
     }>;
     createIndex(collection: string, index: any, options?: mongo.CreateIndexesOptions): Promise<{
         errcode: {

package/dist/types/Framework/Database/RedisManager.d.ts

@@ -1,64 +1,17 @@
 import * as redis from 'redis';
-export declare let GRedisMgr: RedisManager;
+declare type RedisClientType = redis.RedisClientType<redis.RedisDefaultModules & redis.RedisModules, redis.RedisFunctions, redis.RedisScripts>;
+export declare let GRedisMgr: RedisManager & RedisClientType;
 export declare class RedisManager {
-    protected _redis: redis.RedisClient;
-    get redis(): redis.RedisClient;
-    protected _resis_init_succ: boolean;
+    protected _redis: RedisClientType;
+    get redis(): RedisClientType;
     protected _redisCfg: {
         open: boolean;
-        host: string;
-        port: number;
-        database: number;
-        password: string;
-    };
-    constructor();
+    } & redis.RedisClientOptions;
     init(redisCfg: {
         open: boolean;
-        host: string;
-        port: number;
-        database: number;
-        password: string;
-    }): Promise<unknown>;
+    } & redis.RedisClientOptions): Promise<unknown>;
     onConnect(): void;
     onEnd(): void;
     onError(err: any): void;
-    expire(key: any, seconds: any): Promise<unknown>;
-    incr(key: any): Promise<number>;
-    set(key: any, value: any): Promise<unknown>;
-    get(key: any): Promise<string>;
-    /**
-     *
-     * @param key
-     * @param cb 有表示异步
-     */
-    del(key: any, cb?: any): Promise<unknown>;
-    hset(h: any, key: any, value: any): Promise<unknown>;
-    hget(h: any, key: any): Promise<unknown>;
-    hdel(key: any, sub_key: any): Promise<unknown>;
-    /**
-     * hash值，能转换位整数的就自动转换为整数
-     * @param h key
-     */
-    hgetall(h: any): Promise<{
-        [key: string]: any;
-    }>;
-    /**
-     *
-     * @param h
-     * @param array
-     */
-    hmset(h: any, array: any): Promise<unknown>;
-    lpush(key: any, array: any): Promise<unknown>;
-    lrange(key: string, start?: number, end?: number): Promise<unknown>;
-    ltrim(key: string, start: number, end?: number): Promise<unknown>;
-    sadd(key: any, array: any): Promise<unknown>;
-    smembers(key: any): Promise<unknown>;
-    srem(key: any, array: any): Promise<unknown>;
-    keys(key: any): Promise<unknown>;
-    multi(): redis.Multi;
-    exists(key: string): Promise<unknown>;
-    exec(multi: redis.Multi): Promise<Array<any>>;
-    publish(channel: string, value: string): Promise<unknown>;
-    subscribe(channel: string): Promise<unknown>;
-    on(message: string, cb: any): void;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "8.3.6",
+  "version": "8.4.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -31,53 +31,53 @@
   "license": "MIT",
   "dependencies": {
     "@alicloud/sms-sdk": "^1.1.6",
-    "@types/cookie-parser": "^1.4.2",
-    "@types/cors": "^2.8.12",
+    "@types/cookie-parser": "^1.4.3",
+    "@types/cors": "^2.8.13",
     "@types/crypto-js": "^4.1.1",
-    "@types/express": "^4.17.13",
-    "@types/formidable": "^2.0.0",
-    "@types/mime": "^2.0.3",
-    "@types/mssql": "^7.1.5",
-    "@types/mysql": "^2.15.19",
-    "@types/node": "^16.11.7",
-    "@types/nodemailer": "^6.4.4",
-    "@types/redis": "^2.8.32",
+    "@types/express": "^4.17.17",
+    "@types/formidable": "^3.4.1",
+    "@types/mime": "^3.0.1",
+    "@types/mssql": "^8.1.2",
+    "@types/mysql": "^2.15.21",
+    "@types/node": "^20.5.7",
+    "@types/nodemailer": "^6.4.9",
+    "@types/redis": "^4.0.10",
     "@types/reflect-metadata": "^0.1.0",
-    "@types/request": "^2.48.7",
-    "@types/underscore": "^1.11.4",
+    "@types/request": "^2.48.8",
+    "@types/underscore": "^1.11.8",
     "@types/urlencode": "^1.1.2",
-    "@types/websocket": "^1.0.4",
+    "@types/websocket": "^1.0.6",
     "alipay_sdk2": "^1.1.6",
-    "alipay-sdk": "^3.1.7",
+    "alipay-sdk": "^3.5.0",
     "colors": "^1.4.0",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
     "ec-key": "0.0.4",
-    "express": "^4.17.1",
-    "fast-xml-parser": "^3.21.1",
-    "formidable": "^2.0.1",
+    "express": "^4.18.2",
+    "fast-xml-parser": "^4.2.7",
+    "formidable": "^3.5.1",
     "fs": "0.0.1-security",
     "http": "0.0.0",
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
-    "log4js": "^6.3.0",
+    "log4js": "^6.9.1",
     "mime": "^3.0.0",
-    "mongodb": "^5.2.0",
-    "mssql": "^8.0.2",
+    "mongodb": "^6.0.0",
+    "mssql": "^9.2.0",
     "mysql": "^2.18.1",
-    "nodemailer": "^6.7.0",
+    "nodemailer": "^6.9.4",
     "process": "^0.11.10",
-    "protobufjs": "^6.11.2",
-    "qiniu": "^7.4.0",
+    "protobufjs": "^7.2.5",
+    "qiniu": "^7.9.0",
     "readline2": "^1.0.1",
-    "redis": "^3.1.2",
+    "redis": "^4.6.8",
     "reflect-metadata": "^0.1.13",
     "request": "^2.88.0",
-    "socket.io": "^4.3.2",
+    "socket.io": "^4.7.2",
     "underscore": "^1.13.6",
     "urlencode": "^1.1.0",
-    "webpack": "^5.73.0",
+    "webpack": "^5.88.2",
     "webpack-node-externals": "^3.0.0",
     "websocket": "^1.0.34"
   }