@live-change/db 0.8.20 → 0.8.22

package/lib/Database.js

@@ -239,22 +239,23 @@ class Database {
       let code = config.code
       const params = config.parameters
       index = new Index(this, name, code, params, config)
+      this.indexes.set(name, index)
       try {
-        debug("STARTING INDEX", name, "IN DATABASE", this.name)
         await index.startIndex()
-        debug("STARTED INDEX", name, "IN DATABASE", this.name)
       } catch(error) {
         console.error("INDEX", name, "ERROR", error, "CODE:\n", code)
-        console.error("DELETING INDEX", name)
+        console.error("DELETINGww INDEX", name)
         delete this.config.indexes[name]
         this.indexesListObservable.remove(name)
         if(this.onAutoRemoveIndex && config) this.onAutoRemoveIndex(name, config.uid)
+        console.error("DELETED INDEX", name)
         await this.saveConfig(this.config)
         throw error
       }
       this.indexes.set(name, index)
       return index
     }
+    await index.startPromise
     return index
   }
 

package/lib/Index.js

@@ -25,7 +25,7 @@ class ObjectReader extends ChangeStream {
     return {
       dispose() {
         const callbackIndex = this.callbacks.indexOf(cb)
-        if(callbackIndex == -1) throw new Error('Observer double dispose')
+        if(callbackIndex === -1) throw new Error('Observer double dispose')
         this.callbacks.splice(callbackIndex, 1)
         /// TODO: dispose or ignore reader somehow if no callbacks
       }
@@ -68,6 +68,8 @@ class RangeReader extends ChangeStream {
   }
 }
 
+let commandsReaderCreated = false
+
 class TableReader extends ChangeStream {
 
  /* set opLogPromise(promise) {
@@ -93,6 +95,15 @@ class TableReader extends ChangeStream {
 
     this.readOpLog(this.opLogReader.currentKey)
 
+    if(table.name === 'commands') {
+      console.trace("TABLE READER CREATED", prefix, table.name)
+      if(commandsReaderCreated) {
+        console.error("TABLE READER CREATED TWICE!!!", prefix, table.name)
+        process.exit(1)
+      }
+      commandsReaderCreated = true
+    }
+
     let firstFull = 0
     /*setInterval(() => {
       if(this.opLogObservable && this.opLogObservable.list && this.opLogObservable.list.length == opLogBatchSize) {
@@ -160,8 +171,22 @@ class TableReader extends ChangeStream {
   }
   dispose() {
     this.disposed = true
-    for(let objectReader of this.objectReaders) objectReader.dispose()
-    for(let rangeReader of this.objectReaders) rangeReader.dispose()
+    for(let objectReader of this.objectReaders.values()) {
+      try {
+        objectReader.dispose()
+      } catch(e) {
+        console.error("ERROR DISPOSING OBJECT READER", objectReader)
+        throw e
+      }
+    }
+    for(let rangeReader of this.rangeReaders.values()) {
+      try {
+        rangeReader.dispose()
+      } catch(e) {
+        console.error("ERROR DISPOSING RANGE READER", rangeReader)
+        throw e
+      }
+    }
   }
 
   async readOpLog(key) {
@@ -205,7 +230,7 @@ class TableReader extends ChangeStream {
   putByField(field, id, object) {
     //if(this.prefix == 'table_triggers') console.log("TABLE", this.prefix, " READER PUT", object, this.disposed)
     if(this.disposed) return
-    if(field != 'id') throw new Error("incompatible range protocol")
+    if(field !== 'id') throw new Error("incompatible range protocol")
     this.opLogBuffer.push(object)
     this.opLogReader.handleSignal()
   }
@@ -249,10 +274,10 @@ class TableReader extends ChangeStream {
       } else {
         const op = next.operation
         if(op) {
-          if(op.type == 'put') {
+          if(op.type === 'put') {
             await this.change(op.object, op.oldObject, op.object.id, next.id)
           }
-          if(op.type == 'delete') {
+          if(op.type === 'delete') {
             //console.log("DELETE CHANGE", next)
             await this.change(null, op.object, op.object.id, next.id)
           }
@@ -260,7 +285,7 @@ class TableReader extends ChangeStream {
           console.error("NULL OPERATION", next)
         }
       }
-      if(this.opLogBuffer.length == 0 && this.opLogObservable.list.length >= opLogBatchSize) {
+      if(this.opLogBuffer.length === 0 && this.opLogObservable.list.length >= opLogBatchSize) {
         //console.log("ENTER OPLOG READ!")
         await this.readOpLog(this.opLogObservable.list[this.opLogObservable.list.length - 1].id)
         //console.log("READ TO RESULT, OP LOG PROMISE:", this.opLogPromise)
@@ -283,7 +308,7 @@ class OpLogReader {
   }
   table(name) {
     const prefix = 'table_'+name
-    let reader = this.tableReaders.find(tr => tr.prefix == prefix)
+    let reader = this.tableReaders.find(tr => tr.prefix === prefix)
     if(!reader) {
       reader = new TableReader(this, prefix, this.database.table(name))
       this.tableReaders.push(reader)
@@ -293,7 +318,7 @@ class OpLogReader {
   }
   index(name) {
     const prefix = 'index_'+name
-    let reader = this.tableReaders.find(tr => tr.prefix == prefix)
+    let reader = this.tableReaders.find(tr => tr.prefix === prefix)
     if(!reader) {
       reader = new TableReader(this, prefix, this.database.index(name))
       this.tableReaders.push(reader)
@@ -303,7 +328,7 @@ class OpLogReader {
   }
   log(name) {
     const prefix = 'log_'+name
-    let reader = this.tableReaders.find(tr => tr.prefix == prefix)
+    let reader = this.tableReaders.find(tr => tr.prefix === prefix)
     if(!reader) {
       reader = new TableReader(this, prefix, this.database.log(name), true)
       this.tableReaders.push(reader)
@@ -335,7 +360,7 @@ class OpLogReader {
         //console.log("GOT NEXT KEYS")
         if(this.disposed) return
         //console.log("POSSIBLE NEXT KEYS", possibleNextKeys.map(({key, reader}) => [reader.prefix, key]))
-        if(possibleNextKeys.length == 0) { /// It could happen when oplog is cleared
+        if(possibleNextKeys.length === 0) { /// It could happen when oplog is cleared
           return
         }
         let next = null
@@ -348,10 +373,10 @@ class OpLogReader {
         //console.log("NEXT KEY", next && next.reader && next.reader.prefix, next && next.key)
         const lastKey = '\xFF\xFF\xFF\xFF'
         //console.log("NEXT", !!next, "KEY", next && next.key, lastKey)
-        if(!next || next.key == lastKey) break // nothing to read
+        if(!next || next.key === lastKey) break // nothing to read
         let otherReaderNext = null
         for(const possibleKey of possibleNextKeys) {
-          if(possibleKey.reader != next.reader && possibleKey.key
+          if(possibleKey.reader !== next.reader && possibleKey.key
               && (!otherReaderNext || possibleKey.key < otherReaderNext.key))
             otherReaderNext = possibleKey
         }
@@ -408,9 +433,9 @@ class IndexWriter {
     this.index.put(object)
   }
   delete(object) {
-    const id = object.id
+    const id = typeof object === 'string' ? object :  object.id
     if(!id) throw new Error(`ID is empty ${JSON.stringify(object)}`)
-    this.index.delete(object.id)
+    this.index.delete(id)
   }
   update(id, ops) {
     if(typeof id != 'string') {
@@ -463,8 +488,14 @@ class Index extends Table {
     this.codeObservable = new ReactiveDao.ObservableValue(code)
     this.params = params
     this.code = code
+    this.startPromise = null
   }
   async startIndex() {
+    if(!this.startPromise)this.startPromise = this.startIndexInternal()
+    return this.startPromise
+  }
+  async startIndexInternal() {
+    console.error("STARTING INDEX", this.name, "IN DATABASE", this.database.name)
     debug("EXECUTING INDEX CODE", this.name)
     this.scriptContext = this.database.createScriptContext({
       /// TODO: script available routines
@@ -520,6 +551,7 @@ class Index extends Table {
         type: 'indexed'
       }
     })
+    debug("STARTED INDEX", this.name, "IN DATABASE", this.database.name)
   }
   async deleteIndex() {
     this.reader.dispose()

package/lib/queryGet.js

@@ -63,7 +63,7 @@ class TableReader extends ChangeStream {
     while(true) {
       objects = await (await this.#table).rangeGet(range)
       results = results.concat(await Promise.all(objects.map(object => cb(object, null, object.id, this.#time()))))
-      if(objects.length == maxGetLimit)  {
+      if(objects.length === maxGetLimit)  {
         range.gt = objects[objects.length - 1].id
         console.log("GET LIMIT REACHED! GETTING MORE", range)
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.8.20",
+  "version": "0.8.22",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.8.20",
-    "@live-change/db-store-lmdb": "^0.8.20",
+    "@live-change/db-store-level": "^0.8.22",
+    "@live-change/db-store-lmdb": "^0.8.22",
     "minimist": ">=1.2.3",
     "next-tick": "^1.1.0",
     "rimraf": "^5.0.5",
@@ -32,9 +32,9 @@
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "^0.8.20",
+    "@live-change/dao": "^0.8.22",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "e238d89b80f45ddaf9e92bc3d07459870a14e07b"
+  "gitHead": "70a56ac3dc54167a2d32ce47a00150e7a94bd04d"
 }