@friggframework/core 2.0.0--canary.496.a94ee46.0 → 2.0.0--canary.490.feacde9.0

package/database/prisma.js

@@ -14,22 +14,40 @@ const config = require('./config');
  * Note: This should only be called when DB_TYPE is 'mongodb'
  */
 function ensureMongoDbUrl() {
-    // If DATABASE_URL is already set, use it
+    let connectionString;
+    
     if (process.env.DATABASE_URL && process.env.DATABASE_URL.trim()) {
-        return;
-    }
-
-    // Fallback to MONGO_URI for backwards compatibility with DocumentDB deployments
-    if (process.env.MONGO_URI && process.env.MONGO_URI.trim()) {
-        process.env.DATABASE_URL = process.env.MONGO_URI;
+        connectionString = process.env.DATABASE_URL;
+    } else if (process.env.MONGO_URI && process.env.MONGO_URI.trim()) {
+        connectionString = process.env.MONGO_URI;
         logger.debug('Using MONGO_URI as DATABASE_URL for MongoDB connection');
-        return;
+    } else {
+        throw new Error(
+            'DATABASE_URL or MONGO_URI environment variable must be set for MongoDB'
+        );
     }
-
-    // Neither is set - error
-    throw new Error(
-        'DATABASE_URL or MONGO_URI environment variable must be set for MongoDB'
-    );
+    
+    // Ensure readPreference=primary for transaction support
+    // MongoDB requires this for all operations within transactions
+    try {
+        const url = new URL(connectionString);
+        const params = url.searchParams;
+        
+        const existingReadPreference = params.get('readPreference');
+        if (existingReadPreference && existingReadPreference !== 'primary') {
+            params.set('readPreference', 'primary');
+            logger.debug(`Overrode readPreference from ${existingReadPreference} to primary for transaction support`);
+        } else if (!existingReadPreference) {
+            params.set('readPreference', 'primary');
+            logger.debug('Added readPreference=primary to MongoDB connection string for transaction support');
+        }
+        
+        connectionString = url.toString();
+    } catch (error) {
+        logger.warn('Failed to parse MongoDB connection string as URL, skipping readPreference configuration:', error.message);
+    }
+    
+    process.env.DATABASE_URL = connectionString;
 }
 
 function getEncryptionConfig() {
@@ -104,14 +122,27 @@ const prismaClientSingleton = () => {
 
     // Helper to try loading Prisma client from multiple locations
     const loadPrismaClient = (dbType) => {
-        const paths = [
-            // Lambda layer location (when using Prisma Lambda layer)
-            `/opt/nodejs/node_modules/generated/prisma-${dbType}`,
-            // Local development location (relative to core package)
+        const fs = require('fs');
+        const layerPath = `/opt/nodejs/node_modules/generated/prisma-${dbType}`;
+        
+        // Check if layer exists (when usePrismaLambdaLayer=true)
+        if (fs.existsSync(layerPath)) {
+            try {
+                return require(layerPath).PrismaClient;
+            } catch (err) {
+                // Layer exists but failed to load - fall through to bundled paths
+            }
+        }
+        
+        // Layer doesn't exist or failed - use bundled/local paths (when usePrismaLambdaLayer=false)
+        const localPaths = [
+            // Bundled with function (when usePrismaLambdaLayer=false)
+            `@friggframework/core/generated/prisma-${dbType}`,
+            // Local development (relative to core package)
             `../generated/prisma-${dbType}`,
         ];
 
-        for (const path of paths) {
+        for (const path of localPaths) {
             try {
                 return require(path).PrismaClient;
             } catch (err) {
@@ -120,7 +151,8 @@ const prismaClientSingleton = () => {
         }
 
         throw new Error(
-            `Cannot find Prisma client for ${dbType}. Tried paths: ${paths.join(', ')}`
+            `Cannot find Prisma client for ${dbType}. ` +
+            `Tried layer path: ${layerPath}, local paths: ${localPaths.join(', ')}`
         );
     };
 

package/database/repositories/health-check-repository-mongodb.js

@@ -29,32 +29,21 @@ class HealthCheckRepositoryMongoDB extends HealthCheckRepositoryInterface {
         }
 
         return {
-            readyState: isConnected ? 1 : 0,
             readyState: isConnected ? 1 : 0,
             stateName,
             isConnected,
         };
     }
 
+    /**
+     * @param {number} maxTimeMS
+     * @returns {Promise<number>} Response time in milliseconds
+     */
     async pingDatabase(maxTimeMS = 2000) {
         const pingStart = Date.now();
-        
-        // Create a timeout promise that rejects after maxTimeMS
-        const timeoutPromise = new Promise((_, reject) => 
-            setTimeout(() => reject(new Error('Database ping timeout')), maxTimeMS)
-        );
-        
-        // Race between the database ping and the timeout
-        await Promise.race([
-            prisma.$queryRaw`SELECT 1`.catch(() => {
-                // For MongoDB, use runCommandRaw instead
-                return prisma.$runCommandRaw({ ping: 1 });
-            }),
-            timeoutPromise
-        ]);
-        
-        return Date.now() - pingStart;
-    }
+        await this.prisma.$queryRaw`SELECT 1`.catch(() => {
+            return this.prisma.$runCommandRaw({ ping: 1 });
+        });
         return Date.now() - pingStart;
     }
 
@@ -75,10 +64,17 @@ class HealthCheckRepositoryMongoDB extends HealthCheckRepositoryInterface {
      * @returns {Promise<Object|null>}
      */
     async getRawCredentialById(id) {
-        const { ObjectId } = require('mongodb');
-        return await mongoose.connection.db
-            .collection('Credential')
-            .findOne({ _id: new ObjectId(id) });
+        const result = await this.prisma.$runCommandRaw({
+            find: 'Credential',
+            filter: { _id: { $oid: id } },
+            limit: 1,
+        });
+        
+        if (!result.cursor || !result.cursor.firstBatch || result.cursor.firstBatch.length === 0) {
+            return null;
+        }
+        
+        return result.cursor.firstBatch[0];
     }
 
     async deleteCredential(id) {

package/database/utils/mongodb-collection-utils.js

@@ -5,11 +5,14 @@
  * handling the constraint that collections cannot be created inside
  * multi-document transactions.
  *
+ * Uses Prisma's $runCommandRaw to send native MongoDB commands directly,
+ * avoiding the need for mongoose connection.
+ *
  * @see https://github.com/prisma/prisma/issues/8305
  * @see https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
  */
 
-const { mongoose } = require('../mongoose');
+const { prisma } = require('../prisma');
 
 /**
  * Ensures a MongoDB collection exists
@@ -18,6 +21,9 @@ const { mongoose } = require('../mongoose');
  * transactions. This function checks if a collection exists and creates it if needed,
  * preventing "Cannot create namespace in multi-document transaction" errors.
  *
+ * Uses Prisma's $runCommandRaw to send native MongoDB commands, which works with
+ * both MongoDB and DocumentDB.
+ *
  * @param {string} collectionName - Name of the collection to ensure exists
  * @returns {Promise<void>}
  *
@@ -30,23 +36,24 @@ const { mongoose } = require('../mongoose');
  */
 async function ensureCollectionExists(collectionName) {
     try {
-        const collections = await mongoose.connection.db
-            .listCollections({ name: collectionName })
-            .toArray();
+        // Check if collection exists using Prisma's $runCommandRaw
+        const collections = await prisma.$runCommandRaw({
+            listCollections: 1,
+            filter: { name: collectionName }
+        });
 
-        if (collections.length === 0) {
-            // Collection doesn't exist, create it outside of any transaction
-            await mongoose.connection.db.createCollection(collectionName);
-            console.log(`Created MongoDB collection: ${collectionName}`);
+        if (collections.cursor.firstBatch.length === 0) {
+            // Collection doesn't exist, create it
+            await prisma.$runCommandRaw({
+                create: collectionName
+            });
+            console.log(`✓ Created collection: ${collectionName}`);
         }
     } catch (error) {
-        // Collection might already exist due to race condition, or other error
-        // Log warning but don't fail - let subsequent operations handle errors
-        if (error.codeName === 'NamespaceExists') {
-            // This is expected in race conditions, silently continue
-            return;
+        // Ignore "already exists" errors (code 48: NamespaceExists)
+        if (error.code !== 48 && error.codeName !== 'NamespaceExists') {
+            console.warn(`Warning: Could not ensure collection ${collectionName}:`, error.message);
         }
-        console.warn(`Error ensuring collection ${collectionName} exists:`, error.message);
     }
 }
 
@@ -73,11 +80,12 @@ async function ensureCollectionsExist(collectionNames) {
  */
 async function collectionExists(collectionName) {
     try {
-        const collections = await mongoose.connection.db
-            .listCollections({ name: collectionName })
-            .toArray();
+        const collections = await prisma.$runCommandRaw({
+            listCollections: 1,
+            filter: { name: collectionName }
+        });
 
-        return collections.length > 0;
+        return collections.cursor.firstBatch.length > 0;
     } catch (error) {
         console.error(`Error checking if collection ${collectionName} exists:`, error.message);
         return false;

package/database/utils/mongodb-schema-init.js

@@ -16,7 +16,6 @@
  * @see https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
  */
 
-const { mongoose } = require('../mongoose');
 const { ensureCollectionsExist } = require('./mongodb-collection-utils');
 const { getCollectionsFromSchemaSync } = require('./prisma-schema-parser');
 const config = require('../config');
@@ -24,25 +23,29 @@ const config = require('../config');
 /**
  * Initialize MongoDB schema by ensuring all collections exist
  *
- * This should be called once at application startup, after the database
- * connection is established but before handling any requests.
+ * This should be called once at application startup, after Prisma connection
+ * is established but before handling any requests.
  *
  * Dynamically parses the Prisma schema to extract collection names,
  * ensuring automatic sync with schema changes.
  *
+ * Uses Prisma's $runCommandRaw to create collections, which works with both
+ * MongoDB and DocumentDB without requiring mongoose connection.
+ *
  * Benefits:
  * - Prevents transaction namespace creation errors
  * - Fails fast if there are database connection issues
  * - Ensures consistent state across all instances
  * - Idempotent - safe to run multiple times
  * - Automatically syncs with Prisma schema changes
+ * - No mongoose dependency required
  *
  * @returns {Promise<void>}
  *
  * @example
  * ```js
  * await connectPrisma();
- * await initializeMongoDBSchema(); // Run after connection
+ * await initializeMongoDBSchema(); // Run after Prisma connection
  * // Now safe to handle requests
  * ```
  */
@@ -53,14 +56,6 @@ async function initializeMongoDBSchema() {
         return;
     }
 
-    // Check if database is connected
-    if (mongoose.connection.readyState !== 1) {
-        throw new Error(
-            'Cannot initialize MongoDB schema - database not connected. ' +
-            'Call connectPrisma() before initializeMongoDBSchema()'
-        );
-    }
-
     console.log('Initializing MongoDB schema - ensuring all collections exist...');
     const startTime = Date.now();
 

package/generated/prisma-mongodb/edge.js

@@ -35,12 +35,12 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.17.0
- * Query Engine version: c0aafc03b8ef6cdced8654b9a817999e02457d6a
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 Prisma.prismaVersion = {
-  client: "6.17.0",
-  engine: "c0aafc03b8ef6cdced8654b9a817999e02457d6a"
+  client: "6.18.0",
+  engine: "34b5a692b7bd79939a9a2c3ef97d816e749cda2f"
 }
 
 Prisma.PrismaClientKnownRequestError = PrismaClientKnownRequestError;
@@ -291,8 +291,8 @@ const config = {
     "rootEnvPath": null
   },
   "relativePath": "../../prisma-mongodb",
-  "clientVersion": "6.17.0",
-  "engineVersion": "c0aafc03b8ef6cdced8654b9a817999e02457d6a",
+  "clientVersion": "6.18.0",
+  "engineVersion": "34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
   "datasourceNames": [
     "db"
   ],

package/generated/prisma-mongodb/index-browser.js

@@ -20,12 +20,12 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.17.0
- * Query Engine version: c0aafc03b8ef6cdced8654b9a817999e02457d6a
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 Prisma.prismaVersion = {
-  client: "6.17.0",
-  engine: "c0aafc03b8ef6cdced8654b9a817999e02457d6a"
+  client: "6.18.0",
+  engine: "34b5a692b7bd79939a9a2c3ef97d816e749cda2f"
 }
 
 Prisma.PrismaClientKnownRequestError = () => {

package/generated/prisma-mongodb/index.d.ts

@@ -403,8 +403,8 @@ export namespace Prisma {
   export import Exact = $Public.Exact
 
   /**
-   * Prisma Client JS version: 6.17.0
-   * Query Engine version: c0aafc03b8ef6cdced8654b9a817999e02457d6a
+   * Prisma Client JS version: 6.18.0
+   * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
    */
   export type PrismaVersion = {
     client: string
@@ -417,6 +417,7 @@ export namespace Prisma {
    */
 
 
+  export import Bytes = runtime.Bytes
   export import JsonObject = runtime.JsonObject
   export import JsonArray = runtime.JsonArray
   export import JsonValue = runtime.JsonValue

package/generated/prisma-mongodb/index.js

@@ -35,12 +35,12 @@ exports.Prisma = Prisma
 exports.$Enums = {}
 
 /**
- * Prisma Client JS version: 6.17.0
- * Query Engine version: c0aafc03b8ef6cdced8654b9a817999e02457d6a
+ * Prisma Client JS version: 6.18.0
+ * Query Engine version: 34b5a692b7bd79939a9a2c3ef97d816e749cda2f
  */
 Prisma.prismaVersion = {
-  client: "6.17.0",
-  engine: "c0aafc03b8ef6cdced8654b9a817999e02457d6a"
+  client: "6.18.0",
+  engine: "34b5a692b7bd79939a9a2c3ef97d816e749cda2f"
 }
 
 Prisma.PrismaClientKnownRequestError = PrismaClientKnownRequestError;
@@ -292,8 +292,8 @@ const config = {
     "rootEnvPath": null
   },
   "relativePath": "../../prisma-mongodb",
-  "clientVersion": "6.17.0",
-  "engineVersion": "c0aafc03b8ef6cdced8654b9a817999e02457d6a",
+  "clientVersion": "6.18.0",
+  "engineVersion": "34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
   "datasourceNames": [
     "db"
   ],

package/generated/prisma-mongodb/package.json

@@ -151,7 +151,7 @@
     },
     "./*": "./*"
   },
-  "version": "6.17.0",
+  "version": "6.18.0",
   "sideEffects": false,
   "imports": {
     "#wasm-engine-loader": {