OSX Launcher:

* UI Bugfixes/features
    * restart might work
    * open console button should work
    * cleanup

launchers/macosx/I2PLauncher/userinterface/RouterStatusView.swift

@@ -24,63 +24,93 @@ import Cocoa
   @IBOutlet var routerUptimeLabel: NSTextField?
   @IBOutlet var routerPIDLabel: NSTextField?
   
+  
   @IBOutlet var quickControlView: NSView?
   @IBOutlet var routerStartStopButton: NSButton?
+  @IBOutlet var restartRouterButton: NSButton?
   @IBOutlet var openConsoleButton: NSButton?
   
+  
+  @objc func actionBtnOpenConsole(_ sender: Any?) {
+    SwiftMainDelegate.openLink(url: "http://localhost:7657")
+  }
+  
   @objc func actionBtnStartRouter(_ sender: Any?) {
-    NSLog("START ROUTER")
+    NSLog("Router start clicked")
     /*if (RouterManager.shared().getRouterTask() == nil) {
       SBridge.sharedInstance().startupI2PRouter(RouterProcessStatus.i2pDirectoryPath)
     }*/
     (sender as! NSButton).isTransparent = true
     let routerStatus = RouterRunner.launchAgent?.status()
-    switch routerStatus {
+    DispatchQueue(label: "background_start").async {
-    case .loaded?:
+      switch routerStatus {
-      RouterManager.shared().routerRunner.StartAgent(information: RouterRunner.launchAgent)
+      case .loaded?:
-    case .unloaded?:
+        RouterManager.shared().routerRunner.StartAgent(RouterRunner.launchAgent)
-      do {
+      case .unloaded?:
-        try LaunchAgentManager.shared.load(RouterRunner.launchAgent!)
+        do {
-        RouterManager.shared().routerRunner.StartAgent(information: RouterRunner.launchAgent)
+          try LaunchAgentManager.shared.load(RouterRunner.launchAgent!)
-      } catch {
+          RouterManager.shared().routerRunner.StartAgent(RouterRunner.launchAgent)
-        RouterManager.shared().eventManager.trigger(eventName: "router_exception", information: error)
+        } catch {
+          RouterManager.shared().eventManager.trigger(eventName: "router_exception", information: error)
+        }
+        break
+      default:
+        break
+      }
+      DispatchQueue.main.async {
+        self.reEnableButton()
       }
-      break
-    default:
-      break
     }
-    self.reEnableButton()
   }
   
   @objc func actionBtnStopRouter(_ sender: Any?) {
-    NSLog("STOP ROUTER")
+    NSLog("Router stop clicked")
-    let routerStatus = RouterRunner.launchAgent?.status()
+    DispatchQueue(label: "background_shutdown").async {
-    switch routerStatus {
+      RouterManager.shared().routerRunner.StopAgent({
-    case .running?:
+        RouterProcessStatus.isRouterRunning = false
-      NSLog("Found running router")
+        RouterProcessStatus.isRouterChildProcess = false
-      RouterManager.shared().routerRunner.StopAgent()
+        NSLog("Router should be stopped by now.")
-      break
+      })
-    default:
+      // Wait for it to die.
-      break
+      
     }
+    RouterManager.shared().eventManager.trigger(eventName: "toggle_popover")
     self.reEnableButton()
   }
   
-  @objc func actionBtnRestartRouter(sender: Any?) {
+  func restartFn() {
-    if (RouterManager.shared().getRouterTask() != nil) {
+    RouterManager.shared().routerRunner.StopAgent({
-      //RouterManager.shared().getRouterTask()?.requestRestart()
+      sleep(30)
+      RouterManager.shared().routerRunner.StartAgent()
+    })
+  }
+  
+  @objc func actionBtnRestartRouter(_ sender: Any?) {
+    RouterManager.shared().eventManager.trigger(eventName: "toggle_popover")
+    let currentStatus : AgentStatus = RouterRunner.launchAgent?.status() ?? AgentStatus.unloaded
+    if currentStatus != AgentStatus.loaded && currentStatus != AgentStatus.unloaded {
+      NSLog("Found a running router, will unload it from launchd")
+      // OK, router seems to be running
+      DispatchQueue(label: "background_restart").async {
+        self.restartFn()
+        // Report done to main thread
+        DispatchQueue.main.async {
+          self.reEnableButton()
+        }
+      }
     } else {
       NSLog("Can't restart a non running router, start it however...")
-      //SBridge.sharedInstance().startupI2PRouter(RouterProcessStatus.i2pDirectoryPath)
+      RouterManager.shared().routerRunner.StartAgent()
     }
   }
   
   func handlerRouterStart(information:Any?) {
-    print("Triggered handlerRouterStart")
+    NSLog("Triggered handlerRouterStart")
     NSLog("PID2! %@", information as! String)
     routerPIDLabel?.cell?.stringValue = "Router PID: "+(information as! String)
     routerPIDLabel?.needsDisplay = true
     routerStatusLabel?.cell?.stringValue = "Router status: Running"
+    RouterManager.shared().lastRouterPid = (information as? String)
     self.toggleSetButtonStop()
     self.reEnableButton()
   }
@@ -112,10 +142,16 @@ import Cocoa
       RouterStatusView.instance = self
     }
     self.reEnableButton()
+    openConsoleButton!.cell!.action = #selector(self.actionBtnOpenConsole(_:))
+    openConsoleButton!.cell!.target = self
+    restartRouterButton!.cell!.action = #selector(self.actionBtnRestartRouter(_:))
+    restartRouterButton!.cell!.target = self
+    
   }
   
   func handleRouterStop() {
     routerPIDLabel?.cell?.stringValue = "Router PID: Not running"
+    RouterManager.shared().lastRouterPid = nil
     self.toggleSetButtonStart()
     reEnableButton()
   }
@@ -133,41 +169,49 @@ import Cocoa
   }
   
   func setRouterStatusLabelText() {
-    routerStartStopButton?.needsDisplay = true
     routerStartStopButton?.target = self
-    quickControlView?.needsDisplay = true
+    let staticStartedByLabelText = "Router started by launcher? "
+    let staticIsRunningLabelText = "Router status: "
+    let staticRouterVersionLabelText = "Router version: "
+    let staticRouterPidLabelText = "Router PID: "
     
-    do {
+    // Use default here to avoid any potential crashes with force unwrapping
-      let currentStatus : AgentStatus = RouterRunner.launchAgent!.status()
+    let currentStatus : AgentStatus = RouterRunner.launchAgent?.status() ?? AgentStatus.unloaded
-      if currentStatus == AgentStatus.loaded || currentStatus == AgentStatus.unloaded  {
+    if currentStatus == AgentStatus.loaded || currentStatus == AgentStatus.unloaded  {
-        routerStatusLabel?.cell?.stringValue = "Router status: Not running"
+      routerStatusLabel?.cell?.stringValue = staticIsRunningLabelText+"Not running"
-      } else {
-        routerStatusLabel?.cell?.stringValue = "Router status: Running"
-      }
-    } catch {
-      // Ensure it's set even AgentStatus is nil (uninitialized yet..)
-      routerStatusLabel?.cell?.stringValue = "Router status: Not running"
-    }
-    
-    let staticStartedByLabelText = "Router started by launcher?"
-    if RouterProcessStatus.isRouterChildProcess {
-      routerStartedByLabel?.cell?.stringValue = staticStartedByLabelText+" Yes"
     } else {
-      routerStartedByLabel?.cell?.stringValue = staticStartedByLabelText+" No"
+      routerStatusLabel?.cell?.stringValue = staticIsRunningLabelText+"Running"
     }
-    routerStartedByLabel?.needsDisplay = true
+    
+    if RouterProcessStatus.isRouterChildProcess {
+      routerStartedByLabel?.cell?.stringValue = staticStartedByLabelText+"Yes"
+    } else {
+      routerStartedByLabel?.cell?.stringValue = staticStartedByLabelText+"No"
+    }
+    
+    // Try to display PID - if not, the string behind ?? is used as "default"
+    let tmpPidText = RouterManager.shared().lastRouterPid ?? "Not running"
+    routerPIDLabel?.cell?.stringValue = staticRouterPidLabelText+tmpPidText
     
     if let version = RouterProcessStatus.routerVersion {
-      routerVersionLabel?.cell?.stringValue = "Router version: " + version
+      routerVersionLabel?.cell?.stringValue = staticRouterVersionLabelText + version
     } else {
-      routerVersionLabel?.cell?.stringValue = "Router version: Still unknown"
+      routerVersionLabel?.cell?.stringValue = staticRouterVersionLabelText + "Still unknown"
     }
+    
     if let routerStartTime = RouterProcessStatus.routerStartedAt {
       routerUptimeLabel?.cell?.stringValue = "Uptime: Router started " + DateTimeUtils.timeAgoSinceDate(date: NSDate(date: routerStartTime), numericDates: false)
     } else {
       routerUptimeLabel?.cell?.stringValue = "Uptime: Router isn't running"
     }
+    
+    // Needs display function alerts the rendrerer that the UI parts need to be re-drawed.
+    routerStartStopButton?.needsDisplay = true
+    quickControlView?.needsDisplay = true
     routerUptimeLabel?.needsDisplay = true
+    routerVersionLabel?.needsDisplay = true
+    routerStartedByLabel?.needsDisplay = true
+    routerPIDLabel?.needsDisplay = true
   }
   
   

launchers/macosx/I2PLauncher/userinterface/StatusBarController.swift

@@ -44,19 +44,22 @@ import Cocoa
     let pidStr = information as! String
     NSLog("PID! %@", pidStr)
     showPopover(sender: nil)
-    //self.ctrl?.getRouterStatusView()?.handlerRouterStart(information: pidStr)
+    RouterManager.shared().lastRouterPid = pidStr
     self.ctrl?.getRouterStatusView()?.needsDisplay = true
   }
+  
+  func event_toggle(information:Any?) {
+    self.togglePopover(sender: self)
+  }
 
   
   override init() {
     super.init()
     self.ctrl = PopoverViewController.freshController()
     popover.contentViewController = self.ctrl
-    //updateObjectRef = SUUpdater.shared()
+    RouterManager.shared().eventManager.listenTo(eventName: "router_pid", action: pidReaction)
-    //updateObjectRef?.checkForUpdatesInBackground()
-   RouterManager.shared().eventManager.listenTo(eventName: "router_pid", action: pidReaction)
     
+    RouterManager.shared().eventManager.listenTo(eventName: "toggle_popover", action: event_toggle)
     
     if let button = statusItem.button {
       button.image = NSImage(named:"StatusBarButtonImage")