appwrite-utils-cli 0.0.34 → 0.0.35

package/README.md

@@ -86,6 +86,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.35: Added update collection if it exists and permissions or such are different (`documentSecurity` and `enabled`), also added a check for `fetch failed` errors to retry them with recursion, not sure how well that will work out, but we're gonna try it! It will still fail after 5 tries, but hopefully that gives Appwrite some time to figure it's stuff out
 - 0.0.34: Fixed the `bin` section of the package.json, apparently you can't use `node` to run it
 - 0.0.33: Fixed `idMappings`, if you are importing data and use the `idMappings` functionality, you can set a `fieldToSet` based on the value of a `sourceField` in the current imported items data (whether it's in the final data or the original), in order to match another field in another collection. So if you had a store, and it had items and the items have a Region ID for instance. You can then, in your regionId of the items, setup an `idMapping` that will allow you to map the value of the `targetField` based on the value of the `targetFieldToMatch` in the `targetCollection`. Sounds complex, but it's very useful. Like psuedo-relationship resolution, without the relationships.
 - 0.0.29: If you use the `description` variable in an attribute and collection, it'll add that description to the generated schemas. This assumes you have `zod-to-openpi`

package/dist/migrations/collections.js

@@ -163,7 +163,7 @@ export const createOrUpdateCollections = async (database, databaseId, config, de
             usedIds.add(collectionId); // Mark this ID as used
             // Create the collection with the determined ID
             try {
-                collectionToUse = await database.createCollection(databaseId, collectionId, collection.name, permissions, collection.documentSecurity, collection.enabled);
+                collectionToUse = await database.createCollection(databaseId, collectionId, collection.name, permissions, collection.documentSecurity ?? false, collection.enabled ?? true);
                 collection.$id = collectionToUse.$id;
                 nameToIdMapping.set(collection.name, collectionToUse.$id);
             }
@@ -174,6 +174,12 @@ export const createOrUpdateCollections = async (database, databaseId, config, de
         }
         else {
             console.log(`Collection ${collection.name} exists, using it`);
+            if (collection.enabled !== collectionToUse.enabled ||
+                collection.documentSecurity !== collectionToUse.documentSecurity ||
+                collection.$permissions.length !== collectionToUse.$permissions.length) {
+                console.log(`Updating collection: ${collectionToUse.$id}`);
+                await database.updateCollection(databaseId, collectionToUse.$id, collection.name, permissions, collection.documentSecurity ?? false, collection.enabled ?? true);
+            }
         }
         // Update attributes and indexes for the collection
         console.log("Creating Attributes");

package/dist/migrations/users.d.ts

@@ -9,7 +9,7 @@ export declare class UsersController {
     wipeUsers(): Promise<void>;
     getAllUsers(): Promise<Models.User<Models.Preferences>[]>;
     createUsersAndReturn(items: AuthUserCreate[]): Promise<Models.User<Models.Preferences>[]>;
-    createUserAndReturn(item: AuthUserCreate): Promise<Models.User<Models.Preferences>>;
+    createUserAndReturn(item: AuthUserCreate, numAttempts?: number): Promise<Models.User<Models.Preferences>>;
     createAndCheckForUserAndReturn(item: AuthUserCreate): Promise<Models.User<Models.Preferences> | undefined>;
     getUserIdByEmailOrPhone(email?: string, phone?: string): Promise<string | undefined>;
 }

package/dist/migrations/users.js

@@ -1,4 +1,4 @@
-import { Databases, ID, Query, Users } from "node-appwrite";
+import { AppwriteException, Databases, ID, Query, Users, } from "node-appwrite";
 import { AuthUserSchema, } from "../schemas/authUser.js";
 import _ from "lodash";
 import { logger } from "./logging.js";
@@ -96,7 +96,7 @@ export class UsersController {
         const users = await Promise.all(items.map((item) => this.createUserAndReturn(item)));
         return users;
     }
-    async createUserAndReturn(item) {
+    async createUserAndReturn(item, numAttempts) {
         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
@@ -112,6 +112,16 @@ export class UsersController {
             return user;
         }
         catch (e) {
+            if (e instanceof AppwriteException) {
+                if (e.message.includes("fetch failed")) {
+                    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);
             }

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.0.34",
+  "version": "0.0.35",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/collections.ts

@@ -216,8 +216,8 @@ export const createOrUpdateCollections = async (
           collectionId,
           collection.name,
           permissions,
-          collection.documentSecurity,
-          collection.enabled
+          collection.documentSecurity ?? false,
+          collection.enabled ?? true
         );
         collection.$id = collectionToUse.$id;
         nameToIdMapping.set(collection.name, collectionToUse.$id);
@@ -229,6 +229,21 @@ export const createOrUpdateCollections = async (
       }
     } else {
       console.log(`Collection ${collection.name} exists, using it`);
+      if (
+        collection.enabled !== collectionToUse.enabled ||
+        collection.documentSecurity !== collectionToUse.documentSecurity ||
+        collection.$permissions.length !== collectionToUse.$permissions.length
+      ) {
+        console.log(`Updating collection: ${collectionToUse.$id}`);
+        await database.updateCollection(
+          databaseId,
+          collectionToUse.$id,
+          collection.name,
+          permissions,
+          collection.documentSecurity ?? false,
+          collection.enabled ?? true
+        );
+      }
     }
 
     // Update attributes and indexes for the collection

package/src/migrations/users.ts

@@ -1,5 +1,12 @@
 import type { AppwriteConfig, ConfigCollection } from "appwrite-utils";
-import { Databases, ID, Query, Users, type Models } from "node-appwrite";
+import {
+  AppwriteException,
+  Databases,
+  ID,
+  Query,
+  Users,
+  type Models,
+} from "node-appwrite";
 import {
   AuthUserSchema,
   type AuthUser,
@@ -108,7 +115,7 @@ export class UsersController {
     return users;
   }
 
-  async createUserAndReturn(item: AuthUserCreate) {
+  async createUserAndReturn(item: AuthUserCreate, numAttempts?: number) {
     try {
       const user = await this.users.create(
         item.userId || ID.unique(),
@@ -129,6 +136,17 @@ export class UsersController {
       }
       return user;
     } catch (e) {
+      if (e instanceof AppwriteException) {
+        if (e.message.includes("fetch failed")) {
+          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);
       }