@live-change/db-server 0.5.24 → 0.6.1

package/lib/Server.js

@@ -19,37 +19,48 @@ const Database = require('@live-change/db').Database
 
 const debug = require('debug')('db-server')
 
-const packageInfo = require("@live-change/db-server/package.json");
-
 class DatabaseStore {
-  constructor(path, backend, options) {
+  constructor(path, backends, options) {
     this.path = path
-    this.backend = backend
-    this.options = options
+    this.backends = backends
     this.stores = new Map()
-    this.db = backend.createDb(path, options)
+
+    this.dbs = {}
+    this.dbs.default = this.backends.default.createDb(path, options)
   }
   close() {
-    return this.backend.closeDb(this.db)
+    for(let key in this.dbs) {
+      return this.backends[key].closeDb(this.dbs[key])
+    }
   }
   delete() {
-    return this.backend.deleteDb(this.db)
+    for(let key in this.dbs) {
+      return this.backends[key].deleteDb(this.dbs[key])
+    }
   }
   getStore(name, options = {}) {
     let store = this.stores.get(name)
     if(store) return store
-    store = this.backend.createStore(this.db, name, options)
+    const backendName = options.backend ?? (options.memory ? 'memory' : 'default')
+    if(!this.backends[backendName]) {
+      throw new Error(`db ${path} backend ${backendName} not configured`)
+    }
+    if(!this.dbs[backendName]) {
+      this.dbs[backendName] = this.backends[backendName].createDb(this.path, options)
+    }
+    store = this.backends[backendName].createStore(this.dbs[backendName], name, options)
+    store.backendName = backendName
     this.stores.set(name, store)
     return store
   }
   closeStore(name) {
     let store = this.stores.get(name)
     if(!store) return;
-    return this.backend.closeStore(store)
+    return this.backends[store.backendName].closeStore(store)
   }
   deleteStore(name) {
     let store = this.getStore(name)
-    return this.backend.deleteStore(store)
+    return this.backends[store.backendName].deleteStore(store)
   }
 }
 
@@ -66,7 +77,26 @@ class Server {
 
     this.apiServer = new ReactiveDao.ReactiveServer((sessionId) => this.createDao(sessionId))
 
-    this.backend = createBackend(config)
+    this.backends = {}
+    if(config.backend && !this.backends.default) { // backward compatibility
+      this.backends.default = createBackend({
+        name: config.backend,
+        url: config.backendUrl,
+        maxDbs: config.maxDbs,
+        maxDbSize: config.maxDbSize,
+      })
+    }
+    for(let backend of config.backends || []) {
+      this.backends[backend.name] = createBackend(backend)
+    }
+    if(!this.backends.default) {
+      throw new Error("No default backend configured")
+    }
+    if(!this.backends.memory) {
+      this.backends.memory = createBackend({
+        name: "mem"
+      })
+    }
 
     if(this.config.master) {
       this.masterDao = new ReactiveDao('app', {
@@ -269,7 +299,10 @@ class Server {
     let dbStore = this.databaseStores.get(dbName)
     if(!dbStore) {
       debug("CREATE DB", dbPath, dbConfig.storage)
-      dbStore = new DatabaseStore(dbPath, this.backend, dbConfig.storage)
+      const backend = this.backends[dbConfig.backend?.name ?? dbConfig.backend ?? 'default']
+      dbStore = new DatabaseStore(dbPath, { ...this.backends, default: backend },
+        typeof dbConfig.backend == 'object' ? dbConfig.backend : dbConfig.storage
+      )
       this.databaseStores.set(dbName, dbStore)
     }
     const database = new Database(

package/lib/backend.js

@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const rimraf = require("rimraf-promise")
 
-function createBackend(config) {
-  if(config.backend == 'leveldb') {
+function createBackend({ name, url, maxDbs, mapSize }) {
+  if(name == 'leveldb') {
     return {
       levelup: require('levelup'),
       leveldown: require('leveldown'),
@@ -32,7 +32,7 @@ function createBackend(config) {
         await store.clear()
       }
     }
-  } else if(config.backend == 'rocksdb') {
+  } else if(name == 'rocksdb') {
     return {
       levelup: require('levelup'),
       rocksdb: require('level-rocksdb'),
@@ -61,7 +61,7 @@ function createBackend(config) {
         await store.clear()
       }
     }
-  } else if(config.backend == 'memdown') {
+  } else if(name == 'memdown') {
     return {
       levelup: require('levelup'),
       memdown: require('memdown'),
@@ -90,7 +90,7 @@ function createBackend(config) {
         await store.clear()
       }
     }
-  } else if(config.backend == 'mem') {
+  } else if(name == 'mem') {
     return {
       Store: require('@live-change/db-store-rbtree'),
       createDb(path, options) {
@@ -110,7 +110,7 @@ function createBackend(config) {
       async deleteStore(store) {
       }
     }
-  } else if(config.backend == 'lmdb') {
+  } else if(name == 'lmdb') {
     return {
       lmdb: require('node-lmdb'),
       Store: require('@live-change/db-store-lmdb'),
@@ -119,8 +119,8 @@ function createBackend(config) {
         const env = new this.lmdb.Env()
         const envConfig = {
           path: path,
-          maxDbs: config.maxDbs || 1000,
-          mapSize: config.mapSize || (10 * 1024 * 1024 * 1024),
+          maxDbs: maxDbs || 1000,
+          mapSize: mapSize || (10 * 1024 * 1024 * 1024),
           ...options
         }
         env.open(envConfig)
@@ -149,9 +149,9 @@ function createBackend(config) {
         store.lmdb.drop()
       }
     }
-  } else if(config.backend == 'observabledb') {
+  } else if(name == 'observabledb') {
     const Store = require('@live-change/db-store-observable-db')
-    const connection = new Store.Connection(config.backendUrl || 'ws://localhost:3530/api/ws')
+    const connection = new Store.Connection(url || 'ws://localhost:3530/api/ws')
     return {
       Store,
       connection,
@@ -190,7 +190,7 @@ function createBackend(config) {
         return connection.deleteStore(store.databaseName, store.storeName)
       }
     }
-  } else throw new Error("Unknown backend " + config.backend)
+  } else throw new Error("Unknown backend " + name)
 }
 
 module.exports = createBackend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-server",
-  "version": "0.5.24",
+  "version": "0.6.1",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -28,16 +28,16 @@
     "tape": "^5.3.2"
   },
   "dependencies": {
-    "@live-change/dao": "0.5.10",
-    "@live-change/dao-sockjs": "0.5.10",
-    "@live-change/dao-websocket": "0.5.10",
-    "@live-change/db": "^0.5.24",
-    "@live-change/db-admin": "^0.5.24",
-    "@live-change/db-client": "^0.5.24",
-    "@live-change/db-store-level": "^0.5.24",
-    "@live-change/db-store-lmdb": "^0.5.24",
-    "@live-change/db-store-observable-db": "^0.5.24",
-    "@live-change/db-store-rbtree": "^0.5.24",
+    "@live-change/dao": "0.5.14",
+    "@live-change/dao-sockjs": "0.5.14",
+    "@live-change/dao-websocket": "0.5.14",
+    "@live-change/db": "^0.6.1",
+    "@live-change/db-admin": "^0.6.1",
+    "@live-change/db-client": "^0.6.1",
+    "@live-change/db-store-level": "^0.6.1",
+    "@live-change/db-store-lmdb": "^0.6.1",
+    "@live-change/db-store-observable-db": "^0.6.1",
+    "@live-change/db-store-rbtree": "^0.6.1",
     "@live-change/sockjs": "0.4.1",
     "express": "^4.18.1",
     "line-reader": "^0.4.0",
@@ -49,5 +49,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.5.1"
   },
-  "gitHead": "bb5e43a28284d4261091276f213bbe9465fbc306"
+  "gitHead": "f458425c609deeb9d1f38c15a3aa37759629a67e"
 }