@attraccess/plugin-wago 0.1.0-nightly.951.1 → 0.1.0-nightly.953.1

package/dist/index.js

@@ -51671,6 +51671,13 @@ var CONFIGURATION_CAPABILITY = `configuration-v${CONFIGURATION_PROTOCOL_VERSION}
 var REQUIRED_CAPABILITIES = ["claim", "heartbeat", CONFIGURATION_CAPABILITY];
 var SUPPORTED_PROTOCOL_MAJOR = 1;
 function parseAnnouncement(payload) {
+  const heartbeat = parseHeartbeat(payload);
+  const input = JSON.parse(payload.toString("utf8"));
+  if (typeof input.pairingCode !== "string" || !input.pairingCode.trim())
+    throw new Error("announcement pairingCode is required");
+  return { ...heartbeat, pairingCode: input.pairingCode.trim() };
+}
+function parseHeartbeat(payload) {
   let value;
   try {
     value = JSON.parse(payload.toString("utf8"));
@@ -51679,7 +51686,7 @@ function parseAnnouncement(payload) {
   }
   if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("announcement must be an object");
   const input = value;
-  const required = ["hardwareId", "pairingCode", "protocolVersion", "runtimeVersion"];
+  const required = ["hardwareId", "protocolVersion", "runtimeVersion"];
   for (const key of required)
     if (typeof input[key] !== "string" || !input[key].trim()) throw new Error(`announcement ${key} is required`);
   if (!Array.isArray(input.capabilities) || input.capabilities.some((item) => typeof item !== "string"))
@@ -51688,7 +51695,6 @@ function parseAnnouncement(payload) {
     throw new Error("announcement sequence must be a non-negative integer");
   return {
     hardwareId: input.hardwareId.trim(),
-    pairingCode: input.pairingCode.trim(),
     enrollmentSecret: typeof input.enrollmentSecret === "string" ? input.enrollmentSecret.trim() : void 0,
     fingerprint: typeof input.fingerprint === "string" ? input.fingerprint.trim() : void 0,
     protocolVersion: input.protocolVersion.trim(),
@@ -52445,7 +52451,18 @@ var WagoCommandHandler = class {
     const revision = controllerId ? await this.dependencies.appliedRevision(controllerId) : null;
     const snapshot = revision ? JSON.parse(revision.snapshot) : null;
     const channelId = typeof config.channelId === "string" ? config.channelId : void 0;
-    const channel = snapshot?.logicalChannels.find((item) => item.id === channelId);
+    const outputChannels = snapshot?.logicalChannels.filter((item) => item.capabilities.includes("output")) ?? [];
+    let names = {};
+    if (controllerId) {
+      const draft = await this.dependencies.context.getRepository(WagoConfigurationDraft).findOneBy({ controllerId });
+      try {
+        const draftMatchesAppliedRevision = typeof draft?.snapshot === "string" && configurationHash(JSON.parse(draft.snapshot)) === revision?.contentHash;
+        const storedNames = draftMatchesAppliedRevision && JSON.parse(draft?.presetProvenance ?? "null")?.editor?.names;
+        if (storedNames && typeof storedNames === "object" && !Array.isArray(storedNames)) names = storedNames;
+      } catch {
+      }
+    }
+    const channel = outputChannels.find((item) => item.id === channelId);
     const references = channelId && controllerId ? await this.references(controllerId, channelId, resourceId) : [];
     const properties = {
       controllerId: {
@@ -52456,16 +52473,20 @@ var WagoCommandHandler = class {
           const: controller.id,
           title: controller.name ?? controller.hardwareId
         })),
-        refreshesSchema: true
+        refreshesSchema: true,
+        description: controllerId && !revision ? "Publish a configuration and wait for the controller to apply it before authoring commands." : void 0
       }
     };
     if (controllerId && revision && snapshot) {
       properties.channelId = {
         type: "string",
         title: "Logical Channel",
-        oneOf: snapshot.logicalChannels.map((item) => ({ const: item.id, title: `${item.id} (${item.profile})` })),
+        oneOf: outputChannels.map((item) => ({
+          const: item.id,
+          title: typeof names[item.id] === "string" ? names[item.id] : `${item.id} (${item.profile})`
+        })),
         refreshesSchema: true,
-        helpText: references.length ? `Also controlled by resource flow node${references.length === 1 ? "" : "s"}: ${references.join(", ")}. Reuse is allowed.` : void 0
+        description: references.length ? `Also controlled by resource flow node${references.length === 1 ? "" : "s"}: ${references.join(", ")}. Reuse is allowed.` : outputChannels.length ? void 0 : "This applied configuration has no output channels. Add an output and publish it first."
       };
     }
     if (channel) {
@@ -52474,7 +52495,7 @@ var WagoCommandHandler = class {
         ...channel.capabilities.includes("pulse") ? [{ const: "pulse", title: "Pulse" }] : []
       ] : [];
       properties.action = { type: "string", title: "Operation", oneOf: actions, refreshesSchema: true };
-      if (config.action === "set") properties.value = { type: "boolean", title: "State" };
+      if (config.action === "set") properties.value = { type: "boolean", title: "State", default: false };
       properties.expectedConfigurationRevision = {
         type: "number",
         title: "Configuration revision",
@@ -52515,7 +52536,15 @@ var WagoCommandHandler = class {
       dynamic: true,
       type: "object",
       properties,
-      required: Object.keys(properties).filter((key) => key !== "value")
+      required: [
+        .../* @__PURE__ */ new Set([
+          "controllerId",
+          "channelId",
+          "action",
+          "expectedConfigurationRevision",
+          ...Object.keys(properties)
+        ])
+      ]
     };
   }
   async validate(config, validationContext = /* @__PURE__ */ new Map()) {
@@ -53429,7 +53458,7 @@ var WagoService = class {
   async onHeartbeat(hardwareId, payload) {
     let heartbeat;
     try {
-      heartbeat = parseAnnouncement(payload);
+      heartbeat = parseHeartbeat(payload);
     } catch (error) {
       this.context.logger.warn(
         `Ignoring invalid WAGO heartbeat: ${error instanceof Error ? error.message : String(error)}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@attraccess/plugin-wago",
-  "version": "0.1.0-nightly.951.1",
+  "version": "0.1.0-nightly.953.1",
   "description": "Official Attraccess integration for WAGO CC100 controllers.",
   "keywords": [
     "attraccess-plugin",