12 Commits

7 changed files with 745 additions and 559 deletions

View File

@@ -92,4 +92,6 @@ async function main() {
} }
} }
main().catch(rootLogger.error); main().catch((error) => {
rootLogger.error(error, 'Error in main');
});

1141
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -46,21 +46,21 @@
"build:docs": "typedoc" "build:docs": "typedoc"
}, },
"dependencies": { "dependencies": {
"@aws-sdk/credential-providers": "3.817.0", "@aws-sdk/credential-providers": "3.823.0",
"amazon-cognito-identity-js": "6.3.15", "amazon-cognito-identity-js": "6.3.15",
"aws-iot-device-sdk-v2": "1.21.4", "aws-iot-device-sdk-v2": "1.21.5",
"dayjs": "1.11.13", "dayjs": "1.11.13",
"lodash": "4.17.21" "lodash": "4.17.21"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "9.27.0", "@eslint/js": "9.28.0",
"@semantic-release/npm": "12.0.1", "@semantic-release/npm": "12.0.1",
"@types/lodash": "4.17.17", "@types/lodash": "4.17.17",
"@types/node": "22.15.21", "@types/node": "22.15.29",
"conventional-changelog-conventionalcommits": "9.0.0", "conventional-changelog-conventionalcommits": "9.0.0",
"dotenv": "16.5.0", "dotenv": "16.5.0",
"eslint": "9.27.0", "eslint": "9.28.0",
"eslint-plugin-jsdoc": "50.6.17", "eslint-plugin-jsdoc": "50.7.1",
"eslint-plugin-tsdoc": "0.4.0", "eslint-plugin-tsdoc": "0.4.0",
"pino": "9.7.0", "pino": "9.7.0",
"pino-pretty": "13.0.0", "pino-pretty": "13.0.0",
@@ -70,9 +70,9 @@
"semantic-release": "24.2.5", "semantic-release": "24.2.5",
"tsup": "8.5.0", "tsup": "8.5.0",
"tsx": "4.19.4", "tsx": "4.19.4",
"typedoc": "0.28.4", "typedoc": "0.28.5",
"typedoc-material-theme": "1.4.0", "typedoc-material-theme": "1.4.0",
"typescript": "5.8.3", "typescript": "5.8.3",
"typescript-eslint": "8.32.1" "typescript-eslint": "8.33.1"
} }
} }

View File

@@ -6,7 +6,7 @@ import { ChangeDeviceState } from '@/types/mqtt/in/ChangeDeviceState';
import { InMessageType } from '@/types/mqtt/in/InMessageType'; import { InMessageType } from '@/types/mqtt/in/InMessageType';
import { StartPublishingDeviceStatus } from '@/types/mqtt/in/StartPublishingDeviceStatus'; import { StartPublishingDeviceStatus } from '@/types/mqtt/in/StartPublishingDeviceStatus';
import { OutMessageType } from '@/types/mqtt/out/OutMessageType'; import { OutMessageType } from '@/types/mqtt/out/OutMessageType';
import { Devices } from '@/types/rest/Devices'; import { Devices, DeviceStates, Firmwares } from '@/types/rest';
import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers'; import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers';
import { import {
AuthenticationDetails, AuthenticationDetails,
@@ -184,7 +184,43 @@ export class MysaApiClient {
const response = await this._fetcher(`${MysaApiBaseUrl}/devices`, { const response = await this._fetcher(`${MysaApiBaseUrl}/devices`, {
headers: { headers: {
Authorization: `${session.getAccessToken().getJwtToken()}` Authorization: `${session.getIdToken().getJwtToken()}`
}
});
if (!response.ok) {
throw new MysaApiError(response);
}
return response.json();
}
async getDeviceFirmwares(): Promise<Firmwares> {
this._logger.debug(`Fetching device firmwares...`);
const session = await this.getFreshSession();
const response = await this._fetcher(`${MysaApiBaseUrl}/devices/firmware`, {
headers: {
Authorization: `${session.getIdToken().getJwtToken()}`
}
});
if (!response.ok) {
throw new MysaApiError(response);
}
return response.json();
}
async getDeviceStates(): Promise<DeviceStates> {
this._logger.debug(`Fetching device states...`);
const session = await this.getFreshSession();
const response = await this._fetcher(`${MysaApiBaseUrl}/devices/state`, {
headers: {
Authorization: `${session.getIdToken().getJwtToken()}`
} }
}); });
@@ -252,10 +288,10 @@ export class MysaApiClient {
* @param deviceId - The ID of the device to start receiving updates for. * @param deviceId - The ID of the device to start receiving updates for.
*/ */
async startRealtimeUpdates(deviceId: string) { async startRealtimeUpdates(deviceId: string) {
this._logger.info(`Starting realtime updates for device '${deviceId}'`); this._logger.info(`Starting real-time updates for device '${deviceId}'`);
if (this._realtimeDeviceIds.has(deviceId)) { if (this._realtimeDeviceIds.has(deviceId)) {
this._logger.debug(`Realtime updates for device '${deviceId}' already started`); this._logger.debug(`Real-time updates for device '${deviceId}' already started`);
return; return;
} }
@@ -296,6 +332,8 @@ export class MysaApiClient {
* @param deviceId - The ID of the device to stop receiving real-time updates for. * @param deviceId - The ID of the device to stop receiving real-time updates for.
*/ */
async stopRealtimeUpdates(deviceId: string) { async stopRealtimeUpdates(deviceId: string) {
this._logger.info(`Stopping real-time updates for device '${deviceId}'`);
const timer = this._realtimeDeviceIds.get(deviceId); const timer = this._realtimeDeviceIds.get(deviceId);
if (!timer) { if (!timer) {
this._logger.warn(`No real-time updates are running for device '${deviceId}'`); this._logger.warn(`No real-time updates are running for device '${deviceId}'`);
@@ -308,7 +346,6 @@ export class MysaApiClient {
this._logger.debug(`Unsubscribing to MQTT topic '/v1/dev/${deviceId}/out'...`); this._logger.debug(`Unsubscribing to MQTT topic '/v1/dev/${deviceId}/out'...`);
await mqttConnection.unsubscribe(`/v1/dev/${deviceId}/out`); await mqttConnection.unsubscribe(`/v1/dev/${deviceId}/out`);
this._logger.debug(`Stopping real-time updates for device '${deviceId}'...`);
clearInterval(timer); clearInterval(timer);
this._realtimeDeviceIds.delete(deviceId); this._realtimeDeviceIds.delete(deviceId);
} }
@@ -320,20 +357,20 @@ export class MysaApiClient {
if ( if (
this._cognitoUserSession.isValid() && this._cognitoUserSession.isValid() &&
dayjs.unix(this._cognitoUserSession.getAccessToken().getExpiration()).isAfter() dayjs.unix(this._cognitoUserSession.getIdToken().getExpiration()).isAfter()
) { ) {
this._logger.info('Session is valid, no need to refresh'); this._logger.debug('Session is valid, no need to refresh');
return Promise.resolve(this._cognitoUserSession); return Promise.resolve(this._cognitoUserSession);
} }
this._logger.info('Session is not valid or expired, refreshing...'); this._logger.debug('Session is not valid or expired, refreshing...');
return new Promise<CognitoUserSession>((resolve, reject) => { return new Promise<CognitoUserSession>((resolve, reject) => {
this._cognitoUser!.refreshSession(this._cognitoUserSession!.getRefreshToken(), (error, session) => { this._cognitoUser!.refreshSession(this._cognitoUserSession!.getRefreshToken(), (error, session) => {
if (error) { if (error) {
this._logger.error('Failed to refresh session:', error); this._logger.error('Failed to refresh session:', error);
reject(new UnauthenticatedError('Unable to refresh the authentication session.')); reject(new UnauthenticatedError('Unable to refresh the authentication session.'));
} else { } else {
this._logger.info('Session refreshed successfully'); this._logger.debug('Session refreshed successfully');
this._cognitoUserSession = session; this._cognitoUserSession = session;
this.emitter.emit('sessionChanged', this.session); this.emitter.emit('sessionChanged', this.session);
resolve(session); resolve(session);

View File

@@ -0,0 +1,17 @@
/** Device firmware information */
export interface FirmwareDevice {
/** Device ID */
Device: string;
/** Device firmware version */
InstalledVersion: string;
}
/**
* Collection of firmware devices indexed by device ID
*
* Maps device ID strings to their corresponding firmware device objects, providing a lookup table for all devices
* associated with a user account.
*/
export interface Firmwares {
Firmware: Record<string, FirmwareDevice>;
}

69
src/types/rest/States.ts Normal file
View File

@@ -0,0 +1,69 @@
/** Represents a timestamped value with metadata */
export interface TimestampedValue<T = number> {
/** Timestamp when the value was recorded */
t: number;
/** The actual value */
v: T;
}
/** Represents the state of a single device */
export interface DeviceState {
/** Device identifier */
Device: string;
/** Overall timestamp for the device state */
Timestamp: number;
/** Time the device has been on */
OnTime: TimestampedValue<number>;
/** Temperature set point */
SetPoint: TimestampedValue<number>;
/** Display brightness level */
Brightness: TimestampedValue<number>;
/** Schedule mode setting */
ScheduleMode: TimestampedValue<number>;
/** Hold time setting */
HoldTime: TimestampedValue<number>;
/** Wi-Fi signal strength */
Rssi: TimestampedValue<number>;
/** Thermostat mode */
TstatMode: TimestampedValue<number>;
/** Available heap memory */
FreeHeap: TimestampedValue<number>;
/** Sensor temperature reading */
SensorTemp: TimestampedValue<number>;
/** Current mode */
Mode: TimestampedValue<number>;
/** Voltage measurement */
Voltage: TimestampedValue<number>;
/** Temperature corrected for calibration */
CorrectedTemp: TimestampedValue<number>;
/** Duty cycle percentage */
Duty: TimestampedValue<number>;
/** Heat sink temperature */
HeatSink: TimestampedValue<number>;
/** Time the device has been off */
OffTime: TimestampedValue<number>;
/** Connection status */
Connected: TimestampedValue<boolean>;
/** Current consumption */
Current: TimestampedValue<number>;
/** Humidity reading */
Humidity: TimestampedValue<number>;
/** Lock status */
Lock: TimestampedValue<number>;
}
/**
* Collection of device states indexed by device ID
*
* Maps device ID strings to their corresponding device state objects, providing a lookup table for all devices
* associated with a user account.
*/
export interface DeviceStatesObj {
/** Device state objects indexed by their unique device ID strings */
[deviceId: string]: DeviceState;
}
/** Top-level interface for the device states REST API response. */
export interface DeviceStates {
DeviceStatesObj: DeviceStatesObj;
}

View File

@@ -1 +1,3 @@
export * from './Devices'; export * from './Devices';
export * from './Firmwares';
export * from './States';