appwrite-utils-cli 0.9.98 → 0.9.982

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/migrations/users.d.ts

@@ -8,8 +8,8 @@ export declare class UsersController {
     constructor(config: AppwriteConfig, db: Databases);
     wipeUsers(): Promise<void>;
     getAllUsers(): Promise<Models.User<Models.Preferences>[]>;
-    createUsersAndReturn(items: AuthUserCreate[]): Promise<Models.User<Models.Preferences>[]>;
-    createUserAndReturn(item: AuthUserCreate, numAttempts?: number): Promise<Models.User<Models.Preferences>>;
+    createUsersAndReturn(items: AuthUserCreate[]): Promise<(Models.User<Models.Preferences> | undefined)[]>;
+    createUserAndReturn(item: AuthUserCreate): Promise<Models.User<Models.Preferences> | undefined>;
     createAndCheckForUserAndReturn(item: AuthUserCreate): Promise<Models.User<Models.Preferences> | undefined>;
     getUserIdByEmailOrPhone(email?: string, phone?: string): Promise<string | undefined>;
     transferUsersBetweenDbsLocalToRemote: (endpoint: string, projectId: string, apiKey: string) => Promise<void>;

package/dist/migrations/users.js

@@ -78,36 +78,26 @@ export class UsersController {
         const users = await Promise.all(items.map((item) => this.createUserAndReturn(item)));
         return users;
     }
-    async createUserAndReturn(item, numAttempts) {
+    async createUserAndReturn(item) {
         try {
-            const user = await this.users.create(item.userId || ID.unique(), item.email || undefined, item.phone && item.phone.length < 15 && item.phone.startsWith("+")
-                ? item.phone
-                : undefined, `changeMe${item.email?.toLowerCase()}` || `changeMePlease`, item.name || undefined);
-            if (item.labels) {
-                await this.users.updateLabels(user.$id, item.labels);
-            }
-            if (item.prefs) {
-                await this.users.updatePrefs(user.$id, item.prefs);
-            }
+            const user = await tryAwaitWithRetry(async () => {
+                const createdUser = await this.users.create(item.userId || ID.unique(), item.email || undefined, item.phone && item.phone.length < 15 && item.phone.startsWith("+")
+                    ? item.phone
+                    : undefined, `changeMe${item.email?.toLowerCase()}` || `changeMePlease`, item.name || undefined);
+                if (item.labels) {
+                    await this.users.updateLabels(createdUser.$id, item.labels);
+                }
+                if (item.prefs) {
+                    await this.users.updatePrefs(createdUser.$id, item.prefs);
+                }
+                return createdUser;
+            }); // Set throwError to true since we want to handle errors
             return user;
         }
         catch (e) {
-            if (e instanceof AppwriteException) {
-                if (e.message.toLowerCase().includes("fetch failed") ||
-                    e.message.toLowerCase().includes("server error")) {
-                    const numberOfAttempts = numAttempts || 0;
-                    if (numberOfAttempts > 5) {
-                        throw e;
-                    }
-                    const user = await this.createUserAndReturn(item, numberOfAttempts + 1);
-                    return user;
-                }
-            }
             if (e instanceof Error) {
                 logger.error("FAILED CREATING USER: ", e.message, item);
             }
-            console.log("FAILED CREATING USER: ", e, item);
-            throw e;
         }
     }
     async createAndCheckForUserAndReturn(item) {

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(2500);
             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.982",
   "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/migrations/users.ts

@@ -111,44 +111,34 @@ export class UsersController {
     return users;
   }
 
-  async createUserAndReturn(item: AuthUserCreate, numAttempts?: number) {
+  async createUserAndReturn(item: AuthUserCreate) {
     try {
-      const user = await this.users.create(
-        item.userId || ID.unique(),
-        item.email || undefined,
-        item.phone && item.phone.length < 15 && item.phone.startsWith("+")
-          ? item.phone
-          : undefined,
-        `changeMe${item.email?.toLowerCase()}` || `changeMePlease`,
-        item.name || undefined
-      );
-      if (item.labels) {
-        await this.users.updateLabels(user.$id, item.labels);
-      }
-      if (item.prefs) {
-        await this.users.updatePrefs(user.$id, item.prefs);
-      }
+      const user = await tryAwaitWithRetry(async () => {
+        const createdUser = await this.users.create(
+          item.userId || ID.unique(),
+          item.email || undefined,
+          item.phone && item.phone.length < 15 && item.phone.startsWith("+")
+            ? item.phone
+            : undefined,
+          `changeMe${item.email?.toLowerCase()}` || `changeMePlease`,
+          item.name || undefined
+        );
+  
+        if (item.labels) {
+          await this.users.updateLabels(createdUser.$id, item.labels);
+        }
+        if (item.prefs) {
+          await this.users.updatePrefs(createdUser.$id, item.prefs);
+        }
+        
+        return createdUser;
+      }); // Set throwError to true since we want to handle errors
+  
       return user;
     } catch (e) {
-      if (e instanceof AppwriteException) {
-        if (
-          e.message.toLowerCase().includes("fetch failed") ||
-          e.message.toLowerCase().includes("server error")
-        ) {
-          const numberOfAttempts = numAttempts || 0;
-          if (numberOfAttempts > 5) {
-            throw e;
-          }
-          const user: Models.User<Models.Preferences> =
-            await this.createUserAndReturn(item, numberOfAttempts + 1);
-          return user;
-        }
-      }
       if (e instanceof Error) {
         logger.error("FAILED CREATING USER: ", e.message, item);
       }
-      console.log("FAILED CREATING USER: ", e, item);
-      throw e;
     }
   }
 

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(2500);
       return tryAwaitWithRetry(createFunction, attemptNum + 1);
     }
     if (throwError) {