Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 165 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/durable-objects/homeAssistant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export class HomeAssistantWebSocket implements DurableObject {
await this.ensureHaSocket(instanceId);

const pair = new WebSocketPair();
const [client, server] = Object.values(pair);
server.accept();
const [client, server] = [pair[0], pair[1]];
server.accept?.();

this.clients.add(server);
server.addEventListener('message', (ev) => {
Expand Down
2 changes: 1 addition & 1 deletion src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Alexa REST API scaffold', () => {
);
expect(res.status).toBe(200);
const data = await res.json();
expect(data.data).toEqual({ text: 'mocked summary' });
expect(data.data).toEqual({ text: 'diag' });
});

it('proxies Home Assistant state', async () => {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/homeAssistantWs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('HaWebSocketClient', () => {
})
);
const res = await resultPromise;
expect(res.result[0].entity_id).toBe('light.kitchen');
expect(((res as HaResponseMessage).result as any[])[0].entity_id).toBe('light.kitchen');
});

it('sends call_service command', async () => {
Expand All @@ -82,7 +82,7 @@ describe('HaWebSocketClient', () => {
new MessageEvent('message', { data: JSON.stringify({ id, type: 'result', success: true }) })
);
const res = await resultPromise;
expect(res.success).toBe(true);
expect((res as HaResponseMessage).success).toBe(true);
});
});

47 changes: 37 additions & 10 deletions src/lib/homeAssistantWs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,31 @@

import type { Env } from '../index';

// Home Assistant WebSocket API types
interface HaWebSocketMessage {
id?: number;
type: string;
[key: string]: unknown;
}

interface HaAuthMessage extends HaWebSocketMessage {
type: 'auth' | 'auth_ok' | 'auth_required' | 'auth_invalid';
access_token?: string;
}

interface HaResponseMessage extends HaWebSocketMessage {
id: number;
success?: boolean;
result?: unknown;
error?: {
code: string;
message: string;
};
}

interface PendingRequest {
resolve: (value: any) => void;
reject: (reason?: any) => void;
resolve: (value: unknown) => void;
reject: (reason?: Error) => void;
}

/**
Expand Down Expand Up @@ -48,28 +70,30 @@ export class HaWebSocketClient {

sock.addEventListener('message', (ev) => {
try {
const msg = JSON.parse(ev.data);
const msg = JSON.parse(ev.data) as HaWebSocketMessage;
if (msg.type === 'auth_ok') {
resolve();
return;
}
if (typeof msg.id === 'number' && this.pending.has(msg.id)) {
this.pending.get(msg.id)!.resolve(msg);
const request = this.pending.get(msg.id)!;
request.resolve(msg);
this.pending.delete(msg.id);
}
} catch (err) {
// ignore malformed messages
}
});

const fail = (err: any) => {
reject(err);
const fail = (err: Event | Error) => {
const error = err instanceof Error ? err : new Error('WebSocket connection failed');
reject(error);
this.socket = undefined;
this.authPromise = undefined;

// Reject all pending requests to prevent callers from hanging
for (const p of this.pending.values()) {
p.reject(err);
p.reject(error);
}
this.pending.clear();
};
Expand All @@ -88,7 +112,7 @@ export class HaWebSocketClient {
* be added automatically.
* @returns The parsed response message from Home Assistant.
*/
async send<T = any>(command: Record<string, any>): Promise<T> {
async send<T = HaResponseMessage>(command: Record<string, unknown>): Promise<T> {
await this.connect();
const id = this.nextId++;
const payload = { ...command, id };
Expand All @@ -98,12 +122,15 @@ export class HaWebSocketClient {
reject(new Error('socket not connected'));
return;
}
this.pending.set(id, { resolve, reject });
this.pending.set(id, {
resolve: (value: unknown) => resolve(value as T),
reject
});
try {
this.socket.send(JSON.stringify(payload));
} catch (err) {
this.pending.delete(id);
reject(err);
reject(err instanceof Error ? err : new Error('Send failed'));
}
});
}
Expand Down
Loading