Better host and port handling

- server now generates a temporary file named 'wshost.tmp' by default in the current working directory that contains defined web socket url. - chat sample takes host[:port] as the first parameter or uses gethostname to create the instance.
albeva · Dec 21, 2011 · dc6ce54 · dc6ce54
1 parent 2cdd4aa
commit dc6ce54
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 3 deletions.
diff --git a/WebSocket/Server.php b/WebSocket/Server.php
@@ -102,6 +102,16 @@ class Server
 	protected $serializers = array();
 
 
+	/**
+	 * Create temporary file containing host and port
+	 * information that server was started with at the given path
+	 * false to not create
+	 *
+	 * @var bool|string
+	 */
+	protected $temporary = 'wshost.tmp';
+
+
 	/**
 	 * Create new WebSocket server instance.
 	 *
@@ -169,6 +179,21 @@ function loadConfig(array $config)
 		}
 		$this->clientClass = $clientClass;
 
+		// temporary file name
+		if (array_key_exists('tempoaray', $config)) {
+			if (!$config['tempoaray']) $this->temporary = false;
+			else $this->temporary = (string)$config['tempoaray'];
+		}
+
+		// resolve temporary path
+		if ($this->temporary) {
+			if ($this->temporary[0] == '/' || preg_match('/^[a-zA-Z]:\\\/', $this->temporary)) {
+				$this->temporary = $this->temporary;
+			} else {
+				$this->temporary = getcwd() . '/' . $this->temporary;
+			}
+		}
+
 		// serializer
 		if (isset($config['serializer'])) {
 			$type = $config['serializer'];
@@ -215,6 +240,11 @@ function start()
 		$this->sockets[(int)$master] = $master;
 		$this->established           = microtime(true);
 
+		// write temporary
+		if ($this->temporary) {
+			file_put_contents($this->temporary, "ws://{$this->host}:{$this->port}");
+		}
+
 		// log
 		$this->log('Server started: ' . date('Y-m-d H:i:s'));
 		$this->log('Master socket : ' . $master);

diff --git a/examples/chat/index.php b/examples/chat/index.php
@@ -0,0 +1,77 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>PHP WebSocket Chat sample</title>
+		<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" media="all">
+		<link rel="stylesheet" type="text/css" href="css/chat.css" media="all">
+		<script type="text/javascript">
+			window.WEB_SOCKET_SWF_LOCATION = "web-socket-js/WebSocketMain.swf";
+			window.socket_host = "<?= file_get_contents('wshost.tmp') ?>";
+		</script>
+		<script type="text/javascript" src="web-socket-js/swfobject.js"></script>
+		<script type="text/javascript" src="web-socket-js/web_socket.js"></script>
+		<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
+		<script type="text/javascript" src="js/bootstrap-modal.js"></script>
+		<script type="text/javascript" src="js/modernizr.custom.81235.js"></script>
+		<script type="text/javascript" src="js/client.js"></script>
+		<script type="text/javascript" src="js/ui.js"></script>
+		<script type="text/javascript" src="js/app.js"></script>
+	</head>
+	<body>
+		<div id="wrapper">
+			<div class="page-header">
+				<h1>PHP WebSocket Chat sample</h1>
+			</div>
+			<div id="main">
+				<div id="content">
+					<div id="chat-area">
+					</div>
+					<div id="input-area">
+						<input type="text" name="message" id="message">
+						<button id="say" class="btn primary">Say</button>
+					</div>
+				</div>
+				<div id="sidebar">
+					<div id="list"></div>
+				</div>
+			</div>
+		</div>
+		<!-- sample modal content -->
+		<div id="details" class="modal hide fade">
+			<div class="modal-header">
+				<a href="#" class="close">&times;</a>
+				<h3>Your details</h3>
+			</div>
+			<div class="modal-body">
+				<form action="?">
+					<div class="clearfix">
+						<label for="nickname">Your Nickname</label>
+						<div class="input">
+							<input id="nickname" class="xlarge" type="text" maxlength="10" name="nickname">
+						</div>
+					</div>
+					<div class="clearfix">
+						<label>Your Avatar</label>
+						<div class="input">
+							<ul class="avatar-select">
+								<li class="avatar-1 active"></li>
+								<li class="avatar-2"></li>
+								<li class="avatar-3"></li>
+								<li class="avatar-4"></li>
+								<li class="avatar-5"></li>
+								<li class="avatar-6"></li>
+								<li class="avatar-7"></li>
+								<li class="avatar-8"></li>
+							</ul>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<a href="#" class="btn save primary">Save</a>
+				<a href="#" class="btn disconnect danger">Disconnect</a>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/examples/chat/js/app.js b/examples/chat/js/app.js
@@ -19,7 +19,7 @@ $(function() {
 		clients     = {},
 		connected   = false,
 		socket      = null,
-		host        = 'ws://173.203.111.216:12345',
+		host        = window.socket_host,
 		WSocket     = window.MozWebSocket || window.WebSocket,
 		myself      = null,
 		setSettings, send, connect, close, onOpen, onMessage, onClose, say;

diff --git a/examples/chat/server.php b/examples/chat/server.php
@@ -76,9 +76,17 @@ function receive($msg)
 
 // Create server
 try {
+	// detect host and port
+	$host = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : gethostname();
+	$port = 12345;
+	if (strpos($host, ':') !== false) {
+		list($host, $port) = explode(':', $host);
+	}
+
+	// create the server instance
 	$server = new WebSocket\Server(array(
-		'host'			=> '173.203.111.216',
-		'port'			=> 12345,
+		'host'			=> $host,
+		'port'			=> $port,
 		'clientClass'	=> 'Chatter',
 		'serializer'	=> 'json'
 	));

diff --git a/examples/chat/wshost.tmp b/examples/chat/wshost.tmp
@@ -0,0 +1 @@
+ws://localhost:9876