@toa.io/storages.mongodb 1.0.0-alpha.11 → 1.0.0-alpha.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,13 +19,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/console": "1.0.0-alpha.11",
-    "@toa.io/conveyor": "1.0.0-alpha.11",
-    "@toa.io/core": "1.0.0-alpha.11",
-    "@toa.io/generic": "1.0.0-alpha.11",
-    "@toa.io/pointer": "1.0.0-alpha.11",
+    "@toa.io/console": "1.0.0-alpha.13",
+    "@toa.io/conveyor": "1.0.0-alpha.13",
+    "@toa.io/core": "1.0.0-alpha.13",
+    "@toa.io/generic": "1.0.0-alpha.13",
+    "@toa.io/pointer": "1.0.0-alpha.13",
     "mongodb": "6.3.0",
     "saslprep": "1.0.3"
   },
-  "gitHead": "e343ac81eef12957cfa5e520119b1276b8ec0ad2"
+  "gitHead": "f779cc4a98abe96e4e928b918f9521826403536b"
 }

package/src/client.js

@@ -57,17 +57,17 @@ class Client extends Connector {
    */
   async open () {
     const urls = await this.resolveURLs()
+    const db = process.env.CONTEXT ?? 'toa-dev'
+    const collection = this.locator.lowercase
 
-    this.key = getKey(urls)
+    this.key = getKey(db, urls)
 
     INSTANCES[this.key] ??= this.createInstance(urls)
 
     this.instance = await INSTANCES[this.key]
     this.instance.count++
 
-    this.collection = this.instance.client
-      .db(this.locator.namespace)
-      .collection(this.locator.name)
+    this.collection = this.instance.client.db(db).collection(collection)
   }
 
   /**
@@ -118,8 +118,8 @@ class Client extends Connector {
   }
 }
 
-function getKey (urls) {
-  return urls.sort().join(' ')
+function getKey (db, urls) {
+  return db + ':' + urls.sort().join(' ')
 }
 
 const OPTIONS = {

package/src/storage.js

@@ -75,14 +75,20 @@ class Storage extends Connector {
       }
     } catch (error) {
       if (error.code === ERR_DUPLICATE_KEY) {
-        return new exceptions.DuplicateException(Object.keys(error.keyValue))
+        const keys = error.keyValue ? Object.keys(error.keyValue) : undefined
+
+        if (keys === undefined) {
+          console.error(error)
+        }
+
+        return new exceptions.DuplicateException(keys)
       } else {
         throw error
       }
     }
   }
 
-  async upsert (query, changeset, insert) {
+  async upsert (query, changeset) {
     const {
       criteria,
       options
@@ -93,20 +99,6 @@ class Storage extends Connector {
       $inc: { _version: 1 }
     }
 
-    if (insert !== undefined) {
-      delete insert._version
-
-      options.upsert = true
-
-      if (criteria._id !== undefined) {
-        insert._id = criteria._id
-      } else {
-        return null
-      } // this shouldn't ever happen
-
-      if (Object.keys(insert) > 0) update.$setOnInsert = insert
-    }
-
     options.returnDocument = 'after'
 
     const result = await this.#connection.update(criteria, update, options)