@live-change/db 0.3.63 → 0.5.4

package/lib/Database.js

@@ -7,6 +7,8 @@ const getRandomValues = require('get-random-values')
 
 const ReactiveDao = require("@live-change/dao")
 
+const debug = require('debug')('db')
+
 class Database {
   constructor(config, storeFactory, saveConfig, deleteStore, name, createScriptContext) {
     this.name = name
@@ -227,39 +229,29 @@ class Database {
     return summary
   }
 
-  async openIndex(name) {
-    let config = this.config.indexes[name]
-    if(!config) {
-      console.log("INDEX", name, "NOT EXISTS - WAITING!")
-      await new Promise(r => setTimeout(r, 500))
-      config = this.config.indexes[name]
-    }
-    let index, code
-    if(!config) throw new Error(`Index ${name} not found`)
-    code = config.code
-    const params = config.parameters
-    index = new Index(this, name, code, params, config)
-    try {
-      console.log("STARTING INDEX", name)
-      await index.startIndex()
-      console.log("STARTED INDEX", name)
-    } catch(error) {
-      console.error("INDEX", name, "ERROR", error, "CODE:\n", code)
-      console.error("DELETING INDEX", name)
-      delete this.config.indexes[name]
-      this.indexesListObservable.remove(name)
-      if(this.onAutoRemoveIndex && config) this.onAutoRemoveIndex(name, config.uid)
-      await this.saveConfig(this.config)
-      throw error
-    }
-    this.indexes.set(name, index)
-    return index
-  }
   async index(name) {
     let index = this.indexes.get(name)
     if(!index) {
-      index = this.openIndex(name)
+      const config = this.config.indexes[name]
+      if(!config) throw new Error(`Index ${name} not found`)
+      let code = config.code
+      const params = config.parameters
+      index = new Index(this, name, code, params, config)
+      try {
+        debug("STARTING INDEX", name)
+        await index.startIndex()
+        debug("STARTED INDEX", name)
+      } catch(error) {
+        console.error("INDEX", name, "ERROR", error, "CODE:\n", code)
+        console.error("DELETING INDEX", name)
+        delete this.config.indexes[name]
+        this.indexesListObservable.remove(name)
+        if(this.onAutoRemoveIndex && config) this.onAutoRemoveIndex(name, config.uid)
+        await this.saveConfig(this.config)
+        throw error
+      }
       this.indexes.set(name, index)
+      return index
     }
     return index
   }
@@ -286,7 +278,7 @@ class Database {
 
   handleUnhandledRejectionInIndex(name, reason, promise) {
     const config = this.config.indexes[name]
-    console.error("INDEX", name, "unhandledRejection", reason, "CODE:\n", config.code)
+    console.error("INDEX", name, "unhandledRejection", reason, "CODE:\n", config?.code)
     console.error("DELETING INDEX", name)
     process.nextTick(() => {
       if(!config) {

package/lib/Index.js

@@ -6,6 +6,8 @@ const profileLog = require('./profileLog.js')
 const queryObservable = require('./queryObservable.js')
 const { ChangeStream } = require('./ChangeStream.js')
 
+const debug = require('debug')('db')
+
 const opLogBatchSize = 128 /// TODO: incrase after testing
 
 class ObjectReader extends ChangeStream {
@@ -419,6 +421,9 @@ class IndexWriter {
   synchronized(key, code) {
     return this.index.synchronized(key, code)
   }
+  timeout(date, callback) {
+    throw new Error('index timeouts not implemented yet!')
+  }
   debug(...args) {
     console.log('INDEX', this.index.name, 'DEBUG', ...args)
   }
@@ -437,7 +442,7 @@ class Index extends Table {
     this.code = code
   }
   async startIndex() {
-    console.log("EXECUTING INDEX CODE", this.name)
+    debug("EXECUTING INDEX CODE", this.name)
     this.scriptContext = this.database.createScriptContext({
       /// TODO: script available routines
     })
@@ -445,7 +450,7 @@ class Index extends Table {
     this.codeFunction = (input, output) => queryFunction(input, output, this.params)
     this.writer = new IndexWriter(this)
     this.reader = null
-    console.log("STARTING INDEX", this.name)
+    debug("STARTING INDEX", this.name)
     const lastIndexOperations = await this.opLog.rangeGet({ reverse: true, limit: 1 })
     const lastIndexOperation = lastIndexOperations[0]
     let lastUpdateTimestamp = 0
@@ -475,11 +480,11 @@ class Index extends Table {
     codePromise = this.codeFunction(this.reader, this.writer)
     //console.log("READING!")
     await this.reader.readMore()
-    console.log("WAITING FOR CODE!", this.name)
+    debug("WAITING FOR CODE!", this.name)
     await codePromise
     this.state = INDEX_READY
     const startTime = Date.now()
-    console.log("INDEX STARTED!", this.name)
+    debug("INDEX STARTED!", this.name)
     await this.opLog.put({
       id: ((''+startTime).padStart(16, '0'))+':000000',
       timestamp: startTime,
@@ -499,7 +504,7 @@ class Index extends Table {
     if(existingSourceInfo) return
     const newSourceInfo = { type: sourceType, name: sourceName }
     config.sources.push(newSourceInfo)
-    console.log("NEW INDEX", this.name, "SOURCE DETECTED", sourceType, sourceName)
+    debug("NEW INDEX", this.name, "SOURCE DETECTED", sourceType, sourceName)
     this.configObservable.set(config)
     this.database.config.indexes[this.name] = config
     this.database.handleConfigUpdated()

package/lib/queryGet.js

@@ -167,6 +167,10 @@ class QueryWriter {
     this.#locks.set(key, promise)
     return await promise
   }
+  timeout(date, callback) {
+    /// ignore
+    return () => {}
+  }
   debug(...args) {
     console.log('QUERY DEBUG', ...args)
   }

package/lib/queryObservable.js

@@ -244,6 +244,7 @@ class QueryWriter {
   #locks = new Map()
   #observationMode = false
   #reverse = false
+  #timeouts = new Set()
 
   constructor(observable, database) {
     this.#observable = observable
@@ -335,6 +336,20 @@ class QueryWriter {
     this.#locks.set(key, promise)
     return await promise
   }
+  timeout(date, callback) {
+    const toTimeout = new Date(date).getTime() - Date.now()
+    const timeout = setTimeout(callback, toTimeout)
+    this.#timeouts.add(timeout)
+    return () => {
+      this.#timeouts.delete(timeout)
+    }
+  }
+  dispose() {
+    for(let timeout of this.#timeouts) {
+      clearTimeout(timeout)
+    }
+    this.#timeouts.clear()
+  }
   debug(...args) {
     console.log('QUERY DEBUG', ...args)
   }
@@ -383,6 +398,7 @@ class QueryObservable extends ReactiveDao.ObservableList {
     }
 
     if(this.reader) this.reader.dispose()
+    if(this.writer) this.writer.dispose()
 
     this.disposed = true
     this.respawnId++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.3.63",
+  "version": "0.5.4",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/live-change/db.git"
+    "url": "git+https://github.com/live-change/live-change-db.git"
   },
   "author": {
     "email": "m8@em8.pl",
@@ -17,23 +17,15 @@
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/live-change/db/issues"
+    "url": "https://github.com/live-change/live-change-db/issues"
   },
-  "homepage": "https://github.com/live-change/db",
+  "homepage": "https://github.com/live-change/live-change-db",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.1.14",
-    "@live-change/db-store-lmdb": "^0.1.13",
-    "encoding-down": "^6.3.0",
-    "level-rocksdb": "^4.0.0",
-    "leveldown": "^5.6.0",
-    "levelup": "^4.4.0",
-    "memdown": "^5.1.0",
+    "@live-change/db-store-level": "^0.5.4",
+    "@live-change/db-store-lmdb": "^0.5.4",
     "minimist": ">=1.2.3",
-    "node-lmdb": "^0.8.0",
     "rimraf": "^3.0.2",
-    "rocksdb": "^4.1.0",
     "sockjs": "^0.3.21",
-    "subleveldown": "^4.1.4",
     "tape": "^4.13.3",
     "websocket-extensions": ">=0.1.4"
   },
@@ -41,5 +33,6 @@
     "@live-change/dao": "^0.3.3",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
-  }
+  },
+  "gitHead": "0dfd0cb953fad982630808934326d00abea2c2b4"
 }