@7365admin1/core 3.86.0 → 3.87.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@7365admin1/core",
   "license": "MIT",
-  "version": "3.86.0",
+  "version": "3.87.0",
   "author": "7365admin1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
     "build": "tsup src/index.ts --format cjs,esm --dts && shx cp -r src/public dist && shx cp -r src/utils/handlebars dist",
     "release": "yarn run build && changeset publish",
     "lint": "tsc",
-    "test": "tsup src/config.ts src/utils/building-map.util.ts src/utils/robot-cloud.util.ts src/utils/robot-adapter.util.ts src/utils/png-encoder.util.ts src/services/demo.adapter.ts src/utils/robot-tracking.util.ts src/utils/robot-apps.util.ts src/utils/robot-permission.util.ts src/utils/lift-contract.util.ts src/utils/anpr-revoke.util.ts src/utils/anpr-plate.util.ts src/utils/vehicle-request.util.ts src/utils/camera-view.util.ts src/utils/camera-bulk-import.util.ts src/utils/dashboard-metrics.util.ts src/utils/camera-capability.util.ts src/utils/camera-playback.util.ts src/services/camera-device-http.service.ts src/utils/camera-alert.util.ts src/utils/dahua-protocol.util.ts src/utils/site-name.util.ts src/utils/service-provider-invite.util.ts src/utils/notification-category.util.ts src/utils/hid-card.util.ts src/utils/hid-json.util.ts src/utils/hid-access.util.ts src/models/customer-site.model.ts src/models/site-camera.model.ts src/models/member.model.ts src/models/subscription.model.ts src/utils/session-id.util.ts src/utils/occurrence-query.util.ts src/utils/occurrence-book-create.util.ts src/utils/update-result.util.ts src/utils/hid-amico-authz.util.ts src/utils/promo-code-currency.util.ts src/utils/console-audit.util.ts src/utils/org-suspension.util.ts src/utils/session-revoke.util.ts src/models/hid-amico.model.ts src/models/patrol-email.model.ts src/utils/patrol-email-pdf.util.ts src/utils/visitor-status.util.ts src/utils/self-service-email.util.ts src/utils/hid-secret.util.ts src/models/visitor-invite.model.ts src/models/guard-invite.model.ts src/utils/site-timezone.util.ts src/utils/bulletin-service-apps.util.ts src/models/bulletin-board.model.ts src/utils/vehicle-import.util.ts src/utils/expired-vehicle-sweep.util.ts src/models/vehicle.model.ts src/controllers/chat.controller.ts src/utils/file-owner.util.ts src/utils/console-permission.util.ts src/utils/role-scope.util.ts src/utils/org-default-roles.util.ts src/utils/org-modules.util.ts src/utils/site-modules.util.ts src/utils/resident-app-modules.util.ts src/utils/resident-default-role.util.ts src/utils/invite-role-scope.util.ts src/models/personal-emergency-chain.model.ts src/utils/self-signup-files.util.ts src/models/person.model.ts src/utils/module-gate.util.ts src/utils/member-lookup.util.ts src/utils/notification-access.util.ts src/utils/module-access.util.ts src/services/module-gate.service.ts src/controllers/site.controller.ts src/controllers/organization.controller.ts src/controllers/member.controller.ts src/utils/org-owner-repair.util.ts src/utils/socket-session.util.ts src/utils/people-create-gate.util.ts src/utils/service-app-type.util.ts --format esm --out-dir test/.build --no-dts --silent && node --test test/*.test.mjs",
+    "test": "tsup src/config.ts src/utils/building-map.util.ts src/utils/robot-cloud.util.ts src/utils/robot-adapter.util.ts src/utils/png-encoder.util.ts src/services/demo.adapter.ts src/utils/robot-fault.util.ts src/utils/robot-tracking.util.ts src/utils/robot-apps.util.ts src/utils/robot-permission.util.ts src/utils/lift-contract.util.ts src/utils/anpr-revoke.util.ts src/utils/anpr-plate.util.ts src/utils/vehicle-request.util.ts src/utils/camera-view.util.ts src/utils/camera-bulk-import.util.ts src/utils/dashboard-metrics.util.ts src/utils/camera-capability.util.ts src/utils/camera-playback.util.ts src/services/camera-device-http.service.ts src/utils/camera-alert.util.ts src/utils/dahua-protocol.util.ts src/utils/site-name.util.ts src/utils/service-provider-invite.util.ts src/utils/notification-category.util.ts src/utils/hid-card.util.ts src/utils/hid-json.util.ts src/utils/hid-access.util.ts src/models/customer-site.model.ts src/models/site-camera.model.ts src/models/member.model.ts src/models/subscription.model.ts src/utils/session-id.util.ts src/utils/occurrence-query.util.ts src/utils/occurrence-book-create.util.ts src/utils/update-result.util.ts src/utils/hid-amico-authz.util.ts src/utils/promo-code-currency.util.ts src/utils/console-audit.util.ts src/utils/org-suspension.util.ts src/utils/session-revoke.util.ts src/models/hid-amico.model.ts src/models/patrol-email.model.ts src/utils/patrol-email-pdf.util.ts src/utils/visitor-status.util.ts src/utils/self-service-email.util.ts src/utils/hid-secret.util.ts src/models/visitor-invite.model.ts src/models/guard-invite.model.ts src/utils/site-timezone.util.ts src/utils/bulletin-service-apps.util.ts src/models/bulletin-board.model.ts src/utils/vehicle-import.util.ts src/utils/expired-vehicle-sweep.util.ts src/models/vehicle.model.ts src/controllers/chat.controller.ts src/utils/file-owner.util.ts src/utils/console-permission.util.ts src/utils/role-scope.util.ts src/utils/org-default-roles.util.ts src/utils/org-modules.util.ts src/utils/site-modules.util.ts src/utils/resident-app-modules.util.ts src/utils/resident-default-role.util.ts src/utils/invite-role-scope.util.ts src/models/personal-emergency-chain.model.ts src/utils/self-signup-files.util.ts src/models/person.model.ts src/utils/module-gate.util.ts src/utils/member-lookup.util.ts src/utils/notification-access.util.ts src/utils/module-access.util.ts src/services/module-gate.service.ts src/controllers/site.controller.ts src/controllers/organization.controller.ts src/controllers/member.controller.ts src/utils/org-owner-repair.util.ts src/utils/socket-session.util.ts src/utils/people-create-gate.util.ts src/utils/service-app-type.util.ts --format esm --out-dir test/.build --no-dts --silent && node --test test/*.test.mjs",
     "test:camera": "yarn test",
     "test:e2e": "yarn build && node --test --test-concurrency=1 --test-timeout=600000 \"test/e2e/*.test.mjs\""
   },

package/test/demo-adapter.test.mjs

@@ -162,3 +162,36 @@ test("the encoder refuses an impossible image rather than emitting a broken one"
   assert.throws(() => encodeGreyscalePng(new Uint8Array(4), 0, 4), /positive size/);
   assert.throws(() => encodeGreyscalePng(new Uint8Array(2), 10, 10), /one byte per pixel/);
 });
+
+/* ------------------------------------------------ faults and spot cleaning */
+
+import { demoFault, DEMO_FAULT_ROBOT } from "./.build/services/demo.adapter.mjs";
+
+test("one demo robot faults two minutes in every thirty, keyed by when it started", async () => {
+  const windowStart = 30 * 60_000 * 1000;
+  const inside = await at(windowStart + 60_000).getRobot(DEMO_FAULT_ROBOT);
+  assert.equal(inside.mode, "MAINTENANCE");
+  assert.equal(inside.fault.code, "DEMO_BRUSH_JAM");
+  assert.equal(inside.fault.since, windowStart);
+  assert.match(inside.fault.message, /simulated/);
+
+  const after = await at(windowStart + 3 * 60_000).getRobot(DEMO_FAULT_ROBOT);
+  assert.equal(after.fault, null);
+  // Only the one robot, so a fleet screen is not a wall of red.
+  assert.equal(demoFault("DEMO-0001", windowStart), null);
+});
+
+test("the demo brand supports spot cleaning, and parks the robot on the spot", async () => {
+  assert.equal(commandSupported(DEMO_CAPABILITIES, "spot"), true);
+  const t = 5 * 60_000; // outside any fault window, battery well above flat
+  const demo = at(t);
+  await demo.sendCommand("DEMO-0001", {
+    kind: "spot",
+    points: [{ x: 90, y: 50 }, { x: 110, y: 50 }, { x: 110, y: 70 }, { x: 90, y: 70 }],
+  });
+  const robot = await demo.getRobot("DEMO-0001");
+  assert.equal(robot.mode, "WORKING");
+  // Pixels to metres at 0.05 m/px, y flipped (180 px tall plan).
+  assert.ok(Math.abs(robot.position.x - 5) < 1e-9);
+  assert.ok(Math.abs(robot.position.y - (180 - 60) * 0.05) < 1e-9);
+});

package/test/e2e/harness.mjs

@@ -874,10 +874,12 @@ function buildApp(nsu, core) {
   // mirrors iservice365-API-core/src/routes/robot.route.ts
   const robots = express.Router();
   {
-    const { createRobot, getRobots } = core.useRobotController();
+    const { createRobot, getRobots, updateRobot, deleteRobot } = core.useRobotController();
 
     robots.post("/", requireAuth, createRobot);
     robots.get("/organization/:organization/site/:site", requireAuth, getRobots);
+    robots.patch("/:id([0-9a-fA-F]{24})", requireAuth, updateRobot);
+    robots.delete("/:id([0-9a-fA-F]{24})", requireAuth, deleteRobot);
   }
 
   // mirrors iservice365-API-core/src/routes/attendance-settings.route.ts

package/test/e2e/robot-scope.e2e.test.mjs

@@ -290,6 +290,73 @@ describe("robots and their credentials are scoped to their estate", { concurrenc
     assert.deepEqual(stranger.body, insider.body);
   });
 
+  // ---- edit and remove: the estate comes off the STORED robot ---------------
+
+  const seeded = async (name) => (await byName(name))._id;
+  const audits = async (action, target) =>
+    await h.db.collection("console-audit").find({ action, target: String(target) }).toArray();
+
+  record("14. an outsider cannot EDIT or REMOVE another estate's robot by quoting its id", async () => {
+    const robotB = await seeded("rb-seeded-b");
+    const edit = await h.api(`/robots/${robotB}`, {
+      method: "PATCH", sid: outsiderSid, body: { name: "rb-hijacked" },
+    });
+    const remove = await h.api(`/robots/${robotB}`, { method: "DELETE", sid: outsiderSid });
+
+    assert.equal(edit.status, 404);
+    assert.equal(remove.status, 404);
+    const stored = await h.db.collection(COLL).findOne({ _id: robotB });
+    assert.equal(stored.name, "rb-seeded-b");
+    assert.ok(!stored.deletedAt);
+  });
+
+  record("15. the estate's own manager edits a robot, and it is audited without credentials", async () => {
+    const robotB = await seeded("rb-seeded-b");
+    const res = await h.api(`/robots/${robotB}`, {
+      method: "PATCH", sid: managerSid, body: { name: "rb-renamed-b", robotSn: "SN-1" },
+    });
+    assert.equal(res.status, 200);
+
+    const stored = await h.db.collection(COLL).findOne({ _id: robotB });
+    assert.equal(stored.name, "rb-renamed-b");
+    assert.equal(stored.robotSn, "SN-1");
+
+    const [row] = await audits("robot.updated", robotB);
+    assert.equal(row?.after?.name, "rb-renamed-b");
+    assert.equal(row?.before?.name, "rb-seeded-b");
+    assert.equal(JSON.stringify(row).includes("e2e-fake"), false);
+  });
+
+  record("16. an empty edit is a 400", async () => {
+    const robotB = await seeded("rb-renamed-b");
+    const res = await h.api(`/robots/${robotB}`, { method: "PATCH", sid: managerSid, body: {} });
+    assert.equal(res.status, 400);
+  });
+
+  record("17. a removed robot stops listing and answers as not found, and the row stays", async () => {
+    const robotB = await seeded("rb-renamed-b");
+    const remove = await h.api(`/robots/${robotB}`, { method: "DELETE", sid: managerSid });
+    assert.equal(remove.status, 200);
+
+    const list = await h.api(listUrl(id.orgB, id.siteB), { sid: managerSid });
+    assert.equal((list.body?.items ?? []).some((r) => r.name === "rb-renamed-b"), false);
+
+    const again = await h.api(`/robots/${robotB}`, { method: "DELETE", sid: managerSid });
+    assert.equal(again.status, 404);
+
+    const stored = await h.db.collection(COLL).findOne({ _id: robotB });
+    assert.ok(stored.deletedAt, "soft delete keeps the row");
+    assert.equal((await audits("robot.removed", robotB)).length, 1);
+  });
+
+  record("18. creating a robot writes an audit row, without credentials", async () => {
+    const robot = await byName("rb-allowed");
+    const [row] = await audits("robot.added", robot._id);
+    assert.equal(row?.after?.name, "rb-allowed");
+    assert.equal(String(row?.org), String(id.orgB));
+    assert.equal(JSON.stringify(row).includes("e2e-fake"), false);
+  });
+
   record("13. no session is still a 401 on both routes", async () => {
     const list = await h.api(listUrl(id.orgB, id.siteB));
     const create = await h.api("/robots", {
@@ -299,6 +366,9 @@ describe("robots and their credentials are scoped to their estate", { concurrenc
 
     assert.equal(list.status, 401);
     assert.equal(create.status, 401);
+    const robotA = await seeded("rb-seeded-a");
+    assert.equal((await h.api(`/robots/${robotA}`, { method: "PATCH", body: { name: "x" } })).status, 401);
+    assert.equal((await h.api(`/robots/${robotA}`, { method: "DELETE" })).status, 401);
   });
 });
 

package/test/robot-adapter.test.mjs

@@ -129,6 +129,15 @@ test("each command maps to the capability it actually needs", () => {
   assert.equal(commandSupported(caps("navigateToPoint"), "navigate"), true);
 });
 
+test("a spot clean needs spotClean, not just startProcess - a click needs a verified frame", () => {
+  assert.equal(commandSupported(caps("startProcess"), "spot"), false);
+  assert.equal(commandSupported(caps("spotClean"), "spot"), true);
+});
+
+test("spotClean is ours, not Open-RMF's, and moves no brand's tier", () => {
+  assert.equal(robotTier(caps("readLocation", "spotClean")), robotTier(caps("readLocation")));
+});
+
 test("an unknown command kind is refused, not defaulted", () => {
   for (const kind of ["selfDestruct", "", null, undefined, "constructor"]) {
     assert.equal(commandSupported(ALL, kind), false, String(kind));

package/test/robot-fault.test.mjs

@@ -0,0 +1,39 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+
+import {
+  claimFaultOnce,
+  robotFaultKey,
+  robotFaultNotifyEnabled,
+  robotFaultText,
+} from "./.build/utils/robot-fault.util.mjs";
+
+test("the same fault occurrence is claimed once per process", async () => {
+  const local = new Set();
+  const key = robotFaultKey("r1", { code: "JAM", since: 10 });
+  assert.equal(await claimFaultOnce(key, { local }), true);
+  assert.equal(await claimFaultOnce(key, { local }), false);
+  // A second occurrence of the same fault notifies again.
+  assert.equal(await claimFaultOnce(robotFaultKey("r1", { code: "JAM", since: 20 }), { local }), true);
+});
+
+test("another instance holding the claim suppresses it; an unreachable store does not", async () => {
+  assert.equal(await claimFaultOnce("k1", { local: new Set(), claimShared: async () => false }), false);
+  assert.equal(await claimFaultOnce("k2", { local: new Set(), claimShared: async () => null }), true);
+  assert.equal(
+    await claimFaultOnce("k3", { local: new Set(), claimShared: async () => { throw new Error("down"); } }),
+    true,
+  );
+});
+
+test("ROBOT_FAULT_NOTIFY=off silences it; anything else leaves it on", () => {
+  assert.equal(robotFaultNotifyEnabled({}), true);
+  assert.equal(robotFaultNotifyEnabled({ ROBOT_FAULT_NOTIFY: " OFF " }), false);
+  assert.equal(robotFaultNotifyEnabled({ ROBOT_FAULT_NOTIFY: "on" }), true);
+});
+
+test("the text names the robot and the fault", () => {
+  const { body } = robotFaultText("Cleaner 02", { code: "JAM", message: "Side brush jammed" });
+  assert.match(body, /Cleaner 02/);
+  assert.match(body, /Side brush jammed/);
+});