Merge pull request #26 from jsonMartin/revert-21-readwise-throttling

Revert "feat: 👽 implement readwise throttling"

Author: jsonMartin

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Changelog
-## 1.3.1 (2023-08-18)
+## 1.4.0 (2023-08-18)
 Thanks to @johannrichard for the following contributions:
 
 ### Features
@@ -10,7 +10,6 @@ Thanks to @johannrichard for the following contributions:
   - The colon in a title is a special character which by default is replaced witha a dash (-) in filenames. With this change, users can choose what string to use as a replacement.
 
 ### Updates
-- Implement improved readwise API throttling
 - Change field names to reflect their use in frontmatter
 - Introduce option for quotes in tag format
   - make tag formatting more flexible

manifest.json

@@ -1,10 +1,10 @@
 {
   "id": "readwise-mirror",
   "name": "Readwise Mirror",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "minAppVersion": "0.11.0",
   "description": "Mirror your Readwise library directly to an Obsidian vault",
   "author": "jsonmartin",
   "authorUrl": "https://github.com/jsonMartin/",
   "isDesktopOnly": false
-}
+}

readwiseApi.ts

@@ -109,22 +109,10 @@ export class ReadwiseApi {
 
       if (response.status === 429) {
         // Error handling for rate limit throttling
-        // b/c of limitations with cross-origin requests, we don't have (easy) access to the header
-        // We must therefore extract the seconds from the statusText:
-        // "Request was throttled. Expected available in 39 seconds."
-
-        let rateLimitedDelayTime: number = 4000; // Base throttling, 20 requests per minute are the maximum allowable
-
-        if (data.detail) {
-          console.log(`Readwise: ${data.detail}`);
-          const rate = data.detail.match(/available\sin\s([0-9]+)\sseconds/);
-          if (rate) {
-            rateLimitedDelayTime = parseInt(rate[1]) * 1000 + 1000;
-          }
-        }
-
+        const rateLimitedDelayTime = parseInt(response.headers.get('Retry-After')) * 1000 + 1000;
         console.warn(`Readwise: API Rate Limited, waiting to retry for ${rateLimitedDelayTime}`);
         this.notify.setStatusBarText(`Readwise: API Rate Limited, waiting ${rateLimitedDelayTime}`);
+
         await new Promise((_) => setTimeout(_, rateLimitedDelayTime));
         console.info('Readwise: Trying to fetch highlights again...');
         this.notify.setStatusBarText(`Readwise: Attempting to retry...`);
@@ -142,8 +130,7 @@ export class ReadwiseApi {
       }
     } while (data.next);
 
-    if (results.length > 0)
-      console.info(`Readwise: Processed ${results.length} total ${contentType} results successfully`);
+    if (results.length > 0) console.info(`Readwise: Processed ${results.length} total ${contentType} results successfully`);
     return results;
   }