Compare commits
No commits in common. "0cf1139f9b3ce953aeb6a48274dfc58ca500dfdf" and "8ba858f8763a5aa4c511b82b04387fb01fd81287" have entirely different histories.
0cf1139f9b
...
8ba858f876
7 changed files with 141 additions and 400 deletions
|
|
@ -2,15 +2,8 @@ import { useRef, useEffect, useMemo, useState } from "react";
|
|||
import { useQuery } from "@apollo/client";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { useNetworkState } from "~/stores";
|
||||
import { createLogger } from "~/lib/logger";
|
||||
import { UI_SCOPES } from "~/lib/logger/scopes";
|
||||
import useShallowMemo from "./useShallowMemo";
|
||||
|
||||
const hookLogger = createLogger({
|
||||
module: UI_SCOPES.HOOKS,
|
||||
feature: "useLatestWithSubscription",
|
||||
});
|
||||
|
||||
// Constants for retry configuration
|
||||
const MAX_RETRIES = 5;
|
||||
const INITIAL_BACKOFF_MS = 1000; // 1 second
|
||||
|
|
@ -54,15 +47,13 @@ export default function useLatestWithSubscription(
|
|||
const retryCountRef = useRef(0);
|
||||
const subscriptionErrorRef = useRef(null);
|
||||
const timeoutIdRef = useRef(null);
|
||||
const unsubscribeRef = useRef(null);
|
||||
const lastWsClosedDateRef = useRef(null);
|
||||
|
||||
useEffect(() => {
|
||||
const currentVarsHash = JSON.stringify(variables);
|
||||
if (currentVarsHash !== variableHashRef.current) {
|
||||
hookLogger.debug("Variables changed; resetting subscription setup", {
|
||||
subscriptionKey,
|
||||
});
|
||||
console.log(
|
||||
`[${subscriptionKey}] Variables changed, resetting subscription setup`,
|
||||
);
|
||||
highestIdRef.current = null;
|
||||
variableHashRef.current = currentVarsHash;
|
||||
initialSetupDoneRef.current = false;
|
||||
|
|
@ -107,19 +98,19 @@ export default function useLatestWithSubscription(
|
|||
(highestIdRef.current === null || highestId > highestIdRef.current)
|
||||
) {
|
||||
highestIdRef.current = highestId;
|
||||
hookLogger.debug("Updated subscription cursor to highest ID", {
|
||||
subscriptionKey,
|
||||
console.log(
|
||||
`[${subscriptionKey}] Updated subscription cursor to highest ID:`,
|
||||
highestId,
|
||||
});
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Handle empty results case - initialize with 0 to allow subscription for first item
|
||||
if (highestIdRef.current === null) {
|
||||
highestIdRef.current = 0;
|
||||
hookLogger.debug("No initial items; setting subscription cursor", {
|
||||
subscriptionKey,
|
||||
highestId: 0,
|
||||
});
|
||||
console.log(
|
||||
`[${subscriptionKey}] No initial items, setting subscription cursor to:`,
|
||||
0,
|
||||
);
|
||||
}
|
||||
}
|
||||
}, [queryData, cursorKey, subscriptionKey]);
|
||||
|
|
@ -143,20 +134,12 @@ export default function useLatestWithSubscription(
|
|||
if (!subscribeToMore) return;
|
||||
if (highestIdRef.current === null) return; // Wait until we have the highest ID
|
||||
|
||||
// Track WS close events so we only react when wsClosedDate actually changes
|
||||
const wsClosedDateChanged =
|
||||
!!wsClosedDate && wsClosedDate !== lastWsClosedDateRef.current;
|
||||
if (wsClosedDateChanged) {
|
||||
lastWsClosedDateRef.current = wsClosedDate;
|
||||
}
|
||||
|
||||
// Check if max retries reached and we have an error
|
||||
if (retryCountRef.current >= maxRetries && subscriptionErrorRef.current) {
|
||||
hookLogger.error("Max retries reached; stopping subscription attempts", {
|
||||
subscriptionKey,
|
||||
maxRetries,
|
||||
error: subscriptionErrorRef.current,
|
||||
});
|
||||
console.error(
|
||||
`[${subscriptionKey}] Max retries (${maxRetries}) reached. Stopping subscription attempts.`,
|
||||
subscriptionErrorRef.current,
|
||||
);
|
||||
|
||||
// Report to Sentry when max retries are reached
|
||||
try {
|
||||
|
|
@ -172,24 +155,17 @@ export default function useLatestWithSubscription(
|
|||
},
|
||||
});
|
||||
} catch (sentryError) {
|
||||
hookLogger.error("Failed to report max-retries to Sentry", {
|
||||
subscriptionKey,
|
||||
error: sentryError,
|
||||
});
|
||||
console.error("Failed to report to Sentry:", sentryError);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for:
|
||||
// - initial setup not done yet
|
||||
// - OR a new wsClosedDate (WS reconnect)
|
||||
// - OR a retry trigger
|
||||
if (
|
||||
initialSetupDoneRef.current &&
|
||||
!wsClosedDateChanged &&
|
||||
retryTrigger === 0
|
||||
) {
|
||||
// - either initial setup not done yet
|
||||
// - or a new wsClosedDate (WS reconnect)
|
||||
// - or a retry trigger
|
||||
if (initialSetupDoneRef.current && !wsClosedDate && retryTrigger === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -202,16 +178,6 @@ export default function useLatestWithSubscription(
|
|||
timeoutIdRef.current = null;
|
||||
}
|
||||
|
||||
// Always cleanup any existing subscription before creating a new one
|
||||
if (unsubscribeRef.current) {
|
||||
try {
|
||||
unsubscribeRef.current();
|
||||
} catch (_error) {
|
||||
// ignore
|
||||
}
|
||||
unsubscribeRef.current = null;
|
||||
}
|
||||
|
||||
// Calculate backoff delay if this is a retry
|
||||
const backoffDelay =
|
||||
retryCountRef.current > 0
|
||||
|
|
@ -221,13 +187,15 @@ export default function useLatestWithSubscription(
|
|||
)
|
||||
: 0;
|
||||
|
||||
hookLogger.debug("Setting up subscription", {
|
||||
subscriptionKey,
|
||||
retryCount: retryCountRef.current,
|
||||
maxRetries,
|
||||
backoffDelay,
|
||||
highestId: highestIdRef.current,
|
||||
});
|
||||
const retryMessage =
|
||||
retryCountRef.current > 0
|
||||
? ` Retry attempt ${retryCountRef.current}/${maxRetries} after ${backoffDelay}ms delay`
|
||||
: "";
|
||||
|
||||
console.log(
|
||||
`[${subscriptionKey}] Setting up subscription${retryMessage} with highestId:`,
|
||||
highestIdRef.current,
|
||||
);
|
||||
|
||||
// Use timeout for backoff
|
||||
timeoutIdRef.current = setTimeout(() => {
|
||||
|
|
@ -254,12 +222,10 @@ export default function useLatestWithSubscription(
|
|||
maxRetries,
|
||||
);
|
||||
|
||||
hookLogger.warn("Subscription error", {
|
||||
subscriptionKey,
|
||||
attempt: retryCountRef.current,
|
||||
maxRetries,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Subscription error (attempt ${retryCountRef.current}/${maxRetries}):`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
|
||||
// If we haven't reached max retries, trigger a retry
|
||||
if (retryCountRef.current < maxRetries) {
|
||||
|
|
@ -304,11 +270,10 @@ export default function useLatestWithSubscription(
|
|||
}
|
||||
});
|
||||
|
||||
hookLogger.debug("Received new items", {
|
||||
subscriptionKey,
|
||||
receivedCount: filteredNewItems.length,
|
||||
highestId: highestIdRef.current,
|
||||
});
|
||||
console.log(
|
||||
`[${subscriptionKey}] Received ${filteredNewItems.length} new items, updated highestId:`,
|
||||
highestIdRef.current,
|
||||
);
|
||||
|
||||
// For latest items pattern, we prepend new items (DESC order in UI)
|
||||
return {
|
||||
|
|
@ -318,27 +283,30 @@ export default function useLatestWithSubscription(
|
|||
},
|
||||
});
|
||||
|
||||
// Save unsubscribe for cleanup on reruns/unmount
|
||||
unsubscribeRef.current = unsubscribe;
|
||||
|
||||
// Note: cleanup is handled by the effect cleanup below.
|
||||
// Cleanup on unmount or re-run
|
||||
return () => {
|
||||
console.log(`[${subscriptionKey}] Cleaning up subscription`);
|
||||
if (timeoutIdRef.current) {
|
||||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
unsubscribe();
|
||||
};
|
||||
} catch (error) {
|
||||
// Handle setup errors (like malformed queries)
|
||||
hookLogger.error("Error setting up subscription", {
|
||||
subscriptionKey,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Error setting up subscription:`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
subscriptionErrorRef.current = error;
|
||||
|
||||
// Increment retry counter but don't exceed maxRetries
|
||||
retryCountRef.current = Math.min(retryCountRef.current + 1, maxRetries);
|
||||
|
||||
hookLogger.warn("Subscription setup error", {
|
||||
subscriptionKey,
|
||||
attempt: retryCountRef.current,
|
||||
maxRetries,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Subscription setup error (attempt ${retryCountRef.current}/${maxRetries}):`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
|
||||
// If we haven't reached max retries, trigger a retry
|
||||
if (retryCountRef.current < maxRetries) {
|
||||
|
|
@ -360,14 +328,16 @@ export default function useLatestWithSubscription(
|
|||
},
|
||||
});
|
||||
} catch (sentryError) {
|
||||
hookLogger.error("Failed to report setup error to Sentry", {
|
||||
subscriptionKey,
|
||||
error: sentryError,
|
||||
});
|
||||
console.error("Failed to report to Sentry:", sentryError);
|
||||
}
|
||||
}
|
||||
|
||||
// Cleanup is handled by the effect cleanup below.
|
||||
return () => {
|
||||
if (timeoutIdRef.current) {
|
||||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
};
|
||||
}
|
||||
}, backoffDelay);
|
||||
|
||||
|
|
@ -377,16 +347,6 @@ export default function useLatestWithSubscription(
|
|||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
|
||||
if (unsubscribeRef.current) {
|
||||
try {
|
||||
hookLogger.debug("Cleaning up subscription", { subscriptionKey });
|
||||
unsubscribeRef.current();
|
||||
} catch (_error) {
|
||||
// ignore
|
||||
}
|
||||
unsubscribeRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [
|
||||
skip,
|
||||
|
|
|
|||
|
|
@ -2,15 +2,8 @@ import { useRef, useEffect, useMemo, useState } from "react";
|
|||
import { useQuery } from "@apollo/client";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { useNetworkState } from "~/stores";
|
||||
import { createLogger } from "~/lib/logger";
|
||||
import { UI_SCOPES } from "~/lib/logger/scopes";
|
||||
import useShallowMemo from "./useShallowMemo";
|
||||
|
||||
const hookLogger = createLogger({
|
||||
module: UI_SCOPES.HOOKS,
|
||||
feature: "useStreamQueryWithSubscription",
|
||||
});
|
||||
|
||||
// Constants for retry configuration
|
||||
const MAX_RETRIES = 5;
|
||||
const INITIAL_BACKOFF_MS = 1000; // 1 second
|
||||
|
|
@ -47,16 +40,14 @@ export default function useStreamQueryWithSubscription(
|
|||
const retryCountRef = useRef(0);
|
||||
const subscriptionErrorRef = useRef(null);
|
||||
const timeoutIdRef = useRef(null);
|
||||
const unsubscribeRef = useRef(null);
|
||||
const lastWsClosedDateRef = useRef(null);
|
||||
|
||||
useEffect(() => {
|
||||
const currentVarsHash = JSON.stringify(variables);
|
||||
if (currentVarsHash !== variableHashRef.current) {
|
||||
hookLogger.debug("Variables changed; resetting cursor", {
|
||||
subscriptionKey,
|
||||
console.log(
|
||||
`[${subscriptionKey}] Variables changed, resetting cursor to initial value:`,
|
||||
initialCursor,
|
||||
});
|
||||
);
|
||||
lastCursorRef.current = initialCursor;
|
||||
variableHashRef.current = currentVarsHash;
|
||||
initialSetupDoneRef.current = false;
|
||||
|
|
@ -108,10 +99,10 @@ export default function useStreamQueryWithSubscription(
|
|||
const newCursor = lastItem[cursorKey];
|
||||
|
||||
lastCursorRef.current = newCursor;
|
||||
hookLogger.debug("Updated subscription cursor", {
|
||||
subscriptionKey,
|
||||
cursor: newCursor,
|
||||
});
|
||||
console.log(
|
||||
`[${subscriptionKey}] Updated subscription cursor:`,
|
||||
newCursor,
|
||||
);
|
||||
}
|
||||
}, [queryData, cursorKey, subscriptionKey]);
|
||||
|
||||
|
|
@ -133,20 +124,12 @@ export default function useStreamQueryWithSubscription(
|
|||
if (skip) return; // If skipping, do nothing
|
||||
if (!subscribeToMore) return;
|
||||
|
||||
// Track WS close events so we only react when wsClosedDate actually changes
|
||||
const wsClosedDateChanged =
|
||||
!!wsClosedDate && wsClosedDate !== lastWsClosedDateRef.current;
|
||||
if (wsClosedDateChanged) {
|
||||
lastWsClosedDateRef.current = wsClosedDate;
|
||||
}
|
||||
|
||||
// Check if max retries reached and we have an error - this check must be done regardless of other conditions
|
||||
if (retryCountRef.current >= maxRetries && subscriptionErrorRef.current) {
|
||||
hookLogger.error("Max retries reached; stopping subscription attempts", {
|
||||
subscriptionKey,
|
||||
maxRetries,
|
||||
error: subscriptionErrorRef.current,
|
||||
});
|
||||
console.error(
|
||||
`[${subscriptionKey}] Max retries (${maxRetries}) reached. Stopping subscription attempts.`,
|
||||
subscriptionErrorRef.current,
|
||||
);
|
||||
|
||||
// Report to Sentry when max retries are reached
|
||||
try {
|
||||
|
|
@ -162,24 +145,17 @@ export default function useStreamQueryWithSubscription(
|
|||
},
|
||||
});
|
||||
} catch (sentryError) {
|
||||
hookLogger.error("Failed to report max-retries to Sentry", {
|
||||
subscriptionKey,
|
||||
error: sentryError,
|
||||
});
|
||||
console.error("Failed to report to Sentry:", sentryError);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Wait for:
|
||||
// - initial setup not done yet
|
||||
// - OR a new wsClosedDate (WS reconnect)
|
||||
// - OR a retry trigger
|
||||
if (
|
||||
initialSetupDoneRef.current &&
|
||||
!wsClosedDateChanged &&
|
||||
retryTrigger === 0
|
||||
) {
|
||||
// - either initial setup not done yet
|
||||
// - or a new wsClosedDate (WS reconnect)
|
||||
// - or a retry trigger
|
||||
if (initialSetupDoneRef.current && !wsClosedDate && retryTrigger === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -192,16 +168,6 @@ export default function useStreamQueryWithSubscription(
|
|||
timeoutIdRef.current = null;
|
||||
}
|
||||
|
||||
// Always cleanup any existing subscription before creating a new one
|
||||
if (unsubscribeRef.current) {
|
||||
try {
|
||||
unsubscribeRef.current();
|
||||
} catch (_error) {
|
||||
// ignore
|
||||
}
|
||||
unsubscribeRef.current = null;
|
||||
}
|
||||
|
||||
// Calculate backoff delay if this is a retry
|
||||
const backoffDelay =
|
||||
retryCountRef.current > 0
|
||||
|
|
@ -211,13 +177,15 @@ export default function useStreamQueryWithSubscription(
|
|||
)
|
||||
: 0;
|
||||
|
||||
hookLogger.debug("Setting up subscription", {
|
||||
subscriptionKey,
|
||||
retryCount: retryCountRef.current,
|
||||
maxRetries,
|
||||
backoffDelay,
|
||||
cursor: lastCursorRef.current,
|
||||
});
|
||||
const retryMessage =
|
||||
retryCountRef.current > 0
|
||||
? ` Retry attempt ${retryCountRef.current}/${maxRetries} after ${backoffDelay}ms delay`
|
||||
: "";
|
||||
|
||||
console.log(
|
||||
`[${subscriptionKey}] Setting up subscription${retryMessage} with cursor:`,
|
||||
lastCursorRef.current,
|
||||
);
|
||||
|
||||
// Use timeout for backoff
|
||||
timeoutIdRef.current = setTimeout(() => {
|
||||
|
|
@ -244,12 +212,10 @@ export default function useStreamQueryWithSubscription(
|
|||
maxRetries,
|
||||
);
|
||||
|
||||
hookLogger.warn("Subscription error", {
|
||||
subscriptionKey,
|
||||
attempt: retryCountRef.current,
|
||||
maxRetries,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Subscription error (attempt ${retryCountRef.current}/${maxRetries}):`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
|
||||
// If we haven't reached max retries, trigger a retry
|
||||
if (retryCountRef.current < maxRetries) {
|
||||
|
|
@ -297,10 +263,10 @@ export default function useStreamQueryWithSubscription(
|
|||
newItemCursor > lastCursorRef.current
|
||||
) {
|
||||
lastCursorRef.current = newItemCursor;
|
||||
hookLogger.debug("Received item; cursor advanced", {
|
||||
subscriptionKey,
|
||||
cursor: lastCursorRef.current,
|
||||
});
|
||||
console.log(
|
||||
`[${subscriptionKey}] New message received with cursor:`,
|
||||
lastCursorRef.current,
|
||||
);
|
||||
}
|
||||
|
||||
const existing = itemMap.get(item[uniqKey]);
|
||||
|
|
@ -323,27 +289,30 @@ export default function useStreamQueryWithSubscription(
|
|||
},
|
||||
});
|
||||
|
||||
// Save unsubscribe for cleanup on reruns/unmount
|
||||
unsubscribeRef.current = unsubscribe;
|
||||
|
||||
// Note: cleanup is handled by the effect cleanup below.
|
||||
// Cleanup on unmount or re-run
|
||||
return () => {
|
||||
console.log(`[${subscriptionKey}] Cleaning up subscription`);
|
||||
if (timeoutIdRef.current) {
|
||||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
unsubscribe();
|
||||
};
|
||||
} catch (error) {
|
||||
// Handle setup errors (like malformed queries)
|
||||
hookLogger.error("Error setting up subscription", {
|
||||
subscriptionKey,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Error setting up subscription:`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
subscriptionErrorRef.current = error;
|
||||
|
||||
// Increment retry counter but don't exceed maxRetries
|
||||
retryCountRef.current = Math.min(retryCountRef.current + 1, maxRetries);
|
||||
|
||||
hookLogger.warn("Subscription setup error", {
|
||||
subscriptionKey,
|
||||
attempt: retryCountRef.current,
|
||||
maxRetries,
|
||||
console.error(
|
||||
`[${subscriptionKey}] Subscription setup error (attempt ${retryCountRef.current}/${maxRetries}):`,
|
||||
error,
|
||||
});
|
||||
);
|
||||
|
||||
// If we haven't reached max retries, trigger a retry
|
||||
if (retryCountRef.current < maxRetries) {
|
||||
|
|
@ -365,14 +334,16 @@ export default function useStreamQueryWithSubscription(
|
|||
},
|
||||
});
|
||||
} catch (sentryError) {
|
||||
hookLogger.error("Failed to report setup error to Sentry", {
|
||||
subscriptionKey,
|
||||
error: sentryError,
|
||||
});
|
||||
console.error("Failed to report to Sentry:", sentryError);
|
||||
}
|
||||
}
|
||||
|
||||
// Cleanup is handled by the effect cleanup below.
|
||||
return () => {
|
||||
if (timeoutIdRef.current) {
|
||||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
};
|
||||
}
|
||||
}, backoffDelay);
|
||||
|
||||
|
|
@ -382,16 +353,6 @@ export default function useStreamQueryWithSubscription(
|
|||
clearTimeout(timeoutIdRef.current);
|
||||
timeoutIdRef.current = null;
|
||||
}
|
||||
|
||||
if (unsubscribeRef.current) {
|
||||
try {
|
||||
hookLogger.debug("Cleaning up subscription", { subscriptionKey });
|
||||
unsubscribeRef.current();
|
||||
} catch (_error) {
|
||||
// ignore
|
||||
}
|
||||
unsubscribeRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [
|
||||
skip,
|
||||
|
|
|
|||
|
|
@ -5,40 +5,27 @@ import { BACKGROUND_SCOPES } from "~/lib/logger/scopes";
|
|||
import jwtDecode from "jwt-decode";
|
||||
import { initEmulatorMode } from "./emulatorService";
|
||||
|
||||
import {
|
||||
getAlertState,
|
||||
getAuthState,
|
||||
getSessionState,
|
||||
subscribeAlertState,
|
||||
subscribeAuthState,
|
||||
subscribeSessionState,
|
||||
permissionsActions,
|
||||
} from "~/stores";
|
||||
import { getAuthState, subscribeAuthState, permissionsActions } from "~/stores";
|
||||
|
||||
import setLocationState from "~/location/setLocationState";
|
||||
import { storeLocation } from "~/location/storage";
|
||||
|
||||
import env from "~/env";
|
||||
|
||||
// Common config: keep always-on tracking enabled, but default to an IDLE low-power profile.
|
||||
// High-accuracy and "moving" mode are only enabled when an active alert is open.
|
||||
const baseConfig = {
|
||||
const config = {
|
||||
// https://github.com/transistorsoft/react-native-background-geolocation/wiki/Android-Headless-Mode
|
||||
enableHeadless: true,
|
||||
disableProviderChangeRecord: true,
|
||||
// disableMotionActivityUpdates: true,
|
||||
// Default to low-power (idle) profile; will be overridden when needed.
|
||||
desiredAccuracy: BackgroundGeolocation.DESIRED_ACCURACY_LOW,
|
||||
// Larger distance filter in idle mode to prevent frequent GPS wakes.
|
||||
distanceFilter: 200,
|
||||
desiredAccuracy: BackgroundGeolocation.DESIRED_ACCURACY_HIGH,
|
||||
distanceFilter: TRACK_MOVE,
|
||||
// debug: true, // Enable debug mode for more detailed logs
|
||||
logLevel: BackgroundGeolocation.LOG_LEVEL_VERBOSE,
|
||||
// Disable automatic permission requests
|
||||
locationAuthorizationRequest: "Always",
|
||||
stopOnTerminate: false,
|
||||
startOnBoot: true,
|
||||
// Keep heartbeat very infrequent in idle mode.
|
||||
heartbeatInterval: 3600,
|
||||
heartbeatInterval: 900,
|
||||
// Force the plugin to start aggressively
|
||||
foregroundService: true,
|
||||
notification: {
|
||||
|
|
@ -66,19 +53,7 @@ const baseConfig = {
|
|||
autoSync: true,
|
||||
reset: true,
|
||||
};
|
||||
|
||||
const TRACKING_PROFILES = {
|
||||
idle: {
|
||||
desiredAccuracy: BackgroundGeolocation.DESIRED_ACCURACY_LOW,
|
||||
distanceFilter: 200,
|
||||
heartbeatInterval: 3600,
|
||||
},
|
||||
active: {
|
||||
desiredAccuracy: BackgroundGeolocation.DESIRED_ACCURACY_HIGH,
|
||||
distanceFilter: TRACK_MOVE,
|
||||
heartbeatInterval: 900,
|
||||
},
|
||||
};
|
||||
const defaultConfig = config;
|
||||
|
||||
export default async function trackLocation() {
|
||||
const locationLogger = createLogger({
|
||||
|
|
@ -86,66 +61,6 @@ export default async function trackLocation() {
|
|||
feature: "tracking",
|
||||
});
|
||||
|
||||
let currentProfile = null;
|
||||
let authReady = false;
|
||||
let stopAlertSubscription = null;
|
||||
let stopSessionSubscription = null;
|
||||
|
||||
const computeHasOwnOpenAlert = () => {
|
||||
try {
|
||||
const { userId } = getSessionState();
|
||||
const { alertingList } = getAlertState();
|
||||
if (!userId || !Array.isArray(alertingList)) return false;
|
||||
return alertingList.some(
|
||||
({ oneAlert }) =>
|
||||
oneAlert?.state === "open" && oneAlert?.userId === userId,
|
||||
);
|
||||
} catch (e) {
|
||||
locationLogger.warn("Failed to compute active-alert state", {
|
||||
error: e?.message,
|
||||
});
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const applyProfile = async (profileName) => {
|
||||
if (!authReady) {
|
||||
// We only apply profile once auth headers are configured.
|
||||
return;
|
||||
}
|
||||
if (currentProfile === profileName) return;
|
||||
|
||||
const profile = TRACKING_PROFILES[profileName];
|
||||
if (!profile) {
|
||||
locationLogger.warn("Unknown tracking profile", { profileName });
|
||||
return;
|
||||
}
|
||||
|
||||
locationLogger.info("Applying tracking profile", {
|
||||
profileName,
|
||||
desiredAccuracy: profile.desiredAccuracy,
|
||||
distanceFilter: profile.distanceFilter,
|
||||
heartbeatInterval: profile.heartbeatInterval,
|
||||
});
|
||||
|
||||
try {
|
||||
await BackgroundGeolocation.setConfig(profile);
|
||||
|
||||
// Key battery fix:
|
||||
// - IDLE profile forces stationary mode
|
||||
// - ACTIVE profile forces moving mode
|
||||
await BackgroundGeolocation.changePace(profileName === "active");
|
||||
|
||||
currentProfile = profileName;
|
||||
} catch (error) {
|
||||
locationLogger.error("Failed to apply tracking profile", {
|
||||
profileName,
|
||||
error: error?.message,
|
||||
stack: error?.stack,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// Log the geolocation sync URL for debugging
|
||||
locationLogger.info("Geolocation sync URL configuration", {
|
||||
url: env.GEOLOC_SYNC_URL,
|
||||
|
|
@ -161,18 +76,6 @@ export default async function trackLocation() {
|
|||
locationLogger.info("No auth token, stopping location tracking");
|
||||
await BackgroundGeolocation.stop();
|
||||
locationLogger.debug("Location tracking stopped");
|
||||
|
||||
// Cleanup subscriptions when logged out.
|
||||
try {
|
||||
stopAlertSubscription && stopAlertSubscription();
|
||||
stopSessionSubscription && stopSessionSubscription();
|
||||
} finally {
|
||||
stopAlertSubscription = null;
|
||||
stopSessionSubscription = null;
|
||||
}
|
||||
|
||||
authReady = false;
|
||||
currentProfile = null;
|
||||
return;
|
||||
}
|
||||
// unsub();
|
||||
|
|
@ -184,8 +87,6 @@ export default async function trackLocation() {
|
|||
},
|
||||
});
|
||||
|
||||
authReady = true;
|
||||
|
||||
// Log the authorization header that was set
|
||||
locationLogger.debug(
|
||||
"Set Authorization header for background geolocation",
|
||||
|
|
@ -205,7 +106,19 @@ export default async function trackLocation() {
|
|||
});
|
||||
}
|
||||
|
||||
if (!state.enabled) {
|
||||
if (state.enabled) {
|
||||
locationLogger.info("Syncing location data");
|
||||
try {
|
||||
await BackgroundGeolocation.changePace(true);
|
||||
await BackgroundGeolocation.sync();
|
||||
locationLogger.debug("Sync initiated successfully");
|
||||
} catch (error) {
|
||||
locationLogger.error("Failed to sync location data", {
|
||||
error: error.message,
|
||||
stack: error.stack,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
locationLogger.info("Starting location tracking");
|
||||
try {
|
||||
await BackgroundGeolocation.start();
|
||||
|
|
@ -217,31 +130,6 @@ export default async function trackLocation() {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Ensure we are NOT forcing "moving" mode by default.
|
||||
// Default profile is idle unless an active alert requires higher accuracy.
|
||||
const shouldBeActive = computeHasOwnOpenAlert();
|
||||
await applyProfile(shouldBeActive ? "active" : "idle");
|
||||
|
||||
// Subscribe to changes that may require switching profiles.
|
||||
if (!stopSessionSubscription) {
|
||||
stopSessionSubscription = subscribeSessionState(
|
||||
(s) => s?.userId,
|
||||
() => {
|
||||
const active = computeHasOwnOpenAlert();
|
||||
applyProfile(active ? "active" : "idle");
|
||||
},
|
||||
);
|
||||
}
|
||||
if (!stopAlertSubscription) {
|
||||
stopAlertSubscription = subscribeAlertState(
|
||||
(s) => s?.alertingList,
|
||||
() => {
|
||||
const active = computeHasOwnOpenAlert();
|
||||
applyProfile(active ? "active" : "idle");
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
BackgroundGeolocation.onLocation(async (location) => {
|
||||
|
|
@ -273,8 +161,8 @@ export default async function trackLocation() {
|
|||
|
||||
try {
|
||||
locationLogger.info("Initializing background geolocation");
|
||||
await BackgroundGeolocation.ready(baseConfig);
|
||||
await BackgroundGeolocation.setConfig(baseConfig);
|
||||
await BackgroundGeolocation.ready(defaultConfig);
|
||||
await BackgroundGeolocation.setConfig(config);
|
||||
|
||||
// Only set the permission state if we already have the permission
|
||||
const state = await BackgroundGeolocation.getState();
|
||||
|
|
@ -315,9 +203,6 @@ export default async function trackLocation() {
|
|||
subscribeAuthState(({ userToken }) => userToken, handleAuth);
|
||||
locationLogger.debug("Performing initial auth handling");
|
||||
handleAuth(userToken);
|
||||
|
||||
// Initialize emulator mode only in dev/staging to avoid accidental production battery drain.
|
||||
if (__DEV__ || env.IS_STAGING) {
|
||||
// Initialize emulator mode if previously enabled
|
||||
initEmulatorMode();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,16 +18,8 @@ import * as store from "~/stores";
|
|||
|
||||
import getRetryMaxAttempts from "./getRetryMaxAttemps";
|
||||
|
||||
import { createLogger } from "~/lib/logger";
|
||||
import { NETWORK_SCOPES } from "~/lib/logger/scopes";
|
||||
|
||||
const { useNetworkState, networkActions } = store;
|
||||
|
||||
const networkProvidersLogger = createLogger({
|
||||
module: NETWORK_SCOPES.APOLLO,
|
||||
feature: "NetworkProviders",
|
||||
});
|
||||
|
||||
const initializeNewApolloClient = (reload) => {
|
||||
if (reload) {
|
||||
const { apolloClient } = network;
|
||||
|
|
@ -55,10 +47,6 @@ export default function NetworkProviders({ children }) {
|
|||
const networkState = useNetworkState(["initialized", "triggerReload"]);
|
||||
useEffect(() => {
|
||||
if (networkState.triggerReload) {
|
||||
networkProvidersLogger.debug("Network triggerReload received", {
|
||||
reloadId: store.getAuthState()?.reloadId,
|
||||
hasUserToken: !!store.getAuthState()?.userToken,
|
||||
});
|
||||
initializeNewApolloClient(true);
|
||||
setKey((prevKey) => prevKey + 1);
|
||||
}
|
||||
|
|
@ -66,10 +54,6 @@ export default function NetworkProviders({ children }) {
|
|||
|
||||
useEffect(() => {
|
||||
if (key > 0) {
|
||||
networkProvidersLogger.debug("Network reloaded", {
|
||||
reloadId: store.getAuthState()?.reloadId,
|
||||
hasUserToken: !!store.getAuthState()?.userToken,
|
||||
});
|
||||
networkActions.onReload();
|
||||
}
|
||||
}, [key]);
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ import { NETWORK_SCOPES } from "~/lib/logger/scopes";
|
|||
import getStatusCode from "./getStatusCode";
|
||||
import isAbortError from "./isAbortError";
|
||||
|
||||
import { getSessionState } from "~/stores";
|
||||
|
||||
let pendingRequests = [];
|
||||
|
||||
const resolvePendingRequests = () => {
|
||||
|
|
@ -129,31 +127,10 @@ export default function createErrorLink({ store }) {
|
|||
|
||||
// Capture all other errors in Sentry
|
||||
const errorMessage = `apollo error: ${getErrorMessage(error)}`;
|
||||
|
||||
const authState = getAuthState();
|
||||
const sessionState = getSessionState() || {};
|
||||
|
||||
// Keep Sentry context useful but avoid high-volume/PII payloads.
|
||||
// - Don't attach the raw Apollo error object (can contain request details)
|
||||
// - Don't attach identifiers (userId/deviceId)
|
||||
// - Keep role info since it's relevant to the incident class
|
||||
const safeExtras = {
|
||||
operationName: operation.operationName,
|
||||
statusCode,
|
||||
reloadId: authState?.reloadId,
|
||||
hasUserToken: !!authState?.userToken,
|
||||
authLoading: !!authState?.loading,
|
||||
session: {
|
||||
initialized: !!sessionState.initialized,
|
||||
defaultRole: sessionState.defaultRole,
|
||||
allowedRolesCount: Array.isArray(sessionState.allowedRoles)
|
||||
? sessionState.allowedRoles.length
|
||||
: 0,
|
||||
},
|
||||
};
|
||||
|
||||
Sentry.captureException(new Error(errorMessage), {
|
||||
extra: safeExtras,
|
||||
extra: {
|
||||
errorObject: error,
|
||||
},
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -202,7 +202,6 @@ export default createAtom(({ get, merge, getActions }) => {
|
|||
};
|
||||
const confirmLoginRequest = async ({ authTokenJwt, isConnected }) => {
|
||||
authLogger.info("Confirming login request", { isConnected });
|
||||
const reloadId = Date.now();
|
||||
if (!isConnected) {
|
||||
// backup anon tokens
|
||||
const [anonAuthToken, anonUserToken] = await Promise.all([
|
||||
|
|
@ -214,7 +213,7 @@ export default createAtom(({ get, merge, getActions }) => {
|
|||
secureStore.setItemAsync(STORAGE_KEYS.ANON_USER_TOKEN, anonUserToken),
|
||||
]);
|
||||
}
|
||||
merge({ onReloadAuthToken: authTokenJwt, reloadId });
|
||||
merge({ onReloadAuthToken: authTokenJwt });
|
||||
triggerReload();
|
||||
};
|
||||
|
||||
|
|
@ -309,7 +308,6 @@ export default createAtom(({ get, merge, getActions }) => {
|
|||
initialized: false,
|
||||
onReload: false,
|
||||
onReloadAuthToken: null,
|
||||
reloadId: null,
|
||||
userOffMode: false,
|
||||
isReloading: false,
|
||||
lastReloadTime: 0,
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
import { createAtom } from "~/lib/atomic-zustand";
|
||||
|
||||
import { createLogger } from "~/lib/logger";
|
||||
import { SYSTEM_SCOPES } from "~/lib/logger/scopes";
|
||||
|
||||
const treeLogger = createLogger({
|
||||
module: SYSTEM_SCOPES.APP,
|
||||
feature: "tree-reload",
|
||||
});
|
||||
|
||||
const reloadCallbacks = [];
|
||||
|
||||
export default createAtom(({ merge, getActions }) => {
|
||||
|
|
@ -32,14 +24,12 @@ export default createAtom(({ merge, getActions }) => {
|
|||
if (callback) {
|
||||
reloadCallbacks.push(callback);
|
||||
}
|
||||
// Clear session/store state first to stop user-level queries/subscriptions
|
||||
// while we swap identity tokens.
|
||||
networkActions.triggerReload();
|
||||
sessionActions.clear();
|
||||
resetStores();
|
||||
merge({
|
||||
triggerReload: true,
|
||||
// Keep the tree suspended until we've run reload callbacks.
|
||||
suspend: true,
|
||||
suspend: false,
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -47,26 +37,12 @@ export default createAtom(({ merge, getActions }) => {
|
|||
merge({
|
||||
triggerReload: false,
|
||||
});
|
||||
|
||||
// Run all reload callbacks sequentially and await them.
|
||||
// This ensures auth identity swap completes BEFORE the network layer is recreated.
|
||||
while (reloadCallbacks.length > 0) {
|
||||
let callback = reloadCallbacks.shift();
|
||||
if (callback) {
|
||||
try {
|
||||
await Promise.resolve(callback());
|
||||
} catch (error) {
|
||||
treeLogger.error("Reload callback threw", {
|
||||
error: error?.message,
|
||||
});
|
||||
callback();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
networkActions.triggerReload();
|
||||
|
||||
// Allow tree to render again; NetworkProviders will show its loader until ready.
|
||||
merge({ suspend: false });
|
||||
};
|
||||
|
||||
const suspendTree = () => {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue