refactor(mobile): valildation of server after each scan

backend/db/schema/scanlog.schema.ts

@@ -9,6 +9,7 @@ export const scanLog = pgTable("scan_log", {
 	message: text("message").notNull(),
 	prompt: text("prompt"),
 	commandDescription: text("command_description"),
+	runningNumber: text("running_number").default("0"),
 	status: text("status"),
 	lines: jsonb("lines").default([]),
 	add_Date: timestamp("add_Date").defaultNow(),

backend/mobile/mobileAuth.route.ts

@@ -263,6 +263,10 @@ r.patch("/user/:id", requireAuth, async (req, res) => {
 		updates.active = req.body.active;
 	}
 
+	if (req.body?.excludedCommand !== undefined) {
+		updates.excludedCommand = req.body.excludedCommand;
+	}
+
 	if (req.body?.role !== undefined) {
 		updates.role = req.body.role;
 	}

backend/mobile/scanLogs.route.ts

@@ -18,6 +18,8 @@ router.post("/", async (req, res) => {
 			commandDescription: body.commandDescription,
 			status: body.status,
 			lines: body.lines,
+			user: body.user,
+			runningNumber: body.runningNumber,
 		})
 		.returning();
 

lstMobile/app.json

@@ -15,8 +15,8 @@
         "foregroundImage": "./assets/adaptive-icon-white.png",
         "backgroundColor": "#ffffff"
       },
-      "versionCode": 24,
-      "minSupportedVersionCode": 21,
+      "versionCode": 30,
+      "minSupportedVersionCode": 26,
       "predictiveBackGestureEnabled": false,
       "package": "net.alpla.lst.mobile"
     },

lstMobile/src/app/(tabs)/_layout.tsx

@@ -15,9 +15,11 @@ export default function TabsLayout() {
 	const isUnlocked = useMobileAuthStore((s) => s.isUnlocked);
 
 	const port = parseInt(serverPort || "0", 10) >= 50000;
-
-	if (!user || (!isUnlocked && !port)) {
-		return <Redirect href="/login" />;
+	console.log(port);
+	if (!port) {
+		if (!user || !isUnlocked) {
+			return <Redirect href="/login" />;
+		}
 	}
 
 	const isNormalScanner = parseInt(serverPort || "0", 10) >= 50000;

lstMobile/src/app/login.tsx

@@ -2,7 +2,7 @@ import axios from "axios";
 
 import { useRouter } from "expo-router";
 import { useState } from "react";
-import { Button, Text, View } from "react-native";
+import { Alert, Button, Text, View } from "react-native";
 import { Input } from "../components/ui/input";
 import { useAppStore } from "../hooks/useAppStore";
 import { useMobileAuthStore } from "../hooks/useMobileAuth";
@@ -38,6 +38,7 @@ export default function Login() {
 			}
 		} catch (error) {
 			console.log(error);
+			Alert.alert("Login Error", `Invalid pin please try again`);
 		}
 	};
 
@@ -70,7 +71,7 @@ export default function Login() {
 				</View>
 			</View>
 			<View>
-				<Text>
+				<Text className="p-3">
 					Warning: If you are logged into another scanner you will encounter
 					scan errors, please do not try to log into more than 1 scanner at a
 					time.

lstMobile/src/app/setup.tsx

@@ -25,6 +25,8 @@ export default function Setup() {
 
 	const server = useServerStore((s) => s.serverVersion);
 
+	// TODO: if on lst version and the user is manager or admin just login
+
 	const authCheck = () => {
 		if (pin === "6971") {
 			setAuth(true);

lstMobile/src/components/LSTScanner.tsx

@@ -7,6 +7,7 @@ import { useMobileAuthStore } from "../hooks/useMobileAuth";
 import { useScannerStore } from "../hooks/useScannerStore";
 import { scannerFeedback } from "../lib/feedbackScan";
 import { sendTcpMessage } from "../lib/tcpScan";
+import { versionCheck } from "../lib/versionValidation";
 import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
 import { ScannedLabelBox } from "./ScannedLabels";
 import { GlobalFooter } from "./UpdateFooter";
@@ -45,10 +46,15 @@ export default function LSTScanner() {
 				scan.data.toLowerCase().includes(cmd.toLowerCase()),
 			);
 
+			console.log(user?.excludedCommand);
+
 			if (isAlphaStart && isExcluded) {
 				Alert.alert(
-					`Command: ${scan.data} is not allowed to be used, please contact logistics if this is an error`,
+					"Command not allowed",
+					`Command: ${scan.data}\n\nPlease contact logistics if this is an error`,
 				);
+
+				return;
 			}
 
 			let commandToSend = `${STX}${user?.scannerId}@${scan.data}${ETX}`;
@@ -68,16 +74,24 @@ export default function LSTScanner() {
 			const scanned = (await sendTcpMessage(
 				commandToSend,
 				serverIp,
-				parseInt(serverPort || "0", 10),
+				50004,
 			)) as any;
+
 			// send the logs to lst but allow it to time out if it dose not exist just bc.
-			const logInfo = { ...scanned, user: user?.name };
 
 			try {
-				await axios.post(
-					`http://${serverIp.trim()}:3000/lst/api/mobile/logs`,
-					logInfo,
-				);
+				await axios.post(`http://${serverIp.trim()}:3000/lst/api/mobile/logs`, {
+					scannerId: user?.scannerId ?? "0",
+					message: scanned.data.message,
+					prompt: scanned.data.prompt,
+					commandDescription: scanned.data.commandDescription,
+					status: scanned.data.status,
+					lines: scanned.data.lines,
+					user: user?.name ?? "prodScan",
+					runningNumber: scan.data.startsWith("000")
+						? parseInt(scan.data.slice(10, -1) || "000", 10).toString()
+						: "0",
+				});
 			} catch (error) {
 				console.log(error);
 			}
@@ -90,7 +104,15 @@ export default function LSTScanner() {
 					vibrate: true,
 					led: true,
 				});
+
 				setBGColor("bg-green-500");
+
+				// version check
+				versionCheck();
+
+				// auth update
+				useMobileAuthStore.getState().updateLastScan();
+
 				setTimeout(() => {
 					setBGColor(null);
 				}, 1 * 1000);
@@ -117,7 +139,6 @@ export default function LSTScanner() {
 		},
 		[
 			serverIp,
-			serverPort,
 			setLastScan,
 			user?.scannerId,
 			user?.name,

lstMobile/src/components/ProdScanner.tsx

@@ -3,9 +3,11 @@ import { format } from "date-fns-tz";
 import { useCallback, useEffect, useState } from "react";
 import { Text, View } from "react-native";
 import { useAppStore } from "../hooks/useAppStore";
+import { useMobileAuthStore } from "../hooks/useMobileAuth";
 import { useScannerStore } from "../hooks/useScannerStore";
 import { scannerFeedback } from "../lib/feedbackScan";
 import { sendTcpMessage } from "../lib/tcpScan";
+import { versionCheck } from "../lib/versionValidation";
 import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
 import { ScannedLabelBox } from "./ScannedLabels";
 import { GlobalFooter } from "./UpdateFooter";
@@ -52,11 +54,16 @@ export default function ProdScanner() {
 				parseInt(serverPort || "0", 10),
 			)) as any;
 			// send the logs to lst but allow it to time out if it dose not exist just bc.
-
+			const data = {
+				...scanned.data,
+				runningNumber: scan.data.startsWith("000")
+					? parseInt(scan.data.slice(10, -1) || "000", 10).toString()
+					: "0",
+			};
 			try {
 				await axios.post(
 					`http://${serverIp.trim()}:3000/lst/api/mobile/logs`,
-					scanned,
+					data,
 				);
 			} catch (error) {
 				console.log(error);
@@ -71,6 +78,13 @@ export default function ProdScanner() {
 					led: true,
 				});
 				setBGColor("bg-green-500");
+
+				// version check
+				versionCheck();
+
+				// auth update
+				useMobileAuthStore.getState().updateLastScan();
+
 				setTimeout(() => {
 					setBGColor(null);
 				}, 1 * 1000);

lstMobile/src/hooks/useAppStartup.tsx

@@ -2,6 +2,7 @@ import axios from "axios";
 import Constants from "expo-constants";
 import { useEffect, useRef, useState } from "react";
 import { devDelay } from "../lib/devMode";
+import { versionCheck } from "../lib/versionValidation";
 import { useAppStore } from "./useAppStore";
 import { useServerStore } from "./useServerCheck";
 
@@ -24,7 +25,6 @@ export function useAppStartup() {
 	const hasHydrated = useAppStore((s) => s.hasHydrated);
 	const serverPort = useAppStore((s) => s.serverPort);
 	const serverIp = useAppStore((s) => s.serverIp);
-	const setServerVersion = useServerStore((s) => s.setServerVersion);
 
 	useEffect(() => {
 		if (!hasHydrated) {
@@ -62,29 +62,7 @@ export function useAppStartup() {
 					return;
 				}
 
-				const port =
-					parseInt(serverPort || "0", 10) >= 50000 ? "3000" : serverPort;
-
-				try {
-					const res = await axios.get(
-						`http://${serverIp}:${port}/lst/api/mobile/version`,
-						{ timeout: 5000 },
-					);
-
-					if (res.status === 200) {
-						setServerVersion(res.data);
-					}
-
-					const build = Constants.expoConfig?.android?.versionCode ?? 1;
-
-					if (build < res.data.minSupportedVersionCode) {
-						setStartupRoute("/updateScreen");
-						setReady(true);
-						return;
-					}
-				} catch (error) {
-					console.log("Version check error:", error);
-				}
+				await versionCheck();
 
 				setStatus("scannerMode");
 				await devDelay(1500);
@@ -123,7 +101,7 @@ export function useAppStartup() {
 		return () => {
 			cancelled = true;
 		};
-	}, [hasHydrated, serverIp, serverPort, setServerVersion]);
+	}, [hasHydrated, serverIp, serverPort]);
 
 	return {
 		ready,

lstMobile/src/hooks/useDeviceCheck.tsx

@@ -19,7 +19,11 @@ export default function useDeviceLock() {
 				nextAppState === "background" || nextAppState === "inactive";
 
 			if (wasActive && isNowInactive) {
-				useMobileAuthStore.getState().lock();
+				const auth = useMobileAuthStore.getState();
+
+				if (auth.shouldLockForIdle()) {
+					auth.lock();
+				}
 			}
 
 			appStateRef.current = nextAppState;

lstMobile/src/hooks/useMobileAuth.ts

@@ -1,5 +1,7 @@
 import { create } from "zustand";
 
+const ONE_HOUR = 1000 * 60 * 60;
+
 type MobileUser = {
 	id: string;
 	name: string;
@@ -11,19 +13,40 @@ type MobileUser = {
 type AuthState = {
 	user: MobileUser | null;
 	isUnlocked: boolean;
+	lastScanAt: number | null;
 
 	setUser: (user: MobileUser) => void;
+	updateLastScan: () => void;
 	lock: () => void;
 	logout: () => void;
+	shouldLockForIdle: () => boolean;
 };
 
-export const useMobileAuthStore = create<AuthState>((set) => ({
+export const useMobileAuthStore = create<AuthState>((set, get) => ({
 	user: null,
 	isUnlocked: false,
+	lastScanAt: null,
 
-	setUser: (user) => set({ user, isUnlocked: true }),
-
+	setUser: (user) =>
+		set({
+			user,
+			isUnlocked: true,
+			lastScanAt: Date.now(),
+		}),
+	updateLastScan: () => set({ lastScanAt: Date.now() }),
 	lock: () => set({ isUnlocked: false }),
 
-	logout: () => set({ user: null, isUnlocked: false }),
+	logout: () =>
+		set({
+			user: null,
+			isUnlocked: false,
+			lastScanAt: null,
+		}),
+	shouldLockForIdle: () => {
+		const lastScanAt = get().lastScanAt;
+
+		if (!lastScanAt) return true;
+
+		return Date.now() - lastScanAt > ONE_HOUR;
+	},
 }));

lstMobile/src/lib/versionValidation.ts

@@ -1,43 +1,73 @@
-
+import axios from "axios";
+import { useAppStore } from "../hooks/useAppStore";
+import { useServerStore } from "../hooks/useServerCheck";
 
 export type ServerVersionInfo = {
-  packageName: string;
-  versionName: string;
-  versionCode: number;
-  minSupportedVersionCode: number;
-  fileName: string;
+	packageName: string;
+	versionName: string;
+	versionCode: number;
+	minSupportedVersionCode: number;
+	fileName: string;
 };
 
 export type StartupStatus =
-  | { state: "checking" }
-  | { state: "needs-config" }
-  | { state: "offline" }
-  | { state: "blocked"; reason: string; server: ServerVersionInfo }
-  | { state: "warning"; message: string; server: ServerVersionInfo }
-  | { state: "ready"; server: ServerVersionInfo | null };
+	| { state: "checking" }
+	| { state: "needs-config" }
+	| { state: "offline" }
+	| { state: "blocked"; reason: string; server: ServerVersionInfo }
+	| { state: "warning"; message: string; server: ServerVersionInfo }
+	| { state: "ready"; server: ServerVersionInfo | null };
 
 export function evaluateVersion(
-  appBuildCode: number,
-  server: ServerVersionInfo
+	appBuildCode: number,
+	server: ServerVersionInfo,
 ): StartupStatus {
-  if (appBuildCode < server.minSupportedVersionCode) {
-    return {
-      state: "blocked",
-      reason: "This scanner app is too old and must be updated before use.",
-      server,
-    };
-  }
+	if (appBuildCode < server.minSupportedVersionCode) {
+		return {
+			state: "blocked",
+			reason: "This scanner app is too old and must be updated before use.",
+			server,
+		};
+	}
 
-  if (appBuildCode !== server.versionCode) {
-    return {
-      state: "warning",
-      message: `A newer version is available. Installed build: ${appBuildCode}, latest build: ${server.versionCode}.`,
-      server,
-    };
-  }
+	if (appBuildCode !== server.versionCode) {
+		return {
+			state: "warning",
+			message: `A newer version is available. Installed build: ${appBuildCode}, latest build: ${server.versionCode}.`,
+			server,
+		};
+	}
 
-  return {
-    state: "ready",
-    server,
-  };
-}
+	return {
+		state: "ready",
+		server,
+	};
+}
+
+export const versionCheck = async () => {
+	const { setServerVersion } = useServerStore.getState();
+	const { serverPort, serverIp } = useAppStore.getState();
+
+	const port = parseInt(serverPort || "0", 10) >= 50000 ? "3000" : serverPort;
+
+	try {
+		const res = await axios.get(
+			`http://${serverIp}:${port}/lst/api/mobile/version`,
+			{ timeout: 5000 },
+		);
+
+		if (res.status === 200) {
+			setServerVersion(res.data);
+		}
+
+		// const build = Constants.expoConfig?.android?.versionCode ?? 1;
+
+		// if (build < res.data.minSupportedVersionCode) {
+		// 	setStartupRoute("/updateScreen");
+		// 	setReady(true);
+		// 	return;
+		// }
+	} catch (error) {
+		console.log("Version check error:", error);
+	}
+};

migrations/0047_spotty_queen_noir.sql

@@ -0,0 +1 @@
+ALTER TABLE "scan_log" ADD COLUMN "running_number" text DEFAULT '0';

migrations/meta/_journal.json

@@ -330,6 +330,13 @@
       "when": 1778059910210,
       "tag": "0046_chemical_the_leader",
       "breakpoints": true
+    },
+    {
+      "idx": 47,
+      "version": "7",
+      "when": 1778068577325,
+      "tag": "0047_spotty_queen_noir",
+      "breakpoints": true
     }
   ]
 }