wingbot-mongodb 4.2.8 → 4.2.10

package/.nyc_output/processinfo/561e17b4-b0de-410b-ab5f-ce9b6ffe8232.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2997333,"argv":["/nix/store/h4apbnz8p5fmjwcmzlaxcjm5vr70d97x-nodejs-slim-24.13.0/bin/node","/home/lika85456/workspace/wingbot/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/home/lika85456/workspace/wingbot/wingbot-mongodb","time":1772622254531,"ppid":2997322,"coverageFilename":"/home/lika85456/workspace/wingbot/wingbot-mongodb/.nyc_output/561e17b4-b0de-410b-ab5f-ce9b6ffe8232.json","externalId":"","uuid":"561e17b4-b0de-410b-ab5f-ce9b6ffe8232","files":["/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BaseStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/defaultLogger.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/getNestedObjects.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/AttachmentCache.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/AuditLogStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BotConfigStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BotTokenStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/tokenFactory.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/ChatLogStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/NotificationsStorage.js","/home/lika85456/workspace/wingbot/wingbot-mongodb/src/StateStorage.js"]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/getNestedObjects.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["e6d9f3c1-d3d8-4e19-a2e5-18bcc8f35eb7"]},"externalIds":{}}
+{"processes":{"561e17b4-b0de-410b-ab5f-ce9b6ffe8232":{"parent":null,"children":[]}},"files":{"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BaseStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/defaultLogger.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/getNestedObjects.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/AttachmentCache.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/AuditLogStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BotConfigStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/BotTokenStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/tokenFactory.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/ChatLogStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/NotificationsStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"],"/home/lika85456/workspace/wingbot/wingbot-mongodb/src/StateStorage.js":["561e17b4-b0de-410b-ab5f-ce9b6ffe8232"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "4.2.8",
+  "version": "4.2.10",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "types": "types/main.d.ts",
@@ -49,7 +49,7 @@
     "jsdoc-to-markdown": "^7.1.1",
     "jsdoc-tsimport-plugin": "^1.0.5",
     "mocha": "^10.1.0",
-    "mongodb": "^6.1.0",
+    "mongodb": "^6.21.0",
     "nyc": "^15.1.0",
     "typescript": "^5.9.3",
     "wingbot": "^3.46.3"

package/src/BaseStorage.js

@@ -13,15 +13,9 @@ const getNestedObjects = require('./getNestedObjects');
 /** @typedef {import('mongodb').Document} Document */
 /** @typedef {import('mongodb').CreateIndexesOptions} CreateIndexesOptions */
 
-/**
- * @template T=ObjectId
- * @typedef {object} CustomIdentifier
- * @prop {T} _id
- */
-
 /**
  * @template {object} T
- * @typedef {T & CustomIdentifier<ObjectId>} WithId
+ * @typedef {import('mongodb').WithId<T>} WithId
  */
 
 /**
@@ -42,7 +36,7 @@ function signReplacer (k, v) {
 }
 
 /**
- * @template T={} {Document}
+ * @template T={Document}
  */
 class BaseStorage {
 
@@ -181,7 +175,7 @@ class BaseStorage {
      * @returns {Promise<import('mongodb').Collection<WithId<T>>>}
      */
     preHeat () {
-        return this._getCollection();
+        return this._getCollection(false, true);
     }
 
     /**
@@ -295,9 +289,10 @@ class BaseStorage {
      *
      * @protected
      * @param {boolean} [forRead]
+     * @param {boolean} [forceIndexAwait=false]
      * @returns {Promise<import('mongodb').Collection<WithId<T>>>}
      */
-    async _getCollection (forRead = false) {
+    async _getCollection (forRead = false, forceIndexAwait = false) {
         if (this._collection === null) {
             let c;
             try {
@@ -311,9 +306,11 @@ class BaseStorage {
             }
         }
 
+        const requiresIndexAwait = this._shouldWaitForIndex
+            && (!forRead || this._shouldIndexBeforeRead);
+
         if (this._indexing
-            && this._shouldWaitForIndex
-            && (!forRead || this._shouldIndexBeforeRead)) {
+            && (requiresIndexAwait || forceIndexAwait)) {
 
             const err = await this._indexing;
             this._indexing = false;

package/types/BaseStorage.d.ts

@@ -1,6 +1,6 @@
 export = BaseStorage;
 /**
- * @template T={} {Document}
+ * @template T={Document}
  */
 declare class BaseStorage<T> {
     static netFailuresIntervalMs: number;
@@ -131,9 +131,10 @@ declare class BaseStorage<T> {
      *
      * @protected
      * @param {boolean} [forRead]
+     * @param {boolean} [forceIndexAwait=false]
      * @returns {Promise<import('mongodb').Collection<WithId<T>>>}
      */
-    protected _getCollection(forRead?: boolean): Promise<import("mongodb").Collection<WithId<T>>>;
+    protected _getCollection(forRead?: boolean, forceIndexAwait?: boolean): Promise<import("mongodb").Collection<WithId<T>>>;
     /**
      *
      * @param {object[]} indexes
@@ -176,13 +177,10 @@ declare class BaseStorage<T> {
     drop(): Promise<any>;
 }
 declare namespace BaseStorage {
-    export { Db, Document, CreateIndexesOptions, CustomIdentifier, WithId };
+    export { Db, Document, CreateIndexesOptions, WithId };
 }
 import { ObjectId } from "mongodb";
 type Db = import("mongodb").Db;
 type Document = import("mongodb").Document;
 type CreateIndexesOptions = import("mongodb").CreateIndexesOptions;
-type CustomIdentifier<T> = {
-    _id: T;
-};
-type WithId<T extends unknown> = T & CustomIdentifier<ObjectId>;
+type WithId<T extends unknown> = import("mongodb").WithId<T>;