nostr-tools 2.23.9 → 2.23.11

package/lib/cjs/nip46.js

@@ -372,12 +372,14 @@ var AbstractRelay = class {
   openSubs = /* @__PURE__ */ new Map();
   enablePing;
   enableReconnect;
+  idleTimeout = 0;
   idleSince = Date.now();
   ongoingOperations = 0;
   reconnectTimeoutHandle;
   pingIntervalHandle;
   reconnectAttempts = 0;
   skipReconnection = false;
+  idleTimeoutHandle;
   connectionPromise;
   openCountRequests = /* @__PURE__ */ new Map();
   openEventPublishes = /* @__PURE__ */ new Map();
@@ -393,6 +395,8 @@ var AbstractRelay = class {
     this._WebSocket = opts.websocketImplementation || WebSocket;
     this.enablePing = opts.enablePing;
     this.enableReconnect = opts.enableReconnect || false;
+    if (opts.idleTimeout)
+      this.idleTimeout = opts.idleTimeout;
   }
   static async connect(url, opts) {
     const relay = new AbstractRelay(url, opts);
@@ -416,6 +420,22 @@ var AbstractRelay = class {
   get connected() {
     return this._connected;
   }
+  clearIdleTimeout() {
+    if (this.idleTimeoutHandle) {
+      clearTimeout(this.idleTimeoutHandle);
+      this.idleTimeoutHandle = void 0;
+    }
+  }
+  scheduleIdleClose() {
+    this.clearIdleTimeout();
+    if (this.idleTimeout > 0) {
+      this.idleTimeoutHandle = setTimeout(() => {
+        if (this.ongoingOperations === 0 && this.idleSince) {
+          this.close();
+        }
+      }, this.idleTimeout);
+    }
+  }
   async reconnect() {
     const backoff = this.resubscribeBackoff[Math.min(this.reconnectAttempts, this.resubscribeBackoff.length - 1)];
     this.reconnectAttempts++;
@@ -434,6 +454,7 @@ var AbstractRelay = class {
     this._connected = false;
     this.connectionPromise = void 0;
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     if (this.enableReconnect && !this.skipReconnection) {
       this.reconnect();
     } else {
@@ -591,6 +612,7 @@ var AbstractRelay = class {
   }
   async publish(event) {
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     this.ongoingOperations++;
     const ret = new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -612,8 +634,10 @@ var AbstractRelay = class {
       }
     }
     this.ongoingOperations--;
-    if (this.ongoingOperations === 0)
+    if (this.ongoingOperations === 0) {
       this.idleSince = Date.now();
+      this.scheduleIdleClose();
+    }
     return ret;
   }
   async count(filters, params) {
@@ -639,6 +663,7 @@ var AbstractRelay = class {
   subscribe(filters, params) {
     if (params.label !== "<forced-ping>") {
       this.idleSince = void 0;
+      this.clearIdleTimeout();
       this.ongoingOperations++;
     }
     const sub = this.prepareSubscription(filters, params);
@@ -668,6 +693,7 @@ var AbstractRelay = class {
     this.closeAllSubscriptions("relay connection closed by us");
     this._connected = false;
     this.idleSince = void 0;
+    this.clearIdleTimeout();
     this.onclose?.();
     if (this.ws?.readyState === this._WebSocket.OPEN) {
       this.ws?.close();
@@ -845,8 +871,10 @@ var Subscription = class {
     }
     this.relay.openSubs.delete(this.id);
     this.relay.ongoingOperations--;
-    if (this.relay.ongoingOperations === 0)
+    if (this.relay.ongoingOperations === 0) {
       this.relay.idleSince = Date.now();
+      this.relay.scheduleIdleClose();
+    }
     this.onclose?.(reason);
   }
 };
@@ -922,6 +950,7 @@ var AbstractSimplePool = class {
   verifyEvent;
   enablePing;
   enableReconnect;
+  idleTimeout = 2e4;
   automaticallyAuth;
   trustedRelayURLs = /* @__PURE__ */ new Set();
   onRelayConnectionFailure;
@@ -934,6 +963,8 @@ var AbstractSimplePool = class {
     this._WebSocket = opts.websocketImplementation;
     this.enablePing = opts.enablePing;
     this.enableReconnect = opts.enableReconnect || false;
+    if (opts.idleTimeout)
+      this.idleTimeout = opts.idleTimeout;
     this.automaticallyAuth = opts.automaticallyAuth;
     this.onRelayConnectionFailure = opts.onRelayConnectionFailure;
     this.onRelayConnectionSuccess = opts.onRelayConnectionSuccess;
@@ -948,7 +979,8 @@ var AbstractSimplePool = class {
         verifyEvent: this.trustedRelayURLs.has(url) ? alwaysTrue : this.verifyEvent,
         websocketImplementation: this._WebSocket,
         enablePing: this.enablePing,
-        enableReconnect: this.enableReconnect
+        enableReconnect: this.enableReconnect,
+        idleTimeout: this.idleTimeout
       });
       relay.onclose = () => {
         this.relays.delete(url);