@7365admin1/layer-common 4.121.0 → 4.122.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @iservice365/layer-common
 
+## 4.122.1
+
+### Patch Changes
+
+- 811b0e5: Lift queue: after Connect gateway / New code, the card shows the ready-to-paste gateway settings (this app's address and the code) with Copy settings, Done, and three numbered setup steps; the Waiting line says what to check.
+
+## 4.122.0
+
+### Minor Changes
+
+- 0a37446: Lift queue: each lift card shows its real lift gateway (Connected / Offline / lift not answering, floor and door once decoded, raw readings), and Seven365 Super Admin can create a gateway code (shown once), make a new one, or disconnect. At a HERO Fleet Core site the gateway is read from the saved map's lift of the same name.
+
+### Patch Changes
+
+- 5df1cfd: A Security Ops client meeting notification is now clickable on the web. `client-meeting` joins `SITE_PAGES` and opens the site's Ops Review page, where the meetings are listed. Without the entry `notificationTarget` answered null for the kind and the row opened nothing at all, the same dead end the `security-ops` entry fixed for action alerts. Its own kind rather than `security-ops`, because the phone opens the meeting record itself while the web has no per-meeting page.
+
 ## 4.121.0
 
 ### Minor Changes
@@ -3218,11 +3234,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/assets/css/robot-hero.css

@@ -1264,6 +1264,18 @@ div.hero-editor__wp.hero-editor__sel, div.hero-editor__fid.hero-editor__sel { ou
 .hero .hero-lift-row__release { border: 0; background: none; padding: 0; font: inherit; font-size: 12px; font-weight: 600; color: var(--hero-accent); cursor: pointer; white-space: nowrap; }
 .hero-lift__ask { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-top: 10px; font-size: 13px; }
 .hero-lift__simnote { font-size: 12px; }
+.hero-lift__gw { grid-column: 1 / -1; display: flex; align-items: center; flex-wrap: wrap; gap: 6px 10px; padding: 0 0 10px; font-size: 13px; min-width: 0; }
+.hero-lift__gwread { font-weight: 700; }
+.hero-lift__gwhelp { font-size: 12px; flex-basis: 100%; }
+.hero-lift__gwraw { flex-basis: 100%; font-size: 12px; }
+.hero-lift__gwraw summary { cursor: pointer; opacity: 0.7; }
+.hero-lift__gwreg { display: inline-block; margin: 4px 12px 0 0; font-family: monospace; }
+.hero-lift__gwact { margin-left: auto; display: flex; gap: 6px; }
+.hero-lift__gwcode { flex-basis: 100%; display: flex; align-items: center; flex-wrap: wrap; gap: 6px 10px; padding: 8px 10px; border: 1px solid rgb(var(--v-theme-warning)); }
+.hero-lift__gwini { flex-basis: 100%; margin: 0; padding: 8px 10px; font-family: monospace; font-size: 12px; white-space: pre-wrap; word-break: break-all; user-select: all; background: rgba(var(--v-theme-on-surface), 0.06); }
+.hero-lift__gwsteps { flex-basis: 100%; margin: 0; padding-left: 20px; font-size: 13px; }
+.hero-lift__gwsteps li { margin: 2px 0; }
+.hero-lift__gwcode code { font-family: monospace; word-break: break-all; user-select: all; }
 @media (max-width: 600px) {
   .hero-lift { grid-template-columns: 1fr; }
   .hero-bmap__bar { right: 14px; }

package/components/Robot/LiftQueue.vue

@@ -37,6 +37,41 @@
         <span class="hero-lift__car"><span class="hero-lift__cardot" :class="[`hero-lift__cardot--${l.carTone}`, { 'hero-lift__cardot--blink': l.riding }]" aria-hidden="true" />{{ l.carText }}</span>
       </div>
 
+      <!-- The real lift's read-only gateway link (Inovance B0S over RS-485): status, readings, setup. -->
+      <div v-if="l.gateway || (canEditMap && setupMapId)" class="hero-lift__gw" :data-status="l.gateway?.status ?? 'none'">
+        <template v-if="l.gateway">
+          <span class="hero-chip" :class="`hero-tone--${l.gateway.tone}`" role="status">{{ l.gateway.text }}</span>
+          <span v-if="l.gateway.decoded" class="hero-lift__gwread">{{ l.gateway.decoded }}</span>
+          <span v-else-if="l.gateway.undecoded" class="hero-muted hero-lift__gwread">Real lift answering · floor/door not decoded yet (fill [decode] in the gateway settings)</span>
+          <span v-if="l.gateway.help" class="hero-muted hero-lift__gwhelp">{{ l.gateway.help }}</span>
+          <details v-if="l.gateway.registers.length" class="hero-lift__gwraw">
+            <summary>Raw readings ({{ l.gateway.registers.length }})</summary>
+            <span v-for="r in l.gateway.registers" :key="r.reg" class="hero-lift__gwreg">{{ r.reg }} = {{ r.value }}</span>
+          </details>
+        </template>
+        <span v-else class="hero-muted">No real lift connected · the car below is simulated.</span>
+        <span v-if="canEditMap && setupMapId" class="hero-lift__gwact">
+          <v-btn size="small" variant="outlined" :loading="busy === `gw:${l.name}`" @click="connectGateway(l.name, !!l.gateway)">
+            {{ l.gateway ? "New code" : "Connect gateway" }}
+          </v-btn>
+          <v-btn v-if="l.gateway" size="small" variant="text" :disabled="busy === `gw:${l.name}`" @click="disconnectGateway(l.name)">Disconnect</v-btn>
+        </span>
+        <div v-if="newCode?.lift === l.name" class="hero-lift__gwcode" role="alert">
+          <b>Gateway settings for {{ l.name }} - shown once, copy them now:</b>
+          <pre class="hero-lift__gwini">{{ gatewayIni }}</pre>
+          <span class="hero-lift__gwact">
+            <v-btn size="small" variant="tonal" @click="copyCode">Copy settings</v-btn>
+            <v-btn size="small" variant="text" @click="newCode = null">Done</v-btn>
+          </span>
+          <ol class="hero-lift__gwsteps">
+            <li>On the gateway (Raspberry Pi / PC), paste these two lines into the <code>[server]</code> section of <code>lift-gateway.ini</code>.</li>
+            <li>Check the link without the lift: <code>python3 lift_gateway.py -c lift-gateway.ini --simulate</code>. It prints "iService365 OK" and this card turns <b>Connected</b>.</li>
+            <li>Wire the lift board's MOD1 port, then run it without <code>--simulate</code>. Floor and door show once the lift's register list is in the <code>[decode]</code> section.</li>
+          </ol>
+          <span class="hero-muted">Lost the code? Press New code - the old one stops working.</span>
+        </div>
+      </div>
+
       <div class="hero-lift__shaft" :style="{ height: `${l.shaftH}px` }" :title="l.simulated ? 'Simulated lift - no real lift is controlled yet' : undefined">
         <div class="hero-lift__labels">
           <div v-for="f in l.rails" :key="f.floorNo" class="hero-lift__floor" :class="{ 'hero-lift__floor--lit': f.lit }" :style="{ top: `${f.top}px` }">
@@ -139,13 +174,13 @@ const emit = defineEmits<{
   status: [status: { connected: boolean; faults: number; siteName: string; clientName: string }];
 }>();
 
-const { rows, all, map, fleet, names, loading: mapLoading, error: mapError } = useRobotBuilding(
+const { rows, all, map, saved, fleet, names, loading: mapLoading, error: mapError } = useRobotBuilding(
   toRef(props, "organization"),
   toRef(props, "site"),
   toRef(props, "type"),
 );
 const kicker = computed(() => [props.clientName || names.value.clientName, props.siteName || names.value.siteName].filter(Boolean).join(" · "));
-const { getLiftQueue, requestLift, releaseLiftSession } = useRobots();
+const { getLiftQueue, requestLift, releaseLiftSession, connectLiftGateway, disconnectLiftGateway } = useRobots();
 
 /* ---- the queue, every 3 s while the page is visible ---- */
 const items = ref<Array<Record<string, any>>>([]);
@@ -157,7 +192,16 @@ const error = computed(() => mapError.value);
 
 async function poll() {
   // The fleet building has no lift sessions of ours: its lifts come live with the building (5 s refresh).
-  if (fleet.value) return void (items.value = fleetLiftItems(map.value, all.value), (queueLoading.value = false));
+  if (fleet.value) {
+    // The fleet building's lifts, plus each real lift's gateway from the saved map (same lift name).
+    const list = fleetLiftItems(map.value, all.value);
+    const gw = saved.value?._id ? await getLiftQueue(String(saved.value._id)).catch(() => null) : null;
+    const byName = new Map<string, any>((gw?.items ?? []).map((x: any) => [String(x.liftName), x.gateway ?? null]));
+    items.value = list.map((x: Record<string, any>) => ({ ...x, gateway: byName.get(String(x.liftName)) ?? null }));
+    queueLoading.value = false;
+    now.value = Date.now();
+    return;
+  }
   const id = map.value?._id;
   if (!id) return void (items.value = []);
   if (typeof document !== "undefined" && document.visibilityState === "hidden") return;
@@ -217,6 +261,56 @@ watch(cards, (list) => {
 });
 const busy = ref("");
 const toast = ref("");
+/*
+ * ---- the real lift's gateway (Seven365 Super Admin = canEditMap) ----
+ * Set up on the SAVED map's lift (at a fleet site, the imported Fleet Core building);
+ * the server re-checks Super Admin and stores only the code's sha256.
+ */
+const setupMapId = computed(() => String((fleet.value ? saved.value?._id : map.value?._id) ?? ""));
+const newCode = ref<{ lift: string; code: string } | null>(null);
+async function connectGateway(lift: string, replacing: boolean) {
+  if (replacing && typeof window !== "undefined" && !window.confirm(`Make a new code for ${lift}? The gateway's current code stops working until you paste the new one.`)) return;
+  busy.value = `gw:${lift}`;
+  try {
+    const res = await connectLiftGateway(setupMapId.value, lift);
+    newCode.value = { lift, code: res.code };
+    await poll();
+  } catch (e) {
+    toast.value = robotErrorMessage(
+      e,
+      fleet.value ? "Could not create the code. Import the HERO Fleet Core building on Building map → Edit map first, so this lift is on the saved map." : "Could not create the gateway code.",
+    );
+  } finally {
+    busy.value = "";
+  }
+}
+async function disconnectGateway(lift: string) {
+  if (typeof window !== "undefined" && !window.confirm(`Disconnect the gateway from ${lift}? Its code stops working.`)) return;
+  busy.value = `gw:${lift}`;
+  try {
+    await disconnectLiftGateway(setupMapId.value, lift);
+    if (newCode.value?.lift === lift) newCode.value = null;
+    toast.value = `Gateway disconnected · ${lift}`;
+    await poll();
+  } catch (e) {
+    toast.value = robotErrorMessage(e, "The gateway could not be disconnected.");
+  } finally {
+    busy.value = "";
+  }
+}
+/** The gateway's [server] lines: this app's own address (it forwards /api to iService365) and the code. */
+const gatewayIni = computed(() =>
+  newCode.value ? `url = ${typeof window !== "undefined" ? window.location.origin : ""}\ncode = ${newCode.value.code}` : "",
+);
+async function copyCode() {
+  try {
+    await navigator.clipboard.writeText(gatewayIni.value);
+    toast.value = "Settings copied";
+  } catch {
+    toast.value = "Select the code and copy it by hand.";
+  }
+}
+
 async function ask(l: { name: string }) {
   const robotId = askRobot.value[l.name];
   if (!robotId || !map.value?._id) return;

package/composables/useRobots.ts

@@ -559,6 +559,25 @@ export default function useRobots() {
     );
   }
 
+  /**
+   * A real lift's gateway code (Seven365 Super Admin): a new `lgw_...` code,
+   * shown ONCE in the answer; asking again replaces it (the old one stops working).
+   */
+  function connectLiftGateway(mapId: string, liftName: string) {
+    return useNuxtApp().$api<{ code: string; codeHint: string }>(
+      `/api/robots/building-maps/${mapId}/lifts/${encodeURIComponent(liftName)}/gateway`,
+      { method: "POST" },
+    );
+  }
+
+  /** The gateway's code stops working; the card goes back to the simulated car. */
+  function disconnectLiftGateway(mapId: string, liftName: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/robots/building-maps/${mapId}/lifts/${encodeURIComponent(liftName)}/gateway`,
+      { method: "DELETE" },
+    );
+  }
+
   /** Give the lift back, or leave the queue. */
   function releaseLiftSession(sessionId: string) {
     return useNuxtApp().$api<Record<string, any>>(`/api/robots/lift-sessions/${sessionId}/release`, {
@@ -595,6 +614,8 @@ export default function useRobots() {
     getLiftQueue,
     requestLift,
     releaseLiftSession,
+    connectLiftGateway,
+    disconnectLiftGateway,
     getRobotLiftSession,
     getRobots,
     getSiteFleet,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.121.0",
+  "version": "4.122.1",
   "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/notification-target.ts

@@ -214,6 +214,18 @@ const SITE_PAGES: Record<string, TSitePage[]> = {
    * opened nothing at all. Adding it repairs those too, not only the new alerts.
    */
   "security-ops": [{ apps: ["security"], page: () => "security-ops" }],
+  /**
+   * Security Ops: a client meeting was scheduled, moved or called off, or one
+   * is happening today.
+   *
+   * ITS OWN KIND, NOT `security-ops`, because the two land in different places:
+   * an action belongs to the register and a meeting belongs to the meeting
+   * record. The web has no per-meeting page, so this opens Ops Review, where
+   * the meetings tab lists them; the phone, which does have one, opens the
+   * meeting itself. Same kind, different answer per surface, which is what this
+   * table is for.
+   */
+  "client-meeting": [{ apps: ["security"], page: () => "security-ops" }],
 };
 SITE_PAGES.myVisitors = SITE_PAGES.visitors;
 

package/utils/robot-building.ts

@@ -18,7 +18,7 @@ import {
   pushUndo,
   type TMapPointM,
 } from "./building-map";
-import { floorName } from "./robot-display";
+import { agoText, floorName } from "./robot-display";
 
 /* ================================================================ camera */
 
@@ -1475,5 +1475,64 @@ export function liftCard(lift: Record<string, any>, now = Date.now()) {
     })),
     rows,
     simulated: lift?.simulated === true,
+    gateway: liftGatewayLine(lift?.gateway ?? null),
+  };
+}
+
+const DOOR_TEXT = ["Doors closed", "Doors moving", "Doors open"];
+const MOTION_TEXT = ["Stopped", "Going up", "Going down", "Moving"];
+const MODE_TEXT = ["Mode unknown", "Normal", "Robot mode", "FIRE mode", "Out of service", "EMERGENCY"];
+
+/**
+ * The real lift's gateway (read-only link to the Inovance board), in words:
+ * one status line, a tone, and the decoded floor/door/motion/mode once the
+ * gateway's [decode] settings are filled in. `null` = no gateway: the car is simulated.
+ */
+export function liftGatewayLine(g: Record<string, any> | null) {
+  if (!g) return null;
+  const ago = g.ageS == null ? "" : agoText(0, Number(g.ageS) * 1000);
+  const byStatus: Record<string, { text: string; tone: string; help: string }> = {
+    waiting: {
+      text: `Waiting for the gateway (code …${g.codeHint ?? ""})`,
+      tone: "neutral",
+      help: "The gateway has not sent anything yet. Check its lift-gateway.ini (url and code from Connect gateway), its network, and that the program is running.",
+    },
+    connected: { text: `Connected · last reading ${ago}`, tone: "success", help: "" },
+    "no-lift": {
+      text: "Gateway online · lift not answering",
+      tone: "warning",
+      help: g.lastError || "Check the RS-485 wiring (A/B), baud, parity and unit address.",
+    },
+    offline: {
+      text: `Offline · last heard ${ago}`,
+      tone: "error",
+      help: "Nothing from the gateway for 30 s: check its power, network, and that the program is running.",
+    },
+  };
+  const line = byStatus[g.status] ?? byStatus.offline!;
+  const st = g.status === "connected" ? g.state : null;
+  const decoded = st
+    ? [
+        st.currentFloor ? `Floor ${st.currentFloor}` : "",
+        st.doorState != null ? DOOR_TEXT[st.doorState] ?? "" : "",
+        st.motionState != null ? MOTION_TEXT[st.motionState] ?? "" : "",
+        st.currentMode != null ? MODE_TEXT[st.currentMode] ?? "" : "",
+      ].filter(Boolean).join(" · ")
+    : "";
+  const registers = Object.entries((g.registers ?? {}) as Record<string, number>)
+    .map(([reg, value]) => ({ reg, value }))
+    .sort((a, b) => Number(a.reg) - Number(b.reg));
+  return {
+    ...line,
+    status: String(g.status ?? "offline"),
+    connected: g.status === "connected",
+    decoded,
+    // Until the Inovance register list is in the gateway's settings, only raw numbers exist.
+    undecoded: g.status === "connected" && !decoded,
+    registers,
+    port: String(g.port ?? ""),
+    version: String(g.gatewayVersion ?? ""),
+    codeHint: String(g.codeHint ?? ""),
+    readings: Number(g.readings ?? 0),
   };
 }