@live-change/db-store-observable-db 0.1.1 → 0.5.3

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/db-store-observable-db.iml" filepath="$PROJECT_DIR$/db-store-observable-db.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/db-store-observable-db.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/lib/Store.js

@@ -52,7 +52,7 @@ const rangeFlags = {
 
 const resultPutFlags = {
   Found: 0x1,
-  Created:  0x2,
+  Created: 0x2,
   Last: 0x4
 }
 
@@ -479,7 +479,7 @@ class DatabaseConnection {
     packet.writeUInt16BE(keyBuffer.length, 1+4+4)
     keyBuffer.copy(packet, 1+4+4+2)
     if(debug) console.log("OBSERVE KEY", key)
-    return this.rawRequest(packet, (packet) => {
+    const requestId = this.rawRequest(packet, (packet) => {
       if(debug) console.log("HANDLE OBSERVE PACKET", packet)
       const opcode = packet.readInt8(0)
       if(opcode == opCodes.Result) {
@@ -489,12 +489,16 @@ class DatabaseConnection {
       } else if(opcode == opCodes.Error) {
         const error = packet.toString('utf8', 5)
         onError(error)
+        return true
       } else {
         console.error("Unknown opcode", opCodeToString[opcode])
         onError("Unknown opcode: " + opCodeToString[opcode])
       }
+      process.exit(1)
       return false// finish waiting
     })
+    //console.log("OBSERVE", key, "=>", requestId)
+    return requestId
   }
 
   async observeRange(databaseName, storeName, range, onResultPut, onChanges, onError) {
@@ -551,6 +555,7 @@ class DatabaseConnection {
   }
 
   async unobserve(requestId) {
+    //console.log("UNOBSERVE", requestId)
     if(!this.waitingRequests.get(requestId)) {
       throw new Error("unobserve of not observed! "+requestId)
     }
@@ -599,7 +604,9 @@ class Store {
     const oldDispose = observableValue.dispose
     const oldRespawn = observableValue.respawn
     observableValue.dispose = () => {
-      this.connection.unobserve(observableValue.requestId)
+      //console.trace("DISPOSE!")
+      //console.log("DISPOSE", observableValue.requestId, this.disposed)
+      //if(!this.disposed) this.connection.unobserve(observableValue.requestId)
       oldDispose.apply(this)
     }
     observableValue.respawn = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-store-observable-db",
-  "version": "0.1.1",
+  "version": "0.5.3",
   "description": "Database backend protocol",
   "main": "index.js",
   "scripts": {
@@ -28,5 +28,6 @@
     "bufferutil": "^4.0.3",
     "utf-8-validate": "^5.0.4",
     "ws": "^7.4.5"
-  }
+  },
+  "gitHead": "d92fb65e55f55e246e7a4615cff609cafdc32eba"
 }

package/tests/store-non-reactive.js

@@ -23,7 +23,7 @@ test("store non-reactive properties", t => {
   })
 
   t.test("non reactive operations", async t => {
-    t.plan(24)
+    t.plan(25)
 
     t.test("put value", async t => {
       t.plan(1)
@@ -78,6 +78,13 @@ test("store non-reactive properties", t => {
       t.deepEqual(values, 3, 'range count' )
     })
 
+    t.test("count all", async t => {
+      t.plan(1)
+      let values = await store.countGet({ })
+      t.deepEqual(values, 3, 'full count' )
+    })
+
+
     t.test("get reverse range [c,a]", async t => {
       t.plan(1)
       let values = await store.rangeGet({ gte: 'a', lte: 'c', reverse: true })