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
26
dist/types/compat/AlexaErrorResponse.d.ts
vendored
Normal file
26
dist/types/compat/AlexaErrorResponse.d.ts
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
import type { MqttClient } from "mqtt";
|
||||
import type { ErrorResponseMessage } from "../messages/types.js";
|
||||
/** An ErrorResponse as 1.x builds it: device.getErrorMessage(token), setErrorMessage(), send(). */
|
||||
export declare class AlexaErrorResponse {
|
||||
private readonly correlationToken;
|
||||
private readonly rootTopic;
|
||||
private readonly endpointId;
|
||||
private readonly mqttClient;
|
||||
private error;
|
||||
private namespace?;
|
||||
private readonly messageId;
|
||||
/** Where a failed publish is reported (set by the Device that built this message, 1.5.2): send() never rejects. */
|
||||
onPublishError?: (err: Error) => void;
|
||||
constructor(correlationToken: string, rootTopic: string, endpointId: string, mqttClient: MqttClient);
|
||||
/**
|
||||
* 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: string, message: string, otherParams?: Record<string, any>, options?: {
|
||||
namespace?: string;
|
||||
}): void;
|
||||
toJSON(): ErrorResponseMessage;
|
||||
/** Resolves with the topic published to, or "" when the publish failed. Never rejects. */
|
||||
send(sendAsync?: boolean): Promise<string>;
|
||||
}
|
||||
61
dist/types/compat/AlexaStatusMessage.d.ts
vendored
Normal file
61
dist/types/compat/AlexaStatusMessage.d.ts
vendored
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
import type { MqttClient } from "mqtt";
|
||||
import type { ChangeCause, Property } from "../messages/types.js";
|
||||
import { TemperatureSensorScale } from "./enums.js";
|
||||
import type { EndpointHealth, PowerController } from "./enums.js";
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
export declare class AlexaStatusMessage {
|
||||
private readonly correlationToken;
|
||||
private readonly rootTopic;
|
||||
private readonly endpointId;
|
||||
private readonly mqttClient;
|
||||
private readonly isResponse;
|
||||
private readonly isDeferred;
|
||||
private readonly changeCause;
|
||||
private readonly state;
|
||||
private readonly messageId;
|
||||
private estimatedDeferralInSeconds?;
|
||||
/** Where a failed publish is reported (set by the Device that built this message, 1.5.2): send() never rejects. */
|
||||
onPublishError?: (err: Error) => void;
|
||||
constructor(correlationToken: string, rootTopic: string, endpointId: string, mqttClient: MqttClient, isResponse?: boolean, isDeferred?: boolean, changeCause?: ChangeCause | null);
|
||||
private addProperty;
|
||||
/** ChangeReport: the add*Prop calls that follow describe what CHANGED (the default for a change report). */
|
||||
changed(): this;
|
||||
/** ChangeReport: the add*Prop calls that follow describe the other, unchanged properties (context). */
|
||||
unchanged(): this;
|
||||
/** True for a ChangeReport (Device.getChangeReport). */
|
||||
isChangeReport(): boolean;
|
||||
/**
|
||||
* 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(): {
|
||||
event: any;
|
||||
context?: {
|
||||
properties: Property[];
|
||||
};
|
||||
};
|
||||
addModeControllerProp(instance: string, value: string, uncertaintyInMs?: number): this;
|
||||
addThermostatModeProp(mode: string, uncertaintyInMs?: number): this;
|
||||
addEstimatedDeferralTime(seconds: number): this;
|
||||
addThermostatControllerProp(name: "lowerSetpoint" | "upperSetpoint" | "targetSetpoint", scale: TemperatureSensorScale, value: number, uncertaintyInMs?: number): this;
|
||||
/** Alexa.EndpointHealth connectivity: EndpointHealth.OK / UNREACHABLE (the plain strings "OK" / "UNREACHABLE" are accepted too). */
|
||||
addHealthProp(health: EndpointHealth | `${EndpointHealth}`, uncertaintyInMs?: number): this;
|
||||
addPowerControllerProp(power: PowerController, uncertaintyInMs?: number): this;
|
||||
addTemperatureSensorProp(scale: TemperatureSensorScale, value: number, uncertaintyInMs?: number): this;
|
||||
addBrightnessControllerProp(brightness: number, uncertaintyInMs?: number): this;
|
||||
addColorTemperatureControllerProp(colorTemp: number, uncertaintyInMs?: number): this;
|
||||
addToggleControllerProp(state: PowerController, instance: string, uncertaintyInMs?: number): this;
|
||||
/** A property built by the caller. It goes to the context, also in a ChangeReport after changed(). */
|
||||
addContextProp(prop: Property): 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 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?: boolean): Promise<string>;
|
||||
}
|
||||
94
dist/types/compat/enums.d.ts
vendored
94
dist/types/compat/enums.d.ts
vendored
|
|
@ -181,7 +181,7 @@ export declare const EndpointHealth: import("../index.js").InterfaceDescriptor<{
|
|||
name: string;
|
||||
value: import("../index.js").Schema<import("../registry/schema.js").InferShape<{
|
||||
value: import("../registry/schema.js").EnumSchema<"OK" | "UNREACHABLE">;
|
||||
reason: import("../registry/schema.js").OptionalSchema<"WIFI_BAD_PASSWORD" | "WIFI_AP_NOT_FOUND" | "WIFI_ROUTER_UNREACHABLE" | "WIFI_AP_CHANNEL_QUALITY_LOW" | "INTERNET_UNREACHABLE" | "CAPTIVE_PORTAL_CHECK_FAILED" | "UNKNOWN">;
|
||||
reason: import("../registry/schema.js").OptionalSchema<"UNKNOWN" | "WIFI_BAD_PASSWORD" | "WIFI_AP_NOT_FOUND" | "WIFI_ROUTER_UNREACHABLE" | "WIFI_AP_CHANNEL_QUALITY_LOW" | "INTERNET_UNREACHABLE" | "CAPTIVE_PORTAL_CHECK_FAILED">;
|
||||
}>>;
|
||||
note: string;
|
||||
};
|
||||
|
|
@ -190,4 +190,96 @@ export declare const EndpointHealth: import("../index.js").InterfaceDescriptor<{
|
|||
readonly UNREACHABLE: "UNREACHABLE";
|
||||
};
|
||||
export type EndpointHealth = (typeof Connectivity)[keyof typeof Connectivity];
|
||||
/** The modes of a thermostat the 1.x helpers know. */
|
||||
export declare enum ThermostatMode {
|
||||
OFF = "OFF",
|
||||
HEAT = "HEAT",
|
||||
COOL = "COOL",
|
||||
AUTO = "AUTO",
|
||||
ECO = "ECO",
|
||||
CUSTOM = "CUSTOM"
|
||||
}
|
||||
/** The scale of a temperature given to addTemperatureSensorProp() and addThermostatControllerProp(). */
|
||||
export declare enum TemperatureSensorScale {
|
||||
CELSIUS = "CELSIUS",
|
||||
FAHRENHEIT = "FAHRENHEIT"
|
||||
}
|
||||
/** The error types of alexa-errorresponse.html, "Error type values". */
|
||||
export declare enum AlexaErrorType {
|
||||
ALREADY_IN_OPERATION = "ALREADY_IN_OPERATION",
|
||||
AUTHORIZATION_REQUIRED = "AUTHORIZATION_REQUIRED",
|
||||
BRIDGE_UNREACHABLE = "BRIDGE_UNREACHABLE",
|
||||
BYPASS_NEEDED = "BYPASS_NEEDED",
|
||||
CLOUD_CONTROL_DISABLED = "CLOUD_CONTROL_DISABLED",
|
||||
CHILD_LOCK = "CHILD_LOCK",
|
||||
CONFIGURATION_UPDATE_NOT_ALLOWED = "CONFIGURATION_UPDATE_NOT_ALLOWED",
|
||||
COOK_DURATION_TOO_LONG = "COOK_DURATION_TOO_LONG",
|
||||
COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE = "COOLING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE",
|
||||
COOLING_STAGES_EXCEEDS_LIMIT = "COOLING_STAGES_EXCEEDS_LIMIT",
|
||||
DATA_DELETION_NOT_SUPPORTED = "DATA_DELETION_NOT_SUPPORTED",
|
||||
DATA_RETRIEVAL_NOT_SUPPORTED = "DATA_RETRIEVAL_NOT_SUPPORTED",
|
||||
DEVICE_STUCK = "DEVICE_STUCK",
|
||||
DISABLED_BY_USER = "DISABLED_BY_USER",
|
||||
DO_NOT_DISTURB_MODE = "DO_NOT_DISTURB_MODE",
|
||||
DOOR_CLOSED_TOO_LONG = "DOOR_CLOSED_TOO_LONG",
|
||||
DOOR_OPEN = "DOOR_OPEN",
|
||||
DUAL_SETPOINTS_UNSUPPORTED = "DUAL_SETPOINTS_UNSUPPORTED",
|
||||
ENDPOINT_BUSY = "ENDPOINT_BUSY",
|
||||
ENDPOINT_CONTROL_UNAVAILABLE = "ENDPOINT_CONTROL_UNAVAILABLE",
|
||||
ENDPOINT_LOW_POWER = "ENDPOINT_LOW_POWER",
|
||||
ENDPOINT_UNREACHABLE = "ENDPOINT_UNREACHABLE",
|
||||
EXCEEDED_PIN_ATTEMPTS = "EXCEEDED_PIN_ATTEMPTS",
|
||||
EXPIRED_AUTHORIZATION_CREDENTIAL = "EXPIRED_AUTHORIZATION_CREDENTIAL",
|
||||
FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS = "FAILED_TO_BOOTSTRAP_COMMISSIONING_PROCESS",
|
||||
FIRMWARE_OUT_OF_DATE = "FIRMWARE_OUT_OF_DATE",
|
||||
HARDWARE_MALFUNCTION = "HARDWARE_MALFUNCTION",
|
||||
HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE = "HEATING_LOCKOUT_TEMPERATURE_VALUE_OUT_OF_RANGE",
|
||||
HEATING_STAGES_EXCEEDS_LIMIT = "HEATING_STAGES_EXCEEDS_LIMIT",
|
||||
INSUFFICIENT_PERMISSIONS = "INSUFFICIENT_PERMISSIONS",
|
||||
INSUFFICIENT_RESOURCE = "INSUFFICIENT_RESOURCE",
|
||||
INSUFFICIENT_SPACE = "INSUFFICIENT_SPACE",
|
||||
INTERNAL_ERROR = "INTERNAL_ERROR",
|
||||
INVALID_AUTHORIZATION_CREDENTIAL = "INVALID_AUTHORIZATION_CREDENTIAL",
|
||||
INVALID_AUXILIARY_HEATING_SYSTEM_TYPE = "INVALID_AUXILIARY_HEATING_SYSTEM_TYPE",
|
||||
INVALID_DIRECTIVE = "INVALID_DIRECTIVE",
|
||||
INVALID_SYSTEM_TYPE = "INVALID_SYSTEM_TYPE",
|
||||
INVALID_TARGET_STATE = "INVALID_TARGET_STATE",
|
||||
INVALID_TEMPERATURE_SCALE = "INVALID_TEMPERATURE_SCALE",
|
||||
INVALID_TERMINAL_CONNECTION = "INVALID_TERMINAL_CONNECTION",
|
||||
INVALID_VALUE = "INVALID_VALUE",
|
||||
MAINTENANCE_REQUIRED = "MAINTENANCE_REQUIRED",
|
||||
MAX_COMMISSIONING_LIMIT_REACHED = "MAX_COMMISSIONING_LIMIT_REACHED",
|
||||
MISSING_SETUP_INFORMATION = "MISSING_SETUP_INFORMATION",
|
||||
NO_SUCH_ENDPOINT = "NO_SUCH_ENDPOINT",
|
||||
NOT_CALIBRATED = "NOT_CALIBRATED",
|
||||
NOT_IN_OPERATION = "NOT_IN_OPERATION",
|
||||
NOT_READY = "NOT_READY",
|
||||
NOT_SUPPORTED_IN_CURRENT_MODE = "NOT_SUPPORTED_IN_CURRENT_MODE",
|
||||
NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE = "NOT_SUPPORTED_WITH_CURRENT_BATTERY_CHARGE_STATE",
|
||||
OBSTACLE_DETECTED = "OBSTACLE_DETECTED",
|
||||
PARTNER_APPLICATION_REDIRECTION = "PARTNER_APPLICATION_REDIRECTION",
|
||||
PIN_SETUP_REQUIRED = "PIN_SETUP_REQUIRED",
|
||||
POWER_LEVEL_NOT_SUPPORTED = "POWER_LEVEL_NOT_SUPPORTED",
|
||||
PREHEAT_REQUIRED = "PREHEAT_REQUIRED",
|
||||
PROBE_REQUIRED = "PROBE_REQUIRED",
|
||||
RATE_LIMIT_EXCEEDED = "RATE_LIMIT_EXCEEDED",
|
||||
REMOTE_START_NOT_SUPPORTED = "REMOTE_START_NOT_SUPPORTED",
|
||||
REMOVE_PROBE = "REMOVE_PROBE",
|
||||
REMOTE_START_DISABLED = "REMOTE_START_DISABLED",
|
||||
REQUESTED_SETPOINTS_TOO_CLOSE = "REQUESTED_SETPOINTS_TOO_CLOSE",
|
||||
SAFETY_BEAM_BREACHED = "SAFETY_BEAM_BREACHED",
|
||||
SUBSCRIPTION_REQUIRED = "SUBSCRIPTION_REQUIRED",
|
||||
TEMPERATURE_VALUE_OUT_OF_RANGE = "TEMPERATURE_VALUE_OUT_OF_RANGE",
|
||||
THERMOSTAT_IS_OFF = "THERMOSTAT_IS_OFF",
|
||||
TOO_MANY_FAILED_ATTEMPTS = "TOO_MANY_FAILED_ATTEMPTS",
|
||||
TRIPLE_SETPOINTS_UNSUPPORTED = "TRIPLE_SETPOINTS_UNSUPPORTED",
|
||||
UNABLE_TO_CHARGE = "UNABLE_TO_CHARGE",
|
||||
UNAUTHORIZED = "UNAUTHORIZED",
|
||||
UNCLEARED_ALARM = "UNCLEARED_ALARM",
|
||||
UNSUPPORTED_THERMOSTAT_MODE = "UNSUPPORTED_THERMOSTAT_MODE",
|
||||
UNCLEARED_TROUBLE = "UNCLEARED_TROUBLE",
|
||||
UNWILLING_TO_SET_SCHEDULE = "UNWILLING_TO_SET_SCHEDULE",
|
||||
UNWILLING_TO_SET_VALUE = "UNWILLING_TO_SET_VALUE",
|
||||
VALUE_OUT_OF_RANGE = "VALUE_OUT_OF_RANGE"
|
||||
}
|
||||
export {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue