@toa.io/storages.mongodb 1.0.0-alpha.0 → 1.0.0-alpha.3

package/package.json

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

package/src/connection.js

@@ -4,8 +4,8 @@
 
 const { MongoClient } = require('mongodb')
 const { Connector } = require('@toa.io/core')
-const { console } = require('@toa.io/console')
 const { resolve } = require('@toa.io/pointer')
+const { Conveyor } = require('@toa.io/conveyor')
 const { ID } = require('./deployment')
 
 class Connection extends Connector {
@@ -14,6 +14,8 @@ class Connection extends Connector {
   #client
   /** @type {import('mongodb').Collection<toa.mongodb.Record>} */
   #collection
+  /** @type {toa.conveyor.Conveyor<toa.core.storages.Record, boolean>} */
+  #conveyor
 
   constructor (locator) {
     super()
@@ -31,14 +33,15 @@ class Connection extends Connector {
     await this.#client.connect()
 
     this.#collection = this.#client.db(db).collection(collection)
+    this.#conveyor = new Conveyor((objects) => this.addMany(objects))
 
-    console.info('Storage Mongo connected')
+    console.info(`Storage Mongo '${this.#locator.id}' connected`)
   }
 
   async close () {
     await this.#client?.close()
 
-    console.info('Storage Mongo disconnected')
+    console.info(`Storage Mongo '${this.#locator.id}' disconnected`)
   }
 
   /** @hot */
@@ -48,22 +51,25 @@ class Connection extends Connector {
 
   /** @hot */
   async find (query, options) {
-    const cursor = await this.#collection.find(query, options)
+    const cursor = this.#collection.find(query, options)
 
     return cursor.toArray()
   }
 
   /** @hot */
   async add (record) {
-    /** @type {boolean} */
+    return this.#conveyor.process(record)
+  }
+
+  async addMany (records) {
     let result
 
     try {
-      const response = await this.#collection.insertOne(record)
+      const response = await this.#collection.insertMany(records, { ordered: false })
 
       result = response.acknowledged
     } catch (e) {
-      if (e.code === 11000) result = false // duplicate id
+      if (e.code === ERR_DUPLICATE_KEY) result = false
       else throw e
     }
 
@@ -87,9 +93,11 @@ class Connection extends Connector {
 }
 
 const OPTIONS = {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-  ignoreUndefined: true
+  ignoreUndefined: true,
+  connectTimeoutMS: 0,
+  serverSelectionTimeoutMS: 0
 }
 
+const ERR_DUPLICATE_KEY = 11000
+
 exports.Connection = Connection

package/src/storage.js

@@ -48,7 +48,7 @@ class Storage extends Connector {
     const criteria = { _id: entity.id, _version: entity._version }
     const result = await this.#connection.replace(criteria, to(entity))
 
-    return result.value !== null
+    return result !== null
   }
 
   async store (entity) {
@@ -75,7 +75,7 @@ class Storage extends Connector {
 
     const result = await this.#connection.update(criteria, update, options)
 
-    return from(result.value)
+    return from(result)
   }
 }
 

package/test/connection.test.js

@@ -0,0 +1,58 @@
+'use strict'
+
+const insertManyMock = jest.fn(() => ({ acknowledged: true }))
+jest.mock('mongodb', () => ({
+  __esModule: true,
+  MongoClient: function () {
+    this.connect = () => {},
+    this.db = () => ({
+      collection: () => ({
+        insertMany: insertManyMock
+      })
+    })
+    return this
+  },
+}))
+jest.mock('@toa.io/pointer', () => ({
+  __esModule: true,
+  resolve: () => ['url'],
+}))
+const { generate } = require('randomstring')
+const { Connection } = require('../src/connection')
+
+
+let connection
+
+beforeEach(async () => {
+  jest.clearAllMocks()
+  connection = new Connection({ id: 1 })
+  await connection.open()
+})
+
+it('should be', () => {
+  expect(Connection).toBeDefined()
+})
+
+it('should insert', async () => {
+  const object = generate()
+
+  await connection.add(object)
+
+  expect(insertManyMock).toHaveBeenCalledWith([object], { ordered: false })
+})
+
+it('should batch insert', async () => {
+  const a = generate()
+  const b = generate()
+  const c = generate()
+
+  await Promise.all([
+    connection.add(a),
+    connection.add(b),
+    connection.add(c)
+  ])
+
+  expect(insertManyMock).toHaveBeenCalledTimes(2)
+  expect(insertManyMock).toHaveBeenNthCalledWith(1, [a], { ordered: false })
+  expect(insertManyMock).toHaveBeenNthCalledWith(2, [b, c], { ordered: false })
+})

package/types/connection.d.ts

@@ -1,29 +1,31 @@
 // noinspection ES6UnusedImports
 
 import type {
-    Document,
-    Filter,
-    FindOneAndReplaceOptions,
-    FindOneAndUpdateOptions,
-    FindOptions,
-    UpdateFilter
+  Document,
+  Filter,
+  FindOneAndReplaceOptions,
+  FindOneAndUpdateOptions,
+  FindOptions,
+  UpdateFilter,
 } from 'mongodb'
 
 import type { Connector } from '@toa.io/core'
 import type { Record } from './record'
 
-declare namespace toa.mongodb {
+declare namespace toa.mongodb{
 
-    interface Connection extends Connector {
-        get(query: Filter<Record>, options?: FindOptions<Record>): Promise<Record>
+  interface Connection extends Connector{
+    get (query: Filter<Record>, options?: FindOptions<Record>): Promise<Record>
 
-        find(query: Filter<Record>, options?: FindOptions<Record>): Promise<Record[]>
+    find (query: Filter<Record>, options?: FindOptions<Record>): Promise<Record[]>
 
-        add(record: Record): Promise<boolean>
+    add (record: Record): Promise<boolean>
 
-        replace(query: Filter<Record>, record: UpdateFilter<Record>, options?: FindOneAndReplaceOptions): Promise<any>
+    addMany (records: Record[]): Promise<boolean>
 
-        update(query: Filter<Record>, update: UpdateFilter<Record>, options?: FindOneAndUpdateOptions): Promise<any>
-    }
+    replace (query: Filter<Record>, record: UpdateFilter<Record>, options?: FindOneAndReplaceOptions): Promise<any>
+
+    update (query: Filter<Record>, update: UpdateFilter<Record>, options?: FindOneAndUpdateOptions): Promise<any>
+  }
 
 }