Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactivexcomponent.js",
"version": "7.0.8",
"version": "7.0.9",
"description": "Javascript reactive client API for XComponent",
"module": "dist/index.js",
"main": "dist/index.js",
Expand Down
12 changes: 5 additions & 7 deletions src/communication/WebSocketSubscriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import { StateMachineInstance } from '../interfaces/StateMachineInstance';
import { StateMachineRef } from '../interfaces/StateMachineRef';
import { StateMachineUpdateListener } from '../interfaces/StateMachineUpdateListener';
import { generateUUID } from '../utils/uuid';
import { Logger } from '../utils/Logger';
// import { Logger } from '../utils/Logger';
import { WebSocketWrapper } from './WebSocketWrapper';

export class WebSocketSubscriber {
private logger = Logger.getLogger('WebSocketSubscriber');
// private logger = Logger.getLogger('WebSocketSubscriber');
private stateMachineRefSendPublisher: WebSocketPublisher;
private subscribedStateMachines: { [componentName: string]: Array<String> };
private updates$: Observable<DeserializedData>;
Expand Down Expand Up @@ -256,18 +256,16 @@ export class WebSocketSubscriber {
}

public getJsonDataFromSnapshot(data: string, topic?: string): Array<StateMachineInstance> {
this.logger.debug('JsonData received from snapshot: ', { data: data, topic: topic }, 2);
let jsonData = this.deserializer.getJsonData(data);
let b64Data = JSON.parse(jsonData.JsonMessage).Items;
let items;
try {
const raw = JSON.parse(this.deserializer.decodeServerMessage(b64Data)!);
if (raw.$values) {
items = raw.$values;
} else {
items = raw;
}
else {
items = raw;
}
} catch (e) {
items = b64Data;
}
Expand All @@ -286,7 +284,7 @@ export class WebSocketSubscriber {
}

public getJsonDataFromEvent(data: string, topic?: string): StateMachineInstance {
this.logger.debug('JsonData received from event: ', { data: data, topic: topic }, 2);
// this.logger.debug('JsonData received from event: ', { data: data, topic: topic }, 2);
let jsonData = this.deserializer.getJsonData(data);
let stateMachineRef = this.getStateMachineRef(
jsonData.Header.StateMachineId,
Expand Down
6 changes: 2 additions & 4 deletions src/communication/xcomponentMessages.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Logger } from '../utils/Logger';
// import { Logger } from '../utils/Logger';

import * as pako from 'pako';

Expand Down Expand Up @@ -71,17 +71,15 @@ export let getHeaderWithIncomingType = (): Header => {
};

export class Serializer {
private logger = Logger.getLogger('Serializer');
// private logger = Logger.getLogger('Serializer');

public convertToWebsocketInputFormat(data: Data): string {
let input = `${data.RoutingKey} ${data.ComponentCode} ${JSON.stringify(data.Event)}`;
this.logger.debug('Message send : ', input);
return input;
}

public convertCommandDataToWebsocketInputFormat(commandData: CommandData): string {
let input = `${commandData.Command} ${JSON.stringify(commandData.Data)}`;
this.logger.debug('Message send : ', input);
return input;
}
}
Expand Down