Skip to content

Commit ff15668

Browse files
author
jango-blockchained
committed
Refactor Home Assistant API and schema validation
- Completely rewrote HassInstance class with fetch-based API methods - Updated Home Assistant schemas to be more precise and flexible - Removed deprecated test environment configuration file - Enhanced WebSocket client implementation - Improved test coverage for Home Assistant API and schema validation - Simplified type definitions and error handling
1 parent 1194660 commit ff15668

File tree

8 files changed

+560
-199
lines changed

8 files changed

+560
-199
lines changed

‎.env.test.example

-11
This file was deleted.

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,5 @@ yarn.lock
6666
pnpm-lock.yaml
6767
bun.lockb
6868

69+
coverage/*
6970
coverage/

‎__tests__/hass/api.test.ts

+84-107
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,134 @@
1-
import { get_hass } from '../../src/hass/index.js';
1+
import { HassInstance } from '../../src/hass/index.js';
2+
import * as HomeAssistant from '../../src/types/hass.js';
23

34
// Mock the entire hass module
45
jest.mock('../../src/hass/index.js', () => ({
56
get_hass: jest.fn()
67
}));
78

8-
describe('Home Assistant API Integration', () => {
9-
const MOCK_HASS_HOST = 'http://localhost:8123';
10-
const MOCK_HASS_TOKEN = 'mock_token_12345';
11-
12-
const mockHassInstance = {
13-
getStates: jest.fn(),
14-
getState: jest.fn(),
15-
callService: jest.fn(),
16-
subscribeEvents: jest.fn()
17-
};
9+
describe('Home Assistant API', () => {
10+
let hass: HassInstance;
1811

1912
beforeEach(() => {
20-
process.env.HASS_HOST = MOCK_HASS_HOST;
21-
process.env.HASS_TOKEN = MOCK_HASS_TOKEN;
22-
jest.clearAllMocks();
23-
(get_hass as jest.Mock).mockResolvedValue(mockHassInstance);
13+
hass = new HassInstance('http://localhost:8123', 'test_token');
2414
});
2515

26-
describe('API Connection', () => {
27-
it('should initialize connection with valid credentials', async () => {
28-
const hass = await get_hass();
29-
expect(hass).toBeDefined();
30-
expect(hass).toBe(mockHassInstance);
31-
});
32-
33-
it('should handle connection errors', async () => {
34-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Connection failed'));
35-
await expect(get_hass()).rejects.toThrow('Connection failed');
36-
});
16+
describe('State Management', () => {
17+
it('should fetch all states', async () => {
18+
const mockStates: HomeAssistant.Entity[] = [
19+
{
20+
entity_id: 'light.living_room',
21+
state: 'on',
22+
attributes: { brightness: 255 },
23+
last_changed: '2024-01-01T00:00:00Z',
24+
last_updated: '2024-01-01T00:00:00Z',
25+
context: { id: '123', parent_id: null, user_id: null }
26+
}
27+
];
3728

38-
it('should handle invalid credentials', async () => {
39-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Unauthorized'));
40-
await expect(get_hass()).rejects.toThrow('Unauthorized');
41-
});
29+
global.fetch = jest.fn().mockResolvedValueOnce({
30+
ok: true,
31+
json: () => Promise.resolve(mockStates)
32+
});
4233

43-
it('should handle missing environment variables', async () => {
44-
delete process.env.HASS_HOST;
45-
delete process.env.HASS_TOKEN;
46-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Missing required environment variables'));
47-
await expect(get_hass()).rejects.toThrow('Missing required environment variables');
34+
const states = await hass.fetchStates();
35+
expect(states).toEqual(mockStates);
36+
expect(fetch).toHaveBeenCalledWith(
37+
'http://localhost:8123/api/states',
38+
expect.any(Object)
39+
);
4840
});
49-
});
5041

51-
describe('State Management', () => {
52-
const mockStates = [
53-
{
42+
it('should fetch single state', async () => {
43+
const mockState: HomeAssistant.Entity = {
5444
entity_id: 'light.living_room',
5545
state: 'on',
56-
attributes: {
57-
brightness: 255,
58-
friendly_name: 'Living Room Light'
59-
}
60-
},
61-
{
62-
entity_id: 'switch.kitchen',
63-
state: 'off',
64-
attributes: {
65-
friendly_name: 'Kitchen Switch'
66-
}
67-
}
68-
];
69-
70-
it('should fetch states successfully', async () => {
71-
mockHassInstance.getStates.mockResolvedValueOnce(mockStates);
72-
const hass = await get_hass();
73-
const states = await hass.getStates();
74-
expect(states).toEqual(mockStates);
75-
});
46+
attributes: { brightness: 255 },
47+
last_changed: '2024-01-01T00:00:00Z',
48+
last_updated: '2024-01-01T00:00:00Z',
49+
context: { id: '123', parent_id: null, user_id: null }
50+
};
51+
52+
global.fetch = jest.fn().mockResolvedValueOnce({
53+
ok: true,
54+
json: () => Promise.resolve(mockState)
55+
});
7656

77-
it('should get single entity state', async () => {
78-
const mockState = mockStates[0];
79-
mockHassInstance.getState.mockResolvedValueOnce(mockState);
80-
const hass = await get_hass();
81-
const state = await hass.getState('light.living_room');
57+
const state = await hass.fetchState('light.living_room');
8258
expect(state).toEqual(mockState);
59+
expect(fetch).toHaveBeenCalledWith(
60+
'http://localhost:8123/api/states/light.living_room',
61+
expect.any(Object)
62+
);
8363
});
8464

8565
it('should handle state fetch errors', async () => {
86-
mockHassInstance.getStates.mockRejectedValueOnce(new Error('Failed to fetch states'));
87-
const hass = await get_hass();
88-
await expect(hass.getStates()).rejects.toThrow('Failed to fetch states');
66+
global.fetch = jest.fn().mockRejectedValueOnce(new Error('Failed to fetch states'));
67+
68+
await expect(hass.fetchStates()).rejects.toThrow('Failed to fetch states');
8969
});
9070
});
9171

9272
describe('Service Calls', () => {
93-
it('should call services successfully', async () => {
94-
mockHassInstance.callService.mockResolvedValueOnce(undefined);
95-
const hass = await get_hass();
73+
it('should call service', async () => {
74+
global.fetch = jest.fn().mockResolvedValueOnce({
75+
ok: true,
76+
json: () => Promise.resolve({})
77+
});
78+
9679
await hass.callService('light', 'turn_on', {
9780
entity_id: 'light.living_room',
9881
brightness: 255
9982
});
100-
expect(mockHassInstance.callService).toHaveBeenCalledWith(
101-
'light',
102-
'turn_on',
103-
{
104-
entity_id: 'light.living_room',
105-
brightness: 255
106-
}
83+
84+
expect(fetch).toHaveBeenCalledWith(
85+
'http://localhost:8123/api/services/light/turn_on',
86+
expect.objectContaining({
87+
method: 'POST',
88+
body: JSON.stringify({
89+
entity_id: 'light.living_room',
90+
brightness: 255
91+
})
92+
})
10793
);
10894
});
10995

11096
it('should handle service call errors', async () => {
111-
mockHassInstance.callService.mockRejectedValueOnce(new Error('Bad Request'));
112-
const hass = await get_hass();
97+
global.fetch = jest.fn().mockRejectedValueOnce(new Error('Service call failed'));
98+
11399
await expect(
114100
hass.callService('invalid_domain', 'invalid_service', {})
115-
).rejects.toThrow('Bad Request');
101+
).rejects.toThrow('Service call failed');
116102
});
117103
});
118104

119-
describe('Event Handling', () => {
105+
describe('Event Subscription', () => {
120106
it('should subscribe to events', async () => {
121-
mockHassInstance.subscribeEvents.mockResolvedValueOnce(undefined);
122-
const hass = await get_hass();
123107
const callback = jest.fn();
108+
const mockWs = {
109+
send: jest.fn(),
110+
close: jest.fn(),
111+
addEventListener: jest.fn()
112+
};
113+
114+
global.WebSocket = jest.fn().mockImplementation(() => mockWs);
115+
124116
await hass.subscribeEvents(callback, 'state_changed');
125-
expect(mockHassInstance.subscribeEvents).toHaveBeenCalledWith(
126-
callback,
127-
'state_changed'
117+
118+
expect(WebSocket).toHaveBeenCalledWith(
119+
'ws://localhost:8123/api/websocket'
128120
);
129121
});
130122

131-
it('should handle event subscription errors', async () => {
132-
mockHassInstance.subscribeEvents.mockRejectedValueOnce(new Error('WebSocket error'));
133-
const hass = await get_hass();
123+
it('should handle subscription errors', async () => {
134124
const callback = jest.fn();
125+
global.WebSocket = jest.fn().mockImplementation(() => {
126+
throw new Error('WebSocket connection failed');
127+
});
128+
135129
await expect(
136130
hass.subscribeEvents(callback, 'state_changed')
137-
).rejects.toThrow('WebSocket error');
138-
});
139-
});
140-
141-
describe('Error Handling', () => {
142-
it('should handle network errors gracefully', async () => {
143-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Network error'));
144-
await expect(get_hass()).rejects.toThrow('Network error');
145-
});
146-
147-
it('should handle rate limiting', async () => {
148-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Too Many Requests'));
149-
await expect(get_hass()).rejects.toThrow('Too Many Requests');
150-
});
151-
152-
it('should handle server errors', async () => {
153-
(get_hass as jest.Mock).mockRejectedValueOnce(new Error('Internal Server Error'));
154-
await expect(get_hass()).rejects.toThrow('Internal Server Error');
131+
).rejects.toThrow('WebSocket connection failed');
155132
});
156133
});
157134
});

0 commit comments

Comments
 (0)