@7365admin1/layer-common 4.149.2 → 4.151.0

package/utils/robot-display.ts

@@ -1968,33 +1968,51 @@ export const PATROL_ROUND_CHOICES = [
   { title: "Until stopped", value: 0 },
 ];
 
-export type TJobOptions = { modeFlag: number; subModeFlag: number; levelFlag: number; cleanTimes: number; rounds: number };
-export const JOB_OPTION_DEFAULTS: TJobOptions = { modeFlag: 1, subModeFlag: 0, levelFlag: 1, cleanTimes: 1, rounds: 1 };
+export type TJobOptions = { modeFlag: number; subModeFlag: number; levelFlag: number; cleanTimes: number; rounds: number; cleanModeId: number | null };
+export const JOB_OPTION_DEFAULTS: TJobOptions = { modeFlag: 1, subModeFlag: 0, levelFlag: 1, cleanTimes: 1, rounds: 1, cleanModeId: null };
+
+/** A cleaning mode from the robot's OWN list (VIGGO 1.1 clean_mode, via records `cleanModes`). */
+export type TRobotCleanMode = { id: number; name: string };
+
+/** The robot's own modes as picker choices, its default first (null = whatever the robot uses). */
+export function robotModeChoices(modes: TRobotCleanMode[] | null | undefined) {
+  const list = (Array.isArray(modes) ? modes : []).filter((m) => Number.isInteger(m?.id) && typeof m?.name === "string" && m.name.trim());
+  return [{ title: "The robot's default", value: null as number | null }, ...list.map((m) => ({ title: m.name.trim(), value: m.id as number | null }))];
+}
 
 /**
  * Which job options the confirm offers: clean options for a cleaning robot whose
  * brand declares `cleanOptions`, rounds for a security robot whose brand declares
  * `patrolRounds` - only on a start (full / area), never on any other command.
  */
-export function jobOptionsOffered(kind: unknown, type: unknown, capabilities: Record<string, unknown> | null | undefined) {
+export function jobOptionsOffered(
+  kind: unknown,
+  type: unknown,
+  capabilities: Record<string, unknown> | null | undefined,
+  /** The robot's own mode list (a brand without our fixed three, e.g. VIGGO): mode + times are offered from it. */
+  robotModes?: TRobotCleanMode[] | null,
+) {
   const start = kind === "full" || kind === "area";
+  const clean = start && type !== "security" && capabilities?.cleanOptions === true;
   return {
-    clean: start && type !== "security" && capabilities?.cleanOptions === true,
+    clean,
     rounds: start && type === "security" && capabilities?.patrolRounds === true,
+    modes: start && type !== "security" && !clean && robotModeChoices(robotModes).length > 1,
   };
 }
 
 /** The command body with the picked options (only the offered ones; vacuum-while-washing only for wash). */
-export function withJobOptions(body: Record<string, unknown>, offered: { clean: boolean; rounds: boolean }, o: TJobOptions) {
+export function withJobOptions(body: Record<string, unknown>, offered: { clean: boolean; rounds: boolean; modes?: boolean }, o: TJobOptions) {
   if (offered.clean) {
     return { ...body, modeFlag: o.modeFlag, subModeFlag: o.modeFlag === 2 ? o.subModeFlag : 0, levelFlag: o.levelFlag, cleanTimes: o.cleanTimes };
   }
   if (offered.rounds) return { ...body, cleanTimes: o.rounds };
+  if (offered.modes) return { ...body, cleanTimes: o.cleanTimes, ...(o.cleanModeId !== null ? { cleanModeId: o.cleanModeId } : {}) };
   return body;
 }
 
 /** One line under the confirm saying what the options mean for this job. */
-export function jobOptionsLine(offered: { clean: boolean; rounds: boolean }, o: TJobOptions): string {
+export function jobOptionsLine(offered: { clean: boolean; rounds: boolean; modes?: boolean }, o: TJobOptions, robotModes?: TRobotCleanMode[] | null): string {
   if (offered.clean) {
     const mode = CLEAN_MODE_CHOICES.find((c) => c.value === o.modeFlag)?.title ?? "Vacuum";
     const power = CLEAN_POWER_CHOICES.find((c) => c.value === o.levelFlag)?.title ?? "Standard";
@@ -2002,5 +2020,9 @@ export function jobOptionsLine(offered: { clean: boolean; rounds: boolean }, o:
     return `${mode}, ${power.toLowerCase()} power, ${o.cleanTimes === 1 ? "once" : `${o.cleanTimes} times`}${wet}.`;
   }
   if (offered.rounds) return o.rounds === 0 ? "It keeps patrolling until someone presses Cancel." : `It patrols the route ${o.rounds === 1 ? "once" : `${o.rounds} times`}.`;
+  if (offered.modes) {
+    const mode = robotModeChoices(robotModes).find((c) => c.value === o.cleanModeId)?.title ?? "The robot's default";
+    return `${mode} mode, ${o.cleanTimes === 1 ? "once" : `${o.cleanTimes} times`}.`;
+  }
   return "";
 }

package/utils/robot-setup.ts

@@ -89,6 +89,7 @@ export function offlineReason(robot: Record<string, any>, state: Record<string,
     if (robot?.brand === "ounitech") return `${name}: the Ounitech cloud did not answer${why}. Ask Ounitech to link this robot's serial to our account.`;
     if (robot?.brand === "padbot") return `${name}: the PadBot cloud did not answer${why}. Check the robot's key and token.`;
     if (robot?.brand === "oneway") return `${name}: OneWay's RMS did not answer${why}. Check the robot's API key and server address, and ask OneWay to put this robot under our company key.`;
+    if (robot?.brand === "viggo") return `${name}: VIGGO's cloud did not answer${why}. Check the robot's access token (it may have expired) and that its VIN is in the saved VIN list.`;
     return `${name}: its cloud did not answer${why}.`;
   }
   return `${name}: its cloud says it is offline - switched off, charging dock unplugged or out of Wi-Fi.`;