Skip to content

Commit 86f5022

Browse files
committed
parse message inside try catch
1 parent 2c7ec96 commit 86f5022

2 files changed

Lines changed: 25 additions & 14 deletions

File tree

OpenFlow/src/Messages/Message.ts

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ export class Message {
159159
}
160160
async RegisterQueue(cli: WebSocketClient) {
161161
this.Reply();
162-
var msg: RegisterQueueMessage<Base> = RegisterQueueMessage.assign(this.data);
162+
var msg: RegisterQueueMessage<Base>
163163
try {
164+
msg = RegisterQueueMessage.assign(this.data);
164165
var jwt = cli.jwt;
165166
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
166167
await cli.CreateConsumer(msg.queuename);
@@ -180,9 +181,9 @@ export class Message {
180181
}
181182
async QueueMessage(cli: WebSocketClient) {
182183
this.Reply();
183-
var msg: QueueMessage = QueueMessage.assign(this.data);
184+
var msg: QueueMessage
184185
try {
185-
//
186+
msg = QueueMessage.assign(this.data);
186187
if (msg.replyto === null || msg.replyto === undefined || msg.replyto === "") {
187188
await cli.sendToQueue(msg);
188189
} else {
@@ -211,8 +212,9 @@ export class Message {
211212
}
212213
async CloseQueue(cli: WebSocketClient) {
213214
this.Reply();
214-
var msg: CloseQueueMessage<Base> = CloseQueueMessage.assign(this.data);
215+
var msg: CloseQueueMessage<Base>
215216
try {
217+
msg = CloseQueueMessage.assign(this.data);
216218
var jwt = cli.jwt;
217219
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
218220
await cli.CloseConsumer(msg.queuename);
@@ -245,8 +247,9 @@ export class Message {
245247
}
246248
private async Query(cli: WebSocketClient): Promise<void> {
247249
this.Reply();
248-
var msg: QueryMessage<Base> = QueryMessage.assign(this.data);
250+
var msg: QueryMessage<Base>
249251
try {
252+
msg = QueryMessage.assign(this.data);
250253
var jwt = cli.jwt;
251254
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
252255
msg.result = await Config.db.query(msg.query, msg.projection, msg.top, msg.skip, msg.orderby, msg.collectionname, jwt);
@@ -266,8 +269,9 @@ export class Message {
266269
}
267270
private async Aggregate(cli: WebSocketClient): Promise<void> {
268271
this.Reply();
269-
var msg: AggregateMessage<Base> = AggregateMessage.assign(this.data);
272+
var msg: AggregateMessage<Base>
270273
try {
274+
msg = AggregateMessage.assign(this.data);
271275
var jwt = cli.jwt;
272276
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
273277
msg.result = await Config.db.aggregate(msg.aggregates, msg.collectionname, jwt);
@@ -286,8 +290,9 @@ export class Message {
286290
}
287291
private async InsertOne(cli: WebSocketClient): Promise<void> {
288292
this.Reply();
289-
var msg: InsertOneMessage<Base> = InsertOneMessage.assign(this.data);
293+
var msg: InsertOneMessage<Base>
290294
try {
295+
msg = InsertOneMessage.assign(this.data);
291296
var jwt = cli.jwt;
292297
var w: number = 0;
293298
var j: boolean = false;
@@ -311,8 +316,9 @@ export class Message {
311316
}
312317
private async UpdateOne(cli: WebSocketClient): Promise<void> {
313318
this.Reply();
314-
var msg: UpdateOneMessage<Base> = UpdateOneMessage.assign(this.data);
319+
var msg: UpdateOneMessage<Base>
315320
try {
321+
msg = UpdateOneMessage.assign(this.data);
316322
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
317323
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
318324
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
@@ -332,8 +338,9 @@ export class Message {
332338
}
333339
private async UpdateMany(cli: WebSocketClient): Promise<void> {
334340
this.Reply();
335-
var msg: UpdateManyMessage<Base> = UpdateManyMessage.assign(this.data);
341+
var msg: UpdateManyMessage<Base>;
336342
try {
343+
msg = UpdateManyMessage.assign(this.data);
337344
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
338345
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
339346
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
@@ -354,8 +361,9 @@ export class Message {
354361

355362
private async InsertOrUpdateOne(cli: WebSocketClient): Promise<void> {
356363
this.Reply();
357-
var msg: InsertOrUpdateOneMessage<Base> = InsertOrUpdateOneMessage.assign(this.data);
364+
var msg: InsertOrUpdateOneMessage<Base>
358365
try {
366+
msg = InsertOrUpdateOneMessage.assign(this.data);
359367
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
360368
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
361369
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
@@ -375,8 +383,9 @@ export class Message {
375383
}
376384
private async DeleteOne(cli: WebSocketClient): Promise<void> {
377385
this.Reply();
378-
var msg: DeleteOneMessage = DeleteOneMessage.assign(this.data);
386+
var msg: DeleteOneMessage
379387
try {
388+
msg = DeleteOneMessage.assign(this.data);
380389
var jwt = cli.jwt;
381390
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
382391
await Config.db.DeleteOne(msg._id, msg.collectionname, jwt);
@@ -395,8 +404,9 @@ export class Message {
395404
}
396405
private async MapReduce(cli: WebSocketClient): Promise<void> {
397406
this.Reply();
398-
var msg: MapReduceMessage<any> = MapReduceMessage.assign(this.data);
407+
var msg: MapReduceMessage<any>
399408
try {
409+
msg = MapReduceMessage.assign(this.data);
400410
var jwt = cli.jwt;
401411
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
402412
msg.result = await Config.db.MapReduce(msg.map, msg.reduce, msg.finalize, msg.query, msg.out, msg.collectionname, msg.scope, jwt);
@@ -416,8 +426,9 @@ export class Message {
416426

417427
private async Signin(cli: WebSocketClient): Promise<void> {
418428
this.Reply();
419-
var msg: SigninMessage = SigninMessage.assign(this.data);
429+
var msg: SigninMessage
420430
try {
431+
msg = SigninMessage.assign(this.data);
421432
var tuser: TokenUser = null;
422433
var user: User = null;
423434
var type: string = "local";

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.249
1+
0.0.250

0 commit comments

Comments
 (0)