1 files changed, 35 insertions, 3 deletions
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 28a219e1..b981a4d4 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -21,11 +21,22 @@ export function scroll(section: any) {
 
 const base = browser ? "" : PUBLIC_COINOS_URL;
 
+let getIp: (() => string | undefined) | undefined;
+
+export const setIpGetter = (fn: () => string | undefined) => {
+	getIp = fn;
+};
+
+const ipHeaders = (): Record<string, string> => {
+	const ip = getIp?.();
+	return ip ? { "cf-connecting-ip": ip } : {};
+};
+
 export const punk = (k: string) =>
 	`${Math.floor((parseInt(k.slice(-2), 16) / 256) * 64) + 1}.webp`;
 
 export const g = (url: string, fetch: any, headers: object) =>
-	fetch(base + url, { headers })
+	fetch(base + url, { headers: { ...ipHeaders(), ...headers } })
 		.then((r: Response) => r.text())
 		.then((body: string) => {
 			try {
@@ -36,7 +47,7 @@ export const g = (url: string, fetch: any, headers: object) =>
 		});
 
 export const get = (url: string, headers = {}) => {
-	return fetch(base + url, { headers })
+	return fetch(base + url, { headers: { ...ipHeaders(), ...headers } })
 		.then(async (r) => {
 			if (r.ok) return r.text();
 			throw new Error(await r.text());
@@ -58,6 +69,7 @@ export const post = async (
 	headers = {
 		"content-type": "application/json",
 		accept: "application/json",
+		...ipHeaders(),
 		...headers,
 	};
 
@@ -148,7 +160,13 @@ export const info = (m: string) => {
 };
 
 export const login = async (
-	user: { username: string; password: string },
+	user: {
+		username: string;
+		password: string;
+		token?: string;
+		challenge?: string;
+		recaptcha?: string;
+	},
 	cookies,
 	ip: string,
 ) => {
@@ -193,6 +211,20 @@ export const auth = (cookies) => ({
 	authorization: `Bearer ${cookies.get("token")}`,
 });
 
+export const isInvalidTokenError = (e: unknown) => {
+	const message = (e as Error)?.message || "";
+	if (!message) return false;
+	const normalized = message.toLowerCase();
+	return (
+		normalized.includes("jwt") ||
+		normalized.includes("invalid token") ||
+		normalized.includes("token expired") ||
+		normalized.includes("expired token") ||
+		normalized.includes("unauthorized") ||
+		normalized.includes("not authorized")
+	);
+};
+
 export const btc = (fiat: number, rate: number): number =>
 	Math.round((fiat * sats) / rate);