fix: return relay reservations in seconds (#1641)

Other bug fixes:

* Guard on setTimeout input being too large, over the max value for a signed 32 bit integer and node will set it to 1.
* Calculate a TTL in the future for the tag, rather than the past

Author: achingbrain

src/circuit/server/index.ts

@@ -259,7 +259,7 @@ class CircuitRelayServer extends EventEmitter<RelayServerEvents> implements Star
       // tag relay target peer
       // result.expire is non-null if `ReservationStore.reserve` returns with status == OK
       if (result.expire != null) {
-        const ttl = new Date().getTime() - result.expire
+        const ttl = (result.expire * 1000) - Date.now()
         await this.peerStore.tagPeer(connection.remotePeer, RELAY_SOURCE_TAG, { value: 1, ttl })
       }
 

src/circuit/server/reservation-store.ts

@@ -88,13 +88,18 @@ export class ReservationStore implements Startable {
     if (this.reservations.size >= this.maxReservations && !this.reservations.has(peer)) {
       return { status: Status.RESERVATION_REFUSED }
     }
+
     const expire = new Date(Date.now() + this.reservationTtl)
     let checkedLimit: Limit | undefined
+
     if (this.applyDefaultLimit) {
       checkedLimit = limit ?? { data: this.defaultDataLimit, duration: this.defaultDurationLimit }
     }
+
     this.reservations.set(peer, { addr, expire, limit: checkedLimit })
-    return { status: Status.OK, expire: expire.getTime() }
+
+    // return expiry time in seconds
+    return { status: Status.OK, expire: Math.round(expire.getTime() / 1000) }
   }
 
   removeReservation (peer: PeerId): void {

src/circuit/transport/discovery.ts

@@ -1,8 +1,8 @@
 import { logger } from '@libp2p/logger'
 import { namespaceToCid } from '../utils.js'
 import {
-  RELAY_RENDEZVOUS_NS
-  , RELAY_V2_HOP_CODEC
+  RELAY_RENDEZVOUS_NS,
+  RELAY_V2_HOP_CODEC
 } from '../constants.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { PeerStore } from '@libp2p/interface-peer-store'

src/circuit/transport/listener.ts

@@ -3,7 +3,7 @@ import type { ConnectionManager } from '@libp2p/interface-connection-manager'
 import type { Listener, ListenerEvents } from '@libp2p/interface-transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import { multiaddr } from '@multiformats/multiaddr'
-import type { ReservationStore } from './reservation-store'
+import type { ReservationStore } from './reservation-store.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import { PeerMap } from '@libp2p/peer-collections'
 import { logger } from '@libp2p/logger'

src/circuit/transport/reservation-store.ts

@@ -167,8 +167,9 @@ export class ReservationStore extends EventEmitter<ReservationStoreEvents> imple
 
         const expiration = getExpirationMilliseconds(reservation.expire)
 
-        // sets a lower bound on the timeout
-        const timeoutDuration = Math.max(expiration - REFRESH_TIMEOUT, REFRESH_TIMEOUT_MIN)
+        // sets a lower bound on the timeout, and also don't let it go over
+        // 2^31 - 1 (setTimeout will only accept signed 32 bit integers)
+        const timeoutDuration = Math.min(Math.max(expiration - REFRESH_TIMEOUT, REFRESH_TIMEOUT_MIN), Math.pow(2, 31) - 1)
 
         const timeout = setTimeout(() => {
           this.addRelay(peerId, type).catch(err => {
@@ -215,7 +216,7 @@ export class ReservationStore extends EventEmitter<ReservationStoreEvents> imple
     try {
       response = await hopstr.read()
     } catch (err: any) {
-      log.error('error parsing reserve message response from %s because', connection.remotePeer, err.message)
+      log.error('error parsing reserve message response from %p because', connection.remotePeer, err)
       throw err
     } finally {
       stream.close()