@rpcbase/client 0.198.0 → 0.205.0

package/rts/getUseQuery/index.js

@@ -1,6 +1,13 @@
 /* @flow */
 import {Platform} from "react-native"
-import {useCallback, useEffect, useState, useMemo, useId, useRef} from "react"
+import {
+  useCallback,
+  useEffect,
+  useState,
+  useMemo,
+  useId,
+  useRef,
+} from "react"
 import debug from "debug"
 import _omit from "lodash/omit"
 import LZString from "lz-string"
@@ -16,198 +23,213 @@ import useData from "./useData"
 
 const log = debug("rb:rts:useQuery")
 
+const getUseQuery =
+  (register_query) =>
+    (model_name, query = {}, options = {}) => {
+      const id = useId()
+
+      // TODO: should the uid be gone here ? it's part of the auth layer, not this here
+      // TODO: retrieve this from future AuthContext in client
+      const uid = useMemo(() => {
+      // TODO: why is there a options.userId here?? (it was for mobile we need to unify this)
+        const _uid = Platform.OS === "web" ? getUid() : options.userId
+        return _uid
+      }, [])
+
+      // used to track if data was loaded synchronously (no need to show any loader)
+      const hasInitiallySetFromStorage = useRef(false)
+      const hasFirstReply = useRef(false)
+      const hasNetworkReply = useRef(false)
+      const lastDocRef = useRef(null)
+      // const [page, setPage] = useState(0)
+
+      const {
+        key = "",
+        projection = {},
+        sort = {},
+        useStorage = false,
+      } = options
+
+      const storageKey = useMemo(() => {
+        return `${uid}${key ? `.${key}` : ""}.${model_name}.${JSON.stringify(query)}.${JSON.stringify(projection)}.${JSON.stringify(sort)}`
+      }, [uid, key, model_name, query, projection, sort])
+
+      const [source, setSource] = useState()
+
+      const dataRef = useRef(null)
+      const [data, setData] = useData({
+        useStorage,
+        storageKey,
+        hasInitiallySetFromStorage,
+      })
+
+      const [error, setError] = useState()
+
+      const [loading, setLoading] = useState(() => {
+        if (hasInitiallySetFromStorage.current) {
+          return false
+        }
+        return true
+      })
 
-const getUseQuery = (register_query) => (
-  model_name,
-  query = {},
-  options = {},
-) => {
-  const id = useId()
-
-  // TODO: should the uid be gone here ? it's part of the auth layer, not this here
-  // TODO: retrieve this from future AuthContext in client
-  const uid = useMemo(() => {
-    // TODO: why is there a options.userId here?? (it was for mobile we need to unify this)
-    const _uid = Platform.OS === "web" ? getUid() : options.userId
-    return _uid
-  }, [])
-
-  // used to track if data was loaded synchronously (no need to show any loader)
-  const hasInitiallySetFromStorage = useRef(false)
-  const hasFirstReply = useRef(false)
-  const hasNetworkReply = useRef(false)
-  const lastDocRef = useRef(null)
-  // const [page, setPage] = useState(0)
-
-  const {
-    key = "",
-    projection = {},
-    sort = {},
-    useStorage = false,
-  } = options
-
-  const storageKey = useMemo(() => {
-    return `${uid}${key ? `.${key}` : ""}.${model_name}.${JSON.stringify(query)}.${JSON.stringify(projection)}.${JSON.stringify(sort)}`
-  }, [uid, key, model_name, query, projection, sort])
-
-  const [source, setSource] = useState()
-
-  const dataRef = useRef(null)
-  const [data, setData] = useData({useStorage, storageKey, hasInitiallySetFromStorage})
-
-  const [error, setError] = useState()
-
-  const [loading, setLoading] = useState(() => {
-    if (hasInitiallySetFromStorage.current) {
-      return false
-    }
-    return true
-  })
-
-  useEffect(() => {
-    if (options.debug) {
-      console.log("use query", model_name, query, options)
-    }
-  }, [model_name, query, options])
-
-  const applyNewData = (newData, context) => {
-    setData(newData)
-    // set data in a ref so that it doesn't force re-rendering ie: unsubscribe / resubscribe
-    dataRef.current = newData
-
-    // useStorage currently used as a fast local cache, indexedDB
-    // we only save network queries
-    // TODO: use localstorage in react native and pouchdb everywhere
-    if (useStorage && context.source === "network") {
-      if (Platform.OS === "web") {
-        localStorage.setItem(storageKey, LZString.compressToUTF16(JSON.stringify(newData)))
-      } else {
-        // TODO: this is done in pouchDB nOW ?????
-        // TODO: RN MMKV
-        console.log("mmkv NYI")
-      }
-    }
-
-    if (newData?.length > 0) {
-      lastDocRef.current = newData[newData.length - 1]
-    }
-  }
-
-  const applyContext = (newContext) => {
-    if (newContext.source !== source) {
-      setSource(newContext.source)
-    }
-  }
-
-  useEffect(() => {
-    const queryKey = key || id
-
-    if (!model_name) {
-      console.warn("attempting to register query with empty collection, skipping")
-      return
-    }
-
-    if (options.debug ) {
-      console.log("register query", model_name, query, options)
-    }
-
-    const start = Date.now()
-
-    log("will register query", model_name, query)
-
-    const unsubscribe = register_query(model_name, query, {...options, key: queryKey}, (err, queryResult, context) => {
-      log("callback answer with context", context, queryResult?.length)
-
-      // believe it or not, the network can be faster than indexeddb...
-      if (context.source === "cache" && hasNetworkReply.current) {
-        log("skipping cache arriving later than network")
-        return
-      }
-
-      // mark if we received from network
-      if (context.source === "network" && !hasNetworkReply.current) {
-        hasNetworkReply.current = true
-      }
-
-      if (options.debug) {
-        console.log("query took", Date.now() - start, model_name, query)
-      }
+      useEffect(() => {
+        if (options.debug) {
+          console.log("use query", model_name, query, options)
+        }
+      }, [model_name, query, options])
+
+      const applyNewData = (newData, context) => {
+        setData(newData)
+        // set data in a ref so that it doesn't force re-rendering ie: unsubscribe / resubscribe
+        dataRef.current = newData
+
+        // useStorage currently used as a fast local cache, indexedDB
+        // we only save network queries
+        // TODO: use localstorage in react native and pouchdb everywhere
+        if (useStorage && context.source === "network") {
+          if (Platform.OS === "web") {
+            localStorage.setItem(
+              storageKey,
+              LZString.compressToUTF16(JSON.stringify(newData)),
+            )
+          } else {
+          // TODO: this is done in pouchDB nOW ?????
+          // TODO: RN MMKV
+            console.log("mmkv NYI")
+          }
+        }
 
-      setLoading(false)
-      if (err) {
-        setError(err)
-        return
+        if (newData?.length > 0) {
+          lastDocRef.current = newData[newData.length - 1]
+        }
       }
 
-      log("query callback", model_name, queryKey, JSON.stringify(query))
-
-      // return if no data (this should be handled already)
-      if (!queryResult) return
-
-      let newData
-      if (Array.isArray(queryResult)) {
-        newData = queryResult.map((o) => _omit(o, "__txn_id"))
-      } else {
-        newData = _omit(queryResult, "__txn_id")
+      const applyContext = (newContext) => {
+        if (newContext.source !== source) {
+          setSource(newContext.source)
+        }
       }
 
-      // we return once in any case
-      if (!hasFirstReply.current) {
-        hasFirstReply.current = true
+      useEffect(() => {
+        const queryKey = key || id
 
-        // skip if we already have the data
-        if (isEqualValues(data, newData)) {
-          applyContext(context)
+        if (!model_name) {
+          console.warn(
+            "attempting to register query with empty collection, skipping",
+          )
           return
         }
 
-        applyContext(context)
-        applyNewData(newData, context)
-        return
-      }
-
-      // TODO: this should be handled by the consumer with the context (cache or network)
-      if (context.is_local && options.skipLocal && hasFirstReply.current) {
-        log("skipping local update", key)
-        return
-      }
-
-      if (__DEV__ && isEqual(data, newData) && !isEqualValues(data, newData)) {
-        alert("EQUALITY MISMATCH THIS SHOULD NOT HAPPEN!", data, newData)
-      }
-
-      if (!isEqualValues(dataRef.current, newData)) {
-        applyContext(context)
-        applyNewData(newData, context)
-      } else {
-        applyContext(context)
-      }
-    })
-
-    return () => {
-      log && log("useQuery cleanup unsubscribe()")
-      typeof unsubscribe === "function" && unsubscribe()
-    }
-
-    // WARNING: do not change the hooks dependencies param or you risk creating infinite loops as it unsubscribes on cleanup
-    // TODO: this isnt right we need to update on options change too
-  }, [JSON.stringify(query), key])
-
+        if (options.debug) {
+          console.log("register query", model_name, query, options)
+        }
 
-  const loadNextPage = useCallback(() => {
-    console.log("loadNextPage NYI")
-  }, [])
+        const start = Date.now()
+
+        log("will register query", model_name, query)
+
+        const unsubscribe = register_query(
+          model_name,
+          query,
+          {...options, key: queryKey, uid},
+          (err, queryResult, context) => {
+            log("callback answer with context", context, queryResult?.length)
+
+            // believe it or not, the network can be faster than indexeddb...
+            if (context.source === "cache" && hasNetworkReply.current) {
+              log("skipping cache arriving later than network")
+              return
+            }
+
+            // mark if we received from network
+            if (context.source === "network" && !hasNetworkReply.current) {
+              hasNetworkReply.current = true
+            }
+
+            if (options.debug) {
+              console.log("query took", Date.now() - start, model_name, query)
+            }
+
+            setLoading(false)
+            if (err) {
+              setError(err)
+              return
+            }
+
+            log("query callback", model_name, queryKey, JSON.stringify(query))
+
+            // return if no data (this should be handled already)
+            if (!queryResult) return
+
+            let newData
+            if (Array.isArray(queryResult)) {
+              newData = queryResult.map((o) => _omit(o, "__txn_id"))
+            } else {
+              newData = _omit(queryResult, "__txn_id")
+            }
+
+            // we return once in any case
+            if (!hasFirstReply.current) {
+              hasFirstReply.current = true
+
+              // skip if we already have the data
+              if (isEqualValues(data, newData)) {
+                applyContext(context)
+                return
+              }
+
+              applyContext(context)
+              applyNewData(newData, context)
+              return
+            }
+
+            // TODO: this should be handled by the consumer with the context (cache or network)
+            if (context.is_local && options.skipLocal && hasFirstReply.current) {
+              log("skipping local update", key)
+              return
+            }
+
+            if (
+              __DEV__ &&
+            isEqual(data, newData) &&
+            !isEqualValues(data, newData)
+            ) {
+              alert("EQUALITY MISMATCH THIS SHOULD NOT HAPPEN!", data, newData)
+            }
+
+            if (!isEqualValues(dataRef.current, newData)) {
+              applyContext(context)
+              applyNewData(newData, context)
+            } else {
+              applyContext(context)
+            }
+          },
+        )
+
+        return () => {
+          log && log("useQuery cleanup unsubscribe()")
+          typeof unsubscribe === "function" && unsubscribe()
+        }
 
+      // WARNING: do not change the hooks dependencies param or you risk creating infinite loops as it unsubscribes on cleanup
+      // TODO: this isnt right we need to update on options change too
+      }, [JSON.stringify(query), key])
 
-  const result = useMemo(() => ({data, source, error, loading, loadNextPage}), [data, source, error, loading, loadNextPage])
+      const loadNextPage = useCallback(() => {
+        console.log("loadNextPage NYI")
+      }, [])
 
-  // TODO:
-  // if (Array.isArray(result.data) && !result.source) {
-  //   console.warn("RESULT HAS NO SOURCE", {data, error, loading, source})
-  // }
+      const result = useMemo(
+        () => ({data, source, error, loading, loadNextPage}),
+        [data, source, error, loading, loadNextPage],
+      )
 
-  return result
-}
+      // TODO:
+      // if (Array.isArray(result.data) && !result.source) {
+      //   console.warn("RESULT HAS NO SOURCE", {data, error, loading, source})
+      // }
 
+      return result
+    }
 
 export default getUseQuery

package/rts/rts.js

@@ -39,7 +39,7 @@ export const add_local_txn = (txn_id) => {
 
 
 // TODO: add compression / decompression
-const dispatch_query_payload = (payload) => {
+const dispatch_query_payload = (payload, uid) => {
   log("dispatch_query_payload", payload)
 
   const {model_name, query_key} = payload
@@ -83,19 +83,19 @@ const dispatch_query_payload = (payload) => {
 
   // TODO: pouchdb on react native
   if (Platform.OS === "web") {
-    store.update_docs(model_name, data)
+    store.update_docs(model_name, data, uid)
   }
 }
 
 
-export const connect = (tenant_id) => new Promise((resolve) => {
-
-  if (tenant_id) {
-    log("rts client will connect")
-  } else {
-    log("no tenant_id, rts connect will skip")
+export const connect = (tenant_id, user_id) => new Promise((resolve) => {
+  if (!tenant_id) {
+    log("missing tenant_id, skipping")
     return
   }
+  assert(user_id, "missing user_id")
+
+  log("rts client will connect")
 
   _socket = io(getBaseUrl(), {
     forceNew: true,
@@ -126,7 +126,7 @@ export const connect = (tenant_id) => new Promise((resolve) => {
 
   _socket.on("query_payload", (payload) => {
     // console.log("socket:query_payload", payload)
-    dispatch_query_payload(payload)
+    dispatch_query_payload(payload, user_id)
   })
 
   _socket.on("delete_doc", (payload) => {
@@ -151,13 +151,13 @@ export const disconnect = () => {
 }
 
 
-export const reconnect = (tenant_id) => {
+export const reconnect = (tenant_id, user_id) => {
   log("socket will force reconnect")
 
   // destroy current socket if exists
   disconnect()
 
-  connect(tenant_id)
+  connect(tenant_id, user_id)
 }
 
 // register a query
@@ -204,7 +204,7 @@ export const register_query = (model_name, query, _options, _callback) => {
 
   if (Platform.OS === "web") {
     // run the query from the cache a first time
-    store.run_query({model_name, query, query_key, options}, callback)
+    store.run_query({model_name, query, options}, callback)
   }
 
   return () => {

package/rts/signout.ts

@@ -0,0 +1,8 @@
+import * as get_collection from "./store/get_collection"
+import {disconnect} from "./rts"
+
+
+export const signout = async() => {
+  get_collection.destroy_all()
+  disconnect()
+}

package/rts/store/get_collection.js

@@ -22,24 +22,34 @@ PouchDB.prefix = prefix
 PouchDB.plugin(IndexedDBAdapter)
 PouchDB.plugin(FindPlugin)
 
-const _cols_store = Object.create(null)
+let _cols_store = Object.create(null)
 
-const get_collection = (col_name) => {
+export const get_collection = (col_name, options) => {
 
   if (!col_name) {
     console.warn("supplied invalid / empty collection name to rts")
   }
+  if (!options.uid) {
+    console.warn("rts: get_collection: missing options.uid")
+  }
+
+  const col_key = `${options.uid}/${col_name}`
 
-  if (_cols_store[col_name]) {
-    return _cols_store[col_name]
+  if (_cols_store[col_key]) {
+    return _cols_store[col_key]
   } else {
     // https://pouchdb.com/api.html#create_database
-    const col = new PouchDB(col_name, { adapter: "indexeddb", revs_limit: 1 })
-    _cols_store[col_name] = col
+    const col = new PouchDB(col_key, {adapter: "indexeddb", revs_limit: 1})
+    _cols_store[col_key] = col
 
     return col
   }
 
 }
 
-export default get_collection
+
+export const destroy_all = async() => {
+  await Promise.map(Object.values(_cols_store), (db) => db.destroy())
+
+  _cols_store = Object.create(null)
+}

package/rts/store/index.js

@@ -5,13 +5,13 @@ import "./debug"
 
 import {UNDERSCORE_PREFIX} from "./constants"
 
-import get_collection from "./get_collection"
+import {get_collection} from "./get_collection"
 import update_docs from "./update_docs"
 import satisfies_projection from "./satisfies_projection"
 import replace_query_keys from "./replace_query_keys"
 
-const log = debug("rb:rts:store")
 
+const log = debug("rb:rts:store")
 
 // TODO: listening for changes
 // https://github.com/pouchdb/pouchdb/tree/master/packages/node_modules/pouchdb-find#dbcreateindexindex--callback
@@ -39,12 +39,12 @@ const log = debug("rb:rts:store")
 
 // TODO: implement store in a shared worker
 // TODO: should we filter all docs by projection ? or just the ones where the projection isn't complete ?
-const run_query = async({model_name, query, query_key, options}, callback) => {
-  // console.log("run_query", {model_name, query, query_key, options})
+const run_query = async({model_name, query, options}, callback) => {
+  log("run_query", {model_name, query, options})
   // console.time("store run_query")
 
   // TODO: we should prefix model_name with RB_TENANT_ID + env_id
-  const collection = get_collection(model_name)
+  const collection = get_collection(model_name, options)
 
   const replaced_query = replace_query_keys(query, (k) => (k.startsWith("_") && k !== "_id") ? `${UNDERSCORE_PREFIX}${k}` : k)
 
@@ -64,7 +64,7 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
     .map(({_rev, ...doc}) => {
       // TODO: handle projections here
       const remapped_doc = Object.entries(doc).reduce((new_doc, [key, value]) => {
-        let new_key = key.startsWith('$_') ? key.replace(/^\$_/, "") : key
+        let new_key = key.startsWith("$_") ? key.replace(/^\$_/, "") : key
         new_doc[new_key] = value
         return new_doc
       }, {})
@@ -82,7 +82,7 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
     mapped_docs = mapped_docs.sort((a, b) => {
       for (const key in options.sort) {
         // Check if property exists on both objects
-        if (a.hasOwnProperty(key) && b.hasOwnProperty(key)) {
+        if (Object.hasOwn(a, key) && Object.hasOwn(b, key)) {
           const dir = options.sort[key] // Direction of sorting: 1 or -1
 
           if (a[key] < b[key]) return -1 * dir

package/rts/store/update_docs.js

@@ -1,11 +1,12 @@
 /* @flow */
-import get_collection from "./get_collection"
+
+import {get_collection} from "./get_collection"
 
 import {UNDERSCORE_PREFIX} from "./constants"
 
 
-const update_docs = async(model_name, data) => {
-  const collection = get_collection(model_name)
+const update_docs = async(model_name, data, uid) => {
+  const collection = get_collection(model_name, {uid})
 
   const all_ids = data.map((doc) => doc._id)
 
@@ -31,7 +32,7 @@ const update_docs = async(model_name, data) => {
 
     const op = Object.entries(mongo_doc)
       .reduce((new_doc, [key, value]) => {
-        let new_key = key !== "_id" && key.startsWith('_') ? `${UNDERSCORE_PREFIX}${key}` : key
+        let new_key = key !== "_id" && key.startsWith("_") ? `${UNDERSCORE_PREFIX}${key}` : key
         new_doc[new_key] = value
         return new_doc
       }, current_doc)

package/ui/Modal/ModalForm/index.js

@@ -4,7 +4,7 @@ import {forwardRef, useImperativeHandle, useEffect, useState, useRef} from "reac
 import {FormProvider} from "react-hook-form"
 
 import ActivityIndicator from "../../ActivityIndicator"
-import SubmitButton from "../../SubmitButton"
+import {SubmitButton} from "../../../form/SubmitButton"
 
 import Modal from "../Modal"