appwrite-utils-cli 0.9.98 → 0.9.981

package/README.md

@@ -125,6 +125,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.981: Try fixing `tryAwaitWithRetry` to catch `522` errors from Cloudflare, they were appearing for some users, also added a 1000ms delay to `tryAwaitWithRetry`
 - 0.9.98: Fixing some import errors reported by users
 - 0.9.95: Updated to include new version of `appwrite-utils`
 - 0.9.93: Updated `selectDatabases` and `selectCollections` from the interactive CLI to prefer local collections or databases when synchronizing the databases

package/dist/migrations/databases.js

@@ -2,6 +2,8 @@ import { Client, Databases, IndexType, Query, } from "node-appwrite";
 import { getAppwriteClient, tryAwaitWithRetry, } from "../utils/helperFunctions.js";
 export const fetchAllDatabases = async (database) => {
     const databases = await tryAwaitWithRetry(async () => await database.list([Query.limit(25)]));
+    if (!databases)
+        return [];
     const allDatabases = databases.databases;
     if (allDatabases.length === 0)
         return [];

package/dist/utils/helperFunctions.js

@@ -92,14 +92,21 @@ export const tryAwaitWithRetry = async (createFunction, attemptNum = 0, throwErr
         return await createFunction();
     }
     catch (error) {
-        if (error instanceof AppwriteException &&
+        if ((error instanceof AppwriteException &&
             (error.message.toLowerCase().includes("fetch failed") ||
-                error.message.toLowerCase().includes("server error"))) {
+                error.message.toLowerCase().includes("server error"))) ||
+            (error.code === 522 || error.code === "522")) {
+            if (error.code === 522) {
+                console.log("Cloudflare error. Retrying...");
+            }
+            else {
+                console.log(`Fetch failed on attempt ${attemptNum}. Retrying...`);
+            }
             numTimesFailedTotal++;
-            console.log(`Fetch failed on attempt ${attemptNum}. Retrying...`);
             if (attemptNum > 5) {
                 throw error;
             }
+            await delay(1000);
             return tryAwaitWithRetry(createFunction, attemptNum + 1);
         }
         if (throwError) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.9.98",
+  "version": "0.9.981",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/databases.ts

@@ -16,6 +16,7 @@ export const fetchAllDatabases = async (
   const databases = await tryAwaitWithRetry(
     async () => await database.list([Query.limit(25)])
   );
+  if (!databases) return [];
   const allDatabases = databases.databases;
   if (allDatabases.length === 0) return [];
   let lastDatabaseId = allDatabases[allDatabases.length - 1].$id;

package/src/utils/helperFunctions.ts

@@ -149,15 +149,21 @@ export const tryAwaitWithRetry = async <T>(
     return await createFunction();
   } catch (error) {
     if (
-      error instanceof AppwriteException &&
+      (error instanceof AppwriteException &&
       (error.message.toLowerCase().includes("fetch failed") ||
-        error.message.toLowerCase().includes("server error"))
+        error.message.toLowerCase().includes("server error"))) ||
+      ((error as any).code === 522 || (error as any).code === "522")
     ) {
+      if ((error as any).code === 522) {
+        console.log("Cloudflare error. Retrying...");
+      } else {
+        console.log(`Fetch failed on attempt ${attemptNum}. Retrying...`);
+      }
       numTimesFailedTotal++;
-      console.log(`Fetch failed on attempt ${attemptNum}. Retrying...`);
       if (attemptNum > 5) {
         throw error;
       }
+      await delay(1000);
       return tryAwaitWithRetry(createFunction, attemptNum + 1);
     }
     if (throwError) {