messages: pure builders for every event the bridge sends
src/messages builds Response, StateReport, DeferredResponse, ErrorResponse, ChangeReport and the scene, doorbell and simple events from plain values; messageId and times are parameters, so a test compares whole objects. StateBuilder collects properties checked by the descriptors, AlexaError and AlexaErrors carry the payload fields of an error type. AlexaStatusMessage and AlexaErrorResponse move to src/compat and are written on the builders. On the wire, against 1.5.2: a DeferredResponse has no context key, a ChangeReport has no correlationToken, the namespace of an ErrorResponse follows its type, and a ChangeReport without a changed property is not published: send() resolves "" and the bridge reports an error that names the endpoint. 143 tests pass (108 before). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
parent
2558e21787
commit
46fa06728c
68 changed files with 3410 additions and 1208 deletions
129
dist/cjs/AlexaErrorResponse.js
vendored
129
dist/cjs/AlexaErrorResponse.js
vendored
|
|
@ -1,129 +0,0 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.AlexaErrorResponse = exports.AlexaErrorType = void 0;
|
||||
const crypto_1 = require("crypto");
|
||||
var AlexaErrorType;
|
||||
(function (AlexaErrorType) {
|
||||
AlexaErrorType["ALREADY_IN_OPERATION"] = "ALREADY_IN_OPERATION";
|
||||
AlexaErrorType["AUTHORIZATION_REQUIRED"] = "AUTHORIZATION_REQUIRED";
|
||||
AlexaErrorType["BRIDGE_UNREACHABLE"] = "BRIDGE_UNREACHABLE";
|
||||
AlexaErrorType["BYPASS_NEEDED"] = "BYPASS_NEEDED";
|
||||
AlexaErrorType["CLOUD_CONTROL_DISABLED"] = "CLOUD_CONTROL_DISABLED";
|
||||
AlexaErrorType["CHILD_LOCK"] = "CHILD_LOCK";
|
||||
AlexaErrorType["CONFIGURATION_UPDATE_NOT_ALLOWED"] = "CONFIGURATION_UPDATE_NOT_ALLOWED";
|
||||
AlexaErrorType["COOK_DURATION_TOO_LONG"] = "COOK_DURATION_TOO_LONG";
|
||||
AlexaErrorType["COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE"] = "COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["COOLING_STAGES_EXCEEDS_LIMIT"] = "COOLING_STAGES_EXCEEDS_LIMIT";
|
||||
AlexaErrorType["DATA_DELETION_NOT_SUPPORTED"] = "DATA_DELETION_NOT_SUPPORTED";
|
||||
AlexaErrorType["DATA_RETRIEVAL_NOT_SUPPORTED"] = "DATA_RETRIEVAL_NOT_SUPPORTED";
|
||||
AlexaErrorType["DEVICE_STUCK"] = "DEVICE_STUCK";
|
||||
AlexaErrorType["DISABLED_BY_USER"] = "DISABLED_BY_USER";
|
||||
AlexaErrorType["DO_NOT_DISTURB_MODE"] = "DO_NOT_DISTURB_MODE";
|
||||
AlexaErrorType["DOOR_CLOSED_TOO_LONG"] = "DOOR_CLOSED_TOO_LONG";
|
||||
AlexaErrorType["DOOR_OPEN"] = "DOOR_OPEN";
|
||||
AlexaErrorType["DUAL_SETPOINTS_UNSUPPORTED"] = "DUAL_SETPOINTS_UNSUPPORTED";
|
||||
AlexaErrorType["ENDPOINT_BUSY"] = "ENDPOINT_BUSY";
|
||||
AlexaErrorType["ENDPOINT_CONTROL_UNAVAILABLE"] = "ENDPOINT_CONTROL_UNAVAILABLE";
|
||||
AlexaErrorType["ENDPOINT_LOW_POWER"] = "ENDPOINT_LOW_POWER";
|
||||
AlexaErrorType["ENDPOINT_UNREACHABLE"] = "ENDPOINT_UNREACHABLE";
|
||||
AlexaErrorType["EXCEEDED_PIN_ATTEMPTS"] = "EXCEEDED_PIN_ATTEMPTS";
|
||||
AlexaErrorType["EXPIRED_AUTHORIZATION_CREDENTIAL"] = "EXPIRED_AUTHORIZATION_CREDENTIAL";
|
||||
AlexaErrorType["FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS"] = "FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS";
|
||||
AlexaErrorType["FIRMWARE_OUT_OF_DATE"] = "FIRMWARE_OUT_OF_DATE";
|
||||
AlexaErrorType["HARDWARE_MALFUNCTION"] = "HARDWARE_MALFUNCTION";
|
||||
AlexaErrorType["HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE"] = "HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["HEATING_STAGES_EXCEEDS_LIMIT"] = "HEATING_STAGES_EXCEEDS_LIMIT";
|
||||
AlexaErrorType["INSUFFICIENT_PERMISSIONS"] = "INSUFFICIENT_PERMISSIONS";
|
||||
AlexaErrorType["INSUFFICIENT_RESOURCE"] = "INSUFFICIENT_RESOURCE";
|
||||
AlexaErrorType["INSUFFICIENT_SPACE"] = "INSUFFICIENT_SPACE";
|
||||
AlexaErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
|
||||
AlexaErrorType["INVALID_AUTHORIZATION_CREDENTIAL"] = "INVALID_AUTHORIZATION_CREDENTIAL";
|
||||
AlexaErrorType["INVALID_AUXILIARY_HEATING_SYSTEM_TYPE"] = "INVALID_AUXILIARY_HEATING_SYSTEM_TYPE";
|
||||
AlexaErrorType["INVALID_DIRECTIVE"] = "INVALID_DIRECTIVE";
|
||||
AlexaErrorType["INVALID_SYSTEM_TYPE"] = "INVALID_SYSTEM_TYPE";
|
||||
AlexaErrorType["INVALID_TARGET_STATE"] = "INVALID_TARGET_STATE";
|
||||
AlexaErrorType["INVALID_TEMPERATURE_SCALE"] = "INVALID_TEMPERATURE_SCALE";
|
||||
AlexaErrorType["INVALID_TERMINAL_CONNECTION"] = "INVALID_TERMINAL_CONNECTION";
|
||||
AlexaErrorType["INVALID_VALUE"] = "INVALID_VALUE";
|
||||
AlexaErrorType["MAINTENANCE_REQUIRED"] = "MAINTENANCE_REQUIRED";
|
||||
AlexaErrorType["MAX_COMMISSIONING_LIMIT_REACHED"] = "MAX_COMMISSIONING_LIMIT_REACHED";
|
||||
AlexaErrorType["MISSING_SETUP_INFORMATION"] = "MISSING_SETUP_INFORMATION";
|
||||
AlexaErrorType["NO_SUCH_ENDPOINT"] = "NO_SUCH_ENDPOINT";
|
||||
AlexaErrorType["NOT_CALIBRATED"] = "NOT_CALIBRATED";
|
||||
AlexaErrorType["NOT_IN_OPERATION"] = "NOT_IN_OPERATION";
|
||||
AlexaErrorType["NOT_READY"] = "NOT_READY";
|
||||
AlexaErrorType["NOT_SUPPORTED_IN_CURRENT_MODE"] = "NOT_SUPPORTED_IN_CURRENT_MODE";
|
||||
AlexaErrorType["NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE"] = "NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE";
|
||||
AlexaErrorType["OBSTACLE_DETECTED"] = "OBSTACLE_DETECTED";
|
||||
AlexaErrorType["PARTNER_APPLICATION_REDIRECTION"] = "PARTNER_APPLICATION_REDIRECTION";
|
||||
AlexaErrorType["PIN_SETUP_REQUIRED"] = "PIN_SETUP_REQUIRED";
|
||||
AlexaErrorType["POWER_LEVEL_NOT_SUPPORTED"] = "POWER_LEVEL_NOT_SUPPORTED";
|
||||
AlexaErrorType["PREHEAT_REQUIRED"] = "PREHEAT_REQUIRED";
|
||||
AlexaErrorType["PROBE_REQUIRED"] = "PROBE_REQUIRED";
|
||||
AlexaErrorType["RATE_LIMIT_EXCEEDED"] = "RATE_LIMIT_EXCEEDED";
|
||||
AlexaErrorType["REMOTE_START_NOT_SUPPORTED"] = "REMOTE_START_NOT_SUPPORTED";
|
||||
AlexaErrorType["REMOVE_PROBE"] = "REMOVE_PROBE";
|
||||
AlexaErrorType["REMOTE_START_DISABLED"] = "REMOTE_START_DISABLED";
|
||||
AlexaErrorType["REQUESTED_SETPOINTS_TOO_CLOSE"] = "REQUESTED_SETPOINTS_TOO_CLOSE";
|
||||
AlexaErrorType["SAFETY_BEAM_BREACHED"] = "SAFETY_BEAM_BREACHED";
|
||||
AlexaErrorType["SUBSCRIPTION_REQUIRED"] = "SUBSCRIPTION_REQUIRED";
|
||||
AlexaErrorType["TEMPERATURE_VALUE_OUT_OF_RANGE"] = "TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["THERMOSTAT_IS_OFF"] = "THERMOSTAT_IS_OFF";
|
||||
AlexaErrorType["TOO_MANY_FAILED_ATTEMPTS"] = "TOO_MANY_FAILED_ATTEMPTS";
|
||||
AlexaErrorType["TRIPLE_SETPOINTS_UNSUPPORTED"] = "TRIPLE_SETPOINTS_UNSUPPORTED";
|
||||
AlexaErrorType["UNABLE_TO_CHARGE"] = "UNABLE_TO_CHARGE";
|
||||
AlexaErrorType["UNAUTHORIZED"] = "UNAUTHORIZED";
|
||||
AlexaErrorType["UNCLEARED_ALARM"] = "UNCLEARED_ALARM";
|
||||
AlexaErrorType["UNSUPPORTED_THERMOSTAT_MODE"] = "UNSUPPORTED_THERMOSTAT_MODE";
|
||||
AlexaErrorType["UNCLEARED_TROUBLE"] = "UNCLEARED_TROUBLE";
|
||||
AlexaErrorType["UNWILLING_TO_SET_SCHEDULE"] = "UNWILLING_TO_SET_SCHEDULE";
|
||||
AlexaErrorType["UNWILLING_TO_SET_VALUE"] = "UNWILLING_TO_SET_VALUE";
|
||||
AlexaErrorType["VALUE_OUT_OF_RANGE"] = "VALUE_OUT_OF_RANGE";
|
||||
})(AlexaErrorType || (exports.AlexaErrorType = AlexaErrorType = {}));
|
||||
class AlexaErrorResponse {
|
||||
constructor(correlationToken, rootTopic, endpointId, mqttClient) {
|
||||
this.rootTopic = rootTopic;
|
||||
this.endpointId = endpointId;
|
||||
this.mqttClient = mqttClient;
|
||||
this.event = {
|
||||
header: {
|
||||
namespace: "Alexa",
|
||||
name: "ErrorResponse",
|
||||
messageId: (0, crypto_1.randomUUID)(),
|
||||
correlationToken,
|
||||
payloadVersion: "3",
|
||||
},
|
||||
endpoint: {
|
||||
endpointId,
|
||||
},
|
||||
payload: {},
|
||||
};
|
||||
}
|
||||
setErrorMessage(type, message, otherParams = {}) {
|
||||
this.event.payload = {
|
||||
type,
|
||||
message,
|
||||
...otherParams,
|
||||
};
|
||||
}
|
||||
toJSON() {
|
||||
return { event: this.event };
|
||||
}
|
||||
send(sendAsync = false) {
|
||||
const payload = {
|
||||
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);
|
||||
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.AlexaErrorResponse = AlexaErrorResponse;
|
||||
54
dist/cjs/compat/AlexaErrorResponse.js
vendored
Normal file
54
dist/cjs/compat/AlexaErrorResponse.js
vendored
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.AlexaErrorResponse = void 0;
|
||||
const crypto_1 = require("crypto");
|
||||
const build_js_1 = require("../messages/build.js");
|
||||
const errors_js_1 = require("../messages/errors.js");
|
||||
/** An ErrorResponse as 1.x builds it: device.getErrorMessage(token), setErrorMessage(), send(). */
|
||||
class AlexaErrorResponse {
|
||||
constructor(correlationToken, rootTopic, endpointId, mqttClient) {
|
||||
this.correlationToken = correlationToken;
|
||||
this.rootTopic = rootTopic;
|
||||
this.endpointId = endpointId;
|
||||
this.mqttClient = mqttClient;
|
||||
// Sent when setErrorMessage() was not called: 1.x published an empty payload, which is no ErrorResponse to Alexa
|
||||
this.error = errors_js_1.AlexaErrors.of("INTERNAL_ERROR", "the device answered with an error and did not say which");
|
||||
// One id for the message, however often toJSON() is called
|
||||
this.messageId = (0, crypto_1.randomUUID)();
|
||||
}
|
||||
/**
|
||||
* The error to answer with. otherParams are the fields the type adds to the payload (validRange). The header
|
||||
* carries the namespace the type is documented under, Alexa.ThermostatController for THERMOSTAT_IS_OFF;
|
||||
* options.namespace names another.
|
||||
*/
|
||||
setErrorMessage(type, message, otherParams = {}, options = {}) {
|
||||
this.error = errors_js_1.AlexaErrors.of(type, message, otherParams);
|
||||
this.namespace = options.namespace;
|
||||
}
|
||||
toJSON() {
|
||||
const { type, alexaMessage, extra } = this.error;
|
||||
return (0, build_js_1.errorResponse)({
|
||||
endpointId: this.endpointId,
|
||||
messageId: this.messageId,
|
||||
correlationToken: this.correlationToken,
|
||||
type,
|
||||
message: alexaMessage,
|
||||
extra,
|
||||
namespace: this.namespace ?? this.error.namespace,
|
||||
});
|
||||
}
|
||||
/** Resolves with the topic published to, or "" when the publish failed. Never rejects. */
|
||||
send(sendAsync = false) {
|
||||
const topic = `${this.rootTopic}/${this.endpointId}/${sendAsync ? "deferredResponse" : "alexaResponce"}`; // "alexaResponce" is how Alex2MQTT and Alex2ESP spell the topic
|
||||
return new Promise((resolve) => {
|
||||
this.mqttClient.publish(topic, JSON.stringify(this.toJSON()), (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.AlexaErrorResponse = AlexaErrorResponse;
|
||||
|
|
@ -1,95 +1,63 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.AlexaStatusMessage = exports.TemperatureSensorScale = exports.ThermostatMode = void 0;
|
||||
exports.AlexaStatusMessage = 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 = {}));
|
||||
const build_js_1 = require("../messages/build.js");
|
||||
const StateBuilder_js_1 = require("../messages/StateBuilder.js");
|
||||
const enums_js_1 = require("./enums.js");
|
||||
// The 1.x helpers report every temperature in Celsius, whatever scale the device works in
|
||||
function celsius(scale, value) {
|
||||
return { value: scale === enums_js_1.TemperatureSensorScale.FAHRENHEIT ? (value - 32) * (5 / 9) : value, scale: "CELSIUS" };
|
||||
}
|
||||
/**
|
||||
* A Response, StateReport, DeferredResponse or ChangeReport as 1.x builds it: device.getStatusMessage() or
|
||||
* device.getChangeReport(), the add...Prop() calls, send(). The values are not checked.
|
||||
*/
|
||||
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.correlationToken = correlationToken;
|
||||
this.rootTopic = rootTopic;
|
||||
this.endpointId = endpointId;
|
||||
this.mqttClient = mqttClient;
|
||||
this.isResponse = isResponse;
|
||||
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();
|
||||
// One id for the message, however often toJSON() is called
|
||||
this.messageId = (0, crypto_1.randomUUID)();
|
||||
this.state = new StateBuilder_js_1.StateBuilder({ target: changeCause ? "change" : "context" });
|
||||
}
|
||||
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);
|
||||
this.state.setRaw(namespace, name, value, { instance, uncertaintyInMilliseconds });
|
||||
return this;
|
||||
}
|
||||
/** ChangeReport: the add*Prop calls that follow describe what CHANGED (the default for a change report). */
|
||||
changed() {
|
||||
this.target = "change";
|
||||
this.state.changed();
|
||||
return this;
|
||||
}
|
||||
/** ChangeReport: the add*Prop calls that follow describe the other, unchanged properties (context). */
|
||||
unchanged() {
|
||||
this.target = "context";
|
||||
this.state.unchanged();
|
||||
return this;
|
||||
}
|
||||
/** True for a ChangeReport (Device.getChangeReport). */
|
||||
isChangeReport() {
|
||||
return this.changeCause !== null;
|
||||
}
|
||||
/** The message as it will be published (for tests and logging). */
|
||||
/**
|
||||
* The message as it will be published (for tests and logging). A DeferredResponse has no context. Throws
|
||||
* MessageError for a ChangeReport without a changed property.
|
||||
*/
|
||||
toJSON() {
|
||||
const { endpointId, messageId, correlationToken } = this;
|
||||
if (this.changeCause) {
|
||||
return {
|
||||
event: { ...this.event, payload: { change: { cause: { type: this.changeCause }, properties: this.changeProps } } },
|
||||
context: this.context,
|
||||
};
|
||||
return (0, build_js_1.changeReport)({ endpointId, messageId, cause: this.changeCause, changed: this.state.change, context: this.state.context });
|
||||
}
|
||||
return { context: this.isDeferred ? null : this.context, event: this.event };
|
||||
if (this.isDeferred) {
|
||||
return (0, build_js_1.deferredResponse)({ endpointId, messageId, correlationToken, estimatedDeferralInSeconds: this.estimatedDeferralInSeconds });
|
||||
}
|
||||
const name = this.isResponse ? "Response" : "StateReport";
|
||||
return (0, build_js_1.response)({ name, endpointId, messageId, correlationToken, context: this.state.context });
|
||||
}
|
||||
addModeControllerProp(instance, value, uncertaintyInMs = 0) {
|
||||
return this.addProperty(enums_js_1.AlexaInterfaceType.MODE_CONTROLLER, "mode", value, uncertaintyInMs, instance);
|
||||
|
|
@ -99,9 +67,7 @@ class AlexaStatusMessage {
|
|||
}
|
||||
addEstimatedDeferralTime(seconds) {
|
||||
if (this.isDeferred) {
|
||||
this.event.payload = {
|
||||
estimatedDeferralInSeconds: seconds,
|
||||
};
|
||||
this.estimatedDeferralInSeconds = seconds;
|
||||
}
|
||||
else {
|
||||
console.warn("[AlexaStatusMessage.ts] Attempted to add estimated deferral time, but message is not marked as DeferredResponse.");
|
||||
|
|
@ -109,13 +75,7 @@ class AlexaStatusMessage {
|
|||
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);
|
||||
return this.addProperty(enums_js_1.AlexaInterfaceType.THERMOSTAT_CONTROLLER, name, celsius(scale, value), uncertaintyInMs);
|
||||
}
|
||||
/** Alexa.EndpointHealth connectivity: EndpointHealth.OK / UNREACHABLE (the plain strings "OK" / "UNREACHABLE" are accepted too). */
|
||||
addHealthProp(health, uncertaintyInMs = 0) {
|
||||
|
|
@ -125,13 +85,7 @@ class AlexaStatusMessage {
|
|||
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);
|
||||
return this.addProperty(enums_js_1.AlexaInterfaceType.TEMPERATURE_SENSOR, "temperature", celsius(scale, value), uncertaintyInMs);
|
||||
}
|
||||
addBrightnessControllerProp(brightness, uncertaintyInMs = 0) {
|
||||
return this.addProperty(enums_js_1.AlexaInterfaceType.BRIGHTNESS_CONTROLLER, "brightness", brightness, uncertaintyInMs);
|
||||
|
|
@ -142,29 +96,36 @@ class AlexaStatusMessage {
|
|||
addToggleControllerProp(state, instance, uncertaintyInMs = 0) {
|
||||
return this.addProperty(enums_js_1.AlexaInterfaceType.TOGGLE_CONTROLLER, "toggleState", state, uncertaintyInMs, instance);
|
||||
}
|
||||
/** A property built by the caller. It goes to the context, also in a ChangeReport after changed(). */
|
||||
addContextProp(prop) {
|
||||
this.context.properties.push(prop);
|
||||
this.state.add(prop, "context");
|
||||
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).
|
||||
* the topic, or "" when nothing was published: the publish failed, or the message is a ChangeReport without a
|
||||
* changed property, which Alex2MQTT would drop. 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
|
||||
: `${this.rootTopic}/${this.endpointId}/${sendAsync ? "deferredResponse" : "alexaResponce"}`; // "alexaResponce" is how Alex2MQTT and Alex2ESP spell the topic
|
||||
return new Promise((resolve) => {
|
||||
this.mqttClient.publish(topic, payloadStr, (err) => {
|
||||
if (!err)
|
||||
return resolve(topic);
|
||||
const failed = (err) => {
|
||||
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
|
||||
});
|
||||
};
|
||||
let payload;
|
||||
try {
|
||||
payload = JSON.stringify(this.toJSON());
|
||||
}
|
||||
catch (err) {
|
||||
return failed(err);
|
||||
}
|
||||
this.mqttClient.publish(topic, payload, (err) => (err ? failed(err) : resolve(topic)));
|
||||
});
|
||||
}
|
||||
}
|
||||
97
dist/cjs/compat/enums.js
vendored
97
dist/cjs/compat/enums.js
vendored
|
|
@ -1,6 +1,6 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.EndpointHealth = exports.PowerController = exports.PowerState = exports.AlexaActions = exports.DisplayCategory = exports.AlexaInterfaceType = void 0;
|
||||
exports.AlexaErrorType = exports.TemperatureSensorScale = exports.ThermostatMode = exports.EndpointHealth = exports.PowerController = exports.PowerState = exports.AlexaActions = exports.DisplayCategory = exports.AlexaInterfaceType = void 0;
|
||||
// The enums of 1.x, under their 1.x names.
|
||||
const EndpointHealth_js_1 = require("../registry/interfaces/EndpointHealth.js");
|
||||
const PowerController_js_1 = require("../registry/interfaces/PowerController.js");
|
||||
|
|
@ -161,3 +161,98 @@ const Connectivity = { OK: "OK", UNREACHABLE: "UNREACHABLE" };
|
|||
exports.PowerController = Object.assign(PowerController_js_1.PowerController, exports.PowerState);
|
||||
/** The Alexa.EndpointHealth interface, for device.add(). EndpointHealth.OK and EndpointHealth.UNREACHABLE are the 1.x enum of connectivity values. */
|
||||
exports.EndpointHealth = Object.assign(EndpointHealth_js_1.EndpointHealth, Connectivity);
|
||||
/** The modes of a thermostat the 1.x helpers know. */
|
||||
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 = {}));
|
||||
/** The scale of a temperature given to addTemperatureSensorProp() and addThermostatControllerProp(). */
|
||||
var TemperatureSensorScale;
|
||||
(function (TemperatureSensorScale) {
|
||||
TemperatureSensorScale["CELSIUS"] = "CELSIUS";
|
||||
TemperatureSensorScale["FAHRENHEIT"] = "FAHRENHEIT";
|
||||
})(TemperatureSensorScale || (exports.TemperatureSensorScale = TemperatureSensorScale = {}));
|
||||
/** The error types of alexa-errorresponse.html, "Error type values". */
|
||||
var AlexaErrorType;
|
||||
(function (AlexaErrorType) {
|
||||
AlexaErrorType["ALREADY_IN_OPERATION"] = "ALREADY_IN_OPERATION";
|
||||
AlexaErrorType["AUTHORIZATION_REQUIRED"] = "AUTHORIZATION_REQUIRED";
|
||||
AlexaErrorType["BRIDGE_UNREACHABLE"] = "BRIDGE_UNREACHABLE";
|
||||
AlexaErrorType["BYPASS_NEEDED"] = "BYPASS_NEEDED";
|
||||
AlexaErrorType["CLOUD_CONTROL_DISABLED"] = "CLOUD_CONTROL_DISABLED";
|
||||
AlexaErrorType["CHILD_LOCK"] = "CHILD_LOCK";
|
||||
AlexaErrorType["CONFIGURATION_UPDATE_NOT_ALLOWED"] = "CONFIGURATION_UPDATE_NOT_ALLOWED";
|
||||
AlexaErrorType["COOK_DURATION_TOO_LONG"] = "COOK_DURATION_TOO_LONG";
|
||||
AlexaErrorType["COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE"] = "COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["COOLING_STAGES_EXCEEDS_LIMIT"] = "COOLING_STAGES_EXCEEDS_LIMIT";
|
||||
AlexaErrorType["DATA_DELETION_NOT_SUPPORTED"] = "DATA_DELETION_NOT_SUPPORTED";
|
||||
AlexaErrorType["DATA_RETRIEVAL_NOT_SUPPORTED"] = "DATA_RETRIEVAL_NOT_SUPPORTED";
|
||||
AlexaErrorType["DEVICE_STUCK"] = "DEVICE_STUCK";
|
||||
AlexaErrorType["DISABLED_BY_USER"] = "DISABLED_BY_USER";
|
||||
AlexaErrorType["DO_NOT_DISTURB_MODE"] = "DO_NOT_DISTURB_MODE";
|
||||
AlexaErrorType["DOOR_CLOSED_TOO_LONG"] = "DOOR_CLOSED_TOO_LONG";
|
||||
AlexaErrorType["DOOR_OPEN"] = "DOOR_OPEN";
|
||||
AlexaErrorType["DUAL_SETPOINTS_UNSUPPORTED"] = "DUAL_SETPOINTS_UNSUPPORTED";
|
||||
AlexaErrorType["ENDPOINT_BUSY"] = "ENDPOINT_BUSY";
|
||||
AlexaErrorType["ENDPOINT_CONTROL_UNAVAILABLE"] = "ENDPOINT_CONTROL_UNAVAILABLE";
|
||||
AlexaErrorType["ENDPOINT_LOW_POWER"] = "ENDPOINT_LOW_POWER";
|
||||
AlexaErrorType["ENDPOINT_UNREACHABLE"] = "ENDPOINT_UNREACHABLE";
|
||||
AlexaErrorType["EXCEEDED_PIN_ATTEMPTS"] = "EXCEEDED_PIN_ATTEMPTS";
|
||||
AlexaErrorType["EXPIRED_AUTHORIZATION_CREDENTIAL"] = "EXPIRED_AUTHORIZATION_CREDENTIAL";
|
||||
AlexaErrorType["FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS"] = "FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS";
|
||||
AlexaErrorType["FIRMWARE_OUT_OF_DATE"] = "FIRMWARE_OUT_OF_DATE";
|
||||
AlexaErrorType["HARDWARE_MALFUNCTION"] = "HARDWARE_MALFUNCTION";
|
||||
AlexaErrorType["HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE"] = "HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["HEATING_STAGES_EXCEEDS_LIMIT"] = "HEATING_STAGES_EXCEEDS_LIMIT";
|
||||
AlexaErrorType["INSUFFICIENT_PERMISSIONS"] = "INSUFFICIENT_PERMISSIONS";
|
||||
AlexaErrorType["INSUFFICIENT_RESOURCE"] = "INSUFFICIENT_RESOURCE";
|
||||
AlexaErrorType["INSUFFICIENT_SPACE"] = "INSUFFICIENT_SPACE";
|
||||
AlexaErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
|
||||
AlexaErrorType["INVALID_AUTHORIZATION_CREDENTIAL"] = "INVALID_AUTHORIZATION_CREDENTIAL";
|
||||
AlexaErrorType["INVALID_AUXILIARY_HEATING_SYSTEM_TYPE"] = "INVALID_AUXILIARY_HEATING_SYSTEM_TYPE";
|
||||
AlexaErrorType["INVALID_DIRECTIVE"] = "INVALID_DIRECTIVE";
|
||||
AlexaErrorType["INVALID_SYSTEM_TYPE"] = "INVALID_SYSTEM_TYPE";
|
||||
AlexaErrorType["INVALID_TARGET_STATE"] = "INVALID_TARGET_STATE";
|
||||
AlexaErrorType["INVALID_TEMPERATURE_SCALE"] = "INVALID_TEMPERATURE_SCALE";
|
||||
AlexaErrorType["INVALID_TERMINAL_CONNECTION"] = "INVALID_TERMINAL_CONNECTION";
|
||||
AlexaErrorType["INVALID_VALUE"] = "INVALID_VALUE";
|
||||
AlexaErrorType["MAINTENANCE_REQUIRED"] = "MAINTENANCE_REQUIRED";
|
||||
AlexaErrorType["MAX_COMMISSIONING_LIMIT_REACHED"] = "MAX_COMMISSIONING_LIMIT_REACHED";
|
||||
AlexaErrorType["MISSING_SETUP_INFORMATION"] = "MISSING_SETUP_INFORMATION";
|
||||
AlexaErrorType["NO_SUCH_ENDPOINT"] = "NO_SUCH_ENDPOINT";
|
||||
AlexaErrorType["NOT_CALIBRATED"] = "NOT_CALIBRATED";
|
||||
AlexaErrorType["NOT_IN_OPERATION"] = "NOT_IN_OPERATION";
|
||||
AlexaErrorType["NOT_READY"] = "NOT_READY";
|
||||
AlexaErrorType["NOT_SUPPORTED_IN_CURRENT_MODE"] = "NOT_SUPPORTED_IN_CURRENT_MODE";
|
||||
AlexaErrorType["NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE"] = "NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE";
|
||||
AlexaErrorType["OBSTACLE_DETECTED"] = "OBSTACLE_DETECTED";
|
||||
AlexaErrorType["PARTNER_APPLICATION_REDIRECTION"] = "PARTNER_APPLICATION_REDIRECTION";
|
||||
AlexaErrorType["PIN_SETUP_REQUIRED"] = "PIN_SETUP_REQUIRED";
|
||||
AlexaErrorType["POWER_LEVEL_NOT_SUPPORTED"] = "POWER_LEVEL_NOT_SUPPORTED";
|
||||
AlexaErrorType["PREHEAT_REQUIRED"] = "PREHEAT_REQUIRED";
|
||||
AlexaErrorType["PROBE_REQUIRED"] = "PROBE_REQUIRED";
|
||||
AlexaErrorType["RATE_LIMIT_EXCEEDED"] = "RATE_LIMIT_EXCEEDED";
|
||||
AlexaErrorType["REMOTE_START_NOT_SUPPORTED"] = "REMOTE_START_NOT_SUPPORTED";
|
||||
AlexaErrorType["REMOVE_PROBE"] = "REMOVE_PROBE";
|
||||
AlexaErrorType["REMOTE_START_DISABLED"] = "REMOTE_START_DISABLED";
|
||||
AlexaErrorType["REQUESTED_SETPOINTS_TOO_CLOSE"] = "REQUESTED_SETPOINTS_TOO_CLOSE";
|
||||
AlexaErrorType["SAFETY_BEAM_BREACHED"] = "SAFETY_BEAM_BREACHED";
|
||||
AlexaErrorType["SUBSCRIPTION_REQUIRED"] = "SUBSCRIPTION_REQUIRED";
|
||||
AlexaErrorType["TEMPERATURE_VALUE_OUT_OF_RANGE"] = "TEMPERATURE_VALUE_OUT_OF_RANGE";
|
||||
AlexaErrorType["THERMOSTAT_IS_OFF"] = "THERMOSTAT_IS_OFF";
|
||||
AlexaErrorType["TOO_MANY_FAILED_ATTEMPTS"] = "TOO_MANY_FAILED_ATTEMPTS";
|
||||
AlexaErrorType["TRIPLE_SETPOINTS_UNSUPPORTED"] = "TRIPLE_SETPOINTS_UNSUPPORTED";
|
||||
AlexaErrorType["UNABLE_TO_CHARGE"] = "UNABLE_TO_CHARGE";
|
||||
AlexaErrorType["UNAUTHORIZED"] = "UNAUTHORIZED";
|
||||
AlexaErrorType["UNCLEARED_ALARM"] = "UNCLEARED_ALARM";
|
||||
AlexaErrorType["UNSUPPORTED_THERMOSTAT_MODE"] = "UNSUPPORTED_THERMOSTAT_MODE";
|
||||
AlexaErrorType["UNCLEARED_TROUBLE"] = "UNCLEARED_TROUBLE";
|
||||
AlexaErrorType["UNWILLING_TO_SET_SCHEDULE"] = "UNWILLING_TO_SET_SCHEDULE";
|
||||
AlexaErrorType["UNWILLING_TO_SET_VALUE"] = "UNWILLING_TO_SET_VALUE";
|
||||
AlexaErrorType["VALUE_OUT_OF_RANGE"] = "VALUE_OUT_OF_RANGE";
|
||||
})(AlexaErrorType || (exports.AlexaErrorType = AlexaErrorType = {}));
|
||||
|
|
|
|||
16
dist/cjs/device/Device.js
vendored
16
dist/cjs/device/Device.js
vendored
|
|
@ -1,11 +1,11 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const events_1 = require("events");
|
||||
const crypto_1 = require("crypto");
|
||||
const AlexaErrorResponse_js_1 = require("../AlexaErrorResponse.js");
|
||||
const AlexaStatusMessage_js_1 = require("../AlexaStatusMessage.js");
|
||||
const AlexaErrorResponse_js_1 = require("../compat/AlexaErrorResponse.js");
|
||||
const AlexaInterface_js_1 = require("../compat/AlexaInterface.js");
|
||||
const AlexaStatusMessage_js_1 = require("../compat/AlexaStatusMessage.js");
|
||||
const enums_js_1 = require("../compat/enums.js");
|
||||
const build_js_1 = require("../messages/build.js");
|
||||
const Alexa_js_1 = require("../registry/interfaces/Alexa.js");
|
||||
const EndpointHealth_js_1 = require("../registry/interfaces/EndpointHealth.js");
|
||||
const schema_js_1 = require("../registry/schema.js");
|
||||
|
|
@ -79,6 +79,7 @@ class Device extends events_1.EventEmitter {
|
|||
* A proactive Alexa.ChangeReport (1.5.1): add the changed properties (the default target), optionally
|
||||
* .unchanged() then the others, and .send() - it goes to <root>/changeReport, which Alex2MQTT forwards to the Alexa
|
||||
* event gateway with the user's token. Alexa only accepts it for capabilities registered with proactivelyReported.
|
||||
* Without a changed property send() publishes nothing and resolves with "": Alex2MQTT would drop the report.
|
||||
*/
|
||||
getChangeReport(cause = "PHYSICAL_INTERACTION") {
|
||||
const msg = new AlexaStatusMessage_js_1.AlexaStatusMessage("", this.rootTopic, this.endpointId, this.mqttClient, false, false, cause);
|
||||
|
|
@ -90,14 +91,7 @@ class Device extends events_1.EventEmitter {
|
|||
* (1.5.1). Resolves with the topic published to, or "" when the publish failed (never rejects, 1.5.2).
|
||||
*/
|
||||
sendSceneResponse(correlationToken, activated, cause = "VOICE_INTERACTION", sendAsync = false) {
|
||||
const payload = {
|
||||
context: {},
|
||||
event: {
|
||||
header: { namespace: "Alexa.SceneController", name: activated ? "ActivationStarted" : "DeactivationStarted", messageId: (0, crypto_1.randomUUID)(), correlationToken, payloadVersion: "3" },
|
||||
endpoint: { endpointId: this.endpointId },
|
||||
payload: { cause: { type: cause }, timestamp: new Date().toISOString() },
|
||||
},
|
||||
};
|
||||
const payload = (0, build_js_1.sceneEvent)({ endpointId: this.endpointId, correlationToken, activated, cause });
|
||||
const topic = `${this.rootTopic}/${this.endpointId}/${sendAsync ? "deferredResponse" : "alexaResponce"}`;
|
||||
return new Promise((resolve) => {
|
||||
this.mqttClient.publish(topic, JSON.stringify(payload), (err) => {
|
||||
|
|
|
|||
53
dist/cjs/index.js
vendored
53
dist/cjs/index.js
vendored
|
|
@ -1,9 +1,42 @@
|
|||
"use strict";
|
||||
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
var desc = Object.getOwnPropertyDescriptor(m, k);
|
||||
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
||||
desc = { enumerable: true, get: function() { return m[k]; } };
|
||||
}
|
||||
Object.defineProperty(o, k2, desc);
|
||||
}) : (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
o[k2] = m[k];
|
||||
}));
|
||||
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
||||
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
||||
}) : function(o, v) {
|
||||
o["default"] = v;
|
||||
});
|
||||
var __importStar = (this && this.__importStar) || (function () {
|
||||
var ownKeys = function(o) {
|
||||
ownKeys = Object.getOwnPropertyNames || function (o) {
|
||||
var ar = [];
|
||||
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
||||
return ar;
|
||||
};
|
||||
return ownKeys(o);
|
||||
};
|
||||
return function (mod) {
|
||||
if (mod && mod.__esModule) return mod;
|
||||
var result = {};
|
||||
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
||||
__setModuleDefault(result, mod);
|
||||
return result;
|
||||
};
|
||||
})();
|
||||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.AlexaErrorResponse = exports.AlexaErrorType = exports.ThermostatMode = exports.TemperatureSensorScale = exports.AlexaStatusMessage = exports.PowerState = exports.DisplayCategory = exports.AlexaInterfaceType = exports.AlexaActions = exports.ActionMapping = exports.AlexaInterface = exports.DisplayCategories = exports.States = exports.Actions = exports.Units = exports.Assets = exports.SemanticsBuilder = exports.semantics = exports.text = exports.asset = exports.EndpointHealth = exports.PowerController = exports.ToggleController = exports.TemperatureSensor = exports.RangeController = exports.ModeController = exports.BrightnessController = exports.Alexa = exports.SchemaError = exports.DeclarationError = exports.registry = exports.Capability = exports.Device = exports.DEFAULT_HOST = exports.Alex2MQTT = void 0;
|
||||
exports.AlexaErrorResponse = exports.AlexaStatusMessage = exports.ThermostatMode = exports.TemperatureSensorScale = exports.PowerState = exports.DisplayCategory = exports.AlexaInterfaceType = exports.AlexaErrorType = exports.AlexaActions = exports.ActionMapping = exports.AlexaInterface = exports.property = exports.StateBuilder = exports.MessageError = exports.AlexaErrors = exports.AlexaError = exports.messages = exports.DisplayCategories = exports.States = exports.Actions = exports.Units = exports.Assets = exports.SemanticsBuilder = exports.semantics = exports.text = exports.asset = exports.EndpointHealth = exports.PowerController = exports.ToggleController = exports.TemperatureSensor = exports.RangeController = exports.ModeController = exports.BrightnessController = exports.Alexa = exports.SchemaError = exports.DeclarationError = exports.registry = exports.Capability = exports.Device = exports.DEFAULT_HOST = exports.Alex2MQTT = void 0;
|
||||
// Relative specifiers carry ".js": Node's ES module loader resolves no extension, and TypeScript maps it back to the .ts.
|
||||
var Alex2Node_js_1 = require("./Alex2Node.js");
|
||||
Object.defineProperty(exports, "Alex2MQTT", { enumerable: true, get: function () { return __importDefault(Alex2Node_js_1).default; } });
|
||||
|
|
@ -39,6 +72,14 @@ Object.defineProperty(exports, "Units", { enumerable: true, get: function () { r
|
|||
Object.defineProperty(exports, "Actions", { enumerable: true, get: function () { return index_js_4.ACTIONS; } });
|
||||
Object.defineProperty(exports, "States", { enumerable: true, get: function () { return index_js_4.STATES; } });
|
||||
Object.defineProperty(exports, "DisplayCategories", { enumerable: true, get: function () { return index_js_4.DISPLAY_CATEGORIES; } });
|
||||
// The messages: what the bridge publishes, built from plain values
|
||||
exports.messages = __importStar(require("./messages/index.js"));
|
||||
var index_js_5 = require("./messages/index.js");
|
||||
Object.defineProperty(exports, "AlexaError", { enumerable: true, get: function () { return index_js_5.AlexaError; } });
|
||||
Object.defineProperty(exports, "AlexaErrors", { enumerable: true, get: function () { return index_js_5.AlexaErrors; } });
|
||||
Object.defineProperty(exports, "MessageError", { enumerable: true, get: function () { return index_js_5.MessageError; } });
|
||||
Object.defineProperty(exports, "StateBuilder", { enumerable: true, get: function () { return index_js_5.StateBuilder; } });
|
||||
Object.defineProperty(exports, "property", { enumerable: true, get: function () { return index_js_5.property; } });
|
||||
// 1.x
|
||||
var AlexaInterface_js_1 = require("./compat/AlexaInterface.js");
|
||||
Object.defineProperty(exports, "AlexaInterface", { enumerable: true, get: function () { return AlexaInterface_js_1.AlexaInterface; } });
|
||||
|
|
@ -46,13 +87,13 @@ var ActionMapping_js_1 = require("./compat/ActionMapping.js");
|
|||
Object.defineProperty(exports, "ActionMapping", { enumerable: true, get: function () { return ActionMapping_js_1.ActionMapping; } });
|
||||
var enums_js_2 = require("./compat/enums.js");
|
||||
Object.defineProperty(exports, "AlexaActions", { enumerable: true, get: function () { return enums_js_2.AlexaActions; } });
|
||||
Object.defineProperty(exports, "AlexaErrorType", { enumerable: true, get: function () { return enums_js_2.AlexaErrorType; } });
|
||||
Object.defineProperty(exports, "AlexaInterfaceType", { enumerable: true, get: function () { return enums_js_2.AlexaInterfaceType; } });
|
||||
Object.defineProperty(exports, "DisplayCategory", { enumerable: true, get: function () { return enums_js_2.DisplayCategory; } });
|
||||
Object.defineProperty(exports, "PowerState", { enumerable: true, get: function () { return enums_js_2.PowerState; } });
|
||||
var AlexaStatusMessage_js_1 = require("./AlexaStatusMessage.js");
|
||||
Object.defineProperty(exports, "TemperatureSensorScale", { enumerable: true, get: function () { return enums_js_2.TemperatureSensorScale; } });
|
||||
Object.defineProperty(exports, "ThermostatMode", { enumerable: true, get: function () { return enums_js_2.ThermostatMode; } });
|
||||
var AlexaStatusMessage_js_1 = require("./compat/AlexaStatusMessage.js");
|
||||
Object.defineProperty(exports, "AlexaStatusMessage", { enumerable: true, get: function () { return AlexaStatusMessage_js_1.AlexaStatusMessage; } });
|
||||
Object.defineProperty(exports, "TemperatureSensorScale", { enumerable: true, get: function () { return AlexaStatusMessage_js_1.TemperatureSensorScale; } });
|
||||
Object.defineProperty(exports, "ThermostatMode", { enumerable: true, get: function () { return AlexaStatusMessage_js_1.ThermostatMode; } });
|
||||
var AlexaErrorResponse_js_1 = require("./AlexaErrorResponse.js");
|
||||
Object.defineProperty(exports, "AlexaErrorType", { enumerable: true, get: function () { return AlexaErrorResponse_js_1.AlexaErrorType; } });
|
||||
var AlexaErrorResponse_js_1 = require("./compat/AlexaErrorResponse.js");
|
||||
Object.defineProperty(exports, "AlexaErrorResponse", { enumerable: true, get: function () { return AlexaErrorResponse_js_1.AlexaErrorResponse; } });
|
||||
|
|
|
|||
70
dist/cjs/messages/StateBuilder.js
vendored
Normal file
70
dist/cjs/messages/StateBuilder.js
vendored
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.StateBuilder = void 0;
|
||||
const EndpointHealth_js_1 = require("../registry/interfaces/EndpointHealth.js");
|
||||
const schema_js_1 = require("../registry/schema.js");
|
||||
const property_js_1 = require("./property.js");
|
||||
/**
|
||||
* Collects the properties of one message. For a Response or a StateReport they are its context. For a ChangeReport
|
||||
* changed() and unchanged() say which of the two lists the properties that follow belong to.
|
||||
*/
|
||||
class StateBuilder {
|
||||
constructor(options = {}) {
|
||||
this.lists = { context: [], change: [] };
|
||||
this.target = options.target ?? "context";
|
||||
this.now = options.now ?? (() => new Date());
|
||||
}
|
||||
/**
|
||||
* A property of an interface the library describes, its value checked: set(PowerController, "powerState", "ON").
|
||||
* Given a capability of a device in place of the interface, the property carries the instance of the capability.
|
||||
* Throws SchemaError for a value Alexa would not take.
|
||||
*/
|
||||
set(source, name, value, options = {}) {
|
||||
const descriptor = "descriptor" in source ? source.descriptor : source;
|
||||
const instance = options.instance ?? ("descriptor" in source ? source.instance : "");
|
||||
const where = `${descriptor.namespace}${instance ? ` "${instance}"` : ""}: ${name}`;
|
||||
const described = descriptor.properties[name];
|
||||
if (!described) {
|
||||
const names = Object.keys(descriptor.properties);
|
||||
throw new schema_js_1.SchemaError(where, names.length > 0
|
||||
? `not a property of the interface, which has ${names.join(", ")}`
|
||||
: "the library knows no property of the interface, report it with setRaw()");
|
||||
}
|
||||
if (descriptor.instanced && !instance) {
|
||||
throw new schema_js_1.SchemaError(where, "the interface has instances, pass the one that is reported: { instance: \"Blind.Lift\" }");
|
||||
}
|
||||
return this.setRaw(descriptor.namespace, described.name, described.value.parse(value, where), { ...options, instance });
|
||||
}
|
||||
/** A property as given, nothing checked: for an interface or a value the library does not describe. */
|
||||
setRaw(namespace, name, value, options = {}) {
|
||||
return this.add((0, property_js_1.property)(namespace, name, value, { ...options, timeOfSample: options.timeOfSample ?? this.now() }));
|
||||
}
|
||||
/** The connectivity of Alexa.EndpointHealth, which belongs in every report of an endpoint that declares it. */
|
||||
health(value, reason, options = {}) {
|
||||
return this.set(EndpointHealth_js_1.EndpointHealth, "connectivity", reason ? { value, reason } : { value }, options);
|
||||
}
|
||||
/** A property built elsewhere, to the list that is filled now or to the one named. */
|
||||
add(built, target = this.target) {
|
||||
this.lists[target].push(built);
|
||||
return this;
|
||||
}
|
||||
/** The properties that follow are the ones that changed. */
|
||||
changed() {
|
||||
this.target = "change";
|
||||
return this;
|
||||
}
|
||||
/** The properties that follow did not change: a ChangeReport lists them in its context. */
|
||||
unchanged() {
|
||||
this.target = "context";
|
||||
return this;
|
||||
}
|
||||
/** The properties for the context of the message, in the order they were set. */
|
||||
get context() {
|
||||
return [...this.lists.context];
|
||||
}
|
||||
/** The properties for payload.change of a ChangeReport. */
|
||||
get change() {
|
||||
return [...this.lists.change];
|
||||
}
|
||||
}
|
||||
exports.StateBuilder = StateBuilder;
|
||||
136
dist/cjs/messages/build.js
vendored
Normal file
136
dist/cjs/messages/build.js
vendored
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.MessageError = void 0;
|
||||
exports.response = response;
|
||||
exports.stateReport = stateReport;
|
||||
exports.deferredResponse = deferredResponse;
|
||||
exports.errorResponse = errorResponse;
|
||||
exports.changeReport = changeReport;
|
||||
exports.sceneEvent = sceneEvent;
|
||||
exports.doorbellPress = doorbellPress;
|
||||
exports.simpleEvent = simpleEvent;
|
||||
// Every message the bridge publishes, built from plain values. Nothing here reads the clock or makes an id unless
|
||||
// the caller leaves messageId or a time out, so a test that passes both compares whole objects.
|
||||
const crypto_1 = require("crypto");
|
||||
const errors_js_1 = require("./errors.js");
|
||||
const property_js_1 = require("./property.js");
|
||||
/** A message that would be dropped on its way to Alexa, refused where it is built. */
|
||||
class MessageError extends Error {
|
||||
constructor(endpointId, problem) {
|
||||
super(`${endpointId}: ${problem}`);
|
||||
this.endpointId = endpointId;
|
||||
this.problem = problem;
|
||||
this.name = "MessageError";
|
||||
}
|
||||
}
|
||||
exports.MessageError = MessageError;
|
||||
// The fields in the order of the examples
|
||||
function header(namespace, name, fields) {
|
||||
return {
|
||||
namespace,
|
||||
name,
|
||||
...(fields.instance ? { instance: fields.instance } : {}),
|
||||
messageId: fields.messageId ?? (0, crypto_1.randomUUID)(),
|
||||
...(fields.correlationToken !== undefined ? { correlationToken: fields.correlationToken } : {}),
|
||||
payloadVersion: fields.payloadVersion ?? "3",
|
||||
};
|
||||
}
|
||||
/**
|
||||
* The answer to a directive (alexa-response.html, "Synchronous response"). An endpoint with nothing to report
|
||||
* answers with an empty list of properties, not without a context (state-reporting-for-smart-home-addons.html,
|
||||
* "Directive response example for a property that isn't retrievable").
|
||||
*/
|
||||
function response(fields) {
|
||||
return {
|
||||
event: {
|
||||
header: header(fields.namespace ?? "Alexa", fields.name ?? "Response", fields),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: fields.payload ?? {},
|
||||
},
|
||||
context: { properties: [...(fields.context ?? [])] },
|
||||
};
|
||||
}
|
||||
/** The answer to ReportState: every retrievable property of the endpoint. */
|
||||
function stateReport(fields) {
|
||||
return response({ ...fields, name: "StateReport", namespace: "Alexa", payload: {} });
|
||||
}
|
||||
/**
|
||||
* "The directive arrived, the answer follows": no context, the state is in the Response that follows
|
||||
* (alexa-response.html, "Deferred response example").
|
||||
*/
|
||||
function deferredResponse(fields) {
|
||||
const { estimatedDeferralInSeconds } = fields;
|
||||
return {
|
||||
event: {
|
||||
header: header("Alexa", "DeferredResponse", fields),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: estimatedDeferralInSeconds === undefined ? {} : { estimatedDeferralInSeconds },
|
||||
},
|
||||
};
|
||||
}
|
||||
/** The answer to a directive the endpoint could not follow (alexa-errorresponse.html). */
|
||||
function errorResponse(fields) {
|
||||
return {
|
||||
event: {
|
||||
header: header(fields.namespace ?? (0, errors_js_1.errorNamespace)(fields.type), "ErrorResponse", fields),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: { type: fields.type, message: fields.message, ...fields.extra },
|
||||
},
|
||||
};
|
||||
}
|
||||
const sameProperty = (a, b) => a.namespace === b.namespace && a.name === b.name && (a.instance ?? "") === (b.instance ?? "");
|
||||
/**
|
||||
* A change of state nobody asked for. The header has no correlationToken (message-guide.html, "Header object").
|
||||
* A property that changed is left out of the context: it is reported in one of the two (same page, "Context
|
||||
* object"). Throws MessageError when nothing changed: Alex2MQTT drops such a report without a word.
|
||||
*/
|
||||
function changeReport(fields) {
|
||||
const { endpointId, changed, context = [] } = fields;
|
||||
if (changed.length === 0) {
|
||||
throw new MessageError(endpointId, "a ChangeReport needs at least one property that changed, this one has none. "
|
||||
+ "Add the changed property before unchanged(), or send no report when nothing changed");
|
||||
}
|
||||
return {
|
||||
event: {
|
||||
header: header("Alexa", "ChangeReport", { messageId: fields.messageId }),
|
||||
endpoint: { endpointId },
|
||||
payload: { change: { cause: { type: fields.cause ?? "PHYSICAL_INTERACTION" }, properties: [...changed] } },
|
||||
},
|
||||
context: { properties: context.filter((property) => !changed.some((other) => sameProperty(property, other))) },
|
||||
};
|
||||
}
|
||||
/** The answer to Activate and Deactivate of a scene (alexa-scenecontroller.html). */
|
||||
function sceneEvent(fields) {
|
||||
return {
|
||||
event: {
|
||||
header: header("Alexa.SceneController", fields.activated ? "ActivationStarted" : "DeactivationStarted", fields),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: { cause: { type: fields.cause ?? "VOICE_INTERACTION" }, timestamp: (0, property_js_1.isoTime)(fields.timestamp) },
|
||||
},
|
||||
context: {},
|
||||
};
|
||||
}
|
||||
/** Somebody rang (alexa-doorbelleventsource.html). */
|
||||
function doorbellPress(fields) {
|
||||
return {
|
||||
event: {
|
||||
header: header("Alexa.DoorbellEventSource", "DoorbellPress", { messageId: fields.messageId }),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: { cause: { type: fields.cause ?? "PHYSICAL_INTERACTION" }, timestamp: (0, property_js_1.isoTime)(fields.timestamp) },
|
||||
},
|
||||
};
|
||||
}
|
||||
/** An event of a button or a sensor that routines start on (alexa-simpleeventsource.html). */
|
||||
function simpleEvent(fields) {
|
||||
return {
|
||||
event: {
|
||||
header: header("Alexa.SimpleEventSource", "Event", {
|
||||
instance: fields.instance,
|
||||
messageId: fields.messageId,
|
||||
payloadVersion: "1.0",
|
||||
}),
|
||||
endpoint: { endpointId: fields.endpointId },
|
||||
payload: { id: fields.id, timestamp: (0, property_js_1.isoTime)(fields.timestamp) },
|
||||
},
|
||||
};
|
||||
}
|
||||
74
dist/cjs/messages/errors.js
vendored
Normal file
74
dist/cjs/messages/errors.js
vendored
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.AlexaErrors = exports.AlexaError = void 0;
|
||||
exports.errorNamespace = errorNamespace;
|
||||
// The errors a device answers a directive with (alexa-errorresponse.html). A helper for each type whose payload
|
||||
// has fields of its own, so that the fields cannot be misspelt.
|
||||
const catalog_js_1 = require("../registry/catalog.js");
|
||||
/**
|
||||
* The namespace an ErrorResponse of this type goes under: the one the table of error types lists it with
|
||||
* (THERMOSTAT_IS_OFF: Alexa.ThermostatController, OBSTACLE_DETECTED: Alexa.Safety), Alexa for a type the table
|
||||
* does not have.
|
||||
*/
|
||||
function errorNamespace(type) {
|
||||
return Object.prototype.hasOwnProperty.call(catalog_js_1.ERROR_TYPES, type) ? catalog_js_1.ERROR_TYPES[type] : "Alexa";
|
||||
}
|
||||
/** Thrown by a directive handler, or built to be sent: the directive is answered with this ErrorResponse. */
|
||||
class AlexaError extends Error {
|
||||
constructor(type, message, extra = {}, namespace = errorNamespace(type)) {
|
||||
super(`${type}: ${message}`);
|
||||
this.name = "AlexaError";
|
||||
this.type = type;
|
||||
this.alexaMessage = message;
|
||||
this.extra = extra;
|
||||
this.namespace = namespace;
|
||||
}
|
||||
}
|
||||
exports.AlexaError = AlexaError;
|
||||
// A field that was not given is left out of the payload
|
||||
function given(fields) {
|
||||
return Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined));
|
||||
}
|
||||
exports.AlexaErrors = {
|
||||
/** An error of any type. */
|
||||
of(type, message, extra = {}) {
|
||||
return new AlexaError(type, message, extra);
|
||||
},
|
||||
/** The value is outside what the endpoint takes. For a temperature: temperatureOutOfRange(). */
|
||||
valueOutOfRange(message, validRange) {
|
||||
return new AlexaError("VALUE_OUT_OF_RANGE", message, { validRange });
|
||||
},
|
||||
temperatureOutOfRange(message, validRange) {
|
||||
return new AlexaError("TEMPERATURE_VALUE_OUT_OF_RANGE", message, { validRange });
|
||||
},
|
||||
/** A light showing a color asked for a color temperature: "COLOR". */
|
||||
notSupportedInCurrentMode(message, currentDeviceMode) {
|
||||
return new AlexaError("NOT_SUPPORTED_IN_CURRENT_MODE", message, { currentDeviceMode });
|
||||
},
|
||||
/** percentageState: what is left of the battery, 0 to 100. */
|
||||
endpointLowPower(message, percentageState) {
|
||||
return new AlexaError("ENDPOINT_LOW_POWER", message, given({ percentageState }));
|
||||
},
|
||||
endpointControlUnavailable(message, reason) {
|
||||
return new AlexaError("ENDPOINT_CONTROL_UNAVAILABLE", message, { reason });
|
||||
},
|
||||
notSupportedWithCurrentBatteryChargeState(message, currentChargeState, currentChargeLevelInPercentage) {
|
||||
return new AlexaError("NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE", message, given({ currentChargeState, currentChargeLevelInPercentage }));
|
||||
},
|
||||
/** What has to be refilled. */
|
||||
insufficientResource(message, resourceType) {
|
||||
return new AlexaError("INSUFFICIENT_RESOURCE", message, { resourceType });
|
||||
},
|
||||
/** What the user has to do first. */
|
||||
maintenanceRequired(message, maintenanceAction) {
|
||||
return new AlexaError("MAINTENANCE_REQUIRED", message, given({ maintenanceAction }));
|
||||
},
|
||||
/** Goes under Alexa.ThermostatController. minimumTemperatureDelta: how far apart the setpoints have to be. */
|
||||
setpointsTooClose(message, minimumTemperatureDelta) {
|
||||
return new AlexaError("REQUESTED_SETPOINTS_TOO_CLOSE", message, given({ minimumTemperatureDelta }));
|
||||
},
|
||||
/** Goes under Alexa.SecurityPanelController. With the endpoints listed, the user can bypass them by voice. */
|
||||
bypassNeeded(message, endpointsNeedingBypass) {
|
||||
return new AlexaError("BYPASS_NEEDED", message, given({ endpointsNeedingBypass }));
|
||||
},
|
||||
};
|
||||
22
dist/cjs/messages/index.js
vendored
Normal file
22
dist/cjs/messages/index.js
vendored
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.StateBuilder = exports.property = exports.errorNamespace = exports.AlexaErrors = exports.AlexaError = exports.MessageError = exports.stateReport = exports.simpleEvent = exports.sceneEvent = exports.response = exports.errorResponse = exports.doorbellPress = exports.deferredResponse = exports.changeReport = void 0;
|
||||
// The messages of the bridge without the bridge: builders, the state collector and the errors.
|
||||
var build_js_1 = require("./build.js");
|
||||
Object.defineProperty(exports, "changeReport", { enumerable: true, get: function () { return build_js_1.changeReport; } });
|
||||
Object.defineProperty(exports, "deferredResponse", { enumerable: true, get: function () { return build_js_1.deferredResponse; } });
|
||||
Object.defineProperty(exports, "doorbellPress", { enumerable: true, get: function () { return build_js_1.doorbellPress; } });
|
||||
Object.defineProperty(exports, "errorResponse", { enumerable: true, get: function () { return build_js_1.errorResponse; } });
|
||||
Object.defineProperty(exports, "response", { enumerable: true, get: function () { return build_js_1.response; } });
|
||||
Object.defineProperty(exports, "sceneEvent", { enumerable: true, get: function () { return build_js_1.sceneEvent; } });
|
||||
Object.defineProperty(exports, "simpleEvent", { enumerable: true, get: function () { return build_js_1.simpleEvent; } });
|
||||
Object.defineProperty(exports, "stateReport", { enumerable: true, get: function () { return build_js_1.stateReport; } });
|
||||
Object.defineProperty(exports, "MessageError", { enumerable: true, get: function () { return build_js_1.MessageError; } });
|
||||
var errors_js_1 = require("./errors.js");
|
||||
Object.defineProperty(exports, "AlexaError", { enumerable: true, get: function () { return errors_js_1.AlexaError; } });
|
||||
Object.defineProperty(exports, "AlexaErrors", { enumerable: true, get: function () { return errors_js_1.AlexaErrors; } });
|
||||
Object.defineProperty(exports, "errorNamespace", { enumerable: true, get: function () { return errors_js_1.errorNamespace; } });
|
||||
var property_js_1 = require("./property.js");
|
||||
Object.defineProperty(exports, "property", { enumerable: true, get: function () { return property_js_1.property; } });
|
||||
var StateBuilder_js_1 = require("./StateBuilder.js");
|
||||
Object.defineProperty(exports, "StateBuilder", { enumerable: true, get: function () { return StateBuilder_js_1.StateBuilder; } });
|
||||
19
dist/cjs/messages/property.js
vendored
Normal file
19
dist/cjs/messages/property.js
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.isoTime = isoTime;
|
||||
exports.property = property;
|
||||
/** A time as Alexa wants it: ISO 8601 in UTC. Text is taken as given. */
|
||||
function isoTime(time = new Date()) {
|
||||
return typeof time === "string" ? time : time.toISOString();
|
||||
}
|
||||
/** One property of a context or of a change, its fields in the order of the examples. */
|
||||
function property(namespace, name, value, options = {}) {
|
||||
return {
|
||||
namespace,
|
||||
...(options.instance ? { instance: options.instance } : {}),
|
||||
name,
|
||||
value,
|
||||
timeOfSample: isoTime(options.timeOfSample),
|
||||
uncertaintyInMilliseconds: options.uncertaintyInMilliseconds ?? 0,
|
||||
};
|
||||
}
|
||||
3
dist/cjs/messages/types.js
vendored
Normal file
3
dist/cjs/messages/types.js
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
"use strict";
|
||||
// The messages the bridge publishes, as message-guide.html and alexa-response.html draw them.
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
Loading…
Add table
Add a link
Reference in a new issue