A capability is a descriptor plus what the endpoint declares (device/Capability.ts), and its discovery object is
generated from the two. The new API is bridge.addDevice({ endpointId, name, categories, ... }) and
device.add(PowerController, options): both throw a DeclarationError that names the endpoint, the interface and
the instance (device/validate.ts), and leave the bridge and the device as they were. AlexaInterface is the same
Capability with the 1.x methods on it; it, ActionMapping and the enums moved to src/compat/, Device to src/device/.
What a 1.x caller can observe:
- every endpoint ends with { type: "AlexaInterface", interface: "Alexa", version: "3" } (alexa-interface.html);
new Alex2MQTT(..., { alexaInterface: false }) leaves it out
- the fields of a capability object come in the order of Amazon's examples; their content is unchanged
- addCapability() with a name that is not an interface throws (1.5.2 announced it with the version "UNKNOWN")
- ActionMapping takes the payload as an object; a JSON string is parsed (1.5.2 sent the string), any other throws
- what Alexa would reject in a 1.x declaration is not refused: device.check() lists it and the bridge logs each
line once, as "warning: ..." through the log hook, when it answers a discovery
- a device whose JSON cannot be built is left out of the answer and reported as an error event
- PowerController and EndpointHealth are the descriptors and keep ON/OFF and OK/UNREACHABLE; PowerState is new
Tests: six zoo devices declared the 1.x way give the JSON that Alexa accepted from 1.5.2 on 2026-09-28, plus the
Alexa capability. npm test: 85 pass (was 57) in 10-12 s, also on Node 18.20.8 and 20.20.2.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
171 lines
7.6 KiB
JavaScript
171 lines
7.6 KiB
JavaScript
"use strict";
|
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
exports.AlexaStatusMessage = exports.TemperatureSensorScale = exports.ThermostatMode = void 0;
|
|
const crypto_1 = require("crypto");
|
|
const enums_js_1 = require("./compat/enums.js");
|
|
var ThermostatMode;
|
|
(function (ThermostatMode) {
|
|
ThermostatMode["OFF"] = "OFF";
|
|
ThermostatMode["HEAT"] = "HEAT";
|
|
ThermostatMode["COOL"] = "COOL";
|
|
ThermostatMode["AUTO"] = "AUTO";
|
|
ThermostatMode["ECO"] = "ECO";
|
|
ThermostatMode["CUSTOM"] = "CUSTOM";
|
|
})(ThermostatMode || (exports.ThermostatMode = ThermostatMode = {}));
|
|
var TemperatureSensorScale;
|
|
(function (TemperatureSensorScale) {
|
|
TemperatureSensorScale["CELSIUS"] = "CELSIUS";
|
|
TemperatureSensorScale["FAHRENHEIT"] = "FAHRENHEIT";
|
|
})(TemperatureSensorScale || (exports.TemperatureSensorScale = TemperatureSensorScale = {}));
|
|
class AlexaStatusMessage {
|
|
constructor(correlationToken, rootTopic, endpointId, mqttClient, isResponse = false, isDeferred = false, changeCause = null) {
|
|
this.context = { properties: [] };
|
|
/** ChangeReport only: the properties that changed (payload.change.properties); the rest go to context. */
|
|
this.changeProps = [];
|
|
this.changeCause = null;
|
|
this.target = "context";
|
|
this.rootTopic = rootTopic;
|
|
this.endpointId = endpointId;
|
|
this.mqttClient = mqttClient;
|
|
this.isDeferred = isDeferred;
|
|
this.changeCause = changeCause;
|
|
if (changeCause)
|
|
this.target = "change";
|
|
this.event = {
|
|
header: {
|
|
namespace: "Alexa",
|
|
name: changeCause
|
|
? "ChangeReport"
|
|
: isDeferred
|
|
? "DeferredResponse"
|
|
: isResponse
|
|
? "Response"
|
|
: "StateReport",
|
|
payloadVersion: "3",
|
|
messageId: (0, crypto_1.randomUUID)(),
|
|
correlationToken,
|
|
},
|
|
endpoint: {
|
|
endpointId,
|
|
},
|
|
payload: {},
|
|
};
|
|
}
|
|
getTimestamp() {
|
|
return new Date().toISOString();
|
|
}
|
|
addProperty(namespace, name, value, uncertaintyInMilliseconds = 0, instance) {
|
|
const prop = {
|
|
namespace,
|
|
name,
|
|
value,
|
|
timeOfSample: this.getTimestamp(),
|
|
uncertaintyInMilliseconds,
|
|
};
|
|
if (instance)
|
|
prop.instance = instance;
|
|
(this.target === "change" ? this.changeProps : this.context.properties).push(prop);
|
|
return this;
|
|
}
|
|
/** ChangeReport: the add*Prop calls that follow describe what CHANGED (the default for a change report). */
|
|
changed() {
|
|
this.target = "change";
|
|
return this;
|
|
}
|
|
/** ChangeReport: the add*Prop calls that follow describe the other, unchanged properties (context). */
|
|
unchanged() {
|
|
this.target = "context";
|
|
return this;
|
|
}
|
|
/** True for a ChangeReport (Device.getChangeReport). */
|
|
isChangeReport() {
|
|
return this.changeCause !== null;
|
|
}
|
|
/** The message as it will be published (for tests and logging). */
|
|
toJSON() {
|
|
if (this.changeCause) {
|
|
return {
|
|
event: { ...this.event, payload: { change: { cause: { type: this.changeCause }, properties: this.changeProps } } },
|
|
context: this.context,
|
|
};
|
|
}
|
|
return { context: this.isDeferred ? null : this.context, event: this.event };
|
|
}
|
|
addModeControllerProp(instance, value, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.MODE_CONTROLLER, "mode", value, uncertaintyInMs, instance);
|
|
}
|
|
addThermostatModeProp(mode, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.THERMOSTAT_CONTROLLER, "thermostatMode", mode, uncertaintyInMs);
|
|
}
|
|
addEstimatedDeferralTime(seconds) {
|
|
if (this.isDeferred) {
|
|
this.event.payload = {
|
|
estimatedDeferralInSeconds: seconds,
|
|
};
|
|
}
|
|
else {
|
|
console.warn("[AlexaStatusMessage.ts] Attempted to add estimated deferral time, but message is not marked as DeferredResponse.");
|
|
}
|
|
return this;
|
|
}
|
|
addThermostatControllerProp(name, scale, value, uncertaintyInMs = 0) {
|
|
const tempValue = {
|
|
value: scale === TemperatureSensorScale.FAHRENHEIT
|
|
? (value - 32) * (5 / 9)
|
|
: value,
|
|
scale: "CELSIUS",
|
|
};
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.THERMOSTAT_CONTROLLER, name, tempValue, uncertaintyInMs);
|
|
}
|
|
/** Alexa.EndpointHealth connectivity: EndpointHealth.OK / UNREACHABLE (the plain strings "OK" / "UNREACHABLE" are accepted too). */
|
|
addHealthProp(health, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.ENDPOINT_HEALTH, "connectivity", { value: health }, uncertaintyInMs);
|
|
}
|
|
addPowerControllerProp(power, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.POWER_CONTROLLER, "powerState", power, uncertaintyInMs);
|
|
}
|
|
addTemperatureSensorProp(scale, value, uncertaintyInMs = 0) {
|
|
const tempValue = {
|
|
value: scale === TemperatureSensorScale.FAHRENHEIT
|
|
? (value - 32) * (5 / 9)
|
|
: value,
|
|
scale: "CELSIUS",
|
|
};
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.TEMPERATURE_SENSOR, "temperature", tempValue, uncertaintyInMs);
|
|
}
|
|
addBrightnessControllerProp(brightness, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.BRIGHTNESS_CONTROLLER, "brightness", brightness, uncertaintyInMs);
|
|
}
|
|
addColorTemperatureControllerProp(colorTemp, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.COLOR_TEMPERATURE_CONTROLLER, "colorTemperatureInKelvin", colorTemp, uncertaintyInMs);
|
|
}
|
|
addToggleControllerProp(state, instance, uncertaintyInMs = 0) {
|
|
return this.addProperty(enums_js_1.AlexaInterfaceType.TOGGLE_CONTROLLER, "toggleState", state, uncertaintyInMs, instance);
|
|
}
|
|
addContextProp(prop) {
|
|
this.context.properties.push(prop);
|
|
return this;
|
|
}
|
|
/**
|
|
* Publish: a Response/StateReport to <root>/<endpoint>/alexaResponce (sendAsync: deferredResponse), a ChangeReport
|
|
* to <root>/changeReport (Alex2MQTT adds the user's token and posts it to the Alexa event gateway). Resolves with
|
|
* the topic, or "" when the publish failed - the error then goes to the bridge's "error" event (when listened to).
|
|
* Never rejects (1.5.1 did, so an un-caught send() could kill the host).
|
|
*/
|
|
send(sendAsync = false) {
|
|
const payloadStr = JSON.stringify(this.toJSON());
|
|
const topic = this.changeCause
|
|
? `${this.rootTopic}/changeReport`
|
|
: `${this.rootTopic}/${this.endpointId}/${sendAsync ? "deferredResponse" : "alexaResponce"}`; //Yes this should be response but it is incorrect in both Alex2MQTT and Alex2ESP so for consistency is is wrong here too
|
|
return new Promise((resolve) => {
|
|
this.mqttClient.publish(topic, payloadStr, (err) => {
|
|
if (!err)
|
|
return resolve(topic);
|
|
if (this.onPublishError)
|
|
this.onPublishError(err); // -> the bridge's "error" event (when somebody listens)
|
|
resolve(""); // 1.5.1 rejected here, and an un-caught send() then killed the host on any broker hiccup
|
|
});
|
|
});
|
|
}
|
|
}
|
|
exports.AlexaStatusMessage = AlexaStatusMessage;
|