some better fail cases if voicecode isn’t reachable

Author: olilarkin

SourceEditorExtension/VoiceCodeSourceEditorCommand.swift

@@ -95,7 +95,7 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
 
     service.getLatestCommand() { (command) in
       //NSLog(buffer.contentUTI)
-      NSLog(command)
+      NSLog("Command received: " + command)
 
       do {
         let json = try JSON(data: command.data(using: .utf8)!)
@@ -116,9 +116,11 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
     let line = clampLineNumber(lineNumber: json["line"].intValue - 1, nLinesInBuffer: nLinesInBuffer)
 
     switch(json["id"].stringValue) {
-      
+    case "no message":
+      NSLog("Could not connect to VoiceCode websocket")
+      break
     case "initial-state":
-      NSLog("initial state - not handled")
+      NSLog("Initial state - not handled")
       break
 
     // MARK: -

XPCService/VoiceCodeXPCService.swift

@@ -6,41 +6,48 @@ import Starscream
 
   var socket: WebSocket
   var messageReceived: String
+  var failedToConnect: Bool
+  let noMessageStr = "{\"id\": \"no message\"}"
 
   override init() {
     socket = WebSocket(url: URL(string: "ws://localhost:8081/")!)
-    messageReceived = ""
+    messageReceived = noMessageStr
+    failedToConnect = false
     super.init()
     socket.delegate = self
     socket.connect()
   }
 
   func getLatestCommand(withReply: (String) -> ()) {
 
-    while(!socket.isConnected) {
+    //we need to handle this better here - it will block until the connection is made, if it can't make the connection
+    while(!socket.isConnected && !failedToConnect) {
       // NSLog("connecting")
     }
 
-    while(messageReceived == "") {
+    while(messageReceived == noMessageStr && !failedToConnect) {
       // NSLog("waiting for message")
     }
 
     withReply(messageReceived)
 
-    messageReceived = ""
+    messageReceived = noMessageStr
+    failedToConnect = false
   }
 
   func websocketDidConnect(socket: WebSocket) {
-    NSLog("websocket is connected")
+    NSLog("Websocket is connected")
     //socket.write(string: "getCommand")
   }
 
   func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
     if let e = error {
-      NSLog("websocket is disconnected: \(e.localizedDescription)")
+      NSLog("Websocket is disconnected: \(e.localizedDescription)")
     } else {
-      NSLog("websocket disconnected")
+      NSLog("Websocket disconnected")
     }
+    
+    failedToConnect = true;
   }
 
   func websocketDidReceiveMessage(socket: WebSocket, text: String) {