Merge pull request #31 from iExecBlockchainComputing/feature/upgrade-mongoose-to-8.15

chore: upgrade mongoose to 8.16.0

Author: SeddikBellamine

api/package-lock.json

@@ -45,7 +45,7 @@
     "koa-ratelimit": "^5.1.0",
     "koa-router": "^13.0.1",
     "koa2-swagger-ui": "^5.11.0",
-    "mongoose": "^6.13.8",
+    "mongoose": "^8.16.0",
     "randomstring": "^1.3.1",
     "redis": "^4.7.0",
     "socket.io": "^4.8.1",

api/package.json

@@ -1,37 +1,48 @@
+// loaders/mongoose.js
 import mongoose from 'mongoose';
 import { mongo as mongoConfig } from '../config.js';
 import { logger } from '../utils/logger.js';
 
+// Important for compatibility with Mongoose v8+
+// Prevents strict query errors when filtering by fields not in schema
+mongoose.set('strictQuery', false);
+
 const log = logger.extend('mongoose');
 
-const mongooseConnections = {};
+// Cache for connections
+const mongooseConnectionPromises = {};
 
+/**
+ * Returns a Mongoose connection for a given server and db name.
+ * Caches connections for reuse across calls.
+ */
 const getMongoose = async ({ server = mongoConfig.host, db } = {}) => {
-  try {
-    if (db === undefined) {
-      throw Error('missing db name');
-    }
-    if (mongooseConnections[server] && mongooseConnections[server][db]) {
-      log(`using connection ${server}${db}`);
-      const connection = await mongooseConnections[server][db];
-      return connection;
-    }
-    log(`creating connection ${server}${db}`);
-    mongooseConnections[server] = mongooseConnections[server] || {};
-    mongooseConnections[server][db] = mongoose
-      .createConnection(`${server}${db}`, {
-        useNewUrlParser: true,
-        useUnifiedTopology: true,
-        autoIndex: mongoConfig.createIndex || false,
-      })
-      .asPromise();
-    const connection = await mongooseConnections[server][db];
-    log(`opened connection ${server}${db}`);
-    return connection;
-  } catch (error) {
-    log('getMongoose', error);
-    throw error;
+  if (!db) throw new Error('Missing db name');
+
+  // Return existing connection if present
+  if (mongooseConnectionPromises[server]?.[db]) {
+    log(`Using cached connection: ${server}${db}`);
+    return await mongooseConnectionPromises[server][db];
   }
+
+  log(`Creating new connection: ${server}${db}`);
+  const uri = `${server}${db}`;
+  const connectionPromise = mongoose
+    .createConnection(uri, {
+      // Removed deprecated options
+      // useNewUrlParser and useUnifiedTopology are defaults in Mongoose 8+
+
+      autoIndex: mongoConfig.createIndex ?? false, // Create indexes if needed
+      autoCreate: true, // Ensure collections are auto-created
+      bufferCommands: false, // ❗ Important for strict connection behavior in Mongoose 8+
+    })
+    .asPromise();
+
+  // Cache the connection promise
+  mongooseConnectionPromises[server] = mongooseConnectionPromises[server] || {};
+  mongooseConnectionPromises[server][db] = connectionPromise;
+
+  return await connectionPromise;
 };
 
 export { getMongoose };

api/src/loaders/mongoose.js

@@ -87,16 +87,19 @@ const checkAuthorization = async ({
     const signerAddress = recoverAddressEIP712(typedData, signature);
     if (signerAddress === NULL_ADDRESS) throw Error('Null signerAddress');
     log('signerAddress', signerAddress);
-    if (signerAddress.toLowerCase() !== address.toLowerCase())
+
+    if (signerAddress.toLowerCase() !== address.toLowerCase()) {
       throw new AuthError('Failed to verify signer, addresses mismatch.');
-    await current.remove();
-    return {
-      address,
-      chainId,
-    };
+    }
+
+    await ChallengeModel.deleteOne({ _id: current._id });
+
+    return { address, chainId };
   } catch (e) {
     log('checkAuthorization() error', e);
-    throw e;
+    throw e instanceof AuthError
+      ? e
+      : new AuthError('Authorization check failed');
   }
 };
 

api/src/services/auth.js

@@ -1347,7 +1347,7 @@ const unpublishOrders = async ({
     default:
       throw new InternalError('unsupported target');
   }
-  await Promise.all(ordersToUnpublish.map((e) => e.delete()));
+  await Promise.all(ordersToUnpublish.map((e) => e.deleteOne()));
   return ordersToUnpublish.map((e) => e.toJSON());
 };
 

api/src/services/order.js

@@ -8,7 +8,7 @@ import * as apporderModel from '../src/models/apporderModel.js';
 import * as datasetorderModel from '../src/models/datasetorderModel.js';
 import * as workerpoolorderModel from '../src/models/workerpoolorderModel.js';
 import * as requestorderModel from '../src/models/requestorderModel.js';
-
+import * as challengeModel from '../src/models/challengeModel.js';
 const sleep = (ms) =>
   new Promise((res) => {
     setTimeout(res, ms);
@@ -245,14 +245,21 @@ const dropDB = async (dbName) => {
   );
 };
 
+/**
+ * Inserts or updates a challenge in the database using the Mongoose model.
+ * Ensures compatibility with Mongoose v8 and avoids connection mismatches.
+ */
 const setChallenge = async (dbName, challenge) => {
-  const { db } = await getMongoose({ db: dbName });
-  await db.collection('challenges').findOneAndUpdate(
+  const ChallengeModel = await challengeModel.getModel(dbName);
+  await ChallengeModel.findOneAndUpdate(
     { hash: challenge.hash },
-    { $set: challenge },
     {
-      upsert: true,
+      $set: {
+        ...challenge,
+        address: challenge.address,
+      },
     },
+    { upsert: true, new: true },
   );
 };