+
+
Slots
- Filenames must follow the taobin_adv_*.mp4 convention
+ Choose a video per slot — it's renamed to the slot's fixed name on upload.
-
-
-
-
-
- {#if pushingToMachine}
-
-
0 ? (pushProgress.current / pushProgress.total) * 100 : 0}
- max={100}
- class="h-2"
- />
-
-
+
+ {#if onServerCount > 0}
+
+
+ {/if}
- {/if}
-
- {#if uploading}
-
-
0
- ? (uploadProgress.current / uploadProgress.total) * 100
- : 0}
- max={100}
- class="h-2"
- />
-
- Uploading: {uploadProgress.current} / {uploadProgress.total}
-
-
- {/if}
+
+ {#each slots as slot (slot.index)}
+
+
+
+ {String(slot.index).padStart(2, '0')}
+
-
- {#if generatingManifest}
-
-
- {/if}
-
-
- {#if files.length > 0}
-
-
-
- Selected Files ({files.length})
-
- {#if files.some((f) => f.status === 'success')}
-
- {files.filter((f) => f.status === 'success').length} uploaded
-
- {/if}
- {#if files.some((f) => f.status === 'error')}
-
- {files.filter((f) => f.status === 'error').length} invalid/failed
-
+
+
+ {#if slot.preview}
+
+
+ {#if slot.status === 'uploading'}
+
+
+ {:else if slot.status === 'success'}
+
+
+ {/if}
+ {:else if thumbUrls[slot.name]}
+
+
+
+ Replace
+
+
+ {:else}
+
+ Loading…
+ {:else}
+ Choose
+ {/if}
+
{/if}
-
-
-
-
- {#each files as item (item.id)}
-
-
-
-
-
- {#if item.status === 'uploading'}
-
-
- {:else if item.status === 'success'}
-
-
- {/if}
-
-
- {#if item.status !== 'uploading'}
-
removeFile(item.id)}
- disabled={uploading}
- >
-
- {/if}
-
-
-
-
-
- {item.file.name}
-
-
-
- {item.category === 'menu' ? 'Menu banner' : 'Fullscreen'}
+
+
+
+ {slot.name}
+
+ {#if slot.file}
+
+ {#if !slot.dimChecked}
+ Reading…
+ {:else if slot.dimOk}
+
+ {slot.width}×{slot.height}
+
+ {:else}
+
+ {slot.width ?? '?'}×{slot.height ?? '?'} · exp {MENU_SPEC.width}×{MENU_SPEC.height}
- {#if !item.dimChecked}
- Reading…
- {:else if item.dimOk}
-
- {item.width}×{item.height}
-
- {:else}
-
- {item.width ?? '?'}×{item.height ?? '?'}
-
- {/if}
-
- {(item.file.size / (1024 * 1024)).toFixed(1)} MB
-
-
-
- Expected {item.expectedWidth}×{item.expectedHeight}
-
- {#if item.error}
-
- {item.error}
-
{/if}
+
{formatBytes(slot.file.size)}
- {/each}
+ {#if slot.error}
+
+ {slot.error}
+
+ {/if}
+ {:else}
+
Empty · no file selected
+ {/if}
+
+
+ {#if serverFilesByName[slot.name] !== undefined}
+
+
+
+ viewCurrent(slot.name)}
+ disabled={loadingVideoName === slot.name}
+ >
+ {#if loadingVideoName === slot.name}
+
+
+ {/if}
+
+
+
+
+ {#if slot.file}
+ uploadSlot(slot.index)}
+ disabled={anyBusy || slot.status === 'uploading'}
+ >
+ {#if slot.status === 'uploading'}
+
+ {#if slot.status !== 'uploading'}
+ clearSlot(slot.index)}
+ aria-label="Remove"
+ >
+
+ {/if}
+ {/if}
+
-
-
- {/if}
+ {/each}
+
+
+
+
Videos on server
+
+ Currently on the FTP folder for {selectedCountry} — loaded
+ automatically to verify.
+
+
+
+ {#if loadingServerVideos}
+
+
+
+
Click "Load videos" to preview what's on the server.
+
No videos found on the server.
+ {:else}
+
+ {#each serverVideos as video (video.name)}
+
+
+ {#if videoBlobUrls[video.name]}
+
+
+ {:else}
+
playServerVideo(video.name)}
+ disabled={loadingVideoName === video.name}
+ >
+ {#if loadingVideoName === video.name}
+
+ {/if}
+
+
+ {video.name}
+ {formatBytes(video.size)}
+
+
+ {/each}
+
+
+
+ {#if viewingName}
+
+
+
(viewingName = null)}
+ >
+
+
+
e.stopPropagation()}
+ >
+
+ {viewingName}
+ (viewingName = null)}
+ aria-label="Close"
+ >
+
+
+
+ {#if videoBlobUrls[viewingName]}
+
+
+
+
+ {/if}
+
+
diff --git a/src/routes/(authed)/tools/brew/+page.svelte b/src/routes/(authed)/tools/brew/+page.svelte
index dd6e0b1..3e4601f 100644
--- a/src/routes/(authed)/tools/brew/+page.svelte
+++ b/src/routes/(authed)/tools/brew/+page.svelte
@@ -32,7 +32,13 @@
import { deviceCredentialManager } from '$lib/core/adb/deviceCredManager';
import { afterNavigate, goto } from '$app/navigation';
import { env } from '$env/dynamic/public';
- import { adbWriter, isAdbWriterAvailable, sendToAndroid } from '$lib/core/stores/adbWriter';
+ import {
+ adbWriter,
+ isAdbWriterAlive,
+ wasAndroidSocketEverAlive,
+ sendToAndroid
+ } from '$lib/core/stores/adbWriter';
+ import { adbReconnect } from '$lib/core/stores/adbReconnectStore';
import { AdbInstance } from '../../../state.svelte';
import {
setOnMenuSavedCallback,
@@ -68,7 +74,7 @@
let recipeLoading = $state(false);
let recipeAutoLoadAttempted = $state(false);
let isAdbConnected = $derived(Boolean(AdbInstance.instance));
- let isAndroidSocketConnected = $derived(Boolean($adbWriter));
+ let isAndroidSocketConnected = $derived(isAdbWriterAlive());
let isRecipeLoaded = $derived(Boolean(devRecipe));
// clear out event
@@ -121,6 +127,7 @@
try {
addNotification('WARN:Load recipe from app memories ...');
+ logger.info('sending request get recipe');
sendToAndroid({
type: 'get_recipe',
payload: {}
@@ -207,7 +214,7 @@
async function connectAdb() {
try {
if (adb.getAdbInstance()) {
- if (!isAdbWriterAvailable()) {
+ if (!isAdbWriterAlive()) {
await adb.reconnectAndroidServer();
}
await loadBrewDataFromConnectedAdb();
@@ -225,7 +232,14 @@
await loadBrewDataFromConnectedAdb();
}
} catch (e: any) {
- addNotification(`ERROR:${e}`);
+ // addNotification(`ERROR:${e}`);
+ GlobalEventBus.emit('announce', {
+ title: 'Device is busy',
+ subtitle: 'Expect `adb` or some related program has been using the device.',
+ message: 'Help: kill the process & try again',
+ buttonText: 'Ok',
+ type: 'error'
+ });
}
}
@@ -239,7 +253,7 @@
async function tryAutoConnect() {
try {
if (adb.getAdbInstance()) {
- if (!isAdbWriterAvailable()) {
+ if (!isAdbWriterAlive()) {
await adb.reconnectAndroidServer();
}
return true;
@@ -272,7 +286,7 @@
}
if (e instanceof AdbDaemonWebUsbDevice.DeviceBusyError) {
addNotification(
- 'ERR:Device is already in use by another program, please close the program and try again'
+ 'ERR:Device is already in use by another program, check if machine has been installed `adb`, kill the process and try again.'
);
}
@@ -334,7 +348,8 @@
}
async function ensureAndroidSocket() {
- if (isAdbWriterAvailable()) return true;
+ // Use the liveness check, not just "is object in store"
+ if (isAdbWriterAlive()) return true;
if (!adb.getAdbInstance()) {
addNotification('ERR:ADB is not connected');
@@ -343,7 +358,7 @@
await adb.reconnectAndroidServer();
- if (!isAdbWriterAvailable()) {
+ if (!isAdbWriterAlive()) {
addNotification('ERR:Android socket is not connected');
return false;
}
@@ -353,7 +368,9 @@
afterNavigate(async () => {
logger.info('after navigate brew');
- await startFetchRecipeFromMachine();
+ // Data loading is handled by the $effect below — no need to
+ // duplicate it here. This hook is kept for future navigation-
+ // specific side effects only.
});
function getMenuStatus(ms: number): RecipeOverview['status'] {
@@ -832,69 +849,45 @@
onDestroy(() => {
unsubRecipeEvent();
clearOnMenuSavedCallback();
+ void adb.goToMachineHome();
});
$effect(() => {
if (!isAdbConnected) {
- recipeAutoLoadAttempted = false;
+ // Don't reset recipeAutoLoadAttempted here — that causes
+ // duplicate loads on back-and-forth navigation.
return;
}
if (isRecipeLoaded || recipeLoading || recipeAutoLoadAttempted) return;
recipeAutoLoadAttempted = true;
- void loadBrewDataFromConnectedAdb();
- });
- $effect(() => {
- const brewAppStatusInterval = setInterval(async () => {
- // schedule status from .brew_web_status.log
- let inst = adb.getAdbInstance();
- if (inst && devRecipe && !recipeLoading) {
- await adb.executeCmd(
- 'tail -n 1 /sdcard/coffeevending/.brew_web_status.log > /sdcard/coffeevending/.brew_web_status.latest.log'
- );
-
- const latestStatusPath = env.PUBLIC_BREW_WEB_LATEST_STATUS;
- if (!latestStatusPath) return;
-
- let brew_status_log = await adb.pull(latestStatusPath);
- if (brew_status_log) {
- let latest_log = brew_status_log;
-
- if (brew_status !== latest_log) {
- brew_status = latest_log;
-
- // noti from machine
- if (latest_log.includes('!!!')) {
- let log = latest_log.split('!!!');
- let noti_cfg = log[1];
-
- if (noti_cfg.includes('=')) {
- let noti_level = noti_cfg.split('=')[1];
-
- let spl = log[0].split(':');
- let pure_msg = spl[spl.length - 1];
-
- // case special message
- if (pure_msg.includes('starting retry process')) {
- // is waiting/idle process
- pure_msg = 'Wait for brewing';
- }
-
- addNotification(`${noti_level}:${pure_msg}`);
- }
- }
+ void (async () => {
+ if (!isAdbWriterAlive()) {
+ // Writer is null or stale. Decide what to do:
+ if (wasAndroidSocketEverAlive()) {
+ // Socket was alive before and died → show reconnect
+ // banner. isAdbWriterAlive() already triggered it
+ // if the writer was stale.
+ adbReconnect.requestReconnect('Android socket disconnected');
+ return;
+ }
+ // First visit — auto-connect the Android server.
+ if (adb.getAdbInstance()) {
+ try {
+ await adb.reconnectAndroidServer();
+ } catch {
+ // Connection failed — user can retry manually.
}
}
- } else if (inst && !devRecipe) {
- // try again
- // await startFetchRecipeFromMachine();
+ // Re-check after connect attempt
+ if (!isAdbWriterAlive()) {
+ return;
+ }
}
- }, 1000);
- return () => {
- clearInterval(brewAppStatusInterval);
- };
+ await loadBrewDataFromConnectedAdb();
+ })();
});
diff --git a/src/routes/(authed)/tools/create-menu/+page.svelte b/src/routes/(authed)/tools/create-menu/+page.svelte
index 994c294..f1b1b84 100644
--- a/src/routes/(authed)/tools/create-menu/+page.svelte
+++ b/src/routes/(authed)/tools/create-menu/+page.svelte
@@ -14,7 +14,7 @@
import { addNotification } from '$lib/core/stores/noti';
import { referenceFromPage } from '$lib/core/stores/recipeStore';
import { env } from '$env/dynamic/public';
- import { adbWriter, isAdbWriterAvailable } from '$lib/core/stores/adbWriter';
+ import { adbWriter, isAdbWriterAlive, wasAndroidSocketEverAlive } from '$lib/core/stores/adbWriter';
import { AdbInstance } from '../../../state.svelte';
import {
categoryOptions,
@@ -36,12 +36,15 @@
clearOnMenuSavedCallback,
clearMenuSaveState
} from '$lib/core/stores/menuSaveStore';
+ import { MenuStatus } from '$lib/core/types/menuStatus';
const sourceDir = '/sdcard/coffeevending';
const stagedMenuStorageKey = 'brew.create-menu.drafts.v1';
const deletedStagedMenuStorageKey = `${stagedMenuStorageKey}.deleted`;
const stagedMenuAndroidPath = `${sourceDir}/cfg/supra_draft_menus.json`;
const saveResponseTimeoutMs = 60000;
+ const recipeStepTargetCount = 30;
+ const toppingSetTargetCount = 13;
// Recipe data from Android
let devRecipe: any | undefined = $state();
@@ -51,11 +54,14 @@
// Country detection from Android
let detectedCountry = $state
('');
let countryLoading = $state(false);
- const detectedCountryCode = $derived(countryCodeMap[detectedCountry] || countryCodeMap[detectedCountry.toUpperCase()] || '');
+ const detectedCountryCode = $derived(
+ countryCodeMap[detectedCountry] || countryCodeMap[detectedCountry.toUpperCase()] || ''
+ );
+ const primaryLanguageLabel = $derived(getPrimaryLanguageLabel(detectedCountry));
// ADB connection state
let isAdbConnected = $derived(Boolean(AdbInstance.instance));
- let isAndroidSocketConnected = $derived(Boolean($adbWriter));
+ let isAndroidSocketConnected = $derived(isAdbWriterAlive());
let isRecipeLoaded = $derived(Boolean(devRecipe));
// Setup popup state
@@ -83,6 +89,14 @@
let createMenuSaving = $state(false);
let editingDraftProductCode: string | null = $state(null);
let activeTabIndex = $state(0);
+ let materialPickerOpen = $state(false);
+ let materialPickerStepIndex: number | null = $state(null);
+ let materialPickerSearch = $state('');
+ type ToppingPickerType = 'slot' | 'group' | 'list';
+ let toppingPickerOpen = $state(false);
+ let toppingPickerType: ToppingPickerType = $state('slot');
+ let toppingPickerOptionIndex: number | null = $state(null);
+ let toppingPickerSearch = $state('');
// Per-temp form data
type TempFormData = {
@@ -92,8 +106,6 @@
otherName: string;
description: string;
otherDescription: string;
- cashPrice: string;
- nonCashPrice: string;
image: string;
isUse: boolean;
recipeSteps: any[];
@@ -123,6 +135,8 @@
)
.sort((left: any, right: any) => Number(left?.id ?? 0) - Number(right?.id ?? 0))
);
+ let groupedMaterialOptions = $derived(getGroupedMaterialOptions());
+ let toppingPickerOptions = $derived(getToppingPickerOptions());
let activeToppingSlotMaterials = $derived(
(devRecipe?.MaterialSetting ?? [])
@@ -165,6 +179,58 @@
};
}
+ function createPlaceholderRecipeStep() {
+ return {
+ MixOrder: 0,
+ StringParam: '',
+ FeedParameter: 0,
+ FeedPattern: 0,
+ isUse: false,
+ materialPathId: 0,
+ powderGram: 0,
+ powderTime: 0,
+ stirTime: 0,
+ syrupGram: 0,
+ syrupTime: 0,
+ waterCold: 0,
+ waterYield: 0
+ };
+ }
+
+ function getPrimaryLanguageLabel(country: string) {
+ const normalized = country.trim().toUpperCase();
+ const languageByCountry: Record = {
+ THAI: 'Thai',
+ THA: 'Thai',
+ MYS: 'Malay',
+ IDR: 'Indonesian',
+ AUS: 'English',
+ SGP: 'English',
+ SG: 'English',
+ UAE_DUBAI: 'Arabic',
+ DUBAI: 'Arabic',
+ HKG: 'Chinese',
+ GBR: 'English',
+ ROU: 'Romanian',
+ LVA: 'Latvian',
+ EST: 'Estonian',
+ LTU: 'Lithuanian',
+ USA_PEPSI: 'English'
+ };
+
+ return languageByCountry[normalized] ?? (normalized ? normalized : 'Local');
+ }
+
+ function getPrimaryNamePlaceholder() {
+ return primaryLanguageLabel === 'Thai' ? 'ชื่อเมนู' : `Menu name in ${primaryLanguageLabel}`;
+ }
+
+ function getPrimaryDescriptionPlaceholder() {
+ return primaryLanguageLabel === 'Thai'
+ ? 'คำอธิบายเมนู'
+ : `Menu description in ${primaryLanguageLabel}`;
+ }
+
function createEmptyToppingOption(slot: number | null = null) {
return {
slot,
@@ -218,6 +284,77 @@
return `${material.id} - ${material.materialName || material.materialOtherName || 'Unknown'}`;
}
+ function getMaterialCategory(material: any) {
+ if (material?.BeanChannel) return 'Bean';
+ if (material?.PowderChannel) return 'Powder';
+ if (material?.SyrupChannel) return 'Syrup';
+ if (material?.FreshSyrupChannel) return 'Fresh Syrup';
+ if (material?.FrozenFruitChannel) return 'Frozen Fruit';
+ if (material?.LeavesChannel) return 'Leaves';
+ if (material?.SodaChannel) return 'Soda';
+ if (material?.ItemChannel) return 'Item';
+ if (material?.IsEquipment) return 'Equipment';
+ return material?.CanisterType || material?.pathOtherName || 'Other';
+ }
+
+ function getGroupedMaterialOptions() {
+ const search = materialPickerSearch.trim().toLowerCase();
+ const groups = new Map();
+ const categoryOrder = [
+ 'Bean',
+ 'Powder',
+ 'Syrup',
+ 'Fresh Syrup',
+ 'Frozen Fruit',
+ 'Leaves',
+ 'Soda',
+ 'Item',
+ 'Equipment',
+ 'Other'
+ ];
+
+ for (const material of activeMaterials) {
+ const text =
+ `${material.id} ${material.materialName ?? ''} ${material.materialOtherName ?? ''} ${material.pathOtherName ?? ''} ${material.CanisterType ?? ''}`.toLowerCase();
+ if (search && !text.includes(search)) continue;
+
+ const category = getMaterialCategory(material);
+ groups.set(category, [...(groups.get(category) ?? []), material]);
+ }
+
+ return [...groups.entries()]
+ .sort(([left], [right]) => {
+ const leftIndex = categoryOrder.indexOf(left);
+ const rightIndex = categoryOrder.indexOf(right);
+ return (
+ (leftIndex === -1 ? categoryOrder.length : leftIndex) -
+ (rightIndex === -1 ? categoryOrder.length : rightIndex) || left.localeCompare(right)
+ );
+ })
+ .map(([category, materials]) => ({ category, materials }));
+ }
+
+ function getSelectedMaterialName(materialPathId: number | null) {
+ if (materialPathId == null || Number(materialPathId) <= 0) return 'Select material';
+ const material = activeMaterials.find(
+ (item: any) => Number(item.id) === Number(materialPathId)
+ );
+ return material ? materialDisplayName(material) : `${materialPathId} - Unknown material`;
+ }
+
+ function openMaterialPicker(stepIndex: number) {
+ materialPickerStepIndex = stepIndex;
+ materialPickerSearch = '';
+ materialPickerOpen = true;
+ }
+
+ function selectMaterialForActiveStep(materialPathId: number) {
+ if (materialPickerStepIndex == null) return;
+ updateRecipeStepNumber(materialPickerStepIndex, 'materialPathId', String(materialPathId));
+ materialPickerOpen = false;
+ materialPickerStepIndex = null;
+ }
+
function toppingSlotDisplayName(material: any) {
const slot = Number(material?.id) - 8110;
const slotName = material?.materialOtherName || material?.materialName;
@@ -235,6 +372,94 @@
return `${topping?.id ?? '-'} - ${toppingName || 'Unnamed topping'}`;
}
+ function getSelectedToppingSlotName(slot: number | null) {
+ if (slot == null || !Number.isFinite(Number(slot))) return 'Select slot';
+ const material = activeToppingSlotMaterials.find(
+ (item: any) => Number(item.id) - 8110 === Number(slot)
+ );
+ return material ? toppingSlotDisplayName(material) : `Slot ${slot}`;
+ }
+
+ function getSelectedToppingGroupName(groupID: number | null) {
+ if (groupID == null || !Number.isFinite(Number(groupID))) return 'Select group';
+ const group = activeToppingGroups.find((item: any) => Number(item.groupID) === Number(groupID));
+ return group ? toppingGroupDisplayName(group) : `Group ${groupID}`;
+ }
+
+ function getSelectedToppingListName(toppingID: number | null) {
+ if (toppingID == null || !Number.isFinite(Number(toppingID))) return 'Select topping';
+ const topping = activeToppingLists.find((item: any) => Number(item.id) === Number(toppingID));
+ return topping ? toppingListDisplayName(topping) : `Topping ${toppingID}`;
+ }
+
+ function openToppingPicker(type: ToppingPickerType, optionIndex: number) {
+ toppingPickerType = type;
+ toppingPickerOptionIndex = optionIndex;
+ toppingPickerSearch = '';
+ toppingPickerOpen = true;
+ }
+
+ function getToppingPickerTitle() {
+ if (toppingPickerType === 'slot') return 'Select Topping Slot';
+ if (toppingPickerType === 'group') return 'Select Topping Group';
+ return 'Select Default Topping';
+ }
+
+ function getToppingPickerDescription() {
+ if (toppingPickerType === 'slot') return 'Choose the physical topping slot for this menu.';
+ if (toppingPickerType === 'group') return 'Choose the topping group shown to the customer.';
+ return 'Choose the default selected topping from the selected group.';
+ }
+
+ function getActiveToppingPickerOption() {
+ if (toppingPickerOptionIndex == null) return undefined;
+ return activeForm?.toppingOptions?.[toppingPickerOptionIndex];
+ }
+
+ function getToppingPickerOptions() {
+ const search = toppingPickerSearch.trim().toLowerCase();
+ const currentOption = getActiveToppingPickerOption();
+ const options =
+ toppingPickerType === 'slot'
+ ? activeToppingSlotMaterials.map((material: any) => ({
+ value: Number(material.id) - 8110,
+ label: toppingSlotDisplayName(material),
+ description: material.pathOtherName || material.CanisterType || 'Topping material slot'
+ }))
+ : toppingPickerType === 'group'
+ ? activeToppingGroups.map((group: any) => ({
+ value: Number(group.groupID),
+ label: toppingGroupDisplayName(group),
+ description: `${getToppingListsForGroup(Number(group.groupID)).length} toppings`
+ }))
+ : getToppingListsForGroup(currentOption?.groupID ?? null).map((topping: any) => ({
+ value: Number(topping.id),
+ label: toppingListDisplayName(topping),
+ description:
+ topping?.description || topping?.otherDescription || 'Default topping option'
+ }));
+
+ return options.filter((option: any) => {
+ if (!search) return true;
+ return `${option.value} ${option.label} ${option.description}`.toLowerCase().includes(search);
+ });
+ }
+
+ function selectToppingPickerOption(value: number) {
+ if (toppingPickerOptionIndex == null) return;
+
+ if (toppingPickerType === 'slot') {
+ updateToppingSlot(toppingPickerOptionIndex, String(value));
+ } else if (toppingPickerType === 'group') {
+ updateToppingGroup(toppingPickerOptionIndex, String(value));
+ } else {
+ updateToppingList(toppingPickerOptionIndex, String(value));
+ }
+
+ toppingPickerOpen = false;
+ toppingPickerOptionIndex = null;
+ }
+
function normalizeToppingListIDs(value: any) {
if (Array.isArray(value)) {
return value.map(Number).filter((id: number) => Number.isFinite(id) && id > 0);
@@ -298,16 +523,40 @@
try {
const connected = await adb.ensureAdbConnection();
if (connected) {
- if (!isAdbWriterAvailable()) {
+ if (!isAdbWriterAlive()) {
await adb.reconnectAndroidRecipeMenuServer();
}
await loadRecipeFromMachine();
+ return;
+ }
+
+ if (!('usb' in navigator)) {
+ throw new Error('WebUSB not supported');
+ }
+
+ await adb.connectRecipeMenuViaWebUSB();
+ if (adb.getAdbInstance()) {
+ await loadRecipeFromMachine();
}
} catch (e: any) {
addNotification(`ERROR:${e}`);
}
}
+ async function reconnectAndroidSocket() {
+ try {
+ await adb.reconnectAndroidRecipeMenuServer();
+ if (isAdbWriterAlive()) {
+ addNotification('INFO:Android socket connected');
+ } else {
+ addNotification('WARN:Android socket not connected');
+ }
+ } catch (error) {
+ console.error('failed to reconnect android socket', error);
+ addNotification('WARN:Android socket not connected');
+ }
+ }
+
async function loadRecipeFromMachine() {
if (recipeLoading) return;
@@ -357,7 +606,12 @@
// No country file means Thailand
detectedCountry = 'THAI';
}
- logger.info('[CreateMenu] Detected country:', detectedCountry, '-> prefix:', detectedCountryCode);
+ logger.info(
+ '[CreateMenu] Detected country:',
+ detectedCountry,
+ '-> prefix:',
+ detectedCountryCode
+ );
} catch (error) {
// Error reading file means Thailand (default)
detectedCountry = 'THAI';
@@ -368,11 +622,11 @@
}
async function ensureAndroidSocket(): Promise {
- if (isAdbWriterAvailable()) return true;
+ if (isAdbWriterAlive()) return true;
try {
await adb.reconnectAndroidRecipeMenuServer();
- if (isAdbWriterAvailable()) return true;
+ if (isAdbWriterAlive()) return true;
} catch {}
addNotification('WARN:Android socket not connected');
@@ -548,8 +802,6 @@
otherName: '',
description: '',
otherDescription: '',
- cashPrice: '0',
- nonCashPrice: '0',
image: '',
isUse: false,
recipeSteps: [createEmptyRecipeStep()],
@@ -735,6 +987,15 @@
).length;
}
+ function ensureRecipePlaceholders(recipes: any[]) {
+ return [
+ ...recipes,
+ ...Array.from({ length: Math.max(0, recipeStepTargetCount - recipes.length) }, () =>
+ createPlaceholderRecipeStep()
+ )
+ ];
+ }
+
function persistStagedMenus() {
localStorage.setItem(stagedMenuStorageKey, JSON.stringify(stagedMenus));
void persistStagedMenusToAndroid();
@@ -744,8 +1005,9 @@
if (!adb.getAdbInstance()) return;
try {
+ const tempPath = `${stagedMenuAndroidPath}.tmp`;
await adb.push(
- stagedMenuAndroidPath,
+ tempPath,
JSON.stringify(
{
version: 1,
@@ -756,6 +1018,8 @@
2
)
);
+ const result = await adb.executeCmd(`mv ${tempPath} ${stagedMenuAndroidPath}`);
+ if (result?.error) throw new Error(String(result.error));
} catch (error) {
logger.error('failed to persist staged menus to Android', error);
addNotification('WARN:Failed to save draft menus to Android');
@@ -804,21 +1068,21 @@
}
function buildMenuFromForm(form: TempFormData) {
- const toppingSet = form.toppingOptions
- .filter((opt) => opt.slot != null && opt.groupID != null)
- .map((opt) => {
- const group = activeToppingGroups.find((g: any) => Number(g.groupID) === opt.groupID);
- const listGroupIDs = getToppingGroupListIDs(group);
- return {
- ListGroupID: listGroupIDs.length > 0 ? listGroupIDs : [0, 0, 0, 0],
- defaultIDSelect: opt.defaultIDSelect ?? 0,
- groupID: String(opt.groupID),
- isUse: true
- };
- });
+ const toppingSet = Array.from({ length: toppingSetTargetCount }, () => createEmptyToppingSet());
+ for (const opt of form.toppingOptions) {
+ if (opt.slot == null || opt.groupID == null) continue;
- while (toppingSet.length < 4) {
- toppingSet.push(createEmptyToppingSet());
+ const index = opt.slot - 1;
+ if (index < 0 || index >= toppingSet.length) continue;
+
+ const group = activeToppingGroups.find((g: any) => Number(g.groupID) === opt.groupID);
+ const listGroupIDs = getToppingGroupListIDs(group);
+ toppingSet[index] = {
+ ListGroupID: listGroupIDs.length > 0 ? listGroupIDs : [0, 0, 0, 0],
+ defaultIDSelect: opt.defaultIDSelect ?? 0,
+ groupID: String(opt.groupID),
+ isUse: true
+ };
}
const recipeSteps = form.recipeSteps.filter(hasValidMaterialPathId).map((step) => ({
@@ -833,16 +1097,17 @@
}
}
}
+ const recipes = ensureRecipePlaceholders(recipeSteps);
return {
Description: form.description,
ExtendID: 0,
OnTOP: false,
LastChange: formatAndroidRecipeDate(),
- MenuStatus: 0,
+ MenuStatus: MenuStatus.drafted,
StringParam: ',filter-enable=no,',
TextForWarningBeforePay: Array(8).fill('stg_warning=Invisible,img_warning=none'),
- cashPrice: Number(form.cashPrice) || 0,
+ cashPrice: 0,
changerecipe: '',
EncoderCount: 0,
id: 0,
@@ -850,9 +1115,9 @@
productCode: form.productCode,
name: form.name,
otherName: form.otherName,
- nonCashPrice: Number(form.nonCashPrice) || 0,
+ nonCashPrice: 0,
otherDescription: form.otherDescription,
- recipes: recipeSteps,
+ recipes,
ToppingSet: toppingSet,
SubMenu: [],
total_time: -1,
@@ -863,6 +1128,14 @@
};
}
+ function buildPendingOnlineMenu(menu: any) {
+ return {
+ ...menu,
+ MenuStatus: MenuStatus.pendingOnline,
+ recipes: ensureRecipePlaceholders(menu?.recipes ?? [])
+ };
+ }
+
async function createMenuDraft() {
if (tempForms.length === 0) {
addNotification('ERR:No forms to save');
@@ -908,11 +1181,6 @@
async function saveStagedMenuToAndroid(menu: any) {
if (!(await ensureAndroidSocket())) return;
- if (getActiveRecipeStepCount(menu) === 0) {
- setMenuSaveError(menu.productCode, 'Select at least one material before saving');
- addNotification(`ERR:Select at least one material before saving: ${menu.productCode}`);
- return;
- }
setMenuSaving(menu.productCode);
@@ -920,7 +1188,7 @@
type: 'save_recipe_menu_file',
payload: {
time: new Date().toLocaleTimeString(),
- data: menu
+ data: buildPendingOnlineMenu(menu)
}
});
if (!sent) {
@@ -954,18 +1222,6 @@
addNotification('WARN:No draft menus ready to save');
return;
}
- const invalidMenus = menus.filter((menu) => getActiveRecipeStepCount(menu) === 0);
- if (invalidMenus.length > 0) {
- for (const menu of invalidMenus) {
- setMenuSaveError(menu.productCode, 'Select at least one material before saving');
- }
- addNotification(
- `ERR:Select at least one material before saving: ${invalidMenus
- .map((menu) => menu.productCode)
- .join(', ')}`
- );
- return;
- }
logger.info(
'[Create Menu] save all draft menus',
menus.map((menu) => menu.productCode)
@@ -979,7 +1235,7 @@
type: 'save_recipe_menu_file_batch',
payload: {
time: new Date().toLocaleTimeString(),
- data: menus
+ data: menus.map(buildPendingOnlineMenu)
}
});
if (!sent) {
@@ -1126,8 +1382,9 @@
const toppingOptionsFromMenu = (m: any) => {
return (m.ToppingSet ?? [])
- .filter((ts: any) => ts.isUse && Number(ts.groupID) > 0)
- .map((ts: any, index: number) => ({
+ .map((ts: any, index: number) => ({ ts, index }))
+ .filter(({ ts }: { ts: any }) => ts.isUse && Number(ts.groupID) > 0)
+ .map(({ ts, index }: { ts: any; index: number }) => ({
slot: index + 1,
groupID: Number(ts.groupID),
defaultIDSelect: Number(ts.defaultIDSelect) || null
@@ -1142,8 +1399,6 @@
otherName: menu.otherName ?? '',
description: menu.Description ?? '',
otherDescription: menu.otherDescription ?? '',
- cashPrice: String(menu.cashPrice ?? 0),
- nonCashPrice: String(menu.nonCashPrice ?? 0),
image: menu.uriData?.replace(/^img=/, '') ?? '',
isUse: menu.isUse !== false,
recipeSteps: recipeSteps.length > 0 ? recipeSteps : [createEmptyRecipeStep()],
@@ -1184,12 +1439,16 @@
onDestroy(() => {
clearOnMenuSavedCallback();
+ // Leaving Create Menu: dismiss coffeemain's RecipeActivity and let the
+ // XMLEngine kiosk home resume (keeps its current portrait orientation).
+ void adb.goToMachineHome();
});
// Auto-load when ADB is connected
$effect(() => {
if (!isAdbConnected) {
- recipeAutoLoadAttempted = false;
+ // Don't reset recipeAutoLoadAttempted — prevents duplicate loads
+ // on back-and-forth navigation.
detectedCountry = '';
return;
}
@@ -1200,8 +1459,23 @@
// Auto-load recipe data and country
(async () => {
- if (!isAdbWriterAvailable()) {
- await adb.reconnectAndroidRecipeMenuServer();
+ if (!isAdbWriterAlive()) {
+ if (wasAndroidSocketEverAlive()) {
+ // Socket was alive before and died → reconnect banner
+ // already triggered by isAdbWriterAlive() if stale.
+ return;
+ }
+ // First visit — auto-connect the Android recipe menu server.
+ if (adb.getAdbInstance()) {
+ try {
+ await adb.reconnectAndroidRecipeMenuServer();
+ } catch {
+ // Connection failed — user can retry manually.
+ }
+ }
+ if (!isAdbWriterAlive()) {
+ return;
+ }
}
await loadCountryFromMachine();
await loadStagedMenusFromAndroid();
@@ -1237,11 +1511,6 @@
loadRecipeFromMachine()} disabled={recipeLoading}>
{recipeLoading ? 'Loading...' : 'Load Recipe Data'}
- {#if !isAndroidSocketConnected}
- adb.reconnectAndroidRecipeMenuServer()}
- >Reconnect Socket
- {/if}
{:else}
+ Create New Menu
loadRecipeFromMachine()} disabled={recipeLoading}>
@@ -1249,6 +1518,26 @@
{/if}
+ {#if isAdbConnected}
+
+
+ {#if !isAndroidSocketConnected}
+ Required before saving
+ {/if}
+ {/if}
+
{#if isAdbConnected}
@@ -1373,7 +1662,10 @@
{#if detectedCountry}
Machine Country
-
{detectedCountry} (prefix: {detectedCountryCode})
+
+ {detectedCountry}
+ (prefix: {detectedCountryCode})
+
{/if}
@@ -1479,11 +1771,11 @@
-
-
- Cash price
-
-
- Non-cash price
-
+
Image file
Material
-
- updateRecipeStepNumber(
- index,
- 'materialPathId',
- event.currentTarget.value
- )}
+ openMaterialPicker(index)}
>
- Select material
- {#each activeMaterials as material}
- {materialDisplayName(material)}
- {/each}
-
+ {getSelectedMaterialName(step.materialPathId)}
+
@@ -1758,51 +2023,37 @@
Slot
- updateToppingSlot(index, e.currentTarget.value)}
+ openToppingPicker('slot', index)}
>
- Select slot
- {#each activeToppingSlotMaterials as material}
-
- {toppingSlotDisplayName(material)}
-
- {/each}
-
+ {getSelectedToppingSlotName(topping.slot)}
+
Topping group
- updateToppingGroup(index, e.currentTarget.value)}
+ openToppingPicker('group', index)}
>
- Select group
- {#each activeToppingGroups as group}
- {toppingGroupDisplayName(group)}
- {/each}
-
+ {getSelectedToppingGroupName(topping.groupID)}
+
Default topping
- updateToppingList(index, e.currentTarget.value)}
+ onclick={() => openToppingPicker('list', index)}
>
- Select topping
- {#each getToppingListsForGroup(topping.groupID) as toppingItem}
- {toppingListDisplayName(toppingItem)}
- {/each}
-
+ {getSelectedToppingListName(topping.defaultIDSelect)}
+
@@ -1823,6 +2074,96 @@
+
+
+
+
+ Select Material
+
+ Choose a material for recipe step {materialPickerStepIndex == null
+ ? ''
+ : materialPickerStepIndex + 1}. Materials are grouped by channel/category.
+
+
+
+
+
+
+ {#if groupedMaterialOptions.length === 0}
+
+ No materials found.
+
+ {:else}
+
+ {#each groupedMaterialOptions as group}
+
+
+
{group.category}
+
{group.materials.length} items
+
+
+ {#each group.materials as material}
+
selectMaterialForActiveStep(Number(material.id))}
+ >
+ {materialDisplayName(material)}
+
+ {material.pathOtherName || material.CanisterType || 'No path/type'}
+
+
+ {/each}
+
+
+ {/each}
+
+ {/if}
+
+ (materialPickerOpen = false)}>Cancel
+
+
+
+
+
+
+
+
+ {getToppingPickerTitle()}
+ {getToppingPickerDescription()}
+
+
+
+
+
+ {#if toppingPickerOptions.length === 0}
+
+ {toppingPickerType === 'list' ? 'No toppings found for this group.' : 'No options found.'}
+
+ {:else}
+
+ {#each toppingPickerOptions as option}
+
selectToppingPickerOption(option.value)}
+ >
+ {option.label}
+ {option.description}
+
+ {/each}
+
+ {/if}
+
+ (toppingPickerOpen = false)}>Cancel
+
+
+
+
diff --git a/src/routes/(authed)/tools/image-upload/+page.svelte b/src/routes/(authed)/tools/image-upload/+page.svelte
index 073d815..be44b1d 100644
--- a/src/routes/(authed)/tools/image-upload/+page.svelte
+++ b/src/routes/(authed)/tools/image-upload/+page.svelte
@@ -121,6 +121,12 @@
files = [];
}
+
+ async function authHeaders(): Promise> {
+ const token = await $auth?.getIdToken?.();
+ return token ? { Authorization: `Bearer ${token}` } : {};
+ }
+
async function uploadFiles() {
const currentUser = $auth;
if (!currentUser) {
@@ -159,6 +165,7 @@
const response = await fetch(UPLOAD_PROXY_ENDPOINT, {
method: 'POST',
+ headers: await authHeaders(),
body: formData
});
diff --git a/src/routes/(authed)/tools/video-mainpage/+page.svelte b/src/routes/(authed)/tools/video-mainpage/+page.svelte
new file mode 100644
index 0000000..4848f50
--- /dev/null
+++ b/src/routes/(authed)/tools/video-mainpage/+page.svelte
@@ -0,0 +1,970 @@
+
+
+
+
+
+
+
+
Advertisement Videos
+
+ Main-page & brewing-page videos, scheduled by date
+
+
+
+
+ {isAdbConnected ? 'Machine connected' : 'Machine offline'}
+
+ {#if !isAdbConnected}
+
+ {#if connecting}
+ {:else}
+ (showScreenMirror = true)}>
+ Show Android Screen
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+ Upload the same clip twice — the main-page version and the brewing-page
+ _long version. Auto-named
+ brewing_adv<N> (next free 1–40, never overwrites a video
+ in use).
+
+
+
+
+
+
Country
+
+ {countryLabel}
+
+ {#each COUNTRIES as c (c.value)}
+ {c.label}
+ {/each}
+
+
+
+ Writes to inter/{country}/video{country === 'tha'
+ ? ' + flat video/'
+ : ''}.
+
+
+
+
Name
+
+
+ Used for the comment & the …VideoEnable variable.
+
+
+
+
+
+
(optional)
+
+ {#if !endDate}
Blank = open-ended
{/if}
+
+
+
+
+
+ brewing_adv<N>.mp4
+
+ {#if mainFile}
+
+
+
+
+ {mainFile.name} · {fmtMB(mainFile.size)}
+
+ {:else}
+
+ Click to select .mp4
+
+ {/if}
+
+
+
+
+
+ brewing_adv<N>_long.mp4
+
+ {#if brewingFile}
+
+
+
+
+ {brewingFile.name} · {fmtMB(brewingFile.size)}
+
+
+ (length {Math.round(brewingRawSeconds)}s − {DURATION_TRIM})
+
+ {:else}
+
+ Click to select _long .mp4
+
+ {/if}
+
+
+
+
+
+
+ {#each [{ label: 'Thai', name: 'brewing_txt_adv
.png', file: brewingTxtFile, preview: brewingTxtPreview, pick: pickBrewingTxt, clear: clearBrewingTxt }, { label: 'English', name: 'brewing_txt_adv_en.png', file: brewingTxtEnFile, preview: brewingTxtEnPreview, pick: pickBrewingTxtEn, clear: clearBrewingTxtEn }] as t (t.label)}
+
+
{t.label}
+ {#if t.file}
+
+
+
+
+
+ {t.file.name}
+
+ {:else}
+
+
+ {/if}
+
+
+
+
+
+
+ Pushing {pushProgress.name} ({pushProgress.percent}%)
+
+
+
+
+ {#if submitting}
+
+
+
+
+
+
+
Existing videos
+
+ {#if loadingList}
+
+
+
+ {#if managed.length === 0}
+
+ No web-managed videos yet. Ones you add above appear here and can be edited.
+
+ {:else}
+
+ {#each managed as v (v.slug)}
+
+
+
+ {#if v.main}
+
+
+ {:else}
+
+ no main
+
+ {/if}
+
+
+ {#if v.brewing}
+
+
+ {:else}
+
+ no brewing
+
+ {/if}
+
+
+
+
{v.name}
+
+ brewing_adv{v.n}
+ main
+ brewing
+
+
+
openEdit(v)}>
+
+
+ {/each}
+
+ {/if}
+
+
+
+
(showReadonly = !showReadonly)}
+ >
+ read-only
+ {showReadonly ? 'Click to hide' : 'Click to show'}
+
+ {#if showReadonly}
+
+ {#each readonlyList as v (v.filename)}
+
+ {/each}
+
+ {/if}
+
+
+
+
+
+
+
+ Edit video
+
+ {#if editTarget}brewing_adv{editTarget.n} · change dates, rename,
+ or replace either clip{/if}
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+ {#if editTarget?.main}
+
+
+ {/if}
+
+
+
+
+
+
+ {#if editTarget?.brewing}
+
+
+ {/if}
+
+
+ {#if editBrewingFile}
+
+
+ {/if}
+
+
+
+
+
+
+
+
+
+ {#if pushProgress.active}
+
+
+
+ Pushing {pushProgress.name} ({pushProgress.percent}%)
+
+
+ {/if}
+
+ (editOpen = false)} disabled={editSaving}
+ >Cancel
+
+ {#if editSaving}
+
+
+
+
+ tag
+// (adv videos live only on the FTP server, so they can't be linked directly).
+export const GET: RequestHandler = async ({ request, url }) => {
+ try {
+ await verifyAuthToken(request);
+
+ const country = url.searchParams.get('country');
+ const filename = url.searchParams.get('filename');
+ if (!country || !filename) {
+ throw error(400, 'Missing country or filename');
+ }
+
+ // POST (not GET): the kong gateway only routes POST to the taobin-image service.
+ const endpoint = `${ADV_API_BASE}/adv/file/${encodeURIComponent(country)}/${encodeURIComponent(filename)}`;
+ const response = await fetch(endpoint, { method: 'POST' });
+
+ if (!response.ok) {
+ const errorData = await response.json().catch(() => ({ detail: response.statusText }));
+ throw error(response.status, errorData.detail || 'Failed to fetch adv video');
+ }
+
+ return new Response(response.body, {
+ status: 200,
+ headers: {
+ 'Content-Type': response.headers.get('Content-Type') || 'video/mp4',
+ 'Content-Length': response.headers.get('Content-Length') || '',
+ 'Cache-Control': 'no-store'
+ }
+ });
+ } catch (err) {
+ logger.error('[Adv File Proxy] Error:', err);
+ if (err && typeof err === 'object' && 'status' in err) {
+ throw err;
+ }
+ throw error(500, err instanceof Error ? err.message : 'Internal server error');
+ }
+};
diff --git a/src/routes/api/adv-list/+server.ts b/src/routes/api/adv-list/+server.ts
new file mode 100644
index 0000000..4e3f59f
--- /dev/null
+++ b/src/routes/api/adv-list/+server.ts
@@ -0,0 +1,36 @@
+import { logger } from '$lib/core/utils/logger';
+import { json, error } from '@sveltejs/kit';
+import type { RequestHandler } from './$types';
+import { env } from '$env/dynamic/public';
+import { verifyAuthToken } from '$lib/server/auth';
+
+// Adv videos are served by the same taobin_image service as menu images.
+const ADV_API_BASE = env.PUBLIC_POST_IMAGE;
+
+// List the adv .mp4 files currently on a country's FTP folder (for preview).
+export const POST: RequestHandler = async ({ request }) => {
+ try {
+ await verifyAuthToken(request);
+
+ const { country } = await request.json();
+ if (!country || typeof country !== 'string') {
+ throw error(400, 'Missing country');
+ }
+
+ const endpoint = `${ADV_API_BASE}/adv/list/${encodeURIComponent(country)}`;
+ const response = await fetch(endpoint, { method: 'POST' });
+
+ if (!response.ok) {
+ const errorData = await response.json().catch(() => ({ detail: response.statusText }));
+ throw error(response.status, errorData.detail || 'Failed to list adv videos');
+ }
+
+ return json(await response.json());
+ } catch (err) {
+ logger.error('[Adv List Proxy] Error:', err);
+ if (err && typeof err === 'object' && 'status' in err) {
+ throw err;
+ }
+ throw error(500, err instanceof Error ? err.message : 'Internal server error');
+ }
+};
diff --git a/src/routes/api/adv-thumb/+server.ts b/src/routes/api/adv-thumb/+server.ts
new file mode 100644
index 0000000..b7e6b69
--- /dev/null
+++ b/src/routes/api/adv-thumb/+server.ts
@@ -0,0 +1,46 @@
+import { logger } from '$lib/core/utils/logger';
+import { error } from '@sveltejs/kit';
+import type { RequestHandler } from './$types';
+import { env } from '$env/dynamic/public';
+import { verifyAuthToken } from '$lib/server/auth';
+
+// Adv videos are served by the same taobin_image service as menu images.
+const ADV_API_BASE = env.PUBLIC_POST_IMAGE;
+
+// Return a small JPEG poster (single frame) for an adv video so the slot grid can
+// show a thumbnail without downloading the whole mp4. The frontend fetches this
+// with a Bearer token and turns the response into a Blob/object URL for an