@live-change/db 0.3.62 → 0.3.63

package/lib/Database.js

@@ -28,7 +28,7 @@ class Database {
     this.configObservable = new ReactiveDao.ObservableValue(JSON.parse(JSON.stringify(this.config)))
     this.tablesListObservable = new ReactiveDao.ObservableList(Object.keys(this.config.tables))
     this.indexesListObservable = new ReactiveDao.ObservableList(Object.keys(this.config.indexes))
-    this.logsListObservable = new ReactiveDao.ObservableList(Object.keys(this.config.logs))    
+    this.logsListObservable = new ReactiveDao.ObservableList(Object.keys(this.config.logs))
   }
 
   async start(startConfig = {}) {
@@ -93,7 +93,7 @@ class Database {
     this.tablesListObservable.remove(name)
     this.tables.delete(name)
   }
-  
+
   renameTable(name, newName) {
     if(this.config.tables[newName]) throw new Error(`Table ${newName} already exists`)
     const table = this.table(name)
@@ -227,25 +227,38 @@ 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) {
-      const config = this.config.indexes[name]
-      if(!config) throw new Error(`Index ${name} not found`)
-      const code = config.code
-      const params = config.parameters
-      index = new Index(this, name, code, params, config)
-      try {
-        await index.startIndex()
-      } catch(error) {
-        console.error("INDEX", name, "ERROR", error, "CODE:\n", index.code)
-        console.error("DELETING INDEX", name)
-        delete this.config.indexes[name]
-        this.indexesListObservable.remove(name)
-        if(this.onAutoRemoveIndex) this.onAutoRemoveIndex(name, config.uid)
-        await this.saveConfig(this.config)
-        throw error
-      }
+      index = this.openIndex(name)
       this.indexes.set(name, index)
     }
     return index

package/lib/Index.js

@@ -63,6 +63,7 @@ class TableReader extends ChangeStream {
     this.opLogReader = opLogReader
     this.prefix = prefix
     this.table = table
+    Promise.resolve(this.table).then(t=> {if(!t) throw new Error("TABLE NOT FOUND!!!")})
     this.isLog = isLog
     this.objectReaders = new Map()
     this.rangeReaders = new Map()

package/lib/ScriptContext.js

@@ -35,6 +35,7 @@ const defaultContext = {
     return new ChangeStreamPipe()
   },
   'performance': require('perf_hooks').performance,
+  constructor: null
 }
 
 const filenameRE = /scriptFile:(\d+):(\d+)\)$/g
@@ -47,9 +48,9 @@ class ScriptContext {
     }
     this.context = vm.createContext({ ...defaultContext, ...context, ...userContext })
 /*    vm.runInContext(`
-    (function() {      
-      const allowed = ${JSON.stringify(nativeGlobals.concat(Object.keys(userContext)))} 
-      const keys = Object.getOwnPropertyNames(this)    
+    (function() {
+      const allowed = ${JSON.stringify(nativeGlobals.concat(Object.keys(userContext)))}
+      const keys = Object.getOwnPropertyNames(this)
       keys.forEach((key) => {
         const item = this[key]
         if(!item) return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.3.62",
+  "version": "0.3.63",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {