Testkit: bookmark manager in the session

Author: bigmontz

packages/core/src/internal/connection-holder.ts

@@ -122,7 +122,7 @@ class ConnectionHolder implements ConnectionHolderInterface {
     this._referenceCount = 0
     this._connectionPromise = Promise.resolve(null)
     this._onDatabaseNameResolved = onDatabaseNameResolved
-    this._getConnectionAcquistionBookmarks = getConnectionAcquistionBookmarks ?? (async () => Bookmarks.empty())
+    this._getConnectionAcquistionBookmarks = getConnectionAcquistionBookmarks ?? (() => Promise.resolve(Bookmarks.empty()))
   }
 
   mode (): string | undefined {

packages/testkit-backend/src/context.js

@@ -11,6 +11,7 @@ export default class Context {
     this._results = {}
     this._bookmarkSupplierRequests = {}
     this._notifyBookmarksRequests = {}
+    this._bookmarksManagers = {}
   }
 
   addDriver (driver) {
@@ -136,6 +137,20 @@ export default class Context {
     return this._notifyBookmarksRequests[id]
   }
 
+  addBookmarkManager (bookmarkManagerFactory) {
+    this._id++
+    this._bookmarksManagers[this._id] = bookmarkManagerFactory(this._id)
+    return this._id
+  }
+
+  getBookmarkManager (id) {
+    return this._bookmarksManagers[id]
+  }
+
+  removeBookmarkManager (id) {
+    delete this._bookmarksManagers[id]
+  }
+
   _add (map, object) {
     this._id++
     map[this._id] = object

packages/testkit-backend/src/request-handlers-rx.js

@@ -20,11 +20,14 @@ export {
   ForcedRoutingTableUpdate,
   ResultNext,
   RetryablePositive,
-  RetryableNegative
+  RetryableNegative,
+  NewBookmarkManager,
+  BookmarksSupplierCompleted,
+  BookmarksConsumerCompleted
 } from './request-handlers.js'
 
 export function NewSession (context, data, wire) {
-  let { driverId, accessMode, bookmarks, database, fetchSize, impersonatedUser, ignoreBookmarkManager } = data
+  let { driverId, accessMode, bookmarks, database, fetchSize, impersonatedUser, bookmarkManagerId } = data
   switch (accessMode) {
     case 'r':
       accessMode = neo4j.session.READ
@@ -36,14 +39,22 @@ export function NewSession (context, data, wire) {
       wire.writeBackendError('Unknown accessmode: ' + accessMode)
       return
   }
+  let bookmarkManager
+  if (bookmarkManagerId != null) {
+    bookmarkManager = context.getBookmarkManager(bookmarkManagerId)
+    if (bookmarkManager == null) {
+      wire.writeBackendError(`Bookmark manager ${bookmarkManagerId} not found`)
+      return
+    }
+  }
   const driver = context.getDriver(driverId)
   const session = driver.rxSession({
     defaultAccessMode: accessMode,
     bookmarks,
     database,
     fetchSize,
     impersonatedUser,
-    ignoreBookmarkManager
+    bookmarkManager
   })
   const id = context.addSession(session)
   wire.writeResponse(responses.Session({ id }))

packages/testkit-backend/src/request-handlers.js

@@ -107,7 +107,7 @@ export function DriverClose (context, data, wire) {
 }
 
 export function NewSession (context, data, wire) {
-  let { driverId, accessMode, bookmarks, database, fetchSize, impersonatedUser, ignoreBookmarkManager } = data
+  let { driverId, accessMode, bookmarks, database, fetchSize, impersonatedUser, bookmarkManagerId } = data
   switch (accessMode) {
     case 'r':
       accessMode = neo4j.session.READ
@@ -119,14 +119,22 @@ export function NewSession (context, data, wire) {
       wire.writeBackendError('Unknown accessmode: ' + accessMode)
       return
   }
+  let bookmarkManager
+  if (bookmarkManagerId != null) {
+    bookmarkManager = context.getBookmarkManager(bookmarkManagerId)
+    if (bookmarkManager == null) {
+      wire.writeBackendError(`Bookmark manager ${bookmarkManagerId} not found`)
+      return
+    }
+  }
   const driver = context.getDriver(driverId)
   const session = driver.session({
     defaultAccessMode: accessMode,
     bookmarks,
     database,
     fetchSize,
     impersonatedUser,
-    ignoreBookmarkManager
+    bookmarkManager
   })
   const id = context.addSession(session)
   wire.writeResponse(responses.Session({ id }))
@@ -407,6 +415,48 @@ export function ResolverResolutionCompleted (
   request.resolve(addresses)
 }
 
+export function NewBookmarkManager (
+  context,
+  {
+    initialBookmarks,
+    bookmarksSupplierRegistered,
+    bookmarksConsumerRegistered
+  },
+  wire
+) {
+  let bookmarkManager
+  const id = context.addBookmarkManager((bookmarkManagerId) => {
+    let bookmarksSupplier
+    let bookmarksConsumer
+    if (initialBookmarks != null) {
+      initialBookmarks = new Map(Object.entries(initialBookmarks))
+    }
+    if (bookmarksSupplierRegistered === true) {
+      bookmarksSupplier = (database) =>
+        new Promise((resolve, reject) => {
+          const id = context.addBookmarkSupplierRequest(resolve, reject)
+          wire.writeResponse(responses.BookmarksSupplierRequest({ id, bookmarkManagerId, database }))
+        })
+    }
+    if (bookmarksConsumerRegistered === true) {
+      bookmarksConsumer = (database, bookmarks) =>
+        new Promise((resolve, reject) => {
+          const id = context.addNotifyBookmarksRequest(resolve, reject)
+          wire.writeResponse(responses.BookmarksConsumerRequest({ id, bookmarkManagerId, database, bookmarks }))
+        })
+    }
+    bookmarkManager = neo4j.bookmarkManager({
+      initialBookmarks,
+      bookmarksConsumer,
+      bookmarksSupplier
+    })
+
+    return bookmarkManager
+  })
+
+  wire.writeResponse(responses.BookmarkManager({ id }))
+}
+
 export function BookmarksSupplierCompleted (
   context,
   {

packages/testkit-backend/src/responses.js

@@ -14,12 +14,16 @@ export function ResolverResolutionRequired ({ id, address }) {
   return response('ResolverResolutionRequired', { id, address })
 }
 
-export function BookmarksSupplierRequest ({ id, database }) {
-  return response('BookmarksSupplierRequest', { id, database })
+export function BookmarkManager ({ id }) {
+  return response('BookmarkManager', { id })
 }
 
-export function BookmarksConsumerRequest ({ id, database, bookmarks }) {
-  return response('BookmarksConsumerRequest', { id, database, bookmarks })
+export function BookmarksSupplierRequest ({ id, bookmarkManagerId, database }) {
+  return response('BookmarksSupplierRequest', { id, bookmarkManagerId, database })
+}
+
+export function BookmarksConsumerRequest ({ id, bookmarkManagerId, database, bookmarks }) {
+  return response('BookmarksConsumerRequest', { id, bookmarkManagerId, database, bookmarks })
 }
 
 export function Session ({ id }) {