@7365admin1/layer-common 4.128.0 → 4.129.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.129.0
+
+### Minor Changes
+
+- f06eeb9: Robots: OneWay brand in Add / Edit robot (API key + server address, OneWay's cloud prefilled, Find robots lists the company's robots) and a Release emergency stop button for brands whose emergency stop is a software one (OneWay).
+
 ## 4.128.0
 
 ### Minor Changes
@@ -3316,11 +3322,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                              GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                                                                              GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                              owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                                                                              staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/Robot/Detail.vue

@@ -30,8 +30,14 @@
     </div>
   </div>
 
-  <!-- Emergency stop: anyone allowed to command this robot, one tap, no confirm (PadBot today). -->
-  <RobotEmergencyStop v-if="cmdOk && caps?.emergencyStop === true" :robot-id="robotId" :name="record?.name" @stopped="fastUntil = Date.now() + COMMAND_FOLLOW_MS" />
+  <!-- Emergency stop: anyone allowed to command this robot, one tap, no confirm (PadBot, OneWay). OneWay's is a software stop: Release lifts it. -->
+  <RobotEmergencyStop
+    v-if="cmdOk && caps?.emergencyStop === true"
+    :robot-id="robotId"
+    :name="record?.name"
+    :releasable="caps?.emergencyRelease === true && fault?.code === 'E-STOP'"
+    @stopped="fastUntil = Date.now() + COMMAND_FOLLOW_MS"
+  />
 
   <div v-if="error" class="hero-notice" role="alert">{{ error }}</div>
   <div v-else-if="live && !live.ok && live.reason" class="hero-notice" role="status">Can't read this robot right now: {{ live.reason }}</div>

package/components/Robot/EmergencyStop.vue

@@ -4,12 +4,15 @@
     command this robot. One tap, NO confirm - a stop must never wait on a
     dialog or on a state read. The server sends PadBot's "full machine stop"
     over the live link AND its stop command, and says which reached the robot.
+    OneWay's stop is a software one that stays on: while the robot reports it
+    (`releasable`), Release lifts it - after a confirm, since the robot may move again.
   -->
   <div class="hero-estop" role="group" aria-label="Emergency stop">
     <button type="button" class="hero-estop__btn" :disabled="busy" @click="stop">
       <span class="hero-estop__icon" aria-hidden="true">■</span>
       {{ busy ? "Stopping…" : "Emergency stop" }}
     </button>
+    <v-btn v-if="releasable" variant="outlined" :loading="releasing" :disabled="busy" @click="release">Release emergency stop</v-btn>
     <div v-if="result" class="hero-estop__msg" :class="{ 'hero-estop__msg--error': failed }" role="status" aria-live="assertive">{{ result }}</div>
   </div>
 </template>
@@ -18,11 +21,12 @@
 import { ref } from "vue";
 import { estopResultText } from "../../utils/robot-config";
 
-const props = defineProps<{ robotId: string; name?: string }>();
+const props = defineProps<{ robotId: string; name?: string; releasable?: boolean }>();
 const emit = defineEmits<{ stopped: [] }>();
-const { emergencyStopRobot } = useRobots();
+const { emergencyStopRobot, releaseEmergencyStopRobot } = useRobots();
 
 const busy = ref(false);
+const releasing = ref(false);
 const result = ref("");
 const failed = ref(false);
 
@@ -42,6 +46,23 @@ async function stop() {
     busy.value = false;
   }
 }
+
+async function release() {
+  if (!window.confirm(`Release the emergency stop on ${props.name || "this robot"}? It can take commands and move again.`)) return;
+  releasing.value = true;
+  failed.value = false;
+  result.value = "";
+  try {
+    const r = await releaseEmergencyStopRobot(props.robotId);
+    result.value = r?.message || "Emergency stop released.";
+    emit("stopped");
+  } catch (e: any) {
+    failed.value = true;
+    result.value = e?.data?.message || e?.message || "The release did not reach the robot. The emergency stop is still on.";
+  } finally {
+    releasing.value = false;
+  }
+}
 </script>
 
 <style scoped>

package/components/Robot/Form.vue

@@ -67,7 +67,7 @@
           :id="`${uid}-token`"
           v-model="appToken"
           class="hero-input"
-          type="password"
+          :type="tokenSecret ? 'password' : 'text'"
           autocomplete="new-password"
           spellcheck="false"
           :placeholder="credentialPlaceholder(editing)"
@@ -108,7 +108,14 @@ import {
   type TRobotType,
 } from "../../utils/robot-display";
 import { credentialsNote } from "../../utils/robot-floorplan";
-import { credentialLabels, credentialMissingMessage, discoveredRobotOptions } from "../../utils/robot-credential-form";
+import {
+  credentialDiscoverable,
+  credentialLabels,
+  credentialMissingMessage,
+  credentialTokenDefault,
+  credentialTokenIsSecret,
+  discoveredRobotOptions,
+} from "../../utils/robot-credential-form";
 
 const props = withDefaults(
   defineProps<{
@@ -154,9 +161,17 @@ const robotSn = ref(savedSn);
 const found = ref<Array<{ value: string; label: string; disabled: boolean }>>([]);
 const finding = ref(false);
 const labels = computed(() => credentialLabels(brand.value));
-const typed = computed(() => !!appKey.value.trim() && !!appToken.value.trim());
-// Ounitech / PadBot: one credential pair per company account, so the robot is picked from its list.
-const discoverable = computed(() => brand.value === "ounitech" || brand.value === "padbot");
+// A prefilled server address with no key typed is not a typed pair (Find robots then uses the client's saved one).
+const tokenValue = computed(() => (!appKey.value.trim() && appToken.value.trim() === credentialTokenDefault(brand.value) ? "" : appToken.value.trim()));
+const typed = computed(() => !!appKey.value.trim() && !!tokenValue.value);
+// Ounitech / PadBot / OneWay: one company credential lists its robots, so the robot is picked from that list.
+const discoverable = computed(() => credentialDiscoverable(brand.value));
+// OneWay's second field is its server's address: plain text, prefilled with OneWay's cloud when adding.
+const tokenSecret = computed(() => credentialTokenIsSecret(brand.value));
+watch(brand, (b, was) => {
+  if (editing.value) return;
+  if (!appToken.value.trim() || appToken.value === credentialTokenDefault(was)) appToken.value = credentialTokenDefault(b);
+});
 const findHint = computed(() =>
   editing.value || typed.value
     ? "Press Find robots"
@@ -219,12 +234,12 @@ onMounted(async () => {
 
 async function find() {
   error.value = "";
-  if (!!appKey.value.trim() !== !!appToken.value.trim()) {
+  if (!!appKey.value.trim() !== !!tokenValue.value) {
     return void (error.value = `Enter both the ${labels.value.key} and the ${labels.value.token}.`);
   }
   finding.value = true;
   try {
-    const pair = typed.value ? { appKey: appKey.value.trim(), appToken: appToken.value.trim() } : null;
+    const pair = typed.value ? { appKey: appKey.value.trim(), appToken: tokenValue.value } : null;
     const body = pair
       ? { site: site.value, brand: brand.value, ...pair }
       : editing.value
@@ -247,11 +262,11 @@ async function submit() {
   error.value = "";
   if (!name.value.trim()) return void (error.value = "Give the robot a name.");
   // Adding with no pair typed = reuse this client's saved one; needs the picked robot.
-  const useSaved = !editing.value && discoverable.value && !appKey.value.trim() && !appToken.value.trim();
+  const useSaved = !editing.value && discoverable.value && !appKey.value.trim() && !tokenValue.value;
   if (useSaved && !robotSn.value) {
     return void (error.value = `Enter the ${labels.value.key} and ${labels.value.token}, or press Find robots to use this client's saved ones and pick the robot.`);
   }
-  const creds = useSaved ? ({ ok: true, body: {} } as const) : credentialPatch(appKey.value, appToken.value, editing.value);
+  const creds = useSaved ? ({ ok: true, body: {} } as const) : credentialPatch(appKey.value, tokenValue.value, editing.value);
   if (!creds.ok) return void (error.value = credentialMissingMessage(labels.value, editing.value));
   const serial = robotSn.value && robotSn.value !== savedSn ? { robotSn: robotSn.value } : {};
   saving.value = true;

package/composables/useRobots.ts

@@ -358,6 +358,15 @@ export default function useRobots() {
     );
   }
 
+  /** `emergencyRelease` (OneWay): lift a software emergency stop so the robot takes commands again. */
+  function releaseEmergencyStopRobot(id: string) {
+    return useNuxtApp().$api<{ ok: boolean; message: string }>(`/api/robots/${id}/emergency-stop`, {
+      method: "POST",
+      query: { appSlug },
+      body: { release: true },
+    });
+  }
+
   /** Super Admin setup: what can be changed now, read fresh from the maker's cloud (`mapId` picks the map). */
   function getRobotSetup(id: string, mapId?: string | null) {
     return useNuxtApp().$api<Record<string, any>>(`/api/robots/${id}/setup`, {
@@ -656,6 +665,7 @@ export default function useRobots() {
     saveSiteFleetCore,
     createSiteRelayKey,
     emergencyStopRobot,
+    releaseEmergencyStopRobot,
     getRobotSetup,
     applyRobotSetup,
     listBuildingMaps,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.128.0",
+  "version": "4.129.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/robot-credential-form.ts

@@ -14,9 +14,29 @@ export function credentialLabels(brand: unknown): { key: string; token: string }
   // PadBot issues an AccessKey ID + AccessKey Secret per account (API v4.0 §2.1).
   if (brand === "padbot") return { key: "AccessKey ID", token: "AccessKey Secret" };
   if (brand === "demo") return { key: "App key (any value)", token: "Token (any value)" };
+  // OneWay (Anbot RMS): one API key per company; the second field is the RMS server's address.
+  if (brand === "oneway") return { key: "API key", token: "Server address" };
   return { key: "App key", token: "Token" };
 }
 
+/** OneWay's cloud, prefilled in "Server address" when adding (change it only for a company's own RMS). */
+export const ONEWAY_DEFAULT_SERVER = "https://www.anbotcloud.cn";
+
+/** What the second field starts with when adding a robot of this brand ("" = empty). */
+export function credentialTokenDefault(brand: unknown): string {
+  return brand === "oneway" ? ONEWAY_DEFAULT_SERVER : "";
+}
+
+/** False when the second field is not a secret (OneWay's server address): shown as plain text. */
+export function credentialTokenIsSecret(brand: unknown): boolean {
+  return brand !== "oneway";
+}
+
+/** Brands whose one company credential lists its robots, so Add robot picks the serial (Find robots). */
+export function credentialDiscoverable(brand: unknown): boolean {
+  return brand === "ounitech" || brand === "padbot" || brand === "oneway";
+}
+
 /** "Enter the AppID and the Secret ..." - `credentialPatch`'s refusal, in the brand's words. */
 export function credentialMissingMessage(labels: { key: string; token: string }, editing: boolean): string {
   return editing