@orion-js/mongodb 4.2.7 → 4.2.9

package/dist/index.d.cts

@@ -45,7 +45,7 @@ declare class OrionMongoDatabaseWrapper implements OrionMongoClient {
     constructor(connectionName: string);
     config(mongoURL: string, mongoOptions: MongoClientOptions): void;
     awaitConnection(): Promise<this>;
-    connectWithRetry(client: MongoClient): any;
+    connectWithRetry(client: MongoClient): Promise<MongoClient>;
     startConnection(): Promise<MongoClient>;
     closeConnection(): Promise<void>;
 }

package/dist/index.d.ts

@@ -45,7 +45,7 @@ declare class OrionMongoDatabaseWrapper implements OrionMongoClient {
     constructor(connectionName: string);
     config(mongoURL: string, mongoOptions: MongoClientOptions): void;
     awaitConnection(): Promise<this>;
-    connectWithRetry(client: MongoClient): any;
+    connectWithRetry(client: MongoClient): Promise<MongoClient>;
     startConnection(): Promise<MongoClient>;
     closeConnection(): Promise<void>;
 }

package/dist/index.js

@@ -1,5 +1,7 @@
 // src/connect/connections.ts
 import { EventEmitter } from "events";
+import { sleep } from "@orion-js/helpers";
+import { logger } from "@orion-js/logger";
 import { MongoClient } from "mongodb";
 
 // src/connect/getDBName.ts
@@ -22,11 +24,6 @@ function getDBName(url) {
   return dbName;
 }
 
-// src/connect/connections.ts
-import { nextTick } from "process";
-import { logger } from "@orion-js/logger";
-import { sleep } from "@orion-js/helpers";
-
 // src/connect/getMongoURLFromEnv.ts
 import { internalGetEnv } from "@orion-js/env";
 var getMongoURLFromEnv = (connectionName) => {
@@ -131,22 +128,20 @@ var OrionMongoDatabaseWrapper = class {
     await this.connectWithRetry(this.client);
     this.state = "connected";
     this.connectionEvent.emit("connected", this.client);
-    nextTick(() => {
-      this.connectionEvent.removeAllListeners();
-      this.connectionEvent = null;
-    });
+    this.connectionEvent.removeAllListeners();
     return this;
   }
   async connectWithRetry(client) {
-    try {
-      return await client.connect();
-    } catch (error) {
-      logger.error("Error connecting to mongo. Will retry in 5s", {
-        error,
-        connectionName: this.connectionName
-      });
-      await sleep(5e3);
-      return this.connectWithRetry(client);
+    while (true) {
+      try {
+        return await client.connect();
+      } catch (error) {
+        logger.error("Error connecting to mongo. Will retry in 5s", {
+          error,
+          connectionName: this.connectionName
+        });
+        await sleep(5e3);
+      }
     }
   }
   async startConnection() {
@@ -436,19 +431,6 @@ function omit(propsToOmit, obj) {
   return willReturn;
 }
 
-// ../../node_modules/.pnpm/rambdax@11.3.1/node_modules/rambdax/src/flatten.js
-function flatten(list, input) {
-  const willReturn = input === void 0 ? [] : input;
-  for (let i = 0; i < list.length; i++) {
-    if (isArray(list[i])) {
-      flatten(list[i], willReturn);
-    } else {
-      willReturn.push(list[i]);
-    }
-  }
-  return willReturn;
-}
-
 // ../../node_modules/.pnpm/rambdax@11.3.1/node_modules/rambdax/src/isEmpty.js
 function isEmpty(input) {
   const inputType = type(input);
@@ -1021,16 +1003,26 @@ function loadOne_default(collection) {
 }
 
 // src/createCollection/getMethods/dataLoader/loadData.ts
-import { createMapArray, clone as clone2 } from "@orion-js/helpers";
+import { createMapArray } from "@orion-js/helpers";
+
+// src/createCollection/getMethods/dataLoader/dataLoad/index.ts
+import { hashObject } from "@orion-js/helpers";
 
 // src/createCollection/getMethods/dataLoader/dataLoad/getDataLoader.ts
 import DataLoader from "dataloader";
 var cache = /* @__PURE__ */ new Map();
+var staleTimers = /* @__PURE__ */ new Map();
 var getDataLoader = (params) => {
+  var _a;
   const { key, func, timeout } = params;
   const existing = cache.get(key);
   if (existing) return existing;
   const load = async (ids) => {
+    const staleTimer2 = staleTimers.get(key);
+    if (staleTimer2) {
+      clearTimeout(staleTimer2);
+      staleTimers.delete(key);
+    }
     cache.delete(key);
     return await func(ids);
   };
@@ -1038,13 +1030,27 @@ var getDataLoader = (params) => {
     batchScheduleFn: (callback) => setTimeout(callback, timeout)
   };
   const dataLoader = new DataLoader(load, options);
+  const staleTimer = setTimeout(
+    () => {
+      cache.delete(key);
+      staleTimers.delete(key);
+    },
+    Math.max(100, timeout * 20)
+  );
+  (_a = staleTimer.unref) == null ? void 0 : _a.call(staleTimer);
+  staleTimers.set(key, staleTimer);
   cache.set(key, dataLoader);
   return dataLoader;
 };
 
 // src/createCollection/getMethods/dataLoader/dataLoad/index.ts
-import { hashObject } from "@orion-js/helpers";
 var dataLoad = async (options) => {
+  if (options.ids && options.ids.length === 0) {
+    return [];
+  }
+  if (!options.ids && typeof options.id === "undefined") {
+    return [];
+  }
   const dataLoader = getDataLoader({
     key: hashObject(options.loaderKey),
     func: options.load,
@@ -1052,7 +1058,7 @@ var dataLoad = async (options) => {
   });
   if (options.ids) {
     const resultArray = await dataLoader.loadMany(options.ids);
-    return flatten(resultArray);
+    return resultArray.flat();
   }
   return await dataLoader.load(options.id);
 };
@@ -1075,7 +1081,7 @@ function loadData_default(collection) {
       timeout: options.timeout,
       load: async (values) => {
         const query = {
-          ...clone2(options.match),
+          ...options.match || {},
           [options.key]: { $in: values }
         };
         const cursor = collection.find(query, { readPreference: "secondaryPreferred" });
@@ -1365,7 +1371,7 @@ async function loadIndexes(collection) {
 }
 
 // src/createCollection/getSchemaAndModel.ts
-import { clone as clone3 } from "@orion-js/helpers";
+import { clone as clone2 } from "@orion-js/helpers";
 Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
 function prepareShema(schema) {
   if (!schema._id) {
@@ -1387,7 +1393,7 @@ function getSchema(options) {
   }
   if (options.schema.getModel) {
     const model = options.schema.getModel();
-    const schema = model ? clone3(model.getSchema()) : {};
+    const schema = model ? clone2(model.getSchema()) : {};
     return prepareShema(schema);
   }
   if (type(options.schema) === "Object") {