working version of the plugin

Author: dmolsen

README.md

@@ -3,7 +3,7 @@
 
 # Reload Plugin for Pattern Lab
 
-The Reload Plugin adds Web Socket-based automatic browser reload support to Pattern Lab. The Reload Plugin will automatically reload your browser window if you're using the `--watch` flag.
+The Reload Plugin adds Web Socket-based automatic browser reload support to Pattern Lab. The Reload Plugin will automatically reload the Pattern Lab iFrame if you're using the `--watch` flag.
 
 ## Installation
 

composer.json

@@ -26,7 +26,8 @@
   "require": {
     "php":              ">=5.4",
     "pattern-lab/core": "dev-dev",
-    "wrench/wrench":    "^2.0.0"
+    "wrench/wrench":    "^2.0.0",
+    "cocur/background-process": "~0.5"
   },
   "extra": {
     "patternlab": {

dist/js/plugin-reload.js

@@ -1,10 +1,10 @@
 var PluginReload = {
 
   init: function() {
-      
+    
     if ('WebSocket' in window && window.WebSocket.CLOSING === 2) {
 
-      wsc = new WebSocket("ws://"+host+":8001/autoreload");
+      wsc = new WebSocket("ws://localhost:8000/reload");
 
       // when trying to open a connection to WebSocket update the pattern lab nav bar
       wsc.onopen = function () {

src/PatternLab/Reload/AutoReloadApplication.php

@@ -18,60 +18,61 @@
 use \Wrench\Application\NamedApplication;
 
 class AutoReloadApplication extends Application {
-	
-	protected $clients            = array();
-	protected $savedTimestamp     = time();
-	protected $savedTimestampPath = __DIR__."/../../../../../../public/latest-change.txt";
-	
-	/**
-	* Set the saved timestamp. If the latest-change file doesn't exist simply use the current time as the saved time
-	*/
-	public function __construct() {
-		
-		if (file_exists($savedTimestampPath)) {
-			$this->savedTimestamp = file_get_contents($savedTimestampPath);
-		}
-		
-	}
-	
-	/**
-	* When a client connects add it to the list of connected clients
-	*/
-	public function onConnect($client) {
-		$id = $client->getId();
-		$this->clients[$id] = $client;
-	}
-	
-	/**
-	* When a client disconnects remove it from the list of connected clients
-	*/
-	public function onDisconnect($client) {
-		$id = $client->getId();
-		unset($this->clients[$id]);
-	}
-	
-	/**
-	* Dead function in this instance
-	*/
-	public function onData($data, $client) {
-		// function not in use
-	}
-	
-	/**
-	* Sends out a message once a second to all connected clients containing the contents of latest-change.txt
-	*/
-	public function onUpdate() {
-		
-		if (file_exists($savedTimestampPath)) {
-			$readTimestamp = file_get_contents($savedTimestampPath);
-			if ($readTimestamp != $this->savedTimestamp) {
-				foreach ($this->clients as $sendto) {
-					$sendto->send($readTimestamp);
-				}
-				$this->savedTimestamp = $readTimestamp;
-			}
-		}
-		
-	}
-
+  
+  protected $clients            = array();
+  protected $savedTimestamp     = '';
+  protected $savedTimestampPath = '';
+  
+  /**
+  * Set the saved timestamp. If the latest-change file doesn't exist simply use the current time as the saved time
+  */
+  public function __construct() {
+    $this->savedTimestampPath = __DIR__."/../../../../../../public/latest-change.txt";
+    if (file_exists($this->savedTimestampPath)) {
+      $this->savedTimestamp = file_get_contents($this->savedTimestampPath);
+    } else {
+      $this->savedTimestamp = time();
+    }
+  }
+  
+  /**
+  * When a client connects add it to the list of connected clients
+  */
+  public function onConnect($client) {
+    $id = $client->getId();
+    $this->clients[$id] = $client;
+  }
+  
+  /**
+  * When a client disconnects remove it from the list of connected clients
+  */
+  public function onDisconnect($client) {
+    $id = $client->getId();
+    unset($this->clients[$id]);
+  }
+  
+  /**
+  * Dead function in this instance
+  */
+  public function onData($data, $client) {
+    // function not in use
+  }
+  
+  /**
+  * Sends out a message once a second to all connected clients containing the contents of latest-change.txt
+  */
+  public function onUpdate() {
+    
+    if (file_exists($this->savedTimestampPath)) {
+      $readTimestamp = file_get_contents($this->savedTimestampPath);
+      if ($readTimestamp != $this->savedTimestamp) {
+        foreach ($this->clients as $sendto) {
+          $sendto->send($readTimestamp);
+        }
+        $this->savedTimestamp = $readTimestamp;
+      }
+    }
+    
+  }
+  
 }

src/PatternLab/Reload/AutoReloadServer.php

@@ -6,13 +6,12 @@
  * Copyright (c) 2013-2016 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
  *
- * The server that clients attach to to learn about content updates. See
- * lib/Wrench/Application/contentSyncBroadcasterApplication.php for logic
+ * The web socket server that clients attach to to learn about content updates.
  *
  */
 
-require("../../../../../autoload.php");
+require(__DIR__."/../../../../../autoload.php");
 
-$server = new \Wrench\BasicServer('ws://0.0.0.0:8001');
+$server = new \Wrench\BasicServer('ws://localhost:8000', array('allowed_origins' => array('localhost')));
 $server->registerApplication('reload', new \PatternLab\Reload\AutoReloadApplication());
 $server->run();

src/PatternLab/Reload/PatternLabListener.php

@@ -12,15 +12,13 @@
 
 namespace PatternLab\Reload;
 
+use \Cocur\BackgroundProcess\BackgroundProcess;
 use \PatternLab\Config;
 use \PatternLab\Console;
 use \PatternLab\Data;
 
 class PatternLabListener extends \PatternLab\Listener {
 
-  protected $faker;
-  protected $locale;
-  
   /**
   * Add the listeners for this plug-in
   */
@@ -37,8 +35,10 @@ public function __construct() {
   public function initServer() {
 
     if ((bool)Config::getOption("reload.on")) {
-      $path = __DIR__."AutoReloadServer.php";
-      $fp   = popen("php ".$path, "r");
+      $php     = isset($_SERVER["_"]) ? $_SERVER["_"] : Config::getOption("phpBin");
+      $path    = __DIR__."/AutoReloadServer.php";
+      $process = new BackgroundProcess($php." ".$path);
+      $process->run();
     }
 
   }