@postalsys/email-text-tools 1.4.0 → 1.4.1

package/.ncurc.js

@@ -2,7 +2,6 @@ module.exports = {
     upgrade: true,
     reject: [
         // Block package upgrades that moved to ESM
-        'node-fetch',
         'nanoid'
     ]
 };

package/lib/generate-summary.js

@@ -2,10 +2,10 @@
 
 const packageData = require('../package.json');
 const htmlToText = require('../lib/html-to-text');
-const nodeFetch = require('node-fetch');
 const GPT3Tokenizer = require('gpt3-tokenizer').default;
 
-const fetchCmd = global.fetch || nodeFetch;
+const { fetch: fetchCmd, Agent } = require('undici');
+const fetchAgent = new Agent({ connect: { timeout: 90 * 1000 } });
 
 const tokenizer = new GPT3Tokenizer({ type: 'gpt3' });
 
@@ -126,37 +126,50 @@ ${JSON.stringify(content)}`;
         ]
     };
 
-    const reqStartTime = Date.now();
-
-    let res = await fetchCmd(OPENAI_API_URL, {
-        method: 'post',
-        headers,
-        body: JSON.stringify(payload)
-    });
-
-    const reqEndTime = Date.now();
+    let res;
+    let data;
+    let retries = 0;
+
+    let run = async () => {
+        res = await fetchCmd(OPENAI_API_URL, {
+            method: 'post',
+            headers,
+            body: JSON.stringify(payload),
+            dispatcher: fetchAgent
+        });
+
+        data = await res.json();
+
+        if (!res.ok) {
+            if (res.status === 429 && ++retries < 5) {
+                // try again
+                await new Promise(r => setTimeout(r, 1000));
+                return await run();
+            }
 
-    let data = await res.json();
+            if (data && data.error) {
+                let error = new Error(data.error.message || data.error);
+                if (data.error.code) {
+                    error.code = data.error.code;
+                }
 
-    if (!res.ok) {
-        if (data && data.error) {
-            let error = new Error(data.error.message || data.error);
-            if (data.error.code) {
-                error.code = data.error.code;
+                error.statusCode = res.status;
+                throw error;
             }
 
+            let error = new Error('Failed to run API request');
             error.statusCode = res.status;
             throw error;
         }
 
-        let error = new Error('Failed to run API request');
-        error.statusCode = res.status;
-        throw error;
-    }
+        if (!data) {
+            throw new Error(`Failed to POST API request`);
+        }
+    };
 
-    if (!data) {
-        throw new Error(`Failed to POST API request`);
-    }
+    const reqStartTime = Date.now();
+    await run();
+    const reqEndTime = Date.now();
 
     let values;
     const output =
@@ -176,6 +189,9 @@ ${JSON.stringify(content)}`;
         if (typeof values.shouldReply === 'string') {
             values.shouldReply = values.shouldReply === 'true';
         }
+        if (typeof values.shouldReply !== 'undefined' && typeof values.shouldReply !== 'boolean') {
+            delete values.shouldReply;
+        }
     } catch (err) {
         let error = new Error('Failed to parse output from OpenAI API');
         error.textContent = output;

package/lib/risk-analysis.js

@@ -2,10 +2,10 @@
 
 const packageData = require('../package.json');
 const htmlToText = require('../lib/html-to-text');
-const nodeFetch = require('node-fetch');
 const GPT3Tokenizer = require('gpt3-tokenizer').default;
 
-const fetchCmd = global.fetch || nodeFetch;
+const { fetch: fetchCmd, Agent } = require('undici');
+const fetchAgent = new Agent({ connect: { timeout: 90 * 1000 } });
 
 const tokenizer = new GPT3Tokenizer({ type: 'gpt3' });
 
@@ -157,37 +157,50 @@ ${JSON.stringify(content)}`;
         ]
     };
 
-    const reqStartTime = Date.now();
-
-    let res = await fetchCmd(OPENAI_API_URL, {
-        method: 'post',
-        headers,
-        body: JSON.stringify(payload)
-    });
-
-    const reqEndTime = Date.now();
+    let res;
+    let data;
+    let retries = 0;
+
+    let run = async () => {
+        res = await fetchCmd(OPENAI_API_URL, {
+            method: 'post',
+            headers,
+            body: JSON.stringify(payload),
+            dispatcher: fetchAgent
+        });
+
+        data = await res.json();
+
+        if (!res.ok) {
+            if (res.status === 429 && ++retries < 5) {
+                // try again
+                await new Promise(r => setTimeout(r, 1000));
+                return await run();
+            }
 
-    let data = await res.json();
+            if (data && data.error) {
+                let error = new Error(data.error.message || data.error);
+                if (data.error.code) {
+                    error.code = data.error.code;
+                }
 
-    if (!res.ok) {
-        if (data && data.error) {
-            let error = new Error(data.error.message || data.error);
-            if (data.error.code) {
-                error.code = data.error.code;
+                error.statusCode = res.status;
+                throw error;
             }
 
+            let error = new Error('Failed to run API request');
             error.statusCode = res.status;
             throw error;
         }
 
-        let error = new Error('Failed to run API request');
-        error.statusCode = res.status;
-        throw error;
-    }
+        if (!data) {
+            throw new Error(`Failed to POST API request`);
+        }
+    };
 
-    if (!data) {
-        throw new Error(`Failed to POST API request`);
-    }
+    const reqStartTime = Date.now();
+    await run();
+    const reqEndTime = Date.now();
 
     let values;
     const output =

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@postalsys/email-text-tools",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "description": "Email text tools",
     "main": "index.js",
     "scripts": {
@@ -33,8 +33,8 @@
         "juice": "9.0.0",
         "linkify-it": "4.0.1",
         "moment-timezone": "0.5.43",
-        "node-fetch": "2.6.7",
         "node-html-parser": "6.1.5",
-        "tlds": "1.238.0"
+        "tlds": "1.238.0",
+        "undici": "5.22.0"
     }
 }