Update README

Dockerfile

@@ -5,7 +5,10 @@ ENV LANG C.UTF-8
 
 COPY run.sh /
 WORKDIR /usr/
-COPY . .
+COPY example example
+COPY lib lib
+COPY package.json package-lock.json tsconfig.json config.json ./
+
 
 # Setup base
 RUN apk add --no-cache jq nodejs npm

README.md

@@ -6,14 +6,23 @@ rxjs wrapper for [home-assistant-js-websocket](https://github.com/home-assistant
 
 ### Local Development
 
-`npm run dev`
+1. Create a `.env` file with two properties `HOST` and `ACCESS_TOKEN`.
 
-### Local Docker Development
+```
+HOST=http://homeassistant.local:8123
+ACCESS_TOKEN=<long-lived-access-token>
+```
+
+2. Run the development server
+
+```
+npm run dev
+```
 
 #### Local build
 
 `docker build --build-arg BUILD_FROM="homeassistant/amd64-base:latest" -t ha-rxjs .`
 
 #### Local run
 
-`docker run --rm -e SUPERVISOR_TOKEN="<long-lived-access-token>" ha-rxjs`
+`docker run --rm --env-file=.env ha-rxjs`

example/index.ts

@@ -1,25 +1,13 @@
-import dotenv from 'dotenv';
-import { filter, take, tap } from 'rxjs/operators';
+import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { HomeAssistantRXJS } from '../lib';
 
-dotenv.config();
-const host = process.env.HOST ?? 'http://homeassistant:8123';
-const token = process.env.ACCESS_TOKEN;
-
-if (!token) {
-  throw new Error(
-    'No access token (SUPERVISOR_TOKEN or ACCESS_TOKEN) found in environment variables.',
-  );
-}
-
-console.log(`Initializing HA with ${token} at ${host}`);
-const harxjs = new HomeAssistantRXJS(host, token);
+const harxjs = new HomeAssistantRXJS();
 
 harxjs.services$
   .pipe(
-    filter(config => Object.keys(config).length > 0),
+    filter(x => !!x),
     take(1),
-    tap(console.log),
-    tap(() => harxjs.destroy()),
+    tap(x => console.log('connected')),
+    switchMap(() => harxjs.destroy()),
   )
   .subscribe();

lib/connection/create-socket.ts → lib/connection/index.ts

@@ -7,20 +7,51 @@ https://github.com/home-assistant/home-assistant-js-websocket/blob/master/lib/so
 
 // import * as ha from 'home-assistant-js-websocket';
 import {
-  Auth,
+  createConnection,
   ERR_CANNOT_CONNECT,
   ERR_INVALID_AUTH,
   MSG_TYPE_AUTH_INVALID,
   MSG_TYPE_AUTH_OK,
   MSG_TYPE_AUTH_REQUIRED,
 } from 'home-assistant-js-websocket';
 import WebSocket from 'ws';
+import { HomeAssistantRXJSOptions } from '..';
+
+export async function connectToHA() {
+  const connection = await createConnection({
+    createSocket: () =>
+      createSocket({ wsUrl: getWsURL(), token: getToken() }, true),
+  });
+
+  return connection;
+}
+
+function getWsURL() {
+  const host = process.env.HOST;
+  return host
+    ? `ws${host.substr(4)}/api/websocket`
+    : 'ws://supervisor/core/websocket';
+}
+
+function getToken() {
+  const token = process.env.ACCESS_TOKEN || process.env.SUPERVISOR_TOKEN;
+
+  if (!token) {
+    throw new Error(
+      'No access token (SUPERVISOR_TOKEN or ACCESS_TOKEN) found in environment variables.',
+    );
+  }
+
+  return token;
+}
 
 export function createSocket(
-  auth: Auth,
+  auth: HomeAssistantRXJSOptions,
   ignoreCertificates: boolean,
 ): Promise<any> {
-  // Convert from http:// -> ws://, https:// -> wss://
+  console.log(`URL ${auth.wsUrl}`);
+  console.log(`Token ${auth.token}`);
+
   const url = auth.wsUrl;
 
   console.log(
@@ -100,13 +131,13 @@ export function createSocket(
     // Auth is mandatory, so we can send the auth message right away.
     const handleOpen = async () => {
       try {
-        if (auth.expired) {
+        /* if (auth.expired) {
           await auth.refreshAccessToken();
-        }
+        } */
         socket.send(
           JSON.stringify({
             type: 'auth',
-            access_token: auth.accessToken,
+            access_token: auth.token,
           }),
         );
       } catch (err) {

lib/entities.ts

@@ -31,10 +31,7 @@ export class HomeAssistantEntities {
               subscriber.next(entities),
             );
 
-            subscriber.add(() => {
-              subscriber.complete();
-              unsubscribe();
-            });
+            subscriber.add(() => unsubscribe());
           }),
       ),
       tap(entities => this.entities.next(entities)),

lib/index.ts

@@ -1,30 +1,40 @@
+import dotenv from 'dotenv';
 import {
-  createConnection,
-  createLongLivedTokenAuth,
+  Connection,
   HassConfig,
   subscribeConfig,
 } from 'home-assistant-js-websocket';
-import { BehaviorSubject, from, Observable, Subject } from 'rxjs';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import {
   filter,
+  map,
   switchMap,
   switchMapTo,
   take,
   takeUntil,
   tap,
 } from 'rxjs/operators';
-import { createSocket } from './connection/create-socket';
+import { connectToHA } from './connection';
 import { HomeAssistantEntities } from './entities';
 import { HomeAssistantServices } from './services';
 
+export interface HomeAssistantRXJSOptions {
+  token: string;
+  wsUrl: string;
+}
+
 export class HomeAssistantRXJS {
-  constructor(public host: string, private token: string) {
-    process.on('SIGTERM', () => this.destroy().subscribe(process.exit(0)));
+  constructor() {
+    this.initialize();
   }
 
   private readonly destroy$ = new Subject<void>();
-  readonly connection$ = from(this.connectoToHA(this.host, this.token)).pipe(
+
+  private readonly connection = new BehaviorSubject<Connection | null>(null);
+  readonly connection$ = this.connection.pipe(
     filter(connection => !!connection),
+    // next line is to satisfy TS strictNullChecks
+    map(connection => connection as Connection),
   );
 
   readonly services = new HomeAssistantServices(
@@ -43,14 +53,26 @@ export class HomeAssistantRXJS {
   readonly config$ = this.getConfig();
 
   destroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
     return this.connection$.pipe(
       take(1),
+      tap(() => console.log('Closing connection')),
       tap(connection => connection.close()),
+      tap(() => {
+        this.destroy$.next();
+        this.destroy$.complete();
+      }),
+      // tap(() => process.exit(0)),
     );
   }
 
+  private async initialize() {
+    process.on('SIGTERM', () => this.destroy().subscribe(process.exit(0)));
+    dotenv.config();
+
+    const connection = await connectToHA();
+    this.connection.next(connection);
+  }
+
   private getConfig() {
     return this.connection$.pipe(
       switchMap(
@@ -60,22 +82,11 @@ export class HomeAssistantRXJS {
               subscriber.next(config),
             );
 
-            subscriber.add(() => {
-              subscriber.complete();
-              unsubscribe();
-            });
+            subscriber.add(() => unsubscribe());
           }),
       ),
       switchMapTo(this.config.asObservable()),
       takeUntil(this.destroy$),
     );
   }
-
-  private connectoToHA(host: string, token: string) {
-    const auth = createLongLivedTokenAuth(host, token);
-
-    return createConnection({
-      createSocket: () => createSocket(auth, true),
-    });
-  }
 }

lib/services.ts

@@ -51,10 +51,7 @@ export class HomeAssistantServices {
               subscriber.next(services),
             );
 
-            subscriber.add(() => {
-              subscriber.complete();
-              unsubscribe();
-            });
+            subscriber.add(() => unsubscribe());
           }),
       ),
       tap(services => this.services.next(services)),