@terreno/rtk 0.13.3 → 0.14.1

package/src/betterAuthSlice.ts

@@ -6,6 +6,7 @@
  */
 
 import {createListenerMiddleware, createSlice, type PayloadAction} from "@reduxjs/toolkit";
+import {DateTime} from "luxon";
 
 import type {BetterAuthClientInterface, BetterAuthUser} from "./betterAuthTypes";
 
@@ -125,7 +126,7 @@ export const generateBetterAuthSlice = (config: GenerateBetterAuthSliceConfig) =
         state.user = null;
         state.isLoading = false;
         state.error = null;
-        state.lastSyncTimestamp = Date.now();
+        state.lastSyncTimestamp = DateTime.now().toMillis();
       },
 
       /**
@@ -162,7 +163,7 @@ export const generateBetterAuthSlice = (config: GenerateBetterAuthSliceConfig) =
         state.user = action.payload.user;
         state.isLoading = false;
         state.error = null;
-        state.lastSyncTimestamp = Date.now();
+        state.lastSyncTimestamp = DateTime.now().toMillis();
       },
     },
   });

package/src/constants.test.ts

@@ -5,9 +5,11 @@ import {
   baseTasksUrl,
   baseUrl,
   baseWebsocketsUrl,
+  isWebsocketsDebugEnabled,
   logAuth,
   logSocket,
   resolveBaseUrls,
+  setRealtimeDebug,
 } from "./constants";
 
 describe("resolveBaseUrls", () => {
@@ -140,6 +142,51 @@ describe("resolveBaseUrls", () => {
     });
     expect(urls.baseUrl).toBe("http://localhost:4000");
   });
+
+  it("ignores BASE_URL from extra in dev mode and uses hostUri instead", () => {
+    const urls = resolveBaseUrls({
+      expoConstants: {
+        expoConfig: {extra: {BASE_URL: "https://api.prod.com"}, hostUri: "192.168.0.10:8081"},
+      },
+      isDev: true,
+    });
+    expect(urls.baseUrl).toBe("http://192.168.0.10:4000");
+    expect(urls.baseWebsocketsUrl).toBe("ws://192.168.0.10:4000/");
+    expect(urls.baseTasksUrl).toBe("http://192.168.0.10:4000/tasks");
+  });
+
+  it("falls back to experienceUrl when hostUri is empty string", () => {
+    const urls = resolveBaseUrls({
+      expoConstants: {
+        experienceUrl: "exp://10.0.0.5:19000",
+        expoConfig: {extra: {}, hostUri: ""},
+      },
+      isDev: true,
+    });
+    expect(urls.baseUrl).toBe("http://10.0.0.5:4000");
+  });
+
+  it("replaces 'api.' subdomain with 'tasks.' and 'ws.' for envApiUrl", () => {
+    const urls = resolveBaseUrls({
+      envApiUrl: "https://api.staging.example.io",
+      expoConstants: {expoConfig: {extra: {}}},
+      isDev: false,
+    });
+    expect(urls.baseUrl).toBe("https://api.staging.example.io");
+    expect(urls.baseWebsocketsUrl).toBe("https://ws.staging.example.io/");
+    expect(urls.baseTasksUrl).toBe("https://tasks.staging.example.io/tasks");
+  });
+
+  it("handles envApiUrl without 'api.' subdomain gracefully", () => {
+    const urls = resolveBaseUrls({
+      envApiUrl: "https://backend.example.com",
+      expoConstants: {expoConfig: {extra: {}}},
+      isDev: false,
+    });
+    expect(urls.baseUrl).toBe("https://backend.example.com");
+    expect(urls.baseWebsocketsUrl).toBe("https://backend.example.com/");
+    expect(urls.baseTasksUrl).toBe("https://backend.example.com/tasks");
+  });
 });
 
 describe("module-level exports", () => {
@@ -154,7 +201,7 @@ describe("module-level exports", () => {
   });
 });
 
-describe("logAuth / logSocket", () => {
+describe("logAuth", () => {
   const originalDebug = console.debug;
   const calls: unknown[][] = [];
 
@@ -173,6 +220,22 @@ describe("logAuth / logSocket", () => {
     logAuth("auth message");
     expect(calls).toEqual([]);
   });
+});
+
+describe("logSocket", () => {
+  const originalInfo = console.info;
+  const calls: unknown[][] = [];
+
+  beforeEach(() => {
+    calls.length = 0;
+    console.info = (...args: unknown[]): void => {
+      calls.push(args);
+    };
+  });
+
+  afterEach(() => {
+    console.info = originalInfo;
+  });
 
   it("logSocket logs when passed boolean true", () => {
     logSocket(true, "socket message");
@@ -200,5 +263,40 @@ describe("logAuth / logSocket", () => {
   });
 });
 
+describe("setRealtimeDebug / isWebsocketsDebugEnabled", () => {
+  const originalInfo = console.info;
+  afterEach(() => {
+    console.info = originalInfo;
+    setRealtimeDebug(false);
+  });
+
+  it("isWebsocketsDebugEnabled returns false by default", () => {
+    expect(isWebsocketsDebugEnabled()).toBe(false);
+  });
+
+  it("setRealtimeDebug(true) makes isWebsocketsDebugEnabled return true", () => {
+    setRealtimeDebug(true);
+    expect(isWebsocketsDebugEnabled()).toBe(true);
+  });
+
+  it("setRealtimeDebug(false) disables runtime debug", () => {
+    setRealtimeDebug(true);
+    expect(isWebsocketsDebugEnabled()).toBe(true);
+    setRealtimeDebug(false);
+    expect(isWebsocketsDebugEnabled()).toBe(false);
+  });
+
+  it("logSocket logs when runtime websocket debug is enabled via setRealtimeDebug", () => {
+    const calls: unknown[][] = [];
+    console.info = (...args: unknown[]): void => {
+      calls.push(args);
+    };
+
+    setRealtimeDebug(true);
+    logSocket(undefined, "runtime debug message");
+    expect(calls).toEqual([["[websocket]", "runtime debug message"]]);
+  });
+});
+
 // Mock.module tests (expo tunnel warning, AUTH_DEBUG) moved to
 // src/isolated/constants.isolated.ts to avoid coverage tracking interference.

package/src/constants.ts

@@ -17,12 +17,23 @@ export const logAuth = (...args: string[]): void => {
 };
 
 // Handy debug logging socket events, but not enabled by default.
-// Can also be enabled by user feature flag.
+// Can also be enabled by user feature flag or runtime via setRealtimeDebug (admin config).
 const WEBSOCKETS_DEBUG = Constants.expoConfig?.extra?.WEBSOCKETS_DEBUG === "true";
 if (WEBSOCKETS_DEBUG) {
   console.debug("WEBSOCKETS_DEBUG is enabled");
 }
 
+let runtimeWebsocketsDebug = false;
+
+/** Enable websocket debug logging at runtime (e.g. from admin debug.websocketsDebug). */
+export const setRealtimeDebug = (enabled: boolean): void => {
+  runtimeWebsocketsDebug = enabled;
+};
+
+export const isWebsocketsDebugEnabled = (): boolean => {
+  return WEBSOCKETS_DEBUG || runtimeWebsocketsDebug;
+};
+
 // Handy debug logging for websockets, enabled by user.featureFlags.debugWebsockets.enabled or passing in true.
 export const logSocket = (
   user?: {featureFlags?: {debugWebsockets?: {enabled?: boolean}}} | boolean,
@@ -31,9 +42,9 @@ export const logSocket = (
   if (
     typeof user === "boolean"
       ? user
-      : user?.featureFlags?.debugWebsockets?.enabled || WEBSOCKETS_DEBUG
+      : user?.featureFlags?.debugWebsockets?.enabled || isWebsocketsDebugEnabled()
   ) {
-    console.debug(`[websocket]`, ...args);
+    console.info("[websocket]", ...args);
   }
 };
 

package/src/emptyApi.ts

@@ -18,6 +18,7 @@ import {DateTime} from "luxon";
 import qs from "qs";
 import {generateProfileEndpoints, getAuthToken} from "./authSlice";
 import {AUTH_DEBUG, baseUrl, LOGOUT_ACTION_TYPE, TOKEN_REFRESHED_SUCCESS} from "./constants";
+import {shouldDeferOfflineMutation} from "./offlineGate";
 import {IsWeb} from "./platform";
 
 const log = AUTH_DEBUG ? (s: string): void => console.debug(`[auth] ${s}`) : (): void => {};
@@ -25,6 +26,8 @@ const log = AUTH_DEBUG ? (s: string): void => console.debug(`[auth] ${s}`) : ():
 /** Response from Terreno `GET /version-check` (VersionCheckPlugin). */
 export interface VersionCheckResponse {
   message?: string;
+  /** How often the client should poll for updates, in milliseconds. */
+  pollingIntervalMs?: number;
   requiredVersion?: number;
   status: "ok" | "warning" | "required";
   updateUrl?: string;
@@ -39,10 +42,10 @@ interface TokenPayload {
   exp: number;
 }
 
-export async function getTokenExpirationTimes(): Promise<{
+export const getTokenExpirationTimes = async (): Promise<{
   refreshRemainingSecs?: number;
   authRemainingSecs?: number;
-}> {
+}> => {
   let refreshToken: string | null;
   let authToken: string | null;
   if (!IsWeb) {
@@ -78,7 +81,7 @@ export async function getTokenExpirationTimes(): Promise<{
   }
 
   return {authRemainingSecs: authTimeRemaining, refreshRemainingSecs: refreshTimeRemaining};
-}
+};
 
 // Helper function to decode token and get expiration info
 export const getFriendlyExpirationInfo = async (): Promise<string> => {
@@ -210,6 +213,11 @@ export const getBaseQuery = (
 
 export const staggeredBaseQuery = retry(
   async (args: string | FetchArgs, api, extraOptions) => {
+    // Short-circuit immediately when offline for configured mutation endpoints
+    if (api.type === "mutation" && shouldDeferOfflineMutation(api.endpoint, api.getState)) {
+      retry.fail({error: "Network unavailable", status: "FETCH_ERROR"});
+    }
+
     // wait until the mutex is available without locking it
     await mutex.waitForUnlock();
     let token = await getAuthToken();

package/src/index.ts

@@ -5,8 +5,16 @@ export * from "./betterAuthTypes";
 export * from "./constants";
 export * from "./emptyApi";
 export * from "./mongooseSlice";
+export * from "./offlineGate";
+export * from "./offlineMiddleware";
+export * from "./offlineSlice";
 export * from "./platform";
+export * from "./realtime";
 export * from "./socket";
+export * from "./sync";
 export * from "./tagGenerator";
 export * from "./useFeatureFlags";
+export * from "./useOfflineStatus";
+export * from "./useRealtimeDebug";
+export * from "./useServerStatus";
 export * from "./useUpgradeCheck";

package/src/isolated/constants.isolated.ts

@@ -36,10 +36,15 @@ describe("expo tunnel warning", () => {
 describe("AUTH_DEBUG enabled path", () => {
   it("logs debug messages from logAuth when AUTH_DEBUG is true on module load", async () => {
     const debugCalls: unknown[][] = [];
+    const infoCalls: unknown[][] = [];
     const originalDebug = console.debug;
+    const originalInfo = console.info;
     console.debug = (...args: unknown[]): void => {
       debugCalls.push(args);
     };
+    console.info = (...args: unknown[]): void => {
+      infoCalls.push(args);
+    };
     mock.module("expo-constants", () => ({
       default: {expoConfig: {extra: {AUTH_DEBUG: "true", WEBSOCKETS_DEBUG: "true"}}},
     }));
@@ -51,11 +56,10 @@ describe("AUTH_DEBUG enabled path", () => {
       loaded.logAuth("hello");
       expect(debugCalls.length).toBe(preLength + 1);
       loaded.logSocket(undefined, "ws on");
-      expect(debugCalls.some((args) => args[0] === "[websocket]" && args[1] === "ws on")).toBe(
-        true
-      );
+      expect(infoCalls.some((args) => args[0] === "[websocket]" && args[1] === "ws on")).toBe(true);
     } finally {
       console.debug = originalDebug;
+      console.info = originalInfo;
       mock.module("expo-constants", () => ({default: {expoConfig: {extra: {}}}}));
     }
   });