fix(project): 👽 Kideapp changes now better handled

Author: AleksiVirkkala

apps/web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "web",
-	"version": "4.7.0",
+	"version": "4.8.0",
 	"private": true,
 	"scripts": {
 		"dev": "concurrently pnpm:dev:*",
@@ -17,6 +17,8 @@
 		"build-storybook": "storybook build"
 	},
 	"devDependencies": {
+		"@babel/parser": "^7.26.3",
+		"@babel/types": "^7.26.3",
 		"@common/types": "workspace:*",
 		"@floating-ui/dom": "^1.2.8",
 		"@formkit/auto-animate": "1.0.0-beta.6",

apps/web/src/routes/+page.svelte

@@ -18,7 +18,7 @@
 		logs = [];
 		const bot = new KideAppBot({
 			token: $normalizedToken,
-			extraIdApiUrl: `/api/extraid`
+			extraIdApiUrl: `/api/extra-properties`
 		});
 		bot.setOnIsActiveChanged(isActive => (isRunning = isActive));
 		bot.setOnLog(log => (logs = [...logs, log]));

apps/web/src/routes/api/extra-properties/+server.ts

@@ -0,0 +1,7 @@
+import { getLatestExtraProperties } from 'kideappbot';
+import type { RequestHandler } from '../$types';
+
+export const GET: RequestHandler = async () => {
+	const extraProperties = await getLatestExtraProperties();
+	return new Response(JSON.stringify(extraProperties));
+};

apps/web/src/routes/api/extraid/+server.ts

@@ -7,7 +7,7 @@
 		"type": "git",
 		"url": "https://github.com/aleksivirkkala/kideappbot.git"
 	},
-	"version": "4.7.0",
+	"version": "4.8.0",
 	"scripts": {
 		"build": "turbo run build",
 		"dev": "dotenv -- turbo run dev --concurrency 16",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "kideappbot",
-	"version": "2.7.2",
+	"version": "2.8.0",
 	"private": true,
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -18,7 +18,8 @@
 	"author": "Aleksi Virkkala",
 	"license": "UNLICENSED",
 	"dependencies": {
-		"@aleksivirkkala/kideappbot-private": "1.0.0",
+		"@babel/parser": "^7.26.3",
+		"@babel/types": "^7.26.3",
 		"@common/constants": "workspace:*",
 		"@common/types": "workspace:*",
 		"@common/utils": "workspace:*",
@@ -29,16 +30,16 @@
 	},
 	"devDependencies": {
 		"@types/node": "^18.15.0",
-		"@vitest/coverage-c8": "^0.29.2",
+		"@vitest/coverage-c8": "^0.33.0",
 		"eslint-config-base": "workspace:*",
 		"module-alias": "^2.2.2",
-		"msw": "^1.2.0",
+		"msw": "^2.6.8",
 		"nodemon": "^2.0.21",
 		"tsconfig": "workspace:*",
 		"tsup": "^6.7.0",
 		"tsup-config-base": "workspace:*",
 		"typescript": "^5.0.4",
-		"vitest": "^0.29.8"
+		"vitest": "^2.1.8"
 	},
 	"type": "module"
 }

packages/bot-logic/package.json

@@ -6,7 +6,7 @@ import { LogMessage, LogType } from '@common/types';
 import jwtDecode, { InvalidTokenError } from 'jwt-decode';
 import { getTimeLeft, timeout } from '@common/utils';
 import { BotError, FatalBotError, NotImplementedError } from '@/utils/errorUtils';
-import { getLatestExtraID } from '@/utils/reverser';
+import { ExtraProperties, getLatestExtraProperties } from '@/utils/reverser';
 import {
 	Variant,
 	ReservationsPostResponse,
@@ -40,7 +40,10 @@ interface BotOptions {
 }
 
 export class KideAppBot {
-	protected extraId = LATEST_EXTRA_ID;
+	protected extraProperties: ExtraProperties = {
+		extraId: LATEST_EXTRA_ID,
+		xRequestedTokenKey: 'X-Requested-Token-a02'
+	};
 	protected _botIsActive = false;
 	protected silentLog = false;
 	protected startTime: number | null = null;
@@ -88,12 +91,16 @@ export class KideAppBot {
 				icon: '🆔',
 				title: 'Fetching extra ID...'
 			});
-			const latestExtraId = await getLatestExtraID(this.options.extraIdApiUrl);
-			this.extraId = latestExtraId;
+			this.extraProperties = await getLatestExtraProperties(this.options.extraIdApiUrl);
+			this.fullLog({
+				icon: '✅',
+				title: 'Received extra header key',
+				content: this.extraProperties.xRequestedTokenKey
+			});
 			this.fullLog({
 				icon: '✅',
 				title: 'Received extra ID',
-				content: latestExtraId
+				content: this.extraProperties.extraId
 			});
 		} catch (e) {
 			console.error(e);
@@ -104,8 +111,6 @@ export class KideAppBot {
 					content: e.message,
 					force: true
 				});
-				// As a backup return latest known extraID
-				this.extraId = LATEST_EXTRA_ID;
 			}
 		}
 	}
@@ -126,7 +131,10 @@ export class KideAppBot {
 			'Content-Type': 'application/json;charset=UTF-8',
 			accept: 'application/json, text/plain, */*',
 			authorization: 'Bearer ' + token,
-			'X-Requested-Token-c69': calculateXRequestedId(inventoryId, this.extraId)
+			[this.extraProperties.xRequestedTokenKey]: calculateXRequestedId(
+				inventoryId,
+				this.extraProperties.extraId
+			)
 		};
 
 		return await axios.post<ReservationsPostResponse>(API_RESERVATION_ENDPOINT, body, { headers });

packages/bot-logic/src/bot.ts

@@ -1,4 +1,4 @@
 // Bot to be used in the app
 export { KideAppBot as default } from './bot';
 
-export { getLatestExtraID } from './utils/reverser';
+export { getLatestExtraProperties, type ExtraProperties } from './utils/reverser';