cleanup.
This commit is contained in:
parent
b2f3a01439
commit
4b6cc19b9c
|
@ -110,7 +110,8 @@ export class AbstractRelay {
|
||||||
this.ws.onopen = () => {
|
this.ws.onopen = () => {
|
||||||
clearTimeout(this.connectionTimeoutHandle)
|
clearTimeout(this.connectionTimeoutHandle)
|
||||||
this._connected = true
|
this._connected = true
|
||||||
if (this.ws && this.ws.ping) { // && this.pingHeartBeat
|
if (this.ws && this.ws.ping) {
|
||||||
|
// && this.pingHeartBeat
|
||||||
this.pingpong()
|
this.pingpong()
|
||||||
}
|
}
|
||||||
resolve()
|
resolve()
|
||||||
|
@ -146,31 +147,28 @@ export class AbstractRelay {
|
||||||
|
|
||||||
private async receivePong() {
|
private async receivePong() {
|
||||||
return new Promise((res, err) => {
|
return new Promise((res, err) => {
|
||||||
(this.ws && this.ws.on && this.ws.on('pong', () => res(true))) || err("ws can't listen for pong")
|
;(this.ws && this.ws.on && this.ws.on('pong', () => res(true))) || err("ws can't listen for pong")
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// nodejs requires this magic here to ensure connections are closed when internet goes off and stuff
|
||||||
|
// in browsers it's done automatically. see https://github.com/nbd-wtf/nostr-tools/issues/491
|
||||||
private async pingpong() {
|
private async pingpong() {
|
||||||
console.error('pingpong')
|
|
||||||
// if the websocket is connected
|
// if the websocket is connected
|
||||||
if (this.ws?.readyState == 1) {
|
if (this.ws?.readyState == 1) {
|
||||||
console.error('pingpong readyState==1')
|
|
||||||
// send a ping
|
// send a ping
|
||||||
console.error('pingpong ping()');
|
this.ws && this.ws.ping && this.ws.ping()
|
||||||
(this.ws && this.ws.ping) && this.ws.ping()
|
|
||||||
// wait for either a pong or a timeout
|
// wait for either a pong or a timeout
|
||||||
console.error('pingpong wait for pong or timeout')
|
|
||||||
const result = await Promise.any([
|
const result = await Promise.any([
|
||||||
this.receivePong(),
|
this.receivePong(),
|
||||||
new Promise(res => setTimeout(() => res(false), 10000)) // TODO: opts.pingTimeout
|
new Promise(res => setTimeout(() => res(false), 10000)), // TODO: opts.pingTimeout
|
||||||
])
|
])
|
||||||
console.error('pingpong result', result)
|
console.error('pingpong result', result)
|
||||||
if (result) {
|
if (result) {
|
||||||
console.error('pingpong scheduling pingpong')
|
|
||||||
// schedule another pingpong
|
// schedule another pingpong
|
||||||
setTimeout(() => this.pingpong(), 10000) // TODO: opts.pingFrequency
|
setTimeout(() => this.pingpong(), 10000) // TODO: opts.pingFrequency
|
||||||
} else {
|
} else {
|
||||||
console.error('pingpong closing socket')
|
// pingpong closing socket
|
||||||
this.ws && this.ws.close()
|
this.ws && this.ws.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
jsr.json
2
jsr.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@nostr/tools",
|
"name": "@nostr/tools",
|
||||||
"version": "2.15.1",
|
"version": "2.15.2",
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./index.ts",
|
".": "./index.ts",
|
||||||
"./core": "./core.ts",
|
"./core": "./core.ts",
|
||||||
|
|
2
nip29.ts
2
nip29.ts
|
@ -2,7 +2,7 @@ import { AbstractSimplePool } from './abstract-pool.ts'
|
||||||
import { Subscription } from './abstract-relay.ts'
|
import { Subscription } from './abstract-relay.ts'
|
||||||
import type { Event, EventTemplate } from './core.ts'
|
import type { Event, EventTemplate } from './core.ts'
|
||||||
import { fetchRelayInformation, RelayInformation } from './nip11.ts'
|
import { fetchRelayInformation, RelayInformation } from './nip11.ts'
|
||||||
import { AddressPointer, decode, NostrTypeGuard } from './nip19.ts'
|
import { decode, NostrTypeGuard } from './nip19.ts'
|
||||||
import { normalizeURL } from './utils.ts'
|
import { normalizeURL } from './utils.ts'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"name": "nostr-tools",
|
"name": "nostr-tools",
|
||||||
"version": "2.15.0",
|
"version": "2.15.2",
|
||||||
"description": "Tools for making a Nostr client.",
|
"description": "Tools for making a Nostr client.",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
Loading…
Reference in New Issue