mirror of
https://github.com/Cameri/nostream.git
synced 2025-03-17 21:31:48 +01:00
fix: use utf8 instead of utf-8 for ws messages
This commit is contained in:
parent
4b58bc7861
commit
4dc2405317
@ -120,7 +120,7 @@ export class WebSocketAdapter extends EventEmitter implements IWebSocketAdapter
|
||||
private async onClientMessage(raw: Buffer) {
|
||||
let abort: () => void
|
||||
try {
|
||||
const message = attemptValidation(messageSchema)(JSON.parse(raw.toString('utf-8')))
|
||||
const message = attemptValidation(messageSchema)(JSON.parse(raw.toString('utf8')))
|
||||
|
||||
const messageHandler = this.createMessageHandler([message, this]) as IMessageHandler & IAbortable
|
||||
if (typeof messageHandler.abort === 'function') {
|
||||
|
@ -13,6 +13,7 @@ export const workerFactory = (): AppWorker => {
|
||||
const dbClient = getDbClient()
|
||||
const eventRepository = new EventRepository(dbClient)
|
||||
|
||||
// deepcode ignore HttpToHttps: <please specify a reason of ignoring this>
|
||||
const server = http.createServer()
|
||||
const webSocketServer = new WebSocketServer({
|
||||
server,
|
||||
|
@ -158,7 +158,7 @@ export class EventRepository implements IEventRepository {
|
||||
}
|
||||
|
||||
public async create(event: Event): Promise<number> {
|
||||
return this.insert(event).then(prop('rowCount') as () => number)
|
||||
return this.insert(event).then(prop('rowCount') as () => number, () => 0)
|
||||
}
|
||||
|
||||
private insert(event: Event) {
|
||||
|
@ -97,7 +97,7 @@ export async function waitForEOSE(ws: WebSocket, subscription: string): Promise<
|
||||
ws.once('error', onError)
|
||||
|
||||
function onMessage(raw: RawData) {
|
||||
const message = JSON.parse(raw.toString('utf-8'))
|
||||
const message = JSON.parse(raw.toString('utf8'))
|
||||
if (message[0] === MessageType.EOSE && message[1] === subscription) {
|
||||
resolve()
|
||||
cleanup()
|
||||
@ -139,7 +139,7 @@ export async function waitForNextEvent(ws: WebSocket, subscription: string): Pro
|
||||
}
|
||||
|
||||
function onMessage(raw: RawData) {
|
||||
const message = JSON.parse(raw.toString('utf-8'))
|
||||
const message = JSON.parse(raw.toString('utf8'))
|
||||
if (message[0] === MessageType.EVENT && message[1] === subscription) {
|
||||
resolve(message[2])
|
||||
cleanup()
|
||||
@ -172,7 +172,7 @@ export async function waitForEventCount(
|
||||
cleanup()
|
||||
}
|
||||
function onMessage(raw: RawData) {
|
||||
const message = JSON.parse(raw.toString('utf-8'))
|
||||
const message = JSON.parse(raw.toString('utf8'))
|
||||
if (message[0] === MessageType.EVENT && message[1] === subscription) {
|
||||
events.push(message[2])
|
||||
if (!eose && events.length === count) {
|
||||
@ -213,7 +213,7 @@ export async function waitForNotice(ws: WebSocket): Promise<void> {
|
||||
ws.once('error', onError)
|
||||
|
||||
function onMessage(raw: RawData) {
|
||||
const message = JSON.parse(raw.toString('utf-8'))
|
||||
const message = JSON.parse(raw.toString('utf8'))
|
||||
if (message[0] === MessageType.NOTICE) {
|
||||
resolve(message[1])
|
||||
cleanup()
|
||||
|
@ -28,7 +28,7 @@ describe('webSocketAdapterFactory', () => {
|
||||
onStub.returns(client)
|
||||
const request: IncomingMessage = {
|
||||
headers: {
|
||||
'sec-websocket-key': Buffer.from('key', 'utf-8').toString('base64'),
|
||||
'sec-websocket-key': Buffer.from('key', 'utf8').toString('base64'),
|
||||
},
|
||||
} as any
|
||||
const webSocketServerAdapter: IWebSocketServerAdapter = {} as any
|
||||
|
Loading…
x
Reference in New Issue
Block a user