Tune fetch for improved connection management (#1532)

* Custom fetch keepalive Use a custom fetch agent to reduce total TCP connections/DNS lookups and leverage long-lived HTTPS connections * Create changeset --------- Co-authored-by: Tom Sightler <[email protected]> Co-authored-by: dgreif <[email protected]>
dgreif · Nov 23, 2024 · 209f13e · 209f13e
1 parent b3b17c4
commit 209f13e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/.changeset/purple-teachers-applaud.md b/.changeset/purple-teachers-applaud.md
@@ -0,0 +1,6 @@
+---
+'ring-client-api': patch
+'homebridge-ring': patch
+---
+
+Increase keepalive and adjust connection pooling, which will hopefully result in more stable fetch requests
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ring-client-api/package.json b/packages/ring-client-api/package.json
@@ -26,6 +26,7 @@
     "rxjs": "^7.8.1",
     "socket.io-client": "^2.5.0",
     "systeminformation": "^5.23.5",
+    "undici": "^6.21.0",
     "uuid": "^11.0.3",
     "werift": "0.20.1",
     "ws": "^8.18.0"

diff --git a/packages/ring-client-api/rest-client.ts b/packages/ring-client-api/rest-client.ts
@@ -16,14 +16,21 @@ import {
 import { ReplaySubject } from 'rxjs'
 import assert from 'assert'
 import type { Credentials } from '@eneris/push-receiver/dist/types'
+import { Agent } from 'undici'
 
 interface RequestOptions extends RequestInit {
   responseType?: 'json' | 'buffer'
   timeout?: number
   json?: object
+  dispatcher?: Agent
 }
 
-const defaultRequestOptions: RequestOptions = {
+const fetchAgent = new Agent({
+    connections: 6,
+    pipelining: 1,
+    keepAliveTimeout: 115000,
+  }),
+  defaultRequestOptions: RequestOptions = {
     responseType: 'json',
     method: 'GET',
     timeout: 20000,
@@ -116,6 +123,7 @@ async function requestWithRetry<T>(
     const options = {
       ...defaultRequestOptions,
       ...requestOptions,
+      dispatcher: fetchAgent,
     }
 
     // If a timeout is provided, create an AbortSignal for it
@@ -501,7 +509,6 @@ export class RingRestClient {
           authorization: `Bearer ${authTokenResponse.access_token}`,
           hardware_id: hardwareId,
           'User-Agent': 'android:com.ringapp',
-          Connection: 'close',
         },
       })
     } catch (e: any) {