@attraccess/plugin-wago 0.1.0-nightly.929.1 → 0.1.0-nightly.932.1

package/dist/index.js

@@ -277,7 +277,36 @@ var CHANNEL_PROFILES = [
   "generic-digital-output",
   "generic-monitored-input"
 ];
-var CAPABILITIES = ["output", "input", "measurement", "pulse", "guard"];
+var CAPABILITIES = ["output", "input", "measurement", "pulse", "guard", "feedback"];
+var WAGO_PRESETS = [
+  {
+    id: "metered-switched-load",
+    name: "Metered switched load",
+    description: "Switches an output off immediately when disconnected and reports a transformed measurement."
+  },
+  {
+    id: "pulsed-lock-bank",
+    name: "Pulsed lock bank",
+    description: "Pulses an output briefly and returns it to off immediately when disconnected."
+  },
+  {
+    id: "guarded-enable-request",
+    name: "Guarded enable request",
+    description: "Makes a non-safety enable request only while an operational guard is satisfied."
+  },
+  { id: "generic-digital-output", name: "Generic digital output", description: "A conservative output foundation." },
+  { id: "generic-monitored-input", name: "Generic monitored input", description: "A monitored digital input foundation." }
+];
+function applyPreset(snapshot, application) {
+  const preset = application && WAGO_PRESETS.find((item) => item.id === application.presetId);
+  if (!preset) throw new Error("unknown WAGO preset");
+  const channel = presetChannel(application);
+  const existingIndex = snapshot.logicalChannels.findIndex((item) => item.id === application.channelId);
+  const logicalChannels = [...snapshot.logicalChannels];
+  if (existingIndex === -1) logicalChannels.push(channel);
+  else logicalChannels[existingIndex] = channel;
+  return { ...snapshot, logicalChannels };
+}
 function canonicalSnapshot(snapshot) {
   if (!snapshot || typeof snapshot !== "object" || Array.isArray(snapshot))
     throw new Error("configuration snapshot must be an object");
@@ -321,6 +350,7 @@ function validateSnapshot(snapshot) {
   const channels = collection(value.logicalChannels, "logicalChannels", errors);
   const pointIds = /* @__PURE__ */ new Set();
   const channelIds = /* @__PURE__ */ new Set();
+  const channelsById = /* @__PURE__ */ new Map();
   points.forEach((point, index) => {
     const path = `physicalPoints[${index}]`;
     if (!record(point, path, errors)) return;
@@ -335,8 +365,11 @@ function validateSnapshot(snapshot) {
       });
   });
   channels.forEach((channel, index) => {
-    if (channel && typeof channel === "object" && !Array.isArray(channel))
-      addId(channel.id, `logicalChannels[${index}].id`, channelIds, errors);
+    if (channel && typeof channel === "object" && !Array.isArray(channel)) {
+      const item = channel;
+      addId(item.id, `logicalChannels[${index}].id`, channelIds, errors);
+      if (typeof item.id === "string") channelsById.set(item.id, item);
+    }
   });
   channels.forEach((channel, index) => {
     const path = `logicalChannels[${index}]`;
@@ -353,6 +386,7 @@ function validateSnapshot(snapshot) {
         "range",
         "pulse",
         "guard",
+        "feedback",
         "measurement"
       ],
       errors
@@ -365,6 +399,7 @@ function validateSnapshot(snapshot) {
     validateRange(channel.range, `${path}.range`, capabilities, errors);
     validatePulse(channel.pulse, `${path}.pulse`, capabilities, errors);
     validateGuard(channel.guard, `${path}.guard`, capabilities, channelIds, errors);
+    validateFeedback(channel.feedback, `${path}.feedback`, capabilities, channel.id, channelsById, errors);
     validateMeasurement(channel.measurement, `${path}.measurement`, capabilities, errors);
     validateProfile(channel.profile, capabilities, path, errors);
   });
@@ -411,7 +446,7 @@ function exactKeys(value, path, allowed, errors, optional = []) {
       message: "field is not supported by configuration version 1"
     })
   );
-  allowed.filter((key) => !["range", "pulse", "guard", "measurement", ...optional].includes(key) && !(key in value)).forEach(
+  allowed.filter((key) => !["range", "pulse", "guard", "feedback", "measurement", ...optional].includes(key) && !(key in value)).forEach(
     (key) => errors.push({
       path: path === "$" ? key : `${path}.${key}`,
       code: "required_field",
@@ -519,6 +554,22 @@ function validateMeasurement(value, path, capabilities, errors) {
   if (!capabilities.has("measurement"))
     errors.push({ path, code: "unsupported_field", message: "measurement requires measurement capability" });
 }
+function validateFeedback(value, path, capabilities, currentChannelId, channelsById, errors) {
+  if (value === void 0) return;
+  if (!record(value, path, errors)) return;
+  exactKeys(value, path, ["channelId", "expected", "timeoutMs"], errors);
+  const feedbackChannel = typeof value.channelId === "string" ? channelsById.get(value.channelId) : void 0;
+  if (!feedbackChannel)
+    errors.push(referenceError(`${path}.channelId`, "logical channel", value.channelId));
+  else if (value.channelId === currentChannelId || !Array.isArray(feedbackChannel.capabilities) || !feedbackChannel.capabilities.includes("input"))
+    errors.push({ path: `${path}.channelId`, code: "invalid_feedback_channel", message: "feedback must reference a distinct input channel" });
+  if (!["match", "inverse"].includes(value.expected))
+    errors.push({ path: `${path}.expected`, code: "unsupported_value", message: "expected must be match or inverse" });
+  if (!Number.isSafeInteger(value.timeoutMs) || value.timeoutMs <= 0)
+    errors.push({ path: `${path}.timeoutMs`, code: "invalid_timeout", message: "timeoutMs must be a positive integer" });
+  if (!capabilities.has("feedback"))
+    errors.push({ path, code: "unsupported_field", message: "feedback requires feedback capability" });
+}
 function validateProfile(value, capabilities, path, errors) {
   const required = {
     "metered-switched-load": ["output", "measurement"],
@@ -535,6 +586,35 @@ function validateProfile(value, capabilities, path, errors) {
     })
   );
 }
+function presetChannel(application) {
+  const base = {
+    id: application.channelId,
+    physicalPointId: application.physicalPointId,
+    profile: application.presetId,
+    disconnectPolicy: { mode: application.presetId === "generic-monitored-input" ? "hold" : "immediate" }
+  };
+  switch (application.presetId) {
+    case "metered-switched-load":
+      return { ...base, capabilities: ["output", "measurement"], measurement: { unit: "watt", scale: 1, offset: 0 } };
+    case "pulsed-lock-bank":
+      return { ...base, capabilities: ["output", "pulse"], pulse: { durationMs: 500 } };
+    case "guarded-enable-request":
+      if (!application.guardChannelId) throw new Error("guarded enable requests require a guard channel");
+      return {
+        ...base,
+        capabilities: ["output", "guard"],
+        guard: { channelId: application.guardChannelId, when: "on" }
+      };
+    case "generic-monitored-input":
+      return { ...base, capabilities: ["input"] };
+    case "generic-digital-output":
+      return {
+        ...base,
+        capabilities: application.feedbackChannelId ? ["output", "feedback"] : ["output"],
+        ...application.feedbackChannelId ? { feedback: { channelId: application.feedbackChannelId, expected: "match", timeoutMs: 1e3 } } : {}
+      };
+  }
+}
 function referenceError(path, type, id) {
   return { path, code: "missing_reference", message: `${type} ${String(id)} does not exist in this snapshot` };
 }
@@ -554,6 +634,7 @@ var WagoConfigurationDraft = class {
     __publicField(this, "controllerId");
     __publicField(this, "snapshot");
     __publicField(this, "reviewedHash");
+    __publicField(this, "presetProvenance");
     __publicField(this, "updatedAt");
   }
 };
@@ -569,6 +650,9 @@ __decorateClass([
 __decorateClass([
   (0, import_plugins_backend_sdk4.Column)({ type: "varchar", name: "reviewed_hash", nullable: true })
 ], WagoConfigurationDraft.prototype, "reviewedHash", 2);
+__decorateClass([
+  (0, import_plugins_backend_sdk4.Column)({ type: "text", name: "preset_provenance", nullable: true })
+], WagoConfigurationDraft.prototype, "presetProvenance", 2);
 __decorateClass([
   (0, import_plugins_backend_sdk4.Column)({ type: "varchar", name: "updated_at" })
 ], WagoConfigurationDraft.prototype, "updatedAt", 2);
@@ -645,13 +729,13 @@ var WagoService = class {
     __publicField(this, "subscriptionRetryTimer", null);
     __publicField(this, "activeSubscriptionGeneration", 0);
     __publicField(this, "destroyed", false);
-    this.controllers = context.getRepository(WagoController);
-    this.settings = context.getRepository(WagoSettings);
-    this.enrollments = context.getRepository(WagoEnrollment);
-    this.drafts = context.getRepository(WagoConfigurationDraft);
-    this.revisions = context.getRepository(WagoConfigurationRevision);
   }
   async onModuleInit() {
+    this.controllers = this.context.getRepository(WagoController);
+    this.settings = this.context.getRepository(WagoSettings);
+    this.enrollments = this.context.getRepository(WagoEnrollment);
+    this.drafts = this.context.getRepository(WagoConfigurationDraft);
+    this.revisions = this.context.getRepository(WagoConfigurationRevision);
     const enrollments = await this.enrollments.createQueryBuilder("enrollment").where("enrollment.consumedAt IS NULL").getMany();
     for (const enrollment of enrollments) this.scheduleEnrollmentExpiry(enrollment);
     await this.subscribeConfiguredServers();
@@ -715,6 +799,12 @@ var WagoService = class {
   async setDefaultMqttServer(serverId) {
     return this.setSettings(serverId);
   }
+  async enrollmentCredentialSupport(mqttServerId) {
+    if (!await this.context.getMqttServerConfig(mqttServerId))
+      throw new import_common.NotFoundException(`MQTT server ${mqttServerId} not found`);
+    const providers = await this.context.getMqttCredentialProvisioning().availableProviders(mqttServerId);
+    return { automatic: providers.length > 0 };
+  }
   async getDraft(controllerId) {
     await this.claimedController(controllerId);
     return this.drafts.findOneBy({ controllerId });
@@ -728,6 +818,35 @@ var WagoService = class {
     const errors = validateSnapshot(JSON.parse(draft.snapshot));
     return { valid: errors.length === 0, errors };
   }
+  presets() {
+    return WAGO_PRESETS;
+  }
+  async previewPreset(controllerId, application) {
+    const draft = await this.draftForPreset(controllerId);
+    const snapshot = JSON.parse(draft.snapshot);
+    return { draftHash: configurationHash(snapshot), diff: configurationDiff(snapshot, applyPreset(snapshot, application)) };
+  }
+  async applyPreset(controllerId, application, selectedPaths, previewedDraftHash) {
+    return this.withConfigurationLock(controllerId, async () => {
+      const draft = await this.draftForPreset(controllerId);
+      const snapshot = JSON.parse(draft.snapshot);
+      if (previewedDraftHash !== configurationHash(snapshot))
+        throw new import_common.ConflictException("selected preset changes no longer match the configuration draft");
+      const candidate = applyPreset(snapshot, application);
+      const diff = configurationDiff(snapshot, candidate);
+      const validPaths = new Set(diff.map((change) => change.path));
+      if (!Array.isArray(selectedPaths) || selectedPaths.some((path) => !validPaths.has(path)))
+        throw new import_common.ConflictException("selected preset changes no longer match the configuration draft");
+      draft.snapshot = canonicalSnapshot(applySelectedChanges(snapshot, diff, selectedPaths));
+      draft.reviewedHash = null;
+      draft.presetProvenance = JSON.stringify([
+        ...parsePresetProvenance(draft.presetProvenance).slice(-99),
+        { presetId: application.presetId, appliedAt: (/* @__PURE__ */ new Date()).toISOString(), selectedPaths }
+      ]);
+      draft.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return this.drafts.save(draft);
+    });
+  }
   async revisionsFor(controllerId, offset = 0, limit = 20) {
     await this.claimedController(controllerId);
     const pageOffset = Number.isSafeInteger(offset) && offset > 0 ? offset : 0;
@@ -780,7 +899,7 @@ var WagoService = class {
     await this.claimedController(controllerId);
     const serialized = canonicalSnapshot(snapshot);
     const existing = await this.drafts.findOneBy({ controllerId });
-    const draft = existing ?? this.drafts.create({ controllerId, snapshot: serialized, reviewedHash: null, updatedAt: "" });
+    const draft = existing ?? this.drafts.create({ controllerId, snapshot: serialized, reviewedHash: null, presetProvenance: null, updatedAt: "" });
     draft.snapshot = serialized;
     draft.reviewedHash = null;
     draft.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -796,6 +915,12 @@ var WagoService = class {
     const diff = configurationDiff(previous ? JSON.parse(previous.snapshot) : null, JSON.parse(draft.snapshot));
     return { draft, previous, changed: diff.length > 0, diff };
   }
+  async draftForPreset(controllerId) {
+    await this.claimedController(controllerId);
+    const draft = await this.drafts.findOneBy({ controllerId });
+    if (!draft) throw new import_common.NotFoundException(`WAGO controller ${controllerId} has no configuration draft`);
+    return draft;
+  }
   async publishDraftWhileLocked(controllerId) {
     const controller = await this.claimedController(controllerId);
     const draft = await this.drafts.findOneBy({ controllerId });
@@ -1414,6 +1539,36 @@ function safeEqual(left, right) {
 function isValidHardwareId(hardwareId) {
   return Boolean(hardwareId) && !/[/+#]/.test(hardwareId);
 }
+function parsePresetProvenance(value) {
+  if (!value) return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+function applySelectedChanges(snapshot, diff, selectedPaths) {
+  const merged = JSON.parse(JSON.stringify(snapshot));
+  const changes = new Map(diff.map((change) => [change.path, change]));
+  for (const path of selectedPaths) {
+    const change = changes.get(path);
+    if (!change) continue;
+    const segments = [...path.matchAll(/\.([^.[\]]+)|\[(\d+)\]/g)].map((match) => match[1] ?? Number(match[2]));
+    if (!segments.length) continue;
+    let target = merged;
+    for (const segment of segments.slice(0, -1)) {
+      const next = target[segment];
+      if (next === void 0) target[segment] = typeof segment === "number" ? [] : {};
+      target = target[segment];
+    }
+    const last = segments[segments.length - 1];
+    if (last === void 0) continue;
+    if (change.current === void 0) delete target[last];
+    else target[last] = change.current;
+  }
+  return merged;
+}
 
 // backend/wago.controller.ts
 var WagoControllerApi = class {
@@ -1433,12 +1588,26 @@ var WagoControllerApi = class {
     const manualCredentials = body?.manualUsername || body?.manualPassword ? { username: body.manualUsername ?? "", password: body.manualPassword ?? "" } : void 0;
     return this.wago.createEnrollment(body?.hardwareId ?? "", body?.mqttServerId, manualCredentials);
   }
+  credentialSupport(mqttServerId) {
+    return this.wago.enrollmentCredentialSupport(mqttServerId);
+  }
   claim(id, body) {
     return this.wago.claim(id, body?.name ?? "", body?.verifier ?? "", body?.mqttServerId);
   }
   draft(id) {
     return this.wago.getDraft(id);
   }
+  presets() {
+    return this.wago.presets();
+  }
+  previewPreset(id, body) {
+    if (!body?.application) throw new import_common2.BadRequestException("application is required");
+    return this.wago.previewPreset(id, body.application);
+  }
+  applyPreset(id, body) {
+    if (!body?.application) throw new import_common2.BadRequestException("application is required");
+    return this.wago.applyPreset(id, body.application, body.selectedPaths ?? [], body.previewedDraftHash ?? "");
+  }
   saveDraft(id, body) {
     return this.wago.saveDraft(id, body?.snapshot);
   }
@@ -1475,6 +1644,10 @@ __decorateClass([
   (0, import_common2.Post)("enrollments"),
   __decorateParam(0, (0, import_common2.Body)())
 ], WagoControllerApi.prototype, "enrollment", 1);
+__decorateClass([
+  (0, import_common2.Get)("enrollments/credential-support/:mqttServerId"),
+  __decorateParam(0, (0, import_common2.Param)("mqttServerId", import_common2.ParseIntPipe))
+], WagoControllerApi.prototype, "credentialSupport", 1);
 __decorateClass([
   (0, import_common2.Post)("controllers/:id/claim"),
   __decorateParam(0, (0, import_common2.Param)("id", import_common2.ParseIntPipe)),
@@ -1484,6 +1657,19 @@ __decorateClass([
   (0, import_common2.Get)("controllers/:id/configuration/draft"),
   __decorateParam(0, (0, import_common2.Param)("id", import_common2.ParseIntPipe))
 ], WagoControllerApi.prototype, "draft", 1);
+__decorateClass([
+  (0, import_common2.Get)("configuration/presets")
+], WagoControllerApi.prototype, "presets", 1);
+__decorateClass([
+  (0, import_common2.Post)("controllers/:id/configuration/presets/preview"),
+  __decorateParam(0, (0, import_common2.Param)("id", import_common2.ParseIntPipe)),
+  __decorateParam(1, (0, import_common2.Body)())
+], WagoControllerApi.prototype, "previewPreset", 1);
+__decorateClass([
+  (0, import_common2.Post)("controllers/:id/configuration/presets/apply"),
+  __decorateParam(0, (0, import_common2.Param)("id", import_common2.ParseIntPipe)),
+  __decorateParam(1, (0, import_common2.Body)())
+], WagoControllerApi.prototype, "applyPreset", 1);
 __decorateClass([
   (0, import_common2.Post)("controllers/:id/configuration/draft"),
   __decorateParam(0, (0, import_common2.Param)("id", import_common2.ParseIntPipe)),

package/dist/migrations.js

@@ -23,6 +23,7 @@ var migrations_exports = {};
 __export(migrations_exports, {
   AddWagoConfigurationRevisions1780000000002: () => AddWagoConfigurationRevisions1780000000002,
   AddWagoEnrollmentRevocation1780000000001: () => AddWagoEnrollmentRevocation1780000000001,
+  AddWagoPresetProvenance1780000000003: () => AddWagoPresetProvenance1780000000003,
   CreateWagoControllers1780000000000: () => CreateWagoControllers1780000000000
 });
 module.exports = __toCommonJS(migrations_exports);
@@ -98,9 +99,23 @@ var AddWagoConfigurationRevisions1780000000002 = class {
     await queryRunner.query('ALTER TABLE "plugin_wago_settings" DROP COLUMN "operational_prefix"');
   }
 };
+
+// backend/migrations/1780000000003-add-wago-preset-provenance.ts
+var AddWagoPresetProvenance1780000000003 = class {
+  constructor() {
+    __publicField(this, "name", "AddWagoPresetProvenance1780000000003");
+  }
+  async up(queryRunner) {
+    await queryRunner.query('ALTER TABLE "plugin_wago_configuration_drafts" ADD COLUMN "preset_provenance" text');
+  }
+  async down(queryRunner) {
+    await queryRunner.query('ALTER TABLE "plugin_wago_configuration_drafts" DROP COLUMN "preset_provenance"');
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddWagoConfigurationRevisions1780000000002,
   AddWagoEnrollmentRevocation1780000000001,
+  AddWagoPresetProvenance1780000000003,
   CreateWagoControllers1780000000000
 });