@baiyibai-antora/atlassian-client 1.0.0-beta.7 → 1.0.0-beta.8

package/lib/index.js

@@ -32,6 +32,30 @@ class AtlassianClient {
     return `Bearer ${await this.oauth.getAccessToken()}`
   }
 
+  // Transient-failure retry: connections intermittently drop mid-run and a
+  // whole space retrieval or publish must not abort on one hiccup.
+  // Network-level failures retry for any method; gateway 5xx retries are
+  // limited to GET, whose repeats are safe by definition. Token rotation
+  // is never retried here (a repeated rotation request revokes the chain);
+  // it lives in the OAuth session, which keeps its own fetch.
+  async fetchRetry (url, opts) {
+    const delays = [500, 2000]
+    for (let attempt = 0; ; attempt++) {
+      try {
+        const response = await this.fetch(url, opts)
+        const method = (opts && opts.method) || 'GET'
+        if (attempt < delays.length && method === 'GET' && [502, 503, 504].includes(response.status)) {
+          await new Promise((resolve) => setTimeout(resolve, delays[attempt]))
+          continue
+        }
+        return response
+      } catch (err) {
+        if (attempt >= delays.length) throw err
+        await new Promise((resolve) => setTimeout(resolve, delays[attempt]))
+      }
+    }
+  }
+
   async request (method, path, { body, headers, form } = {}) {
     const opts = { method, headers: { Authorization: await this.authHeader(), Accept: 'application/json', ...headers } }
     if (form) {
@@ -41,12 +65,12 @@ class AtlassianClient {
       opts.headers['Content-Type'] = 'application/json'
       opts.body = JSON.stringify(body)
     }
-    let response = await this.fetch(`${this.baseUrl}${path}`, opts)
+    let response = await this.fetchRetry(`${this.baseUrl}${path}`, opts)
     // A 401 on an OAuth session usually means the cached access token was
     // revoked or expired early; refresh once and retry.
     if (response.status === 401 && this.oauth) {
       opts.headers.Authorization = `Bearer ${await this.oauth.refresh()}`
-      response = await this.fetch(`${this.baseUrl}${path}`, opts)
+      response = await this.fetchRetry(`${this.baseUrl}${path}`, opts)
     }
     if (response.status === 404) return null
     if (!response.ok) {
@@ -59,7 +83,7 @@ class AtlassianClient {
 
   // Raw body download (attachments, exports); returns a Buffer or null on 404.
   async download (path) {
-    const response = await this.fetch(`${this.baseUrl}${path}`, {
+    const response = await this.fetchRetry(`${this.baseUrl}${path}`, {
       headers: { Authorization: await this.authHeader() },
       redirect: 'follow',
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baiyibai-antora/atlassian-client",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "description": "Minimal zero-dependency Atlassian Cloud REST client (basic auth, JSON, multipart, v2 cursor pagination) shared by the Confluora packages",
   "license": "MIT",
   "author": "baiyibai",