@rpcbase/client 0.127.0 → 0.128.0

package/apiClient.js

@@ -0,0 +1,15 @@
+/* @flow */
+import axios from "axios"
+
+import {BASE_URL, getTenantId} from "./index"
+
+// TODO: this should be moved to rb:client
+const apiClient = axios.create({
+  baseURL: BASE_URL,
+  withCredentials: true,
+  headers: {
+    "rb-tenant-id": getTenantId(),
+  },
+})
+
+export default apiClient

package/auth/getTenantId.js

@@ -0,0 +1,11 @@
+/* @flow */
+import {Platform} from "react-native"
+
+import {getTenantId as _getTenantId} from "./index"
+
+const getTenantId = Platform.OS === "web" ? _getTenantId : () => {
+  console.warn("native should not call getTenantId, use tenantId from AuthContext")
+  return null
+}
+
+export default getTenantId

package/auth/index.js

@@ -78,7 +78,8 @@ const run_session_check = async() => {
 
 
 // Force trigger run first session check (when we are not in a webworker (or mobile))
-if (typeof window !== "undefined") run_session_check()
+const isJest = !!process?.env?.JEST_WORKER_ID
+if (typeof window !== "undefined" && !isJest) run_session_check()
 
 
 export const session_restrict = (ctx, next) => {
@@ -120,7 +121,7 @@ export const setUid = (val) => {
   }
 }
 
-export const get_tenant_id = () => __tenant_id
+export const getTenantId = () => __tenant_id
 export const set_tenant_id = (val) => {
   __tenant_id = val
   storage.setItem(LAST_TENANT_KEY, val)

package/helpers/post.js

@@ -1,7 +1,7 @@
 /* @flow */
 import axios from "axios"
 
-import BASE_URL from "../base_url"
+import {BASE_URL} from "../index"
 
 const client = axios.create({
   withCredentials: true,

package/index.js

@@ -1,5 +1,17 @@
 /* @flow */
+import {SERVER_PORT, APP_DOMAIN} from "env"
+
 import useRPC from "./helpers/useRPC"
 import useStoredValue from "./helpers/useStoredValue"
+import getTenantId from "./auth/getTenantId"
+
+export {useRPC, useStoredValue, getTenantId}
+
+
+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
+// we assume we specify the port only when localhost or 127.0.0.1
+const isLocal = ["localhost", "127.0.0.1"].includes(APP_DOMAIN)
 
-export {useRPC, useStoredValue}
+export const BASE_URL = isLocal ? `${protocol}//${APP_DOMAIN}:${SERVER_PORT}` : `https://${APP_DOMAIN}`

package/jest.config.js

@@ -13,5 +13,6 @@ module.exports = {
   },
   moduleNameMapper: {
     "^react-native$": "react-native-web",
- },
+  },
+  moduleFileExtensions: ["jest.js", "web.js", "js", "json"],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.127.0",
+  "version": "0.128.0",
   "scripts": {
     "build-firebase": "webpack -c firebase/webpack.config.js",
     "build": "yarn build-firebase",
@@ -28,14 +28,17 @@
     "@babel/preset-react": "7.23.3",
     "@testing-library/react": "14.1.2",
     "@testing-library/react-hooks": "8.0.1",
+    "axios": "1.6.2",
     "babel-jest": "29.7.0",
     "bluebird": "3.7.2",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
+    "page": "1.11.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-native-web": "0.19.9",
     "react-test-renderer": "18.2.0",
+    "validator": "13.11.0",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4"
   }

package/rpc_post.js

@@ -5,10 +5,9 @@ import _get from "lodash/get"
 import _set from "lodash/set"
 
 import get_txn_id from "@rpcbase/std/get_txn_id"
-import {add_local_txn} from "@rpcbase/client/rts"
 
-import get_tenant_id from "./auth/get_tenant_id"
-import BASE_URL from "./base_url"
+import {BASE_URL, getTenantId} from "./index"
+import {add_local_txn} from "./rts"
 
 const TENANT_ID_HEADER = "rb-tenant-id"
 
@@ -28,7 +27,7 @@ const rpc_post = async(url, payload, options = {}) => {
   assert(txn_id, `unable to find txn_id for request ${url}`)
   add_local_txn(txn_id)
 
-  options.headers[TENANT_ID_HEADER] = get_tenant_id()
+  options.headers[TENANT_ID_HEADER] = getTenantId()
 
   const res = await client.post(`${BASE_URL}${url}`, payload, options)
 

package/rts/rts.js

@@ -6,8 +6,7 @@ import _get from "lodash/get"
 import _set from "lodash/set"
 import debug from "debug"
 
-import BASE_URL from "../base_url"
-import {get_tenant_id} from "../auth"
+import {BASE_URL, getTenantId} from "../index"
 
 import store from "./store"
 import getUseDocument from "./getUseDocument"
@@ -91,7 +90,7 @@ const dispatch_query_payload = (payload) => {
 
 
 export const connect = () => new Promise((resolve) => {
-  const tenant_id = get_tenant_id()
+  const tenant_id = getTenantId()
 
   if (tenant_id) {
     log("rts client will connect")

package/auth/get_tenant_id.js

@@ -1,11 +0,0 @@
-/* @flow */
-import {Platform} from "react-native"
-
-import {get_tenant_id as _get_tenant_id} from "./index"
-
-const get_tenant_id = Platform.OS === "web" ? _get_tenant_id : () => {
-  console.warn("native should not call get_tenant_id, use tenantId from AuthContext")
-  return null
-}
-
-export default get_tenant_id

package/base_url.js

@@ -1,15 +0,0 @@
-/* @flow */
-import axios from "axios"
-
-import {SERVER_PORT, APP_DOMAIN} 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
-// we assume we specify the port only when localhost or 127.0.0.1
-const is_local = ["localhost", "127.0.0.1"].includes(APP_DOMAIN)
-
-const BASE_URL = is_local ? `${protocol}//${APP_DOMAIN}:${SERVER_PORT}` : `https://${APP_DOMAIN}`
-
-
-export default BASE_URL