coracle/welshman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use default pool, make adapter context optional

Browse Source
This commit is contained in:
Jon Staab
2025-03-31 09:35:48 -07:00
parent 51dd44161a
commit 4237b145ae
17 changed files with 293 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/net/__tests__/Publish.test.ts
+21 -21
View File
@@ -1,7 +1,7 @@
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
import { EventEmitter } from "events"
import { Unicast, Multicast, PublishEventType, PublishStatus, unicast, multicast } from "../src/publish"
import { AbstractAdapter, AdapterEventType } from "../src/adapter"
import { Unicast, Multicast, PublishEvent, PublishStatus, unicast, multicast } from "../src/publish"
import { AbstractAdapter, AdapterEvent } from "../src/adapter"
import { ClientMessageType, RelayMessage } from "../src/message"
import { SignedEvent, makeEvent } from "@welshman/util"
import { Nip01Signer } from '@welshman/signer'
@@ -20,7 +20,7 @@ class MockAdapter extends AbstractAdapter {
}
receive = (message: RelayMessage) => {
this.emit(AdapterEventType.Receive, message, this.url)
this.emit(AdapterEvent.Receive, message, this.url)
}
}
@@ -49,9 +49,9 @@ describe("Unicast", () => {
const failureSpy = vi.fn()
const completeSpy = vi.fn()
pub.on(PublishEventType.Success, successSpy)
pub.on(PublishEventType.Failure, failureSpy)
pub.on(PublishEventType.Complete, completeSpy)
pub.on(PublishEvent.Success, successSpy)
pub.on(PublishEvent.Failure, failureSpy)
pub.on(PublishEvent.Complete, completeSpy)
await vi.advanceTimersByTimeAsync(200)
@@ -82,9 +82,9 @@ describe("Unicast", () => {
const failureSpy = vi.fn()
const completeSpy = vi.fn()
pub.on(PublishEventType.Success, successSpy)
pub.on(PublishEventType.Failure, failureSpy)
pub.on(PublishEventType.Complete, completeSpy)
pub.on(PublishEvent.Success, successSpy)
pub.on(PublishEvent.Failure, failureSpy)
pub.on(PublishEvent.Complete, completeSpy)
await vi.advanceTimersByTimeAsync(200)
@@ -116,10 +116,10 @@ describe("Unicast", () => {
const completeSpy = vi.fn()
const timeoutSpy = vi.fn()
pub.on(PublishEventType.Success, successSpy)
pub.on(PublishEventType.Failure, failureSpy)
pub.on(PublishEventType.Complete, completeSpy)
pub.on(PublishEventType.Timeout, timeoutSpy)
pub.on(PublishEvent.Success, successSpy)
pub.on(PublishEvent.Failure, failureSpy)
pub.on(PublishEvent.Complete, completeSpy)
pub.on(PublishEvent.Timeout, timeoutSpy)
await vi.runAllTimers(200)
@@ -150,10 +150,10 @@ describe("Unicast", () => {
const completeSpy = vi.fn()
const abortSpy = vi.fn()
pub.on(PublishEventType.Success, successSpy)
pub.on(PublishEventType.Failure, failureSpy)
pub.on(PublishEventType.Complete, completeSpy)
pub.on(PublishEventType.Timeout, abortSpy)
pub.on(PublishEvent.Success, successSpy)
pub.on(PublishEvent.Failure, failureSpy)
pub.on(PublishEvent.Complete, completeSpy)
pub.on(PublishEvent.Timeout, abortSpy)
await vi.runAllTimers(200)
@@ -209,10 +209,10 @@ describe("Multicast", () => {
const completeSpy = vi.fn()
const timeoutSpy = vi.fn()
pub.on(PublishEventType.Success, successSpy)
pub.on(PublishEventType.Failure, failureSpy)
pub.on(PublishEventType.Complete, completeSpy)
pub.on(PublishEventType.Timeout, timeoutSpy)
pub.on(PublishEvent.Success, successSpy)
pub.on(PublishEvent.Failure, failureSpy)
pub.on(PublishEvent.Complete, completeSpy)
pub.on(PublishEvent.Timeout, timeoutSpy)
adapter1.receive(["OK", event.id, true, "hi"])
adapter2.receive(["OK", event.id, false, "hi"])
packages/net/__tests__/Socket.test.ts
+11 -11
View File
@@ -1,7 +1,7 @@
import { sleep } from "@welshman/lib"
import WebSocket from 'isomorphic-ws'
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
import { Socket, SocketStatus, SocketEventType } from "../src/socket"
import { Socket, SocketStatus, SocketEvent } from "../src/socket"
import { ClientMessage, RelayMessage } from "../src/message"
vi.mock('isomorphic-ws', () => {
@@ -39,7 +39,7 @@ describe("Socket", () => {
describe("open", () => {
it("should create websocket and emit opening status", () => {
const statusSpy = vi.fn()
socket.on(SocketEventType.Status, statusSpy)
socket.on(SocketEvent.Status, statusSpy)
socket.open()
@@ -58,7 +58,7 @@ describe("Socket", () => {
it("should emit invalid status on invalid URL", () => {
const statusSpy = vi.fn()
socket.on(SocketEventType.Status, statusSpy)
socket.on(SocketEvent.Status, statusSpy)
vi.mocked(WebSocket).mockImplementationOnce(() => {
throw new Error()
@@ -73,7 +73,7 @@ describe("Socket", () => {
describe("close", () => {
it("should close websocket and emit closed status", () => {
const statusSpy = vi.fn()
socket.on(SocketEventType.Status, statusSpy)
socket.on(SocketEvent.Status, statusSpy)
socket.open()
@@ -89,7 +89,7 @@ describe("Socket", () => {
describe("send", () => {
it("should queue messages and emit enqueue event", () => {
const enqueueSpy = vi.fn()
socket.on(SocketEventType.Enqueue, enqueueSpy)
socket.on(SocketEvent.Enqueue, enqueueSpy)
const message: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.send(message)
@@ -99,7 +99,7 @@ describe("Socket", () => {
it("should send messages when socket is open", async () => {
const sendSpy = vi.fn()
socket.on(SocketEventType.Send, sendSpy)
socket.on(SocketEvent.Send, sendSpy)
socket.open()
socket._ws.onopen()
@@ -117,7 +117,7 @@ describe("Socket", () => {
describe("receive", () => {
it("should handle valid relay messages", async () => {
const receiveSpy = vi.fn()
socket.on(SocketEventType.Receive, receiveSpy)
socket.on(SocketEvent.Receive, receiveSpy)
socket.open()
const message: RelayMessage = ["EVENT", "123", { id: "123", kind: 1 }]
@@ -131,7 +131,7 @@ describe("Socket", () => {
it("should emit error on invalid JSON", () => {
const errorSpy = vi.fn()
socket.on(SocketEventType.Error, errorSpy)
socket.on(SocketEvent.Error, errorSpy)
socket.open()
socket._ws.onmessage({ data: "invalid json" })
@@ -141,7 +141,7 @@ describe("Socket", () => {
it("should emit error on non-array message", () => {
const errorSpy = vi.fn()
socket.on(SocketEventType.Error, errorSpy)
socket.on(SocketEvent.Error, errorSpy)
socket.open()
socket._ws.onmessage({ data: JSON.stringify({ not: "an array" }) })
@@ -159,14 +159,14 @@ describe("Socket", () => {
socket.cleanup()
expect(ws.close).toHaveBeenCalled()
expect(socket.listenerCount(SocketEventType.Send)).toBe(0)
expect(socket.listenerCount(SocketEvent.Send)).toBe(0)
})
})
describe("error handling", () => {
it("should emit error status on websocket error", () => {
const statusSpy = vi.fn()
socket.on(SocketEventType.Status, statusSpy)
socket.on(SocketEvent.Status, statusSpy)
socket.open()
socket._ws.onerror()
packages/net/__tests__/adapter.test.ts
+5 -5
View File
@@ -1,7 +1,7 @@
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
import { Socket, SocketEventType } from "../src/socket"
import { Socket, SocketEvent } from "../src/socket"
import { Relay, LOCAL_RELAY_URL, isRelayUrl } from "@welshman/util"
import { AdapterEventType, SocketAdapter, LocalAdapter, getAdapter } from "../src/adapter"
import { AdapterEvent, SocketAdapter, LocalAdapter, getAdapter } from "../src/adapter"
import { Pool } from "../src/pool"
import { ClientMessage, RelayMessage } from "../src/message"
import EventEmitter from "events"
@@ -45,10 +45,10 @@ describe("SocketAdapter", () => {
it("should forward received messages", () => {
const receiveSpy = vi.fn()
adapter.on(AdapterEventType.Receive, receiveSpy)
adapter.on(AdapterEvent.Receive, receiveSpy)
const message: RelayMessage = ["EVENT", "123", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Receive, message, "wss://test.relay")
socket.emit(SocketEvent.Receive, message, "wss://test.relay")
expect(receiveSpy).toHaveBeenCalledWith(message, "wss://test.relay")
})
@@ -95,7 +95,7 @@ describe("LocalAdapter", () => {
it("should forward received messages", () => {
const receiveSpy = vi.fn()
adapter.on(AdapterEventType.Receive, receiveSpy)
adapter.on(AdapterEvent.Receive, receiveSpy)
const message: RelayMessage = ["EVENT", "123", { id: "123", kind: 1 }]
relay.emit("*", ...message)
packages/net/__tests__/auth.test.ts
+11 -11
View File
@@ -1,8 +1,8 @@
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
import { Socket, SocketStatus, SocketEventType } from "../src/socket"
import { Socket, SocketStatus, SocketEvent } from "../src/socket"
import { makeEvent, CLIENT_AUTH } from "@welshman/util"
import { Nip01Signer } from "@welshman/signer"
import { AuthState, AuthStatus, AuthStateEventType, AuthManager, makeAuthEvent } from "../src/auth"
import { AuthState, AuthStatus, AuthStateEvent, AuthManager, makeAuthEvent } from "../src/auth"
import EventEmitter from "events"
import { RelayMessage } from "../src/message"
@@ -43,7 +43,7 @@ describe('auth', () => {
it("should handle AUTH message from relay", () => {
const message: RelayMessage = ["AUTH", "challenge123"]
socket.emit(SocketEventType.Receive, message)
socket.emit(SocketEvent.Receive, message)
expect(authManager.state.challenge).toBe("challenge123")
expect(authManager.state.status).toBe(AuthStatus.Requested)
@@ -52,7 +52,7 @@ describe('auth', () => {
it("should handle successful OK message", () => {
authManager.state.request = "request123"
const message: RelayMessage = ["OK", "request123", true, "success"]
socket.emit(SocketEventType.Receive, message)
socket.emit(SocketEvent.Receive, message)
expect(authManager.state.status).toBe(AuthStatus.Ok)
expect(authManager.state.details).toBe("success")
@@ -61,7 +61,7 @@ describe('auth', () => {
it("should handle failed OK message", () => {
authManager.state.request = "request123"
const message: RelayMessage = ["OK", "request123", false, "forbidden"]
socket.emit(SocketEventType.Receive, message)
socket.emit(SocketEvent.Receive, message)
expect(authManager.state.status).toBe(AuthStatus.Forbidden)
expect(authManager.state.details).toBe("forbidden")
@@ -70,14 +70,14 @@ describe('auth', () => {
it("should ignore OK messages for different requests", () => {
authManager.state.request = "request123"
const message: RelayMessage = ["OK", "different-request", true, "success"]
socket.emit(SocketEventType.Receive, message)
socket.emit(SocketEvent.Receive, message)
expect(authManager.state.status).toBe(AuthStatus.None)
})
it("should handle client AUTH message", () => {
const message: RelayMessage = ["AUTH", { id: "123", kind: CLIENT_AUTH }]
socket.emit(SocketEventType.Enqueue, message)
socket.emit(SocketEvent.Enqueue, message)
expect(authManager.state.status).toBe(AuthStatus.PendingResponse)
})
@@ -88,7 +88,7 @@ describe('auth', () => {
authManager.state.details = "details"
authManager.state.status = AuthStatus.PendingResponse
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
expect(authManager.state.challenge).toBeUndefined()
expect(authManager.state.request).toBeUndefined()
@@ -98,7 +98,7 @@ describe('auth', () => {
it("should emit status changes", () => {
const statusSpy = vi.fn()
authManager.state.on(AuthStateEventType.Status, statusSpy)
authManager.state.on(AuthStateEvent.Status, statusSpy)
authManager.state.setStatus(AuthStatus.Requested)
@@ -121,14 +121,14 @@ describe('auth', () => {
const respondSpy = vi.spyOn(AuthManager.prototype, "respond")
const eagerManager = new AuthManager(socket, { sign, eager: true })
socket.emit(SocketEventType.Receive, ["AUTH", "challenge123"])
socket.emit(SocketEvent.Receive, ["AUTH", "challenge123"])
expect(respondSpy).toHaveBeenCalled()
})
it("should not respond automatically when eager is false", () => {
const respondSpy = vi.spyOn(AuthManager.prototype, "respond")
socket.emit(SocketEventType.Receive, ["AUTH", "challenge123"])
socket.emit(SocketEvent.Receive, ["AUTH", "challenge123"])
expect(respondSpy).not.toHaveBeenCalled()
})
packages/net/__tests__/policy.test.ts
+44 -44
View File
@@ -1,7 +1,7 @@
import { AUTH_JOIN } from "@welshman/util"
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
import { Socket, SocketStatus, SocketEventType } from "../src/socket"
import { AuthStatus, AuthStateEventType } from "../src/auth"
import { Socket, SocketStatus, SocketEvent } from "../src/socket"
import { AuthStatus, AuthStateEvent } from "../src/auth"
import {
socketPolicySendWhenOpen,
socketPolicyDeferOnAuth,
@@ -46,7 +46,7 @@ describe('policy', () => {
const cleanup = socketPolicyDeferOnAuth(socket)
const removeSpy = vi.spyOn(socket._sendQueue, 'remove')
socket.emit(SocketEventType.Receive, ["AUTH", "challenge"])
socket.emit(SocketEvent.Receive, ["AUTH", "challenge"])
// Regular event should be buffered
const event: ClientMessage = ["EVENT", { id: "123"}]
@@ -70,7 +70,7 @@ describe('policy', () => {
const cleanup = socketPolicyDeferOnAuth(socket)
const sendSpy = vi.spyOn(socket, 'send')
socket.emit(SocketEventType.Receive, ["AUTH", "challenge"])
socket.emit(SocketEvent.Receive, ["AUTH", "challenge"])
// Buffer some messages
const event1: ClientMessage = ["EVENT", { id: "123"}]
@@ -80,7 +80,7 @@ describe('policy', () => {
// Auth succeeds
socket.send(["AUTH", { id: "auth" }])
socket.emit(AuthStateEventType.Status, AuthStatus.Ok)
socket.emit(AuthStateEvent.Status, AuthStatus.Ok)
expect(sendSpy).toHaveBeenCalledWith(event1)
expect(sendSpy).toHaveBeenCalledWith(event2)
@@ -92,7 +92,7 @@ describe('policy', () => {
const cleanup = socketPolicyDeferOnAuth(socket)
const removeSpy = vi.spyOn(socket._sendQueue, 'remove')
socket.emit(SocketEventType.Receive, ["AUTH", "challenge"])
socket.emit(SocketEvent.Receive, ["AUTH", "challenge"])
// Buffer a REQ message
const req: ClientMessage = ["REQ", "123", { kinds: [1] }]
@@ -117,16 +117,16 @@ describe('policy', () => {
// Send an event
const event: ClientMessage = ["EVENT", { id: "123", kind: 1, content: "", tags: [], pubkey: "", sig: "" }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Receive auth-required rejection
socket.emit(SocketEventType.Receive, ["OK", "123", false, "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["OK", "123", false, "auth-required: need to auth first"])
// Should retry the event
expect(sendSpy).toHaveBeenCalledWith(event)
// Receive another auth-required rejection
socket.emit(SocketEventType.Receive, ["OK", "123", false, "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["OK", "123", false, "auth-required: need to auth first"])
// Should not retry again
expect(sendSpy).toHaveBeenCalledTimes(1)
@@ -140,16 +140,16 @@ describe('policy', () => {
// Send a REQ
const req: ClientMessage = ["REQ", "123", { kinds: [1] }]
socket.emit(SocketEventType.Send, req)
socket.emit(SocketEvent.Send, req)
// Receive auth-required rejection via CLOSED
socket.emit(SocketEventType.Receive, ["CLOSED", "123", "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["CLOSED", "123", "auth-required: need to auth first"])
// Should retry the request
expect(sendSpy).toHaveBeenCalledWith(req)
// Receive another auth-required rejection
socket.emit(SocketEventType.Receive, ["CLOSED", "123", "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["CLOSED", "123", "auth-required: need to auth first"])
// Should not retry again
expect(sendSpy).toHaveBeenCalledTimes(1)
@@ -163,10 +163,10 @@ describe('policy', () => {
// Send an AUTH_JOIN event
const event: ClientMessage = ["EVENT", { id: "123", kind: AUTH_JOIN, content: "", tags: [], pubkey: "", sig: "" }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Receive auth-required rejection
socket.emit(SocketEventType.Receive, ["OK", "123", false, "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["OK", "123", false, "auth-required: need to auth first"])
// Should not retry AUTH_JOIN events
expect(sendSpy).not.toHaveBeenCalled()
@@ -180,13 +180,13 @@ describe('policy', () => {
// Send an event
const event: ClientMessage = ["EVENT", { id: "123", kind: 1, content: "", tags: [], pubkey: "", sig: "" }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Receive successful response
socket.emit(SocketEventType.Receive, ["OK", "123", true, ""])
socket.emit(SocketEvent.Receive, ["OK", "123", true, ""])
// Receive auth-required rejection (should not trigger retry since message was cleared)
socket.emit(SocketEventType.Receive, ["OK", "123", false, "auth-required: need to auth first"])
socket.emit(SocketEvent.Receive, ["OK", "123", false, "auth-required: need to auth first"])
// Should not retry
expect(sendSpy).not.toHaveBeenCalled()
@@ -201,11 +201,11 @@ describe('policy', () => {
const openSpy = vi.spyOn(socket, 'open')
// Socket starts closed
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Send a message
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Enqueue, event)
socket.emit(SocketEvent.Enqueue, event)
// Should open the socket
expect(openSpy).toHaveBeenCalled()
@@ -218,11 +218,11 @@ describe('policy', () => {
const openSpy = vi.spyOn(socket, 'open')
// Socket is open
socket.emit(SocketEventType.Status, SocketStatus.Open)
socket.emit(SocketEvent.Status, SocketStatus.Open)
// Send a message
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Enqueue, event)
socket.emit(SocketEvent.Enqueue, event)
// Should not try to open the socket
expect(openSpy).not.toHaveBeenCalled()
@@ -235,12 +235,12 @@ describe('policy', () => {
const openSpy = vi.spyOn(socket, 'open')
// Socket has an error
socket.emit(SocketEventType.Status, SocketStatus.Error)
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Error)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Send a message
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Enqueue, event)
socket.emit(SocketEvent.Enqueue, event)
// Should not try to open the socket due to recent error
expect(openSpy).not.toHaveBeenCalled()
@@ -249,7 +249,7 @@ describe('policy', () => {
vi.advanceTimersByTime(31000)
// Send another message
socket.emit(SocketEventType.Enqueue, event)
socket.emit(SocketEvent.Enqueue, event)
// Now it should try to open
expect(openSpy).toHaveBeenCalled()
@@ -264,7 +264,7 @@ describe('policy', () => {
const closeSpy = vi.spyOn(socket, 'close')
// Set socket as open
socket.emit(SocketEventType.Status, SocketStatus.Open)
socket.emit(SocketEvent.Status, SocketStatus.Open)
// Advance time past the timeout
await vi.advanceTimersByTimeAsync(35000)
@@ -280,13 +280,13 @@ describe('policy', () => {
const closeSpy = vi.spyOn(socket, 'close')
// Set socket as open
socket.emit(SocketEventType.Status, SocketStatus.Open)
socket.emit(SocketEvent.Status, SocketStatus.Open)
// Advance time partially
vi.advanceTimersByTime(20000)
// Send a message
socket.emit(SocketEventType.Send, ["EVENT", { id: "123" }])
socket.emit(SocketEvent.Send, ["EVENT", { id: "123" }])
// Advance time partially again
vi.advanceTimersByTime(20000)
@@ -308,13 +308,13 @@ describe('policy', () => {
const closeSpy = vi.spyOn(socket, 'close')
// Set socket as open
socket.emit(SocketEventType.Status, SocketStatus.Open)
socket.emit(SocketEvent.Status, SocketStatus.Open)
// Advance time partially
vi.advanceTimersByTime(20000)
// Receive a message
socket.emit(SocketEventType.Receive, ["EVENT", "123", { id: "123" }])
socket.emit(SocketEvent.Receive, ["EVENT", "123", { id: "123" }])
// Advance time partially again
vi.advanceTimersByTime(20000)
@@ -336,7 +336,7 @@ describe('policy', () => {
const closeSpy = vi.spyOn(socket, 'close')
// Set socket as closed
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance time past the timeout
vi.advanceTimersByTime(31000)
@@ -355,10 +355,10 @@ describe('policy', () => {
// Send an event that will be pending
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Socket closes
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance past the reopen delay
await vi.advanceTimersByTimeAsync(30000)
@@ -375,10 +375,10 @@ describe('policy', () => {
// Send a request that will be pending
const req: ClientMessage = ["REQ", "123", { kinds: [1] }]
socket.emit(SocketEventType.Send, req)
socket.emit(SocketEvent.Send, req)
// Socket closes
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance past the reopen delay
await vi.advanceTimersByTimeAsync(30000)
@@ -395,11 +395,11 @@ describe('policy', () => {
// Send an event that will be pending
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Socket opens then closes quickly
socket.emit(SocketEventType.Status, SocketStatus.Open)
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Open)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance a short time
vi.advanceTimersByTime(5000)
@@ -422,13 +422,13 @@ describe('policy', () => {
// Send an event that will be pending
const event: ClientMessage = ["EVENT", { id: "123", kind: 1 }]
socket.emit(SocketEventType.Send, event)
socket.emit(SocketEvent.Send, event)
// Event completes successfully
socket.emit(SocketEventType.Receive, ["OK", "123", true])
socket.emit(SocketEvent.Receive, ["OK", "123", true])
// Socket closes
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance past the reopen delay
vi.advanceTimersByTime(30000)
@@ -445,14 +445,14 @@ describe('policy', () => {
// Send a request that will be pending
const req: ClientMessage = ["REQ", "123", { kinds: [1] }]
socket.emit(SocketEventType.Send, req)
socket.emit(SocketEvent.Send, req)
// Send close for the request
const close: ClientMessage = ["CLOSE", "123"]
socket.emit(SocketEventType.Send, close)
socket.emit(SocketEvent.Send, close)
// Socket closes
socket.emit(SocketEventType.Status, SocketStatus.Closed)
socket.emit(SocketEvent.Status, SocketStatus.Closed)
// Advance past the reopen delay
vi.advanceTimersByTime(30000)
packages/net/__tests__/request.test.ts
+15 -15
View File
@@ -2,8 +2,8 @@ import { describe, expect, it, vi, beforeEach, afterEach } from "vitest"
import { Nip01Signer } from '@welshman/signer'
import { LOCAL_RELAY_URL, makeEvent } from '@welshman/util'
import { ClientMessageType, RelayMessage } from "../src/message"
import { AdapterContext, AbstractAdapter, AdapterEventType } from "../src/adapter"
import { unireq, multireq, RequestEventType } from "../src/request"
import { AdapterContext, AbstractAdapter, AdapterEvent } from "../src/adapter"
import { unireq, multireq, RequestEvent } from "../src/request"
import { Tracker } from "../src/tracker"
class MockAdapter extends AbstractAdapter {
@@ -20,7 +20,7 @@ class MockAdapter extends AbstractAdapter {
}
receive = (message: RelayMessage) => {
this.emit(AdapterEventType.Receive, message, this.url)
this.emit(AdapterEvent.Receive, message, this.url)
}
}
@@ -50,12 +50,12 @@ describe("Unireq", () => {
const eoseSpy = vi.fn()
const closeSpy = vi.fn()
req.on(RequestEventType.Duplicate, duplicateSpy)
req.on(RequestEventType.Invalid, invalidSpy)
req.on(RequestEventType.Filtered, filteredSpy)
req.on(RequestEventType.Event, eventSpy)
req.on(RequestEventType.Eose, eoseSpy)
req.on(RequestEventType.Close, closeSpy)
req.on(RequestEvent.Duplicate, duplicateSpy)
req.on(RequestEvent.Invalid, invalidSpy)
req.on(RequestEvent.Filtered, filteredSpy)
req.on(RequestEvent.Event, eventSpy)
req.on(RequestEvent.Eose, eoseSpy)
req.on(RequestEvent.Close, closeSpy)
await vi.runAllTimers()
@@ -116,12 +116,12 @@ describe("Multireq", () => {
const eoseSpy = vi.fn()
const closeSpy = vi.fn()
req.on(RequestEventType.Duplicate, duplicateSpy)
req.on(RequestEventType.Invalid, invalidSpy)
req.on(RequestEventType.Filtered, filteredSpy)
req.on(RequestEventType.Event, eventSpy)
req.on(RequestEventType.Eose, eoseSpy)
req.on(RequestEventType.Close, closeSpy)
req.on(RequestEvent.Duplicate, duplicateSpy)
req.on(RequestEvent.Invalid, invalidSpy)
req.on(RequestEvent.Filtered, filteredSpy)
req.on(RequestEvent.Event, eventSpy)
req.on(RequestEvent.Eose, eoseSpy)
req.on(RequestEvent.Close, closeSpy)
await vi.runAllTimers()