@rpcbase/client 0.93.0 → 0.95.0

package/auth/SignUp/index.js

@@ -35,7 +35,7 @@ const SignUp = ({
       set_tenant_id(user_id.slice(0, 8))
       set_is_signed_in(true)
 
-      // we must now reconnect on the websocket as we now have a new cookie
+      // we must now reconnect on the websocket as we have a new cookie
       rts_reconnect()
       onSuccess()
       page(onSuccessRedirect)

package/auth/index.js

@@ -107,10 +107,17 @@ export const session_restrict = (ctx, next) => {
 
 
 export const get_uid = () => __user_id
-export const set_uid = (val) => __user_id = val
+export const set_uid = (val) => {
+  __user_id = val
+  const tenant_id_prefix = val.slice(0, 8)
+  localStorage.setItem(uid_storage_key(tenant_id_prefix), val)
+}
 
 export const get_tenant_id = () => __tenant_id
-export const set_tenant_id = (val) => __tenant_id = val
+export const set_tenant_id = (val) => {
+  __tenant_id = val
+  localStorage.setItem(LAST_TENANT_KEY, val)
+}
 
 export const set_is_signed_in = (val) => __is_authenticated = val
 

package/auth/sign_out.js

@@ -1,9 +1,10 @@
 /* @flow */
 
-import {set_is_signed_in, set_uid} from "./index"
+import {set_is_signed_in, set_uid, set_tenant_id} from "./index"
 
 export const sign_out = () => {
   set_uid(null)
+  set_tenant_id(null)
   set_is_signed_in(false)
   localStorage.clear()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.93.0",
+  "version": "0.95.0",
   "scripts": {
     "build-firebase": "webpack -c firebase/webpack.config.js",
     "build": "yarn build-firebase",

package/rts/index.js

@@ -27,7 +27,6 @@ const _local_txn = []
 // TODO: when server disconnects / crashes and loses all server side stored queries
 // the clients must reconnect and re-register those queries, or the page will need to be hard refreshed
 
-
 // add_local_txn
 // when a request is made to the server, we generate (or send if provided) the txn_id
 // if the array becomes longer than the default buffer length we shift the array
@@ -63,7 +62,7 @@ const dispatch_query_payload = (payload) => {
 
   let data
   try {
-    // TODO: zstd / brotli decompression here
+    // TODO: zstd decompression here
     data = JSON.parse(payload.data_buf)
   } catch (err) {
     console.log("Error", err)
@@ -177,7 +176,6 @@ export const register_query = (model_name, query, _options, _callback) => {
 
   log("register_query", {model_name, query, options, callback})
 
-
   if (!_socket) {
     log("register_query: trying to use null socket", {model_name, query})
     return

package/rts/store/get_collection.js

@@ -25,7 +25,8 @@ const get_collection = (col_name) => {
   if (_cols_store[col_name]) {
     return _cols_store[col_name]
   } else {
-    const col = new PouchDB(col_name, { adapter: "indexeddb" });
+    // https://pouchdb.com/api.html#create_database
+    const col = new PouchDB(col_name, { adapter: "indexeddb", revs_limit: 1 })
     _cols_store[col_name] = col
 
     return col

package/rts/store/index.js

@@ -29,8 +29,6 @@ const log = debug("rb:rts:store")
 //
 //   fn.cancel()
 //
-//   console.log("GOT FN", fn)
-//
 //   console.log("got res", res)
 // _cols_store[col_name].getIndexes().then(function (result) {
 //   console.log("got indexes", result)
@@ -70,7 +68,9 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
     })
 
   if (options.projection) {
-    mapped_docs = mapped_docs.filter((doc) => satisfies_projection(doc, options.projection))
+    mapped_docs = mapped_docs.filter((doc) => {
+      return satisfies_projection(doc, options.projection)
+    })
   }
 
   callback(null, mapped_docs, {source: "cache"})

package/rts/store/satisfies_projection.test.js

@@ -48,3 +48,11 @@ test("missing nested field", () => {
 test("empty", () => {
   expect(satisfies_projection(doc, {field1: 1})).toBe(true)
 })
+
+test("no fields, _id only, empty projection", () => {
+  expect(satisfies_projection({_id: "1012"}, {})).toBe(true)
+})
+
+test("no fields, _id only, mismatching projection", () => {
+  expect(satisfies_projection({_id: "1012"}, {doesntexist: 1})).toBe(false)
+})

package/rts/store/update_docs.js

@@ -7,38 +7,38 @@ const update_docs = async(model_name, data) => {
 
   const all_ids = data.map((doc) => doc._id)
 
-  // console.log("will update cache", model_name, data, all_ids)
-
-  // console.time("find")
-
-  // TODO:
-  // there is also a bulk get which could have different performance than find, try both
-  // https://pouchdb.com/api.html#bulk_get
-
   // https://github.com/pouchdb/pouchdb/tree/master/packages/node_modules/pouchdb-find#dbcreateindexindex--callback
   const {docs: current_docs} = await collection.find({
     selector: {_id: {$in: all_ids}},
     fields: ["_id", "_rev"],
   })
 
-  // console.log("current_docs", current_docs)
+  const current_docs_by_id = current_docs.reduce((acc, val) => {
+    acc[val._id] = val
+    return acc
+  }, {})
+
+  // WARNING: tmp
+  // we don't need to remove docs that aren't present in data because queries are refined with find
 
   const revs_map = {}
   current_docs.forEach((doc) => revs_map[doc._id] = doc._rev)
 
-  const write_docs = data.map((mongo_doc) => {
-    const op = Object.entries(mongo_doc).reduce((new_doc, [key, value]) => {
-      let new_key = key !== "_id" && key.startsWith('_') ? `$_${key}` : key
-      new_doc[new_key] = value
-      return new_doc
-    }, {})
+  const new_docs = data.map((mongo_doc) => {
+    const current_doc = current_docs_by_id[mongo_doc._id] || {}
+
+    const op = Object.entries(mongo_doc)
+      .reduce((new_doc, [key, value]) => {
+        let new_key = key !== "_id" && key.startsWith('_') ? `$_${key}` : key
+        new_doc[new_key] = value
+        return new_doc
+      }, current_doc)
 
     op._rev = revs_map[mongo_doc._id]
     return op
   })
 
-  await collection.bulkDocs(write_docs)
-  // console.timeEnd("find")
+  await collection.bulkDocs(new_docs)
 }
 
 export default update_docs