Skip to content

fix(peer): run isPeerMessage in the send message guards #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dinwwwh wants to merge 1 commit into from
Closed

fix(peer): run isPeerMessage in the send message guards #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions packages/peer/src/validators.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,15 @@ describe('isClientPeerSendMessage', () => {
])('rejects %s', (_, overrides) => {
expect(isClientPeerSendMessage(base(overrides))).toBe(false)
})

it.each([
['non-string id', base({ id: 123 as any, kind: 'request', json: { url: '/path' } })],
['binary as string', base({ kind: 'octet-stream', json: {}, binary: 'data' as any })],
['null', null],
['array', []],
])('rejects %s, which is not a peer message', (_, v) => {
expect(isClientPeerSendMessage(v)).toBe(false)
})
})

describe('isServerPeerSendMessage', () => {
Expand All @@ -270,4 +279,13 @@ describe('isServerPeerSendMessage', () => {
it('rejects request', () => {
expect(isServerPeerSendMessage(base({ kind: 'request', json: { url: '/path' } }))).toBe(false)
})

it.each([
['non-string id', base({ id: 123 as any, kind: 'response', json: {} })],
['binary as string', base({ kind: 'response', json: {}, binary: 'data' as any })],
['null', null],
['array', []],
])('rejects %s, which is not a peer message', (_, v) => {
expect(isServerPeerSendMessage(v)).toBe(false)
})
})
24 changes: 13 additions & 11 deletions packages/peer/src/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,23 @@ export function isPeerStreamCancelMessage(maybe: PeerMessage): maybe is PeerStre
return maybe.kind === 'stream/cancel' && maybe.json === undefined && maybe.binary === undefined
}

export function isClientPeerSendMessage(maybe: PeerMessage): maybe is ClientPeerSendMessage {
export function isClientPeerSendMessage(maybe: unknown): maybe is ClientPeerSendMessage {
return (
isPeerRequestMessage(maybe) ||
isPeerCancelMessage(maybe) ||
isPeerEventStreamMessage(maybe) ||
isPeerOctetStreamMessage(maybe)
isPeerMessage(maybe) &&
(isPeerRequestMessage(maybe) ||
isPeerCancelMessage(maybe) ||
isPeerEventStreamMessage(maybe) ||
isPeerOctetStreamMessage(maybe))
)
}

export function isServerPeerSendMessage(maybe: PeerMessage): maybe is ServerPeerSendMessage {
export function isServerPeerSendMessage(maybe: unknown): maybe is ServerPeerSendMessage {
return (
isPeerResponseMessage(maybe) ||
isPeerCancelMessage(maybe) ||
isPeerEventStreamMessage(maybe) ||
isPeerOctetStreamMessage(maybe) ||
isPeerStreamCancelMessage(maybe)
isPeerMessage(maybe) &&
(isPeerResponseMessage(maybe) ||
isPeerCancelMessage(maybe) ||
isPeerEventStreamMessage(maybe) ||
isPeerOctetStreamMessage(maybe) ||
isPeerStreamCancelMessage(maybe))
)
}
Loading