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
6 changes: 3 additions & 3 deletions packages/core/realtime-js/src/RealtimeClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,10 @@ export default class RealtimeClient {
}

/** @internal */
private _wrapHeartbeatCallback(heartbeatCallback?: HeartbeatCallback) {
return (status: HeartbeatStatus) => {
private _wrapHeartbeatCallback(heartbeatCallback?: HeartbeatCallback): HeartbeatCallback {
return (status, latency) => {
if (status == 'sent') this._setAuthSafely()
if (heartbeatCallback) heartbeatCallback(status)
if (heartbeatCallback) heartbeatCallback(status, latency)
}
}

Expand Down
43 changes: 43 additions & 0 deletions packages/core/realtime-js/test/RealtimeClient.transport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,49 @@ describe('push', () => {
})
})

describe('onConnMessage', () => {
beforeEach(() => {
testSetup = setupRealtimeTest()
})

afterEach(() => {
testSetup.cleanup()
})

test("on heartbeat events from the 'phoenix' topic, callback is called with latency", async () => {
let called = false
let calledLatency: number | undefined = undefined
testSetup.client.onHeartbeat((message, latency) => {
called = message == 'ok'
calledLatency = latency
})

testSetup.connect()
await testSetup.socketConnected()

const socket = testSetup.client.socketAdapter.getSocket()
socket.sendHeartbeat()
// One minute ago
socket.heartbeatSentAt = Date.now() - 60000

const message = JSON.stringify({
join_ref: null,
ref: socket.pendingHeartbeatRef,
topic: 'phoenix',
event: 'phx_reply',
payload: { status: 'ok', response: {} },
})

const messageEvent = new MessageEvent('message', { data: message })
socket.onConnMessage(messageEvent)

assert.strictEqual(called, true)
assert.strictEqual(testSetup.client.socketAdapter.getSocket().pendingHeartbeatRef, null)
expect(calledLatency).toBeGreaterThanOrEqual(60000)
expect(calledLatency).toBeLessThan(61000)
})
})

describe('custom encoder and decoder', () => {
test('encodes to array JSON by default', () => {
testSetup = setupRealtimeTest({
Expand Down