@rpcbase/client 0.50.0 → 0.52.0

package/AppProvider/index.web.js

@@ -0,0 +1,8 @@
+/* @flow */
+
+
+const AppProvider = () => {
+
+}
+
+export default AppProvider

package/auth/SignIn/index.js

@@ -6,6 +6,7 @@ import page from "page"
 import debug from "debug"
 
 import post from "../../helpers/post"
+import {reconnect as rts_reconnect} from "../../rts"
 
 import {set_is_signed_in, set_uid} from "../index"
 import Footer from "../Footer"
@@ -53,6 +54,9 @@ const SignIn = ({
       log("redirect to:", redirect || onSuccessRedirect)
       set_uid(res.user_id)
       set_is_signed_in(true)
+
+      // we must now reconnect on the websocket as we now have a new cookie
+      rts_reconnect()
       onSuccess()
       if (redirect) {
         page(redirect)

package/auth/SignOut/index.js

@@ -7,6 +7,8 @@ import post from "../../helpers/post"
 
 import {set_is_signed_in, set_uid} from "../index"
 
+// TODO: rts_disconnect
+// TODO: clear cache + db
 
 const SignOut = ({
   onSuccess = () => null
@@ -21,6 +23,9 @@ const SignOut = ({
         set_uid(null)
         set_is_signed_in(false)
         localStorage.clear()
+
+        // TODO: clear DB
+
         setIsSignedOut(true)
         onSuccess()
       } else {

package/auth/SignUp/index.js

@@ -2,6 +2,8 @@
 import {useState} from "react"
 import page from "page"
 
+import {reconnect as rts_reconnect} from "../../rts"
+
 import {set_is_signed_in, set_uid} from "../index"
 import post from "../../helpers/post"
 import Footer from "../Footer"
@@ -29,6 +31,9 @@ const SignUp = ({
     if (res.status === "ok") {
       set_uid(res.user_id)
       set_is_signed_in(true)
+
+      // we must now reconnect on the websocket as we now have a new cookie
+      rts_reconnect()
       onSuccess()
       page(onSuccessRedirect)
     } else if (res.status === "error") {

package/base_url.js

@@ -6,11 +6,11 @@ import {SERVER_PORT, HOSTNAME} from "env"
 const protocol = (typeof window !== "undefined" && window?.location?.protocol) || "http:"
 
 // there is no SERVER_PORT in production, as we use the default port and we are behind the gateway
-let BASE_URL
-if (__DEV__) {
-  BASE_URL = `${protocol}//${HOSTNAME}:${SERVER_PORT}`
-} else {
-  BASE_URL = `https://${HOSTNAME}`
-}
+// we assume we specify the port only when localhost or 127.0.0.1
+const is_local = ["localhost", "127.0.0.1"].includes(HOSTNAME)
+
+const BASE_URL = is_local ? `${protocol}//${HOSTNAME}:${SERVER_PORT}` : `https://${HOSTNAME}`
+
+console.log("HOST", HOSTNAME, BASE_URL)
 
 export default BASE_URL

package/hashState.js

@@ -0,0 +1,141 @@
+/* @flow */
+import {useState, useEffect, createContext, useContext, useCallback} from "react"
+import LZString from "lz-string"
+import _isNil from "lodash/isNil"
+import _omitBy from "lodash/omitBy"
+import isEqual from "fast-deep-equal"
+
+import {PAGE_NAVIGATION} from "config/events"
+
+
+const EMPTY_STATE_TOKEN = "N4XyA" // lz-string encoded empty state ''
+
+// WARNING: this assumes hash_str starts with "#"
+const parse_hash_str = (hash_str = window.location.hash) => {
+  if (hash_str.length < 1) {
+    return {}
+  }
+  const current_state_str = hash_str.slice(1)
+  let parsed
+  try {
+    const decoded = LZString.decompressFromEncodedURIComponent(current_state_str)
+    parsed = JSON.parse(decoded)
+  } catch (e) {
+    console.error(e)
+  }
+
+  return parsed || {}
+}
+
+// On first load, retrieve hashState from URL
+const __initial_state = _omitBy(parse_hash_str(), _isNil)
+
+export const encode_payload = (payload) =>
+  LZString.compressToEncodedURIComponent(JSON.stringify(payload))
+
+// add payload to window hash
+const apply_hash_state = (payload) => {
+  const str = encode_payload(payload)
+
+  if (str === EMPTY_STATE_TOKEN) {
+    history.replaceState(null, null, window.location.pathname)
+  } else {
+    history.replaceState(null, null, `${window.location.pathname}#${encode_payload(payload)}`)
+  }
+}
+
+export const HashContext = createContext({
+  hashState: {},
+  serializeHashState: () => null,
+  encodeHashLink: () => null,
+})
+
+export const useHashState = () => {
+  return useContext(HashContext)
+}
+
+export const withHashState = (Component) => {
+  const WrappedComp = ({children, ...props}) => {
+    const hashCtx = useContext(HashContext)
+
+    return (
+      <Component
+        {...props}
+        hashState={hashCtx.hashState}
+        serializeHashState={hashCtx.serializeHashState}
+        encodeHashLink={hashCtx.encodeHashLink}
+      />
+    )
+  }
+
+  WrappedComp.displayName = `withHashState(${Component.displayName})`
+
+  return WrappedComp
+}
+
+export const HashStateProvider = ({children}) => {
+  const [hashState, setHashState] = useState(__initial_state)
+
+  useEffect(() => {
+    const onChange = (ev) => {
+      const newHashStr = ev.detail.context?.hash
+      if (!newHashStr) return
+      // WARNING: page.js strips the "#" we add it back
+      const parsed = _omitBy(parse_hash_str(`#${newHashStr}`), _isNil)
+      const newState = {
+        ...hashState,
+        ...parsed,
+      }
+      // apply only if changed
+      if (!isEqual(hashState, newState)) {
+        setHashState(newState)
+      }
+    }
+    document.body.addEventListener(PAGE_NAVIGATION, onChange)
+
+    return () => document.body.removeEventListener(PAGE_NAVIGATION, onChange)
+  }, [hashState, setHashState])
+
+  useEffect(() => {
+    apply_hash_state(hashState)
+    window.__PRIVATE_HASH_STATE_DO_NOT_USE = hashState
+  }, [hashState])
+
+  const serializeHashState = useCallback((payload) => {
+    setHashState((current) => {
+      // clone and remove nil values
+      const newState = _omitBy(
+        {
+          ...current,
+          ...payload,
+        },
+        _isNil,
+      )
+      return newState
+    })
+  }, [])
+
+  const encodeHashLink = useCallback((payload) => {
+    const newState = _omitBy(
+      {
+        ...hashState,
+        ...payload,
+      },
+      _isNil,
+    )
+
+    return encode_payload(newState)
+  }, [])
+
+  return (
+    <HashContext.Provider
+      value={{
+        hashState,
+        serializeHashState,
+        encodeHashLink,
+      }}
+    >
+      {children}
+    </HashContext.Provider>
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.50.0",
+  "version": "0.52.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0"
   },