diff --git a/clients/js/lib/client.js b/clients/js/lib/client.js index 4a524529..5b07ebb8 100644 --- a/clients/js/lib/client.js +++ b/clients/js/lib/client.js @@ -10,6 +10,7 @@ import createProtoMarshaller from './wire/proto_wire.js'; import createJsonMarshaller from './wire/json_wire.js'; import { raystack, google } from '../protos/proton_compiled.js'; import EventEmitter from 'events'; +import WebSocket from 'ws'; const NANOSECONDS_PER_MILLISECOND = 1e6; @@ -65,7 +66,6 @@ class RaccoonClient extends EventEmitter { } initializeWebSocket() { - const WebSocket = require('ws'); this.wsClient = new WebSocket(this.url); this.wsClient.on('open', () => { this.logger.info('WebSocket connection established'); @@ -75,8 +75,9 @@ class RaccoonClient extends EventEmitter { }); this.wsClient.on('message', (data) => { try { + const response = JSON.parse(data); const sendEventResponse = this.marshaller.unmarshal( - data, + response, raystack.raccoon.v1beta1.SendEventResponse ); this.emit('ack', sendEventResponse.toJSON()); diff --git a/clients/js/package-lock.json b/clients/js/package-lock.json index b67b4a43..6f11b48a 100644 --- a/clients/js/package-lock.json +++ b/clients/js/package-lock.json @@ -1,17 +1,18 @@ { "name": "@raystack/raccoon", - "version": "0.1.0-rc2", + "version": "0.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@raystack/raccoon", - "version": "0.1.0-rc2", + "version": "0.2.2", "license": "Apache-2.0", "dependencies": { "axios": "^1.4.0", "protobufjs": "^7.2.4", - "uuid": "^9.0.0" + "uuid": "^9.0.0", + "ws": "^8.18.0" }, "devDependencies": { "eslint": "^8.47.0", @@ -5763,6 +5764,26 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/clients/js/package.json b/clients/js/package.json index 7a378503..6267bd9d 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -18,7 +18,8 @@ "dependencies": { "axios": "^1.4.0", "protobufjs": "^7.2.4", - "uuid": "^9.0.0" + "uuid": "^9.0.0", + "ws": "^8.18.0" }, "devDependencies": { "eslint": "^8.47.0",