update, some logic mofify

Author: inhere

…amples/assets/images/ws-data-framing.png docs/referrer/images/ws-data-framing.pngexamples/assets/images/ws-data-framing.png renamed to docs/referrer/images/ws-data-framing.png examples/assets/images/ws-data-framing.png renamed to docs/referrer/images/ws-data-framing.png

@@ -10,7 +10,7 @@ Websocket协议通过序列化的数据帧传输数据。数据封包协议中
 
 针对上情况，发现错误的一方可向对方发送close帧（状态码是1002，表示协议错误），以关闭连接。
 
-![](examples/assets/images/ws-data-framing.png)
+![](images/ws-data-framing.png)
 
 详细说明：
 

docs/referrer/websocket.md

@@ -10,9 +10,9 @@
 
 require __DIR__ . '/../../../autoload.php';
 
-use inhere\webSocket\server\Application;
+use inhere\webSocket\Application;
 use inhere\webSocket\http\Request;
-use inhere\webSocket\server\handlers\RouteHandlerInterface;
+use inhere\webSocket\handlers\RouteHandlerInterface;
 
 define('PROJECT_PATH', __DIR__);
 
@@ -34,7 +34,7 @@ $app->onClose(function (Application $app, int $id, array $client) {
  ]);
 });
 
-$rootHandler = $app->route('/', new \inhere\webSocket\server\handlers\RootHandler());
+$rootHandler = $app->route('/', new \inhere\webSocket\handlers\RootHandler());
 
 // commands
 $rootHandler->add('test', function ($data, $index, RouteHandlerInterface $handler) {

examples/app_server

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-08-17
+ * Time: 9:44
+ */
+
+namespace inhere\webSocket\examples\charRoom\webSite;
+
+
+class ChatRoom
+{
+
+}

examples/chatRoom/website/ChatRoom.php

@@ -6,20 +6,22 @@
  * Time: 23:13
  */
 
-namespace inhere\webSocket\server;
+namespace inhere\webSocket;
 
 use inhere\console\io\Input;
 use inhere\console\io\Output;
 use inhere\library\helpers\PhpHelper;
 use inhere\library\helpers\ProcessHelper;
 use inhere\library\traits\OptionsTrait;
 use inhere\library\utils\LiteLogger;
-use inhere\webSocket\server\handlers\RouteHandlerInterface;
-use inhere\webSocket\server\handlers\RootHandler;
-use inhere\webSocket\parts\MessageBag;
+use inhere\webSocket\handlers\RouteHandlerInterface;
+use inhere\webSocket\handlers\RootHandler;
+use inhere\webSocket\http\WSResponse;
 use inhere\webSocket\http\Request;
 use inhere\webSocket\http\Response;
-use inhere\webSocket\WSInterface;
+use inhere\webSocket\server\ServerAbstracter;
+use inhere\webSocket\server\ServerFactory;
+use inhere\webSocket\server\ServerInterface;
 
 /**
  * Class Application
@@ -637,7 +639,7 @@ public function buildMessage($data, string $msg = 'success', int $code = 0)
  * @param string $msg
  * @param int $code
  * @param bool $doSend
- * @return int|MessageBag
+ * @return int|WSResponse
  */
  public function respond($data, string $msg = '', int $code = 0, bool $doSend = true)
  {
@@ -650,15 +652,15 @@ public function respond($data, string $msg = '', int $code = 0, bool $doSend = t
  * response text data to client
  * @param $data
  * @param bool $doSend
- * @return int|MessageBag
+ * @return int|WSResponse
  */
  public function respondText($data, bool $doSend = true)
  {
  if (is_array($data)) {
  $data = implode('', $data);
  }
 
- $mr = MessageBag::make($data)->setWs($this->ws);
+ $mr = WSResponse::make($data)->setWs($this->ws);
 
  if ($doSend) {
  $mr->send();
@@ -695,7 +697,7 @@ public function sendText($data, \Closure $afterMakeMR = null, bool $reset = true
  $data = implode('', $data);
  }
 
- $mr = MessageBag::make($data)->setWs($this->ws);
+ $mr = WSResponse::make($data)->setWs($this->ws);
 
  if ($afterMakeMR) {
  $status = $afterMakeMR($mr);

src/server/Application.php src/Application.phpsrc/server/Application.php renamed to src/Application.php

@@ -6,7 +6,7 @@
  * Time: 15:34
  */
 
-namespace inhere\webSocket\server\handlers;
+namespace inhere\webSocket\handlers;
 
 use inhere\webSocket\http\Request;
 use inhere\webSocket\http\Response;
@@ -16,7 +16,7 @@
  *
  * handle the root '/' webSocket request
  *
- * @package inhere\webSocket\server\handlers
+ * @package inhere\webSocket\handlers
  */
 class RootHandler extends RouteHandlerAbstracter
 {

src/server/handlers/RootHandler.php src/handlers/RootHandler.phpsrc/server/handlers/RootHandler.php renamed to src/handlers/RootHandler.php

@@ -6,19 +6,19 @@
  * Time: 22:51
  */
 
-namespace inhere\webSocket\server\handlers;
+namespace inhere\webSocket\handlers;
 
 use inhere\library\traits\OptionsTrait;
-use inhere\webSocket\server\Application;
+use inhere\webSocket\Application;
 use inhere\webSocket\server\dataParser\ComplexDataParserInterface;
 use inhere\webSocket\server\dataParser\DataParserInterface;
 use inhere\webSocket\http\Request;
 use inhere\webSocket\http\Response;
-use inhere\webSocket\parts\MessageBag;
+use inhere\webSocket\http\WSResponse;
 
 /**
  * Class ARouteHandler
- * @package inhere\webSocket\server\handlers
+ * @package inhere\webSocket\handlers
  */
 abstract class RouteHandlerAbstracter implements RouteHandlerInterface
 {
@@ -299,7 +299,7 @@ public function getCmdHandlers(): array
  * @param string $msg
  * @param int $code
  * @param bool $doSend
- * @return int|MessageBag
+ * @return int|WSResponse
  */
  public function respond($data, string $msg = 'success', int $code = 0, bool $doSend = true)
  {
@@ -309,7 +309,7 @@ public function respond($data, string $msg = 'success', int $code = 0, bool $doS
  /**
  * @param $data
  * @param bool $doSend
- * @return MessageBag|int
+ * @return WSResponse|int
  */
  public function respondText($data, bool $doSend = true)
  {

…rver/handlers/RouteHandlerAbstracter.php src/handlers/RouteHandlerAbstracter.phpsrc/server/handlers/RouteHandlerAbstracter.php renamed to src/handlers/RouteHandlerAbstracter.php src/server/handlers/RouteHandlerAbstracter.php renamed to src/handlers/RouteHandlerAbstracter.php

@@ -6,16 +6,16 @@
  * Time: 15:35
  */
 
-namespace inhere\webSocket\server\handlers;
+namespace inhere\webSocket\handlers;
 
-use inhere\webSocket\server\Application;
+use inhere\webSocket\Application;
 use inhere\webSocket\http\Request;
 use inhere\webSocket\http\Response;
-use inhere\webSocket\parts\MessageBag;
+use inhere\webSocket\http\WSResponse;
 
 /**
  * Interface IRouteHandler
- * @package inhere\webSocket\server\handlers
+ * @package inhere\webSocket\handlers
  */
 interface RouteHandlerInterface
 {
@@ -75,7 +75,7 @@ public function isJsonType();
  * @param string $msg
  * @param int $code
  * @param bool $doSend
- * @return int|MessageBag
+ * @return int|WSResponse
  */
  public function respond($data, string $msg = 'success', int $code = 0, bool $doSend = true);
 

…erver/handlers/RouteHandlerInterface.php src/handlers/RouteHandlerInterface.phpsrc/server/handlers/RouteHandlerInterface.php renamed to src/handlers/RouteHandlerInterface.php src/server/handlers/RouteHandlerInterface.php renamed to src/handlers/RouteHandlerInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-08-17
+ * Time: 11:08
+ */
+
+namespace inhere\webSocket\server;
+
+/**
+ * Class WSRequest
+ * @package inhere\webSocket\server
+ */
+class WSRequest
+{
+
+}

src/http/WSRequest.php

@@ -6,18 +6,18 @@
  * Time: 21:32
  */
 
-namespace inhere\webSocket\parts;
+namespace inhere\webSocket\http;
 
 use inhere\library\traits\TraitArrayAccess;
 use inhere\library\traits\TraitGetterSetterAccess;
 use inhere\webSocket\server\ServerInterface;
 
 /**
- * Class MessageResponse
+ * Class WSResponse
  * webSocket message response
  * @package inhere\webSocket\parts
  */
-class MessageBag implements \ArrayAccess
+class WSResponse implements \ArrayAccess
 {
  use TraitArrayAccess;
  use TraitGetterSetterAccess;