@live-change/db 0.3.61 → 0.5.2

package/lib/Database.js

@@ -7,8 +7,10 @@ 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) {
+  constructor(config, storeFactory, saveConfig, deleteStore, name, createScriptContext) {
     this.name = name
     this.config = {
       tables: {},
@@ -23,6 +25,7 @@ class Database {
     this.tables = new Map()
     this.logs = new Map()
     this.indexes = new Map()
+    this.createScriptContext = createScriptContext
 
     this.configObservable = new ReactiveDao.ObservableValue(JSON.parse(JSON.stringify(this.config)))
     this.tablesListObservable = new ReactiveDao.ObservableList(Object.keys(this.config.tables))
@@ -92,7 +95,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)
@@ -226,25 +229,38 @@ 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) {
-      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
@@ -272,7 +288,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

@@ -1,12 +1,13 @@
 const IntervalTree = require('node-interval-tree').default
 const ReactiveDao = require("@live-change/dao")
 const Table = require('./Table.js')
-const ScriptContext = require('./ScriptContext.js')
 const queryGet = require('./queryGet.js')
 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 {
@@ -64,6 +65,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()
@@ -437,15 +439,15 @@ class Index extends Table {
     this.code = code
   }
   async startIndex() {
-    console.log("EXECUTING INDEX CODE", this.name)
-    this.scriptContext = new ScriptContext({
+    debug("EXECUTING INDEX CODE", this.name)
+    this.scriptContext = this.database.createScriptContext({
       /// TODO: script available routines
     })
     const queryFunction = this.scriptContext.run(this.code,`userCode:${this.database.name}/indexes/${this.name}`)
     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 +477,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 +501,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/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.61",
+  "version": "0.5.2",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -21,25 +21,18 @@
   },
   "homepage": "https://github.com/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.2",
+    "@live-change/db-store-lmdb": "^0.5.2",
     "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"
   },
   "dependencies": {
-    "@live-change/dao": "^0.2.43",
+    "@live-change/dao": "^0.3.3",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
-  }
+  },
+  "gitHead": "af756efb8db9ba90d79774786201cffe9c2162cf"
 }