Skip to content

Commit 4dc2405

Browse files
committed
fix: use utf8 instead of utf-8 for ws messages
1 parent 4b58bc7 commit 4dc2405

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

src/adapters/web-socket-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter
120120
private async onClientMessage(raw: Buffer) {
121121
let abort: () => void
122122
try {
123-
const message = attemptValidation(messageSchema)(JSON.parse(raw.toString('utf-8')))
123+
const message = attemptValidation(messageSchema)(JSON.parse(raw.toString('utf8')))
124124

125125
const messageHandler = this.createMessageHandler([message, this]) as IMessageHandler & IAbortable
126126
if (typeof messageHandler.abort === 'function') {

src/factories/worker-factory.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export const workerFactory = (): AppWorker => {
1313
const dbClient = getDbClient()
1414
const eventRepository = new EventRepository(dbClient)
1515

16+
// deepcode ignore HttpToHttps: <please specify a reason of ignoring this>
1617
const server = http.createServer()
1718
const webSocketServer = new WebSocketServer({
1819
server,

src/repositories/event-repository.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class EventRepository implements IEventRepository {
158158
}
159159

160160
public async create(event: Event): Promise<number> {
161-
return this.insert(event).then(prop('rowCount') as () => number)
161+
return this.insert(event).then(prop('rowCount') as () => number, () => 0)
162162
}
163163

164164
private insert(event: Event) {

test/integration/features/helpers.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export async function waitForEOSE(ws: WebSocket, subscription: string): Promise<
9797
ws.once('error', onError)
9898

9999
function onMessage(raw: RawData) {
100-
const message = JSON.parse(raw.toString('utf-8'))
100+
const message = JSON.parse(raw.toString('utf8'))
101101
if (message[0] === MessageType.EOSE && message[1] === subscription) {
102102
resolve()
103103
cleanup()
@@ -139,7 +139,7 @@ export async function waitForNextEvent(ws: WebSocket, subscription: string): Pro
139139
}
140140

141141
function onMessage(raw: RawData) {
142-
const message = JSON.parse(raw.toString('utf-8'))
142+
const message = JSON.parse(raw.toString('utf8'))
143143
if (message[0] === MessageType.EVENT && message[1] === subscription) {
144144
resolve(message[2])
145145
cleanup()
@@ -172,7 +172,7 @@ export async function waitForEventCount(
172172
cleanup()
173173
}
174174
function onMessage(raw: RawData) {
175-
const message = JSON.parse(raw.toString('utf-8'))
175+
const message = JSON.parse(raw.toString('utf8'))
176176
if (message[0] === MessageType.EVENT && message[1] === subscription) {
177177
events.push(message[2])
178178
if (!eose && events.length === count) {
@@ -213,7 +213,7 @@ export async function waitForNotice(ws: WebSocket): Promise<void> {
213213
ws.once('error', onError)
214214

215215
function onMessage(raw: RawData) {
216-
const message = JSON.parse(raw.toString('utf-8'))
216+
const message = JSON.parse(raw.toString('utf8'))
217217
if (message[0] === MessageType.NOTICE) {
218218
resolve(message[1])
219219
cleanup()

test/unit/factories/websocket-adapter-factory.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('webSocketAdapterFactory', () => {
2828
onStub.returns(client)
2929
const request: IncomingMessage = {
3030
headers: {
31-
'sec-websocket-key': Buffer.from('key', 'utf-8').toString('base64'),
31+
'sec-websocket-key': Buffer.from('key', 'utf8').toString('base64'),
3232
},
3333
} as any
3434
const webSocketServerAdapter: IWebSocketServerAdapter = {} as any

0 commit comments

Comments
 (0)