Move auth to createSocket (#30)

Move auth to connection options

README.md

@@ -43,7 +43,7 @@ async function connect() {
       return;
     }
   }
-  const connection = await createConnection(auth);
+  const connection = await createConnection({ auth });
   subscribeEntities(connection, ent => console.log(ent));
 }
 

example.html

@@ -28,7 +28,7 @@
           return;
         }
       }
-      const connection = await createConnection(auth);
+      const connection = await createConnection({ auth });
       subscribeEntities(connection, entities => renderEntities(connection, entities));
     })();
 

lib/connection.ts

@@ -11,7 +11,6 @@ import {
   HassServices,
   HassConfig
 } from "./types";
-import { Auth } from "./auth";
 import createSocket from "./socket";
 
 const DEBUG = false;
@@ -53,7 +52,6 @@ type WebSocketResponse =
   | WebSocketResultErrorResponse;
 
 export class Connection {
-  auth: Auth;
   options: ConnectionOptions;
   commandId: number;
   commands: {
@@ -65,10 +63,10 @@ export class Connection {
   closeRequested: boolean;
   socket: WebSocket;
 
-  constructor(auth: Auth, options: ConnectionOptions) {
-    this.auth = auth;
+  constructor(options: ConnectionOptions) {
     // connection options
     //  - setupRetry: amount of ms to retry when unable to connect on initial setup
+    //  - createSocket: create a new Socket connection
     this.options = options;
     // id if next command to send
     this.commandId = 1;
@@ -279,7 +277,7 @@ export class Connection {
           console.log("Trying to reconnect");
         }
         try {
-          const socket = await options.createSocket(this.auth, options);
+          const socket = await options.createSocket(options);
           this.setSocket(socket);
         } catch (err) {
           if (err === ERR_INVALID_AUTH) {
@@ -306,16 +304,15 @@ const defaultConnectionOptions: ConnectionOptions = {
 };
 
 export default async function createConnection(
-  auth: Auth,
   options?: Partial<ConnectionOptions>
 ) {
   const connOptions: ConnectionOptions = Object.assign(
     {},
     defaultConnectionOptions,
     options
   );
-  const socket = await options.createSocket(auth, connOptions);
-  const conn = new Connection(auth, connOptions);
+  const socket = await connOptions.createSocket(connOptions);
+  const conn = new Connection(connOptions);
   conn.setSocket(socket);
   return conn;
 }

lib/socket.ts

@@ -9,13 +9,15 @@ import {
 } from "./const";
 import { MSG_TYPE_AUTH_INVALID } from "./const";
 import { ConnectionOptions } from "./types";
+import { authAccessToken } from "./messages";
 
 const DEBUG = false;
 
 export default function createSocket(
-  auth,
   options: ConnectionOptions
 ): Promise<WebSocket> {
+  const auth = options.auth;
+
   // Convert from http:// -> ws://, https:// -> wss://
   const url = `ws${auth.hassUrl.substr(4)}/api/websocket`;
 
@@ -36,7 +38,6 @@ export default function createSocket(
     const closeMessage = () => {
       // If we are in error handler make sure close handler doesn't also fire.
       socket.removeEventListener("close", closeMessage);
-
       if (invalidAuth) {
         promReject(ERR_INVALID_AUTH);
         return;
@@ -72,9 +73,7 @@ export default function createSocket(
         case MSG_TYPE_AUTH_REQUIRED:
           try {
             if (auth.expired) await auth.refreshAccessToken();
-            socket.send(
-              JSON.stringify(message.authAccessToken(auth.access_token))
-            );
+            socket.send(JSON.stringify(authAccessToken(auth.access_token)));
           } catch (err) {
             // Refresh token failed
             invalidAuth = true;

lib/types.ts

@@ -6,7 +6,8 @@ export type UnsubscribeFunc = () => void;
 
 export type ConnectionOptions = {
   setupRetry: number;
-  createSocket: (auth: Auth, options: ConnectionOptions) => Promise<WebSocket>;
+  auth?: Auth;
+  createSocket: (options: ConnectionOptions) => Promise<WebSocket>;
 };
 
 export type HassEvent = {