@rpcbase/client 0.219.0 → 0.222.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.219.0",
+  "version": "0.222.0",
   "scripts": {
     "build": "../../node_modules/.bin/wireit",
     "test": "../../node_modules/.bin/wireit"

package/rts/getUseDocument.js

@@ -2,9 +2,9 @@
 import getUseQuery from "./getUseQuery"
 
 
-const getUseDocument = (register_query) => (...args) => {
+export const getUseDocument = (registerQuery) => (...args) => {
 
-  const useQuery = getUseQuery(register_query)
+  const useQuery = getUseQuery(registerQuery)
 
   const res = useQuery(...args)
 
@@ -19,5 +19,3 @@ const getUseDocument = (register_query) => (...args) => {
 
   return {...res, data}
 }
-
-export default getUseDocument

package/rts/getUseQuery/index.js

@@ -23,8 +23,8 @@ import useData from "./useData"
 
 const log = debug("rb:rts:useQuery")
 
-const getUseQuery =
-  (register_query) =>
+export const getUseQuery =
+  (registerQuery) =>
     (model_name, query = {}, options = {}) => {
       const id = useId()
 
@@ -128,7 +128,7 @@ const getUseQuery =
 
         log("will register query", model_name, query)
 
-        const unsubscribe = register_query(
+        const unsubscribe = registerQuery(
           model_name,
           query,
           {...options, key: queryKey, uid},
@@ -231,5 +231,3 @@ const getUseQuery =
 
       return result
     }
-
-export default getUseQuery

package/rts/index.js

@@ -1,10 +1,10 @@
-/* @flow */
-import {register_query} from "./rts"
-import getUseDocument from "./getUseDocument"
-import getUseQuery from "./getUseQuery"
+import {registerQuery, sendMessage, onMessage} from "./rts"
+import {getUseDocument} from "./getUseDocument"
+import {getUseQuery} from "./getUseQuery"
 
-export const useQuery = getUseQuery(register_query)
 
-export const useDocument = getUseDocument(register_query)
+export const useQuery = getUseQuery(registerQuery)
 
-export {register_query}
+export const useDocument = getUseDocument(registerQuery)
+
+export {registerQuery, sendMessage, onMessage}

package/rts/rts.js

@@ -39,16 +39,16 @@ export const add_local_txn = (txn_id) => {
 
 
 // TODO: add compression / decompression
-const dispatch_query_payload = (payload, uid) => {
-  log("dispatch_query_payload", payload)
+const dispatchQueryPayload = (payload, uid) => {
+  log("dispatchQueryPayload", payload)
 
   const {model_name, query_key} = payload
   // const cb = _get(_callbacks, `${model_name}.${query_key}`)
   const callbacks = _callbacks[`${model_name}.${query_key}`]
 
   if (!callbacks || !Array.isArray(callbacks)) {
-    log("dispatch_query_payload", "unable to find callback for query payload", payload)
-    console.error("dispatch_query_payload", "unable to find callback for query payload", payload)
+    log("dispatchQueryPayload", "unable to find callback for query payload", payload)
+    console.error("dispatchQueryPayload", "unable to find callback for query payload", payload)
     return
   }
 
@@ -65,7 +65,7 @@ const dispatch_query_payload = (payload, uid) => {
     data = JSON.parse(payload.data_buf)
   } catch (err) {
     console.log("Error", err)
-    log("dispatch_query_payload", "unable to parse or send data from payload:", payload.data_buf)
+    log("dispatchQueryPayload", "unable to parse or send data from payload:", payload.data_buf)
   }
 
   if (!data) {
@@ -126,7 +126,7 @@ export const connect = (tenant_id, user_id) => new Promise((resolve) => {
 
   _socket.on("query_payload", (payload) => {
     // console.log("socket:query_payload", payload)
-    dispatch_query_payload(payload, user_id)
+    dispatchQueryPayload(payload, user_id)
   })
 
   _socket.on("delete_doc", (payload) => {
@@ -161,7 +161,7 @@ export const reconnect = (tenant_id, user_id) => {
 }
 
 // register a query
-export const register_query = (model_name, query, _options, _callback) => {
+export const registerQuery = (model_name, query, _options, _callback) => {
   // left shift args if _options is undefined
   let options
   let callback
@@ -174,10 +174,10 @@ export const register_query = (model_name, query, _options, _callback) => {
     callback = _options
   }
 
-  log("register_query", {model_name, query, options, callback})
+  log("registerQuery", {model_name, query, options, callback})
 
   if (!_socket) {
-    log("register_query: trying to use null socket", {model_name, query})
+    log("registerQuery: trying to use null socket", {model_name, query})
     return
   }
 
@@ -200,7 +200,7 @@ export const register_query = (model_name, query, _options, _callback) => {
 
   // TODO: why both run and register query here ? the run_query should come straight from register ?
   _socket.emit("run_query", {model_name, query, query_key, options})
-  _socket.emit("register_query", {model_name, query, query_key, options})
+  _socket.emit("registerQuery", {model_name, query, query_key, options})
 
   if (Platform.OS === "web") {
     // run the query from the cache a first time
@@ -220,7 +220,7 @@ export const register_query = (model_name, query, _options, _callback) => {
 }
 
 
-export const send_message = (message, payload) => {
+export const sendMessage = (message, payload) => {
   if (!_socket) {
     console.error("attempting to send message without socket", {message, payload})
     return
@@ -230,8 +230,14 @@ export const send_message = (message, payload) => {
 }
 
 
-export const on_message = (message, callback) => {
+export const onMessage = (message, callback) => {
   if (!_socket) {
     throw new Error("registering socket message listener without socket")
   }
+
+  _socket.on(message, callback)
+
+  return () => {
+    _socket.off(message, callback)
+  }
 }

package/ui/nav/HeaderContainer/index.tsx

@@ -1,145 +1,13 @@
 import {ReactNode} from "react"
 
-// import apiClient from "../../../apiClient"
-
-// import SearchAnything from "components/search/SearchAnything"
-
-// import LogoNav from "./components/LogoNav"
-
-// Env Selector
-// import useFilteredEnvs from "./components/EnvSelector/useFilteredEnvs"
-// import EnvSelectorToggle from "./components/EnvSelector/Toggle"
-// import EnvSelectorDropdown from "./components/EnvSelector/Dropdown"
-// Group Selector
-// import useFilteredGroups from "./components/GroupSelector/useFilteredGroups"
-// import GroupSelectorToggle from "./components/GroupSelector/Toggle"
-// import GroupSelectorDropdown from "./components/GroupSelector/Dropdown"
-
-// import MorphingDropdown from "./components/MorphingDropdown"
-
-// import AccountsToggle from "./components/AccountsToggle"
-// import NotificationsToggle from "./components/NotificationsToggle"
-// import EnvSettingsToggle from "./components/EnvSettingsToggle"
-// import PublishControl from "./components/PublishControl"
-
-// import AccountsDropdown from "./components/AccountsDropdown"
-// import NotificationsDropdown from "./components/NotificationsDropdown"
-// import PhoneDropdown from "components/phone/PhoneDropdown"
-// import EnvSettingsDropdown from "./components/EnvSettingsDropdown"
-
 import "./header.scss"
 import {useContentViewContext} from "../ContentView/ContentViewContext"
 
-// const DefaultHeader = () => {
-//   return (
-//     <>
-//       <LogoNav isSignedIn={false} />
-
-//       <div className="nav-default d-flex flex-row justify-content-between w-100">
-//         <div className="d-flex flex-row"></div>
-
-//         <div className="d-flex flex-row">
-//           <a className="nav-link px-2 me-2 fw-bold" href="/signin">
-//             Sign In
-//           </a>
-//         </div>
-//       </div>
-//     </>
-//   )
-// }
-
-// const SignedInHeader = () => {
-//   const loc = window.location.pathname
-
-//   const [accounts, setAccounts] = useState([])
-
-//   const {envs, activeEnv, setFilter: setEnvsFilter} = useFilteredEnvs()
-//   const {groups, activeGroup, setFilter: setGroupsFilter} = useFilteredGroups()
-
-//   useEffect(() => {
-//     // TODO: useapi hook with cache
-//     const load = async() => {
-//       const res = await apiClient.post("/api/v1/auth/get_accounts")
-//       assert(res.data.status === "ok")
-//       setAccounts(res.data.accounts)
-//       // console.log("accounts", res.data.accounts)
-//     }
-
-//     load()
-//   }, [])
-
-//   return (
-//     <>
-//       <MorphingDropdown.Provider side="left">
-//         <LogoNav isSignedIn={true} />
-
-//         <EnvSelectorToggle activeEnv={activeEnv} />
-//         <GroupSelectorToggle activeGroup={activeGroup} />
-
-//         <MorphingDropdown.Portal>
-//           <EnvSelectorDropdown
-//             id="env-selector"
-//             envs={envs}
-//             activeEnv={activeEnv}
-//             setFilter={setEnvsFilter}
-//           />
-
-//           <GroupSelectorDropdown
-//             id="group-selector"
-//             groups={groups}
-//             activeGroup={activeGroup}
-//             setFilter={setGroupsFilter}
-//           />
-//         </MorphingDropdown.Portal>
-//       </MorphingDropdown.Provider>
-
-//       {/* Search anything */}
-//       <SearchAnything />
-
-//       <div className="ms-auto d-none d-md-flex flex-row text-truncate">
-//         <a className="nav-link mx-2 px-1" href="/docs">
-//           Docs
-//         </a>
-//         <a
-//           className={cx("nav-link px-1", {active: loc.startsWith("/marketplace")})}
-//           href="/marketplace"
-//         >
-//           Marketplace
-//         </a>
-//       </div>
-
-//       <PublishControl />
-
-//       {/* Phone */}
-//       <PhoneDropdown />
-
-//       <MorphingDropdown.Provider side="right">
-//         {/* WARNING: update the anchor-${ids} on the toggle to match the menus if adding or removing */}
-//         <NotificationsToggle />
-
-//         <EnvSettingsToggle />
-
-//         <AccountsToggle />
-
-//         <MorphingDropdown.Portal>
-//           {/* Notifications */}
-//           <NotificationsDropdown id="notifications" />
-
-//           {/* Env Settings */}
-//           <EnvSettingsDropdown id="env-setup" />
-
-//           {/* Accounts + Org */}
-//           <AccountsDropdown id="accounts" accounts={accounts} />
-//         </MorphingDropdown.Portal>
-//       </MorphingDropdown.Provider>
-//     </>
-//   )
-// }
 
 export const HeaderContainer = ({children}: { children: ReactNode }) => {
   const contentViewContext = useContentViewContext()
 
-  if (!children) return null
+  if (!children || !contentViewContext) return null
 
   return (
     <nav