cgserver 5.4.13 → 5.4.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Framework/SocketServer/ISocket.d.ts +44 -0
- package/lib/Framework/SocketServer/ISocket.js +224 -0
- package/lib/Framework/SocketServer/ISocket.js.map +1 -0
- package/lib/Framework/SocketServer/IWebSocket copy.d.ts +44 -0
- package/lib/Framework/SocketServer/IWebSocket copy.js +224 -0
- package/lib/Framework/SocketServer/IWebSocket copy.js.map +1 -0
- package/lib/Framework/SocketServer/IWebSocket.js +1 -1
- package/lib/Framework/SocketServer/IWebSocket.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { IProtoFilter, EProtoType } from "./ProtoFilter/IProtoFilter";
|
|
2
|
+
import * as ws from 'websocket';
|
|
3
|
+
export declare class IWebSocket {
|
|
4
|
+
protected _await: boolean;
|
|
5
|
+
get await(): boolean;
|
|
6
|
+
protected _debug_msg: boolean;
|
|
7
|
+
get debug_msg(): boolean;
|
|
8
|
+
set debug_msg(value: boolean);
|
|
9
|
+
protected _socket_id: number;
|
|
10
|
+
get socketId(): number;
|
|
11
|
+
protected _tipKey: string;
|
|
12
|
+
get tipKey(): string;
|
|
13
|
+
protected _ws: ws.connection;
|
|
14
|
+
protected _protoType: EProtoType;
|
|
15
|
+
protected _protoFilter: IProtoFilter;
|
|
16
|
+
protected _protoPath: string;
|
|
17
|
+
protected _ip: string;
|
|
18
|
+
get remoteHost(): string;
|
|
19
|
+
get connected(): boolean;
|
|
20
|
+
constructor(protoType?: EProtoType, protoPath?: string);
|
|
21
|
+
getNewMsg(cmd: any, errcode?: any): any;
|
|
22
|
+
receive_heartbeat(jsonData: any): void;
|
|
23
|
+
send_heartbeat(): void;
|
|
24
|
+
onConnect(_ws: ws.connection): void;
|
|
25
|
+
protected _msgs: Array<any>;
|
|
26
|
+
onMessage(message: ws.Message): void;
|
|
27
|
+
protected _onDecode(message: ws.Message, ...params: any[]): any;
|
|
28
|
+
protected _onEncode(data: any, ...params: any[]): any;
|
|
29
|
+
protected _run_await: boolean;
|
|
30
|
+
protected _awaitMessages(): Promise<void>;
|
|
31
|
+
/**
|
|
32
|
+
* 过滤消息，每个消息处理之前调用
|
|
33
|
+
* @param jsonData
|
|
34
|
+
* @returns
|
|
35
|
+
*/
|
|
36
|
+
filterMsg(jsonData: any): boolean;
|
|
37
|
+
protected _onMessage(data: any): Promise<void>;
|
|
38
|
+
onOpen(e?: any): void;
|
|
39
|
+
onError(e: Error): void;
|
|
40
|
+
onClose(reasonCode: number, description: string): void;
|
|
41
|
+
send(data: any): void;
|
|
42
|
+
close(): void;
|
|
43
|
+
getServerNameFromCmd(cmd: any): any;
|
|
44
|
+
}
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.IWebSocket = void 0;
|
|
4
|
+
const Log_1 = require("../Logic/Log");
|
|
5
|
+
const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
|
|
6
|
+
const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
|
|
7
|
+
const Core_1 = require("../Core/Core");
|
|
8
|
+
const FrameworkConfig_1 = require("../Config/FrameworkConfig");
|
|
9
|
+
const _ = require("underscore");
|
|
10
|
+
let WebSocketIdMgr = {
|
|
11
|
+
id: _.random(0, 9998),
|
|
12
|
+
getNewID() {
|
|
13
|
+
return this.id++;
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
class IWebSocket {
|
|
17
|
+
_await = false;
|
|
18
|
+
get await() {
|
|
19
|
+
return this._await;
|
|
20
|
+
}
|
|
21
|
+
_debug_msg = false;
|
|
22
|
+
get debug_msg() {
|
|
23
|
+
return this._debug_msg;
|
|
24
|
+
}
|
|
25
|
+
set debug_msg(value) {
|
|
26
|
+
this._debug_msg = value;
|
|
27
|
+
}
|
|
28
|
+
_socket_id = 0;
|
|
29
|
+
get socketId() {
|
|
30
|
+
return this._socket_id;
|
|
31
|
+
}
|
|
32
|
+
_tipKey = "";
|
|
33
|
+
get tipKey() {
|
|
34
|
+
return this._tipKey;
|
|
35
|
+
}
|
|
36
|
+
_ws = null;
|
|
37
|
+
_protoType = IProtoFilter_1.EProtoType.Json;
|
|
38
|
+
_protoFilter = null;
|
|
39
|
+
_protoPath = "";
|
|
40
|
+
_ip = null;
|
|
41
|
+
get remoteHost() {
|
|
42
|
+
if (!this._ip) {
|
|
43
|
+
this._ip = this._ws.remoteAddress;
|
|
44
|
+
this._ip = this._ip.substring(this._ip.lastIndexOf(":") + 1);
|
|
45
|
+
}
|
|
46
|
+
return this._ip;
|
|
47
|
+
}
|
|
48
|
+
get connected() {
|
|
49
|
+
if (this._ws
|
|
50
|
+
&& this._ws.connected == true) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
|
|
56
|
+
this._debug_msg = FrameworkConfig_1.GFCfg.debug_msg;
|
|
57
|
+
this._socket_id = WebSocketIdMgr.getNewID();
|
|
58
|
+
this._protoType = protoType;
|
|
59
|
+
this._protoPath = protoPath;
|
|
60
|
+
}
|
|
61
|
+
getNewMsg(cmd, errcode) {
|
|
62
|
+
let msg = {
|
|
63
|
+
cmd: cmd,
|
|
64
|
+
errcode: errcode,
|
|
65
|
+
servertime: new Date().getTime()
|
|
66
|
+
};
|
|
67
|
+
return msg;
|
|
68
|
+
}
|
|
69
|
+
receive_heartbeat(jsonData) {
|
|
70
|
+
this.send_heartbeat();
|
|
71
|
+
}
|
|
72
|
+
send_heartbeat() {
|
|
73
|
+
let msg = this.getNewMsg("heartbeat");
|
|
74
|
+
this.send(msg);
|
|
75
|
+
}
|
|
76
|
+
onConnect(_ws) {
|
|
77
|
+
this._ws = _ws;
|
|
78
|
+
if (!this._protoFilter) {
|
|
79
|
+
this._protoFilter = ProtoFactory_1.GProtoFactory.createFilter(this._protoType);
|
|
80
|
+
this._protoFilter.init(this._protoPath);
|
|
81
|
+
}
|
|
82
|
+
this._ws.on("message", this.onMessage.bind(this));
|
|
83
|
+
this._ws.on("error", this.onError.bind(this));
|
|
84
|
+
this._ws.on("close", this.onClose.bind(this));
|
|
85
|
+
this.onOpen();
|
|
86
|
+
}
|
|
87
|
+
_msgs = [];
|
|
88
|
+
onMessage(message) {
|
|
89
|
+
try {
|
|
90
|
+
let msg = this._onDecode(message);
|
|
91
|
+
if (this._await) {
|
|
92
|
+
this._msgs.push(msg);
|
|
93
|
+
if (!this._run_await) {
|
|
94
|
+
this._awaitMessages();
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
this._onMessage(msg);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
Log_1.GLog.error('Received Message Handle Error: ' + e);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
_onDecode(message, ...params) {
|
|
106
|
+
let msg = null;
|
|
107
|
+
if (message.type === 'utf8') {
|
|
108
|
+
msg = this._protoFilter.decode(message.utf8Data, ...params);
|
|
109
|
+
}
|
|
110
|
+
else if (message.type === 'binary') {
|
|
111
|
+
msg = this._protoFilter.decode(message.binaryData, ...params);
|
|
112
|
+
}
|
|
113
|
+
return msg;
|
|
114
|
+
}
|
|
115
|
+
_onEncode(data, ...params) {
|
|
116
|
+
let msg = this._protoFilter.encode(data, ...params);
|
|
117
|
+
return msg;
|
|
118
|
+
}
|
|
119
|
+
_run_await = false;
|
|
120
|
+
async _awaitMessages() {
|
|
121
|
+
this._run_await = true;
|
|
122
|
+
while (this._msgs.length > 0) {
|
|
123
|
+
let msg = this._msgs.shift();
|
|
124
|
+
await this._onMessage(msg);
|
|
125
|
+
}
|
|
126
|
+
this._run_await = false;
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* 过滤消息，每个消息处理之前调用
|
|
130
|
+
* @param jsonData
|
|
131
|
+
* @returns
|
|
132
|
+
*/
|
|
133
|
+
filterMsg(jsonData) {
|
|
134
|
+
if (this._debug_msg
|
|
135
|
+
&& jsonData
|
|
136
|
+
&& jsonData.cmd != "heartbeat") {
|
|
137
|
+
Log_1.GLog.info(this.tipKey + " receive:--------", true);
|
|
138
|
+
Log_1.GLog.info(jsonData, true);
|
|
139
|
+
}
|
|
140
|
+
if (!jsonData.cmd || jsonData.cmd == "") {
|
|
141
|
+
Log_1.GLog.error('Received Message warning: no cmd param,data=');
|
|
142
|
+
Log_1.GLog.error(jsonData);
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
145
|
+
return true;
|
|
146
|
+
}
|
|
147
|
+
async _onMessage(data) {
|
|
148
|
+
let jsonData = data;
|
|
149
|
+
let ret = this.filterMsg(jsonData);
|
|
150
|
+
if (!ret) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
else if (!this["receive_" + jsonData.cmd]) {
|
|
154
|
+
if (this["receive_other_all"]) {
|
|
155
|
+
try {
|
|
156
|
+
await this["receive_other_all"](jsonData); //默认支持其他所有处理消息
|
|
157
|
+
}
|
|
158
|
+
catch (e) {
|
|
159
|
+
if (e && e.stack) {
|
|
160
|
+
Log_1.GLog.error(e.stack);
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
Log_1.GLog.error(e + " msg:data=" + JSON.stringify(jsonData));
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
Log_1.GLog.error('Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
try {
|
|
173
|
+
await this["receive_" + jsonData.cmd](jsonData);
|
|
174
|
+
}
|
|
175
|
+
catch (e) {
|
|
176
|
+
if (e && e.stack) {
|
|
177
|
+
Log_1.GLog.error("error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
Log_1.GLog.error(e + " msg:data=" + JSON.stringify(jsonData));
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
onOpen(e) {
|
|
186
|
+
}
|
|
187
|
+
onError(e) {
|
|
188
|
+
Log_1.GLog.info("onError:" + e.message);
|
|
189
|
+
}
|
|
190
|
+
onClose(reasonCode, description) {
|
|
191
|
+
Log_1.GLog.info("onClose resonCode=" + reasonCode + " des=" + description);
|
|
192
|
+
}
|
|
193
|
+
send(data) {
|
|
194
|
+
if (!this.connected) {
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
if (!data) {
|
|
198
|
+
Log_1.GLog.error("Send Message warning:null data!");
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
if (this._debug_msg
|
|
202
|
+
&& data.cmd != "heartbeat") {
|
|
203
|
+
Log_1.GLog.info(this.tipKey + " send:-----------------------------------", true);
|
|
204
|
+
Log_1.GLog.info(data, true);
|
|
205
|
+
}
|
|
206
|
+
let msg = this._onEncode(data);
|
|
207
|
+
this._ws.send(msg);
|
|
208
|
+
}
|
|
209
|
+
close() {
|
|
210
|
+
this._ws.close();
|
|
211
|
+
}
|
|
212
|
+
getServerNameFromCmd(cmd) {
|
|
213
|
+
if (!cmd || !Core_1.core.isString(cmd)) {
|
|
214
|
+
return null;
|
|
215
|
+
}
|
|
216
|
+
let index = cmd.indexOf("_");
|
|
217
|
+
if (index <= 0) {
|
|
218
|
+
return null;
|
|
219
|
+
}
|
|
220
|
+
return cmd.substring(0, index);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
exports.IWebSocket = IWebSocket;
|
|
224
|
+
//# sourceMappingURL=ISocket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ISocket.js","sourceRoot":"","sources":["../../../Framework/SocketServer/ISocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { IProtoFilter, EProtoType } from "./ProtoFilter/IProtoFilter";
|
|
2
|
+
import * as ws from 'websocket';
|
|
3
|
+
export declare class IWebSocket {
|
|
4
|
+
protected _await: boolean;
|
|
5
|
+
get await(): boolean;
|
|
6
|
+
protected _debug_msg: boolean;
|
|
7
|
+
get debug_msg(): boolean;
|
|
8
|
+
set debug_msg(value: boolean);
|
|
9
|
+
protected _socket_id: number;
|
|
10
|
+
get socketId(): number;
|
|
11
|
+
protected _tipKey: string;
|
|
12
|
+
get tipKey(): string;
|
|
13
|
+
protected _ws: ws.connection;
|
|
14
|
+
protected _protoType: EProtoType;
|
|
15
|
+
protected _protoFilter: IProtoFilter;
|
|
16
|
+
protected _protoPath: string;
|
|
17
|
+
protected _ip: string;
|
|
18
|
+
get remoteHost(): string;
|
|
19
|
+
get connected(): boolean;
|
|
20
|
+
constructor(protoType?: EProtoType, protoPath?: string);
|
|
21
|
+
getNewMsg(cmd: any, errcode?: any): any;
|
|
22
|
+
receive_heartbeat(jsonData: any): void;
|
|
23
|
+
send_heartbeat(): void;
|
|
24
|
+
onConnect(_ws: ws.connection): void;
|
|
25
|
+
protected _msgs: Array<any>;
|
|
26
|
+
onMessage(message: ws.Message): void;
|
|
27
|
+
protected _onDecode(message: ws.Message, ...params: any[]): any;
|
|
28
|
+
protected _onEncode(data: any, ...params: any[]): any;
|
|
29
|
+
protected _run_await: boolean;
|
|
30
|
+
protected _awaitMessages(): Promise<void>;
|
|
31
|
+
/**
|
|
32
|
+
* 过滤消息，每个消息处理之前调用
|
|
33
|
+
* @param jsonData
|
|
34
|
+
* @returns
|
|
35
|
+
*/
|
|
36
|
+
filterMsg(jsonData: any): boolean;
|
|
37
|
+
protected _onMessage(data: any): Promise<void>;
|
|
38
|
+
onOpen(e?: any): void;
|
|
39
|
+
onError(e: Error): void;
|
|
40
|
+
onClose(reasonCode: number, description: string): void;
|
|
41
|
+
send(data: any): void;
|
|
42
|
+
close(): void;
|
|
43
|
+
getServerNameFromCmd(cmd: any): any;
|
|
44
|
+
}
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.IWebSocket = void 0;
|
|
4
|
+
const Log_1 = require("../Logic/Log");
|
|
5
|
+
const ProtoFactory_1 = require("./ProtoFilter/ProtoFactory");
|
|
6
|
+
const IProtoFilter_1 = require("./ProtoFilter/IProtoFilter");
|
|
7
|
+
const Core_1 = require("../Core/Core");
|
|
8
|
+
const FrameworkConfig_1 = require("../Config/FrameworkConfig");
|
|
9
|
+
const _ = require("underscore");
|
|
10
|
+
let WebSocketIdMgr = {
|
|
11
|
+
id: _.random(0, 9998),
|
|
12
|
+
getNewID() {
|
|
13
|
+
return this.id++;
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
class IWebSocket {
|
|
17
|
+
_await = false;
|
|
18
|
+
get await() {
|
|
19
|
+
return this._await;
|
|
20
|
+
}
|
|
21
|
+
_debug_msg = false;
|
|
22
|
+
get debug_msg() {
|
|
23
|
+
return this._debug_msg;
|
|
24
|
+
}
|
|
25
|
+
set debug_msg(value) {
|
|
26
|
+
this._debug_msg = value;
|
|
27
|
+
}
|
|
28
|
+
_socket_id = 0;
|
|
29
|
+
get socketId() {
|
|
30
|
+
return this._socket_id;
|
|
31
|
+
}
|
|
32
|
+
_tipKey = "";
|
|
33
|
+
get tipKey() {
|
|
34
|
+
return this._tipKey;
|
|
35
|
+
}
|
|
36
|
+
_ws = null;
|
|
37
|
+
_protoType = IProtoFilter_1.EProtoType.Json;
|
|
38
|
+
_protoFilter = null;
|
|
39
|
+
_protoPath = "";
|
|
40
|
+
_ip = null;
|
|
41
|
+
get remoteHost() {
|
|
42
|
+
if (!this._ip) {
|
|
43
|
+
this._ip = this._ws.remoteAddress;
|
|
44
|
+
this._ip = this._ip.substring(this._ip.lastIndexOf(":") + 1);
|
|
45
|
+
}
|
|
46
|
+
return this._ip;
|
|
47
|
+
}
|
|
48
|
+
get connected() {
|
|
49
|
+
if (this._ws
|
|
50
|
+
&& this._ws.connected == true) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
|
|
56
|
+
this._debug_msg = FrameworkConfig_1.GFCfg.debug_msg;
|
|
57
|
+
this._socket_id = WebSocketIdMgr.getNewID();
|
|
58
|
+
this._protoType = protoType;
|
|
59
|
+
this._protoPath = protoPath;
|
|
60
|
+
}
|
|
61
|
+
getNewMsg(cmd, errcode) {
|
|
62
|
+
let msg = {
|
|
63
|
+
cmd: cmd,
|
|
64
|
+
errcode: errcode,
|
|
65
|
+
servertime: new Date().getTime()
|
|
66
|
+
};
|
|
67
|
+
return msg;
|
|
68
|
+
}
|
|
69
|
+
receive_heartbeat(jsonData) {
|
|
70
|
+
this.send_heartbeat();
|
|
71
|
+
}
|
|
72
|
+
send_heartbeat() {
|
|
73
|
+
let msg = this.getNewMsg("heartbeat");
|
|
74
|
+
this.send(msg);
|
|
75
|
+
}
|
|
76
|
+
onConnect(_ws) {
|
|
77
|
+
this._ws = _ws;
|
|
78
|
+
if (!this._protoFilter) {
|
|
79
|
+
this._protoFilter = ProtoFactory_1.GProtoFactory.createFilter(this._protoType);
|
|
80
|
+
this._protoFilter.init(this._protoPath);
|
|
81
|
+
}
|
|
82
|
+
this._ws.on("message", this.onMessage.bind(this));
|
|
83
|
+
this._ws.on("error", this.onError.bind(this));
|
|
84
|
+
this._ws.on("close", this.onClose.bind(this));
|
|
85
|
+
this.onOpen();
|
|
86
|
+
}
|
|
87
|
+
_msgs = [];
|
|
88
|
+
onMessage(message) {
|
|
89
|
+
try {
|
|
90
|
+
let msg = this._onDecode(message);
|
|
91
|
+
if (this._await) {
|
|
92
|
+
this._msgs.push(msg);
|
|
93
|
+
if (!this._run_await) {
|
|
94
|
+
this._awaitMessages();
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
this._onMessage(msg);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
Log_1.GLog.error('Received Message Handle Error: ' + e);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
_onDecode(message, ...params) {
|
|
106
|
+
let msg = null;
|
|
107
|
+
if (message.type === 'utf8') {
|
|
108
|
+
msg = this._protoFilter.decode(message.utf8Data, ...params);
|
|
109
|
+
}
|
|
110
|
+
else if (message.type === 'binary') {
|
|
111
|
+
msg = this._protoFilter.decode(message.binaryData, ...params);
|
|
112
|
+
}
|
|
113
|
+
return msg;
|
|
114
|
+
}
|
|
115
|
+
_onEncode(data, ...params) {
|
|
116
|
+
let msg = this._protoFilter.encode(data, ...params);
|
|
117
|
+
return msg;
|
|
118
|
+
}
|
|
119
|
+
_run_await = false;
|
|
120
|
+
async _awaitMessages() {
|
|
121
|
+
this._run_await = true;
|
|
122
|
+
while (this._msgs.length > 0) {
|
|
123
|
+
let msg = this._msgs.shift();
|
|
124
|
+
await this._onMessage(msg);
|
|
125
|
+
}
|
|
126
|
+
this._run_await = false;
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* 过滤消息，每个消息处理之前调用
|
|
130
|
+
* @param jsonData
|
|
131
|
+
* @returns
|
|
132
|
+
*/
|
|
133
|
+
filterMsg(jsonData) {
|
|
134
|
+
if (this._debug_msg
|
|
135
|
+
&& jsonData
|
|
136
|
+
&& jsonData.cmd != "heartbeat") {
|
|
137
|
+
Log_1.GLog.info(this.tipKey + " receive:--------", true);
|
|
138
|
+
Log_1.GLog.info(jsonData, true);
|
|
139
|
+
}
|
|
140
|
+
if (!jsonData.cmd || jsonData.cmd == "") {
|
|
141
|
+
Log_1.GLog.error('Received Message warning: no cmd param,data=');
|
|
142
|
+
Log_1.GLog.error(jsonData);
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
145
|
+
return true;
|
|
146
|
+
}
|
|
147
|
+
async _onMessage(data) {
|
|
148
|
+
let jsonData = data;
|
|
149
|
+
let ret = this.filterMsg(jsonData);
|
|
150
|
+
if (!ret) {
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
else if (!this["receive_" + jsonData.cmd]) {
|
|
154
|
+
if (this["receive_other_all"]) {
|
|
155
|
+
try {
|
|
156
|
+
await this["receive_other_all"](jsonData); //默认支持其他所有处理消息
|
|
157
|
+
}
|
|
158
|
+
catch (e) {
|
|
159
|
+
if (e && e.stack) {
|
|
160
|
+
Log_1.GLog.error(e.stack);
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
Log_1.GLog.error(e + " msg:data=" + JSON.stringify(jsonData));
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
Log_1.GLog.error('Received Message warning: no cmd handle,cmd=' + jsonData.cmd);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
try {
|
|
173
|
+
await this["receive_" + jsonData.cmd](jsonData);
|
|
174
|
+
}
|
|
175
|
+
catch (e) {
|
|
176
|
+
if (e && e.stack) {
|
|
177
|
+
Log_1.GLog.error("error msg:data=" + JSON.stringify(jsonData) + "\n" + e.stack);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
Log_1.GLog.error(e + " msg:data=" + JSON.stringify(jsonData));
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
onOpen(e) {
|
|
186
|
+
}
|
|
187
|
+
onError(e) {
|
|
188
|
+
Log_1.GLog.info("onError:" + e.message);
|
|
189
|
+
}
|
|
190
|
+
onClose(reasonCode, description) {
|
|
191
|
+
Log_1.GLog.info("onClose resonCode=" + reasonCode + " des=" + description);
|
|
192
|
+
}
|
|
193
|
+
send(data) {
|
|
194
|
+
if (!this.connected) {
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
if (!data) {
|
|
198
|
+
Log_1.GLog.error("Send Message warning:null data!");
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
if (this._debug_msg
|
|
202
|
+
&& data.cmd != "heartbeat") {
|
|
203
|
+
Log_1.GLog.info(this.tipKey + " send:-----------------------------------", true);
|
|
204
|
+
Log_1.GLog.info(data, true);
|
|
205
|
+
}
|
|
206
|
+
let msg = this._onEncode(data);
|
|
207
|
+
this._ws.send(msg);
|
|
208
|
+
}
|
|
209
|
+
close() {
|
|
210
|
+
this._ws.close();
|
|
211
|
+
}
|
|
212
|
+
getServerNameFromCmd(cmd) {
|
|
213
|
+
if (!cmd || !Core_1.core.isString(cmd)) {
|
|
214
|
+
return null;
|
|
215
|
+
}
|
|
216
|
+
let index = cmd.indexOf("_");
|
|
217
|
+
if (index <= 0) {
|
|
218
|
+
return null;
|
|
219
|
+
}
|
|
220
|
+
return cmd.substring(0, index);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
exports.IWebSocket = IWebSocket;
|
|
224
|
+
//# sourceMappingURL=IWebSocket%20copy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IWebSocket copy.js","sourceRoot":"","sources":["../../../Framework/SocketServer/IWebSocket copy.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const Core_1 = require("../Core/Core");
|
|
|
8
8
|
const FrameworkConfig_1 = require("../Config/FrameworkConfig");
|
|
9
9
|
const _ = require("underscore");
|
|
10
10
|
let WebSocketIdMgr = {
|
|
11
|
-
id: _.random(0,
|
|
11
|
+
id: _.random(0, 99999999),
|
|
12
12
|
getNewID() {
|
|
13
13
|
return this.id++;
|
|
14
14
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IWebSocket.js","sourceRoot":"","sources":["../../../Framework/SocketServer/IWebSocket.ts"],"names":[],"mappings":";;;AAAA,sCAAoC;AACpC,6DAA2D;AAC3D,6DAAqE;AAErE,uCAAoC;AACpC,+DAAkD;AAClD,gCAAgC;AAChC,IAAI,cAAc,GAClB;IACI,EAAE,EAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,
|
|
1
|
+
{"version":3,"file":"IWebSocket.js","sourceRoot":"","sources":["../../../Framework/SocketServer/IWebSocket.ts"],"names":[],"mappings":";;;AAAA,sCAAoC;AACpC,6DAA2D;AAC3D,6DAAqE;AAErE,uCAAoC;AACpC,+DAAkD;AAClD,gCAAgC;AAChC,IAAI,cAAc,GAClB;IACI,EAAE,EAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAC,QAAQ,CAAC;IAEzB,QAAQ;QAEJ,OAAO,IAAI,CAAC,EAAE,EAAE,CAAA;IACpB,CAAC;CACJ,CAAA;AAED,MAAa,UAAU;IAET,MAAM,GAAG,KAAK,CAAA;IACxB,IAAI,KAAK;QAEL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IACS,UAAU,GAAS,KAAK,CAAA;IAClC,IAAI,SAAS;QAET,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IACD,IAAI,SAAS,CAAC,KAAK;QAEf,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;IAC3B,CAAC;IACS,UAAU,GAAS,CAAC,CAAA;IAC9B,IAAI,QAAQ;QAER,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IACS,OAAO,GAAQ,EAAE,CAAA;IAC3B,IAAI,MAAM;QAEN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IACS,GAAG,GAAgB,IAAI,CAAA;IACvB,UAAU,GAAY,yBAAU,CAAC,IAAI,CAAA;IACrC,YAAY,GAAc,IAAI,CAAA;IAC9B,UAAU,GAAC,EAAE,CAAA;IAEb,GAAG,GAAU,IAAI,CAAA;IAC3B,IAAI,UAAU;QAEV,IAAG,CAAC,IAAI,CAAC,GAAG,EACZ;YACI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAA;YACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC,CAAA;SAC7D;QACD,OAAO,IAAI,CAAC,GAAG,CAAA;IACnB,CAAC;IACD,IAAI,SAAS;QAET,IAAI,IAAI,CAAC,GAAG;eACN,IAAI,CAAC,GAAG,CAAC,SAAS,IAAE,IAAI,EAC9B;YACI,OAAO,IAAI,CAAA;SACd;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,YAAY,SAAS,GAAC,yBAAU,CAAC,IAAI,EAAC,SAAS,GAAC,EAAE;QAE9C,IAAI,CAAC,UAAU,GAAG,uBAAK,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAA;QAC3C,IAAI,CAAC,UAAU,GAAC,SAAS,CAAA;QACzB,IAAI,CAAC,UAAU,GAAC,SAAS,CAAA;IAC7B,CAAC;IACD,SAAS,CAAC,GAAG,EAAE,OAAQ;QAEnB,IAAI,GAAG,GACP;YACI,GAAG,EAAE,GAAG;YACR,OAAO,EAAE,OAAO;YAChB,UAAU,EAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;SAClC,CAAA;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IACD,iBAAiB,CAAC,QAAQ;QAEtB,IAAI,CAAC,cAAc,EAAE,CAAA;IACzB,CAAC;IACD,cAAc;QAEV,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC;IACD,SAAS,CAAC,GAAiB;QAEvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAG,CAAC,IAAI,CAAC,YAAY,EACrB;YACI,IAAI,CAAC,YAAY,GAAG,4BAAa,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SAC1C;QACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IACS,KAAK,GAAY,EAAE,CAAA;IAC7B,SAAS,CAAC,OAAkB;QAExB,IACA;YACI,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;YACjC,IAAG,IAAI,CAAC,MAAM,EACd;gBACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACpB,IAAG,CAAC,IAAI,CAAC,UAAU,EACnB;oBACI,IAAI,CAAC,cAAc,EAAE,CAAA;iBACxB;aACJ;iBAED;gBACI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;aACvB;SACJ;QACD,OAAO,CAAC,EACR;YACI,UAAI,CAAC,KAAK,CAAC,iCAAiC,GAAG,CAAC,CAAC,CAAA;SACpD;IACL,CAAC;IACS,SAAS,CAAC,OAAkB,EAAC,GAAG,MAAM;QAE5C,IAAI,GAAG,GAAC,IAAI,CAAA;QACZ,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAC3B;YACI,GAAG,GAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAC,GAAG,MAAM,CAAC,CAAA;SAC3D;aACI,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAClC;YACI,GAAG,GAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAC,GAAG,MAAM,CAAC,CAAA;SAC7D;QACD,OAAO,GAAG,CAAA;IACd,CAAC;IACS,SAAS,CAAC,IAAI,EAAC,GAAG,MAAM;QAE9B,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAC,GAAG,MAAM,CAAC,CAAA;QAClD,OAAO,GAAG,CAAA;IACd,CAAC;IACS,UAAU,GAAG,KAAK,CAAA;IAClB,KAAK,CAAC,cAAc;QAE1B,IAAI,CAAC,UAAU,GAAC,IAAI,CAAA;QACpB,OAAM,IAAI,CAAC,KAAK,CAAC,MAAM,GAAC,CAAC,EACzB;YACI,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;SAC7B;QACD,IAAI,CAAC,UAAU,GAAC,KAAK,CAAA;IACzB,CAAC;IACD;;;;OAIG;IACH,SAAS,CAAC,QAAQ;QAEd,IAAG,IAAI,CAAC,UAAU;eACZ,QAAQ;eACP,QAAQ,CAAC,GAAG,IAAE,WAAW,EAChC;YACI,UAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAC,oBAAoB,EAAC,IAAI,CAAC,CAAA;YAChD,UAAI,CAAC,IAAI,CAAC,QAAQ,EAAC,IAAI,CAAC,CAAA;SAC3B;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,IAAI,EAAE,EACvC;YACI,UAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;YAC1D,UAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACpB,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IACS,KAAK,CAAC,UAAU,CAAC,IAAI;QAE3B,IAAI,QAAQ,GAAG,IAAI,CAAA;QACnB,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAClC,IAAG,CAAC,GAAG,EACP;YACI,OAAM;SACT;aACI,IAAI,CAAC,IAAI,CAAC,UAAU,GAAC,QAAQ,CAAC,GAAG,CAAC,EACvC;YACI,IAAG,IAAI,CAAC,mBAAmB,CAAC,EAC5B;gBACI,IACA;oBACI,MAAM,IAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAA,CAAA,cAAc;iBAC1D;gBACD,OAAM,CAAC,EACP;oBACI,IAAG,CAAC,IAAE,CAAC,CAAC,KAAK,EACb;wBACI,UAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;qBACtB;yBAED;wBACI,UAAI,CAAC,KAAK,CAAC,CAAC,GAAC,aAAa,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;qBACvD;iBACJ;aACJ;iBAED;gBACI,UAAI,CAAC,KAAK,CAAC,8CAA8C,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;aAC5E;SACJ;aAED;YACI,IACA;gBACI,MAAM,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;aAClD;YACD,OAAM,CAAC,EACP;gBACI,IAAG,CAAC,IAAE,CAAC,CAAC,KAAK,EACb;oBACI,UAAI,CAAC,KAAK,CAAC,iBAAiB,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAC,IAAI,GAAC,CAAC,CAAC,KAAK,CAAC,CAAA;iBACtE;qBAED;oBACI,UAAI,CAAC,KAAK,CAAC,CAAC,GAAC,aAAa,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;iBACvD;aACJ;SACJ;IACL,CAAC;IACD,MAAM,CAAC,CAAE;IAGT,CAAC;IACD,OAAO,CAAC,CAAO;QAEX,UAAI,CAAC,IAAI,CAAC,UAAU,GAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,OAAO,CAAC,UAAiB,EAAE,WAAkB;QAEzC,UAAI,CAAC,IAAI,CAAC,oBAAoB,GAAC,UAAU,GAAC,QAAQ,GAAC,WAAW,CAAC,CAAA;IACnE,CAAC;IACD,IAAI,CAAC,IAAI;QAEL,IAAI,CAAC,IAAI,CAAC,SAAS,EACnB;YACI,OAAM;SACT;QACD,IAAI,CAAC,IAAI,EACT;YACI,UAAI,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;YAC7C,OAAM;SACT;QACD,IAAG,IAAI,CAAC,UAAU;eACZ,IAAI,CAAC,GAAG,IAAE,WAAW,EAC3B;YACI,UAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAC,4CAA4C,EAAC,IAAI,CAAC,CAAA;YACxE,UAAI,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,CAAA;SACvB;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IACD,KAAK;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IACD,oBAAoB,CAAC,GAAG;QAEpB,IAAG,CAAC,GAAG,IAAE,CAAC,WAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAC5B;YACI,OAAO,IAAI,CAAA;SACd;QACD,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC5B,IAAG,KAAK,IAAE,CAAC,EACX;YACI,OAAO,IAAI,CAAA;SACd;QACD,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,EAAC,KAAK,CAAC,CAAA;IACjC,CAAC;CACJ;AAzQD,gCAyQC"}
|