@rpcbase/client 0.129.0 → 0.132.0

package/apiClient.js

@@ -1,11 +1,14 @@
 /* @flow */
 import axios from "axios"
 
-import {BASE_URL, getTenantId} from "./index"
+import getBaseUrl from "./getBaseUrl"
+import getTenantId from "./auth/getTenantId"
+
+console.log("BAGGGG", getTenantId)
+
 
-// TODO: this should be moved to rb:client
 const apiClient = axios.create({
-  baseURL: BASE_URL,
+  baseURL: getBaseUrl(),
   withCredentials: true,
   headers: {
     "rb-tenant-id": getTenantId(),

package/auth/getTenantId.js

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

package/getBaseUrl.js

@@ -0,0 +1,14 @@
+/* @flow */
+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 isLocal = ["localhost", "127.0.0.1"].includes(APP_DOMAIN)
+
+const BASE_URL = isLocal ? `${protocol}//${APP_DOMAIN}:${SERVER_PORT}` : `https://${APP_DOMAIN}`
+
+const getBaseUrl = () => BASE_URL
+
+export default getBaseUrl

package/helpers/post.js

@@ -1,7 +1,7 @@
 /* @flow */
 import axios from "axios"
 
-import {BASE_URL} from "../index"
+import getBaseUrl from "../getBaseUrl"
 
 const client = axios.create({
   withCredentials: true,
@@ -11,7 +11,7 @@ const client = axios.create({
 })
 
 const post = async(url, payload) => {
-  const res = await client.post(`${BASE_URL}${url}`, payload)
+  const res = await client.post(`${getBaseUrl()}${url}`, payload)
   return res.data
 }
 

package/index.js

@@ -1,17 +1,5 @@
 /* @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 const BASE_URL = isLocal ? `${protocol}//${APP_DOMAIN}:${SERVER_PORT}` : `https://${APP_DOMAIN}`
+export {useRPC, useStoredValue}

package/package.json

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

package/rpc_post.js

@@ -6,7 +6,8 @@ import _set from "lodash/set"
 
 import get_txn_id from "@rpcbase/std/get_txn_id"
 
-import {BASE_URL, getTenantId} from "./index"
+import getBaseUrl from "./getBaseUrl"
+import getTenantId from "./auth/getTenantId"
 import {add_local_txn} from "./rts"
 
 const TENANT_ID_HEADER = "rb-tenant-id"
@@ -29,7 +30,7 @@ const rpc_post = async(url, payload, options = {}) => {
 
   options.headers[TENANT_ID_HEADER] = getTenantId()
 
-  const res = await client.post(`${BASE_URL}${url}`, payload, options)
+  const res = await client.post(`${getBaseUrl()}${url}`, payload, options)
 
   if (res.data === "") {
     console.warn("rpc_post:error: got empty res", res)

package/rts/rts.js

@@ -6,7 +6,8 @@ import _get from "lodash/get"
 import _set from "lodash/set"
 import debug from "debug"
 
-import {BASE_URL, getTenantId} from "../index"
+import getBaseUrl from "../getBaseUrl"
+import getTenantId from "../auth/getTenantId"
 
 import store from "./store"
 import getUseDocument from "./getUseDocument"
@@ -100,7 +101,7 @@ export const connect = () => new Promise((resolve) => {
   }
 
 
-  _socket = io(BASE_URL, {
+  _socket = io(getBaseUrl(), {
     forceNew: true,
     transports: ["websocket", "polling"],
     withCredentials: true,