1.5.1: broker errors as events that never crash the host (error only when listened to; connect/offline/reconnect/close; connected flag), configurable broker host + mqtt options + log hook, Alexa.ChangeReport via Device.getChangeReport (<root>/changeReport), SceneController discovery + sendSceneResponse, addCapability options (proactivelyReported), unregisterDevice/clearDevices/getDevices/disconnect, discover/directive events, promise-returning quiet send(); tests on an in-process broker (aedes); readme
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
parent
e96850bdd6
commit
717af632de
16 changed files with 2080 additions and 225 deletions
73
dist/AlexaStatusMessage.js
vendored
73
dist/AlexaStatusMessage.js
vendored
|
|
@ -28,20 +28,29 @@ var TemperatureSensorScale;
|
|||
TemperatureSensorScale["FAHRENHEIT"] = "FAHRENHEIT";
|
||||
})(TemperatureSensorScale || (exports.TemperatureSensorScale = TemperatureSensorScale = {}));
|
||||
class AlexaStatusMessage {
|
||||
constructor(correlationToken, rootTopic, endpointId, mqttClient, isResponse = false, isDeferred = false) {
|
||||
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: isDeferred
|
||||
? "DeferredResponse"
|
||||
: isResponse
|
||||
? "Response"
|
||||
: "StateReport",
|
||||
name: changeCause
|
||||
? "ChangeReport"
|
||||
: isDeferred
|
||||
? "DeferredResponse"
|
||||
: isResponse
|
||||
? "Response"
|
||||
: "StateReport",
|
||||
payloadVersion: "3",
|
||||
messageId: this.generateMessageId(),
|
||||
correlationToken,
|
||||
|
|
@ -68,9 +77,33 @@ class AlexaStatusMessage {
|
|||
};
|
||||
if (instance)
|
||||
prop.instance = instance;
|
||||
this.context.properties.push(prop);
|
||||
(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: Object.assign(Object.assign({}, 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(AlexaInterface_1.AlexaInterfaceType.MODE_CONTROLLER, "mode", value, uncertaintyInMs, instance);
|
||||
}
|
||||
|
|
@ -125,20 +158,18 @@ class AlexaStatusMessage {
|
|||
this.context.properties.push(prop);
|
||||
return this;
|
||||
}
|
||||
send(sendAsync) {
|
||||
const payload = {
|
||||
context: this.isDeferred ? null : this.context,
|
||||
event: this.event,
|
||||
};
|
||||
const topic = `${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
|
||||
const payloadStr = JSON.stringify(payload);
|
||||
this.mqttClient.publish(topic, payloadStr, (err) => {
|
||||
if (err) {
|
||||
console.error("[AlexaStatusMessage] Failed to publish status message:", err);
|
||||
}
|
||||
else {
|
||||
console.log(`[AlexaStatusMessage] Sent message to ${topic}`);
|
||||
}
|
||||
/**
|
||||
* 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; rejects on a publish error (1.4.0 only logged).
|
||||
*/
|
||||
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, reject) => {
|
||||
this.mqttClient.publish(topic, payloadStr, (err) => (err ? reject(err) : resolve(topic)));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue