cgserver 10.1.0 → 10.1.2

package/dist/lib/Framework/Database/Mongo/MongoManager.js

@@ -156,7 +156,7 @@ class MongoExt {
         try {
             let where = this._convertWhere({ _id: key });
             let rs = await Core_1.core.safeCall(col.findOneAndUpdate, col, where, { $inc: { id: 1 } }, { upsert: true });
-            if (rs.id) {
+            if (rs && rs.id) {
                 return rs.id + 1;
             }
             return 1;

package/dist/lib/Framework/SocketServer/IWebSocket.js

@@ -42,6 +42,9 @@ class IWebSocket {
         return this._tipKey;
     }
     _ws = null;
+    get ws() {
+        return this._ws;
+    }
     _req = null;
     _protoType = IProtoFilter_1.EProtoType.Json;
     _protoFilter = null;
@@ -192,8 +195,21 @@ class IWebSocket {
         let data = this._onEncode(msg);
         this._ws.send(data);
     }
-    close() {
-        this._ws.close();
+    /**
+     * Close the connection. A close frame will be sent to the remote peer indicating
+     * that we wish to close the connection, and we will then wait for up to
+     * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
+     * before terminating the underlying socket connection.
+     */
+    close(reasonCode, description) {
+        this._ws.close(reasonCode, description);
+    }
+    /**
+     * Send a close frame to the remote peer and immediately close the socket without
+     * waiting for a response. This should generally be used only in error conditions.
+     */
+    drop(reasonCode, description, skipCloseFrame) {
+        this._ws.drop(reasonCode, description, skipCloseFrame);
     }
 }
 exports.IWebSocket = IWebSocket;

package/dist/types/Framework/SocketServer/IWebSocket.d.ts

@@ -27,6 +27,7 @@ export declare class IWebSocket {
     protected _tipKey: string;
     get tipKey(): string;
     protected _ws: ws.connection;
+    get ws(): ws.connection;
     protected _req: ws.request;
     protected _protoType: EProtoType;
     protected _protoFilter: IProtoFilter;
@@ -60,5 +61,16 @@ export declare class IWebSocket {
     onClose(reasonCode: number, description: string): void;
     filterSendMsg(msg: BaseMsg): boolean;
     send(msg: BaseMsg): void;
-    close(): void;
+    /**
+     * Close the connection. A close frame will be sent to the remote peer indicating
+     * that we wish to close the connection, and we will then wait for up to
+     * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
+     * before terminating the underlying socket connection.
+     */
+    close(reasonCode?: number, description?: string): void;
+    /**
+     * Send a close frame to the remote peer and immediately close the socket without
+     * waiting for a response. This should generally be used only in error conditions.
+     */
+    drop(reasonCode?: number, description?: string, skipCloseFrame?: boolean): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "10.1.0",
+  "version": "10.1.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",