@live-change/db 0.5.2 → 0.5.5

package/lib/Database.js

@@ -229,39 +229,29 @@ class Database {
     return summary
   }
 
-  async openIndex(name) {
-    let config = this.config.indexes[name]
-    if(!config) {
-      debug("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 {
-      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
-  }
   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
   }

package/lib/Index.js

@@ -38,7 +38,7 @@ class RangeReader extends ChangeStream {
     this.tableReader.rangeTree.insert(...this.rangeDescr, this )
     this.callbacks = []
   }
-  onChange(cb) {
+  async onChange(cb) {
     this.callbacks.push(cb)
   }
   async change(obj, oldObj, id, timestamp) {
@@ -421,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)
   }

package/lib/queryGet.js

@@ -37,7 +37,7 @@ class RangeReader extends ChangeStream {
   }
   async onChange(cb) {
     const now = this.#time()
-    let objects = await (await this.#table).rangeGet(this.#range)
+    const objects = await (await this.#table).rangeGet(this.#range)
     await Promise.all(objects.map(object => cb(object, null, object.id, now)))
   }
   unobserve(obs) {}
@@ -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

@@ -232,7 +232,6 @@ class QueryReader {
       } else {
         reader.dispose()
       }
-
     }
   }
 }
@@ -244,6 +243,7 @@ class QueryWriter {
   #locks = new Map()
   #observationMode = false
   #reverse = false
+  #timeouts = new Set()
 
   constructor(observable, database) {
     this.#observable = observable
@@ -335,6 +335,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 +397,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.5.2",
+  "version": "0.5.5",
   "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,22 +17,22 @@
   },
   "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.5.2",
-    "@live-change/db-store-lmdb": "^0.5.2",
+    "@live-change/db-store-level": "^0.5.5",
+    "@live-change/db-store-lmdb": "^0.5.5",
     "minimist": ">=1.2.3",
     "rimraf": "^3.0.2",
-    "sockjs": "^0.3.21",
-    "tape": "^4.13.3",
+    "sockjs": "^0.3.24",
+    "tape": "^5.3.2",
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "^0.3.3",
+    "@live-change/dao": "0.4.6",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "af756efb8db9ba90d79774786201cffe9c2162cf"
+  "gitHead": "bffe88c30f0f0ad2ddbf10308ab8e70b93e4581e"
 }