Merge pull request #14 from CppComet/alfa

3.21

Author: VictorTrapenok

CHANGELOG.md

@@ -5,6 +5,13 @@ FEATURES:
 IMPROVEMENTS: 
 BUG FIXES:
 
+## v3.21
+
+IMPROVEMENTS:
+
+* Added caching in memory for sending static files
+* Added cache-control headers for get requests
+ 
 ## v3.2
 
 BUG FIXES:

readme.MD

@@ -1,41 +1,56 @@
 ![CppComet](https://comet-server.com/img/CppComet.png)
 
-Comet technology – allows sending arbitrary messages to client through server initiative
-
-## How it works
-
-* Browser opens page of your site.
-* After loading this page JavaScript Api establishes a persistent connection to CppComet using websockets.
-* While page is open, your server can send text message to client. It appeals via [CometQL API](http://comet-server.org/doku.php/en:comet:cometql) to CppComet and transfer message for browser.
-* CppComet uses open connection with browser for delivers message in to JavaScript api in browser.
-* [JavaScript API](http://comet-server.org/doku.php/en:comet:javascript_api) delivers this message to your callback.
+Comet server is written in C++, for storing data using MySQL.   
 
 # Features
 
+Comet technology – allows sending arbitrary messages to client through server initiative
+
 * Api for more then 9 languages. [CometQL API](http://comet-server.org/doku.php/en:comet:cometql) allows you connect to server by mysql protocol.
 * Good documentation in [Russian](http://comet-server.org/doku.php/ru) and [English](http://comet-server.org/doku.php/en) languages
-* Allow sending a private message to users
-* Supports users authenticating on the server
-* Allows you to send public messages to users via channels
+* [Supports users authenticating on the server](https://comet-server.com/wiki/doku.php/en:comet:authentication#users_authorization_on_the_cometserver)
+* [Allow sending a private message to users](https://comet-server.com/wiki/doku.php/en:comet:cometql#table_users_messages)
+* [Allows you to send public messages to users via channels](https://comet-server.com/wiki/doku.php/en:comet:cometql#table_pipes_messages)
+* [Allows subscription from JavaScript to changing other user’s status](https://comet-server.com/wiki/doku.php/en:comet:javascript_api#subscribe_to_receive_messages_from_channel)
+* [Allows subscription to updates of online users list in real-time](https://comet-server.com/wiki/doku.php/en:comet:javascript_api#list_of_online_users_channels_track)
+* [Sending messages to channel from JS](https://comet-server.com/wiki/doku.php/en:comet:javascript_api#sending_messages_to_channel_from_js_pipes_web)
+* [Allows get information when users were online](https://comet-server.com/wiki/doku.php/en:comet:cometql#table_users_time)
+ 
+# How it fast
+
+[Report about load testing](https://comet-server.com/wiki/doku.php/en:comet:load-testing-result#report_about_testing_of_64000_connections_online) of 64,000 connections online
+
+# How it works
+
+* Introduction to comet technology [EN](https://comet-server.com/wiki/doku.php/en:comet:introduction-to-comet#introduction) and [RU](https://comet-server.com/wiki/doku.php/comet:introduction-to-comet#introduction) 
+
+# Documentation and examples
+
+Documentation in [Russian](http://comet-server.org/doku.php/ru) and [English](http://comet-server.org/doku.php/en) languages
 
+ * How to build and run [EN](http://comet-server.org/doku.php/en:comet:building-from-source) or [RU](http://comet-server.org/doku.php/comet:building-from-source)
+ * CometQL API documentation [EN](http://comet-server.org/doku.php/en:comet:cometql) or [RU](http://comet-server.org/doku.php/comet:cometql) (To connect to the comet server api from any server-side language is used CometQL)
+ * JavaScript API documentation [EN](http://comet-server.org/doku.php/en:comet:javascript_api) or [RU](http://comet-server.org/doku.php/comet:javascript_api) (To connect to the server from JavaScript API use file from [api/CometServerApi.js](https://github.com/CppComet/comet-server/tree/master/api) )
+
 # Demo
 
 * https://github.com/CppComet/php-chat-example
-* https://github.com/CppComet/comet-server/tree/master/demo/simple-chat
+* https://jsfiddle.net/Levhav/o35kvmn2/21/
+* https://cppcomet.github.io/comet-server/demo/simple-chat/simple-chat.html
 * https://github.com/CppComet/auth-example
 
 ## Demo access to server API
 
+For testing CppComet without install on vps  you can use [free cloud service with same api](https://comet-server.com/). 
+In the all examples I will use demonstration access from [comet-server.com](http://comet-server.com) for those who could not or were too lazy to deploy the server on their vps.
+
 For demo access use credentials:
 ```
 Login: 15
 Password:lPXBFPqNg3f661JcegBY0N0dPXqUBdHXqj2cHf04PZgLHxT6z55e20ozojvMRvB8
 Host: app.comet-server.ru
 ```
 
-CppComet has cloud saas alternative that can be used for testing and demo access.
-In the following examples I will use demonstration access from [comet-server.com](http://comet-server.com) for those who could not or were too lazy to deploy the server on their vps.
-
 Example of connecting to [cometQL api](http://comet-server.org/doku.php/en:comet:cometql) from console using mysql-client:
 ```
 mysql -h app.comet-server.ru -u15 -plPXBFPqNg3f661JcegBY0N0dPXqUBdHXqj2cHf04PZgLHxT6z55e20ozojvMRvB8 -DCometQL_v1 --skip-ssl
@@ -58,28 +73,6 @@ For send message to demo chat use this query:
 INSERT INTO pipes_messages (name, event, message)VALUES("web_MainPageChat", "", '{ "text":"My text","name":"My name"}' );
 ```
 
-# Documentation and examples
-
-Comet server is written in C++, for storing data using MySQL.   
-
-[Documentation and examples](http://comet-server.org/)
-  
-### Building from source and launch
-
-How to build and run [EN](http://comet-server.org/doku.php/en:comet:building-from-source) or [RU](http://comet-server.org/doku.php/comet:building-from-source)
-  
-### CometQL API: 
-
-CometQL API documentation [EN](http://comet-server.org/doku.php/en:comet:cometql) or [RU](http://comet-server.org/doku.php/comet:cometql)
-
- - To connect to the comet server api from any server-side language is used CometQL [EN](http://comet-server.org/doku.php/en:comet:cometql) or [RU](http://comet-server.org/doku.php/comet:cometql)
- 
-### JavaScript API: 
-
-JavaScript API documentation [EN](http://comet-server.org/doku.php/en:comet:javascript_api) or [RU](http://comet-server.org/doku.php/comet:javascript_api)
-
-- To connect to the server from JavaScript API use file from api/CometServerApi.js
-
 License
 ----
 

src/Client_connection.cpp

@@ -29,6 +29,7 @@
 
 char* getGETdata(const char* c,int& user_id);
 
+std::map<std::string, const char*> Client_connection::ram_file_cache;
 int Client_connection::request_mutex_init = 0;
 int Client_connection::max_subscription_event = 50;
 
@@ -1476,7 +1477,7 @@ int Client_connection::web_pipe_msg_v2(thread_data* local_buf, char* event_data,
 int Client_connection::options(int client, int len, thread_data* local_buf)
 {
     char resp[]="HTTP/1.1 200 OK\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
-    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nConnection: close\r\n\r\n+OK\r\n";
+    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\n\r\n+OK\r\n";
     if(web_write( resp ) < 0)
     {
       TagLoger::log(Log_ClientServer, 0, " >Client Failed to send data %d\n",fd);
@@ -1494,7 +1495,7 @@ int Client_connection::options(int client, int len, thread_data* local_buf)
 int Client_connection::get_request(int client, int len, thread_data* local_buf)
 {
     char resp[]="HTTP/1.1 200 OK\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
-    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nConnection: close\r\n\r\n";
+    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\n\r\n";
     if(web_write( resp ) < 0 || web_write( logoPage ) < 0)
     {
       TagLoger::log(Log_ClientServer, 0, " >Client Failed to send data %d\n",fd);
@@ -1505,14 +1506,24 @@ int Client_connection::get_request(int client, int len, thread_data* local_buf)
 int Client_connection::http404_answer(int client, int len, thread_data* local_buf)
 {
     char resp[]="HTTP/1.1 404 Not Found\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
-    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nConnection: close\r\n\r\n";
+    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\n\r\n";
     if(web_write( resp ) < 0 || web_write( logoPage ) < 0)
     {
         TagLoger::log(Log_ClientServer, 0, " >Client Failed to send data %d\n",fd);
     }
     return -1;
 }
 
+int Client_connection::http403_answer(int client, int len, thread_data* local_buf)
+{
+    char resp[]="HTTP/1.1 403 Forbidden\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
+    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\n\r\n";
+    if(web_write( resp ) < 0 || web_write( logoPage ) < 0)
+    {
+        TagLoger::log(Log_ClientServer, 0, " >Client Failed to send data %d\n",fd);
+    }
+    return -1;
+}
 /**
  * Отвечает  на запрос get с урлом /info
  * Ответ всегда выглядит {"status":"ok"}
@@ -1550,7 +1561,7 @@ int Client_connection::get_info_request(int client, int len, thread_data* local_
 int Client_connection::get_favicon_request(int client, int len, thread_data* local_buf)
 { 
     char resp[]="HTTP/1.1 301 OK\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
-    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nConnection: close\r\nLocation: http://comet-server.ru/favicon.ico\r\n\r\n";
+    \r\nAccess-Control-Allow-Methods:POST, GET\r\nAllow: POST, GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\nLocation: http://comet-server.com/favicon.ico\r\n\r\n";
 
     if(web_write( resp ) < 0)
     {
@@ -1562,6 +1573,9 @@ int Client_connection::get_favicon_request(int client, int len, thread_data* loc
 
 int Client_connection::get_custom_request(int client, int len, thread_data* local_buf)
 {
+    char resp[]="HTTP/1.1 200 OK\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
+    \r\nAccess-Control-Allow-Methods: GET\r\nAllow: GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nCache-Control: max-age=3600\r\nConnection: close\r\n\r\n";
+    
     char *p = local_buf->buf.getData();
     int urlStart = strlen("GET ");
     p = p + urlStart;
@@ -1572,28 +1586,38 @@ int Client_connection::get_custom_request(int client, int len, thread_data* loca
         // 404
         return http404_answer(client, len, local_buf);
     }
-    
-    
 
     p[urlEnd - 1] = 0;
     char *uri = p; 
     std::string name(appConf::instance()->get_string("main", "base_dir"));
     if(!name.size())
     {
         // 404
-        return http404_answer(client, len, local_buf);
+        return http403_answer(client, len, local_buf);
     }
 
     name.append(uri); 
 
     TagLoger::log(Log_ClientServer, 0, " >Client GET [%s]\n", name.data());
-    if(name.find("..", 0) != std::string::npos)
+    if(name.find("..") != std::string::npos)
     {
         // Проверка на две точки в урле.
         TagLoger::log(Log_ClientServer, 0, " >Client GET error403 [.. in url] [%s]\n", name.data());
-        return http404_answer(client, len, local_buf);
+        return http403_answer(client, len, local_buf);
+    }
+    
+    auto it = ram_file_cache.find(name);
+    if(it != ram_file_cache.end())
+    {
+        TagLoger::debug(Log_ClientServer, 0, " >send name=%s from ram cache\n", name.data());
+        web_write(resp);
+        web_write(it->second); 
+        return -1;
     }
 
+    /** 
+     * @todo дополнить белым списком запрашиваемых файлов чтоб исключить нагрузку от левых запросов.
+     */ 
     int fp = open(name.data(), O_RDONLY);
     if(fp < 0)
     {
@@ -1603,10 +1627,10 @@ int Client_connection::get_custom_request(int client, int len, thread_data* loca
         return http404_answer(client, len, local_buf);
     }
 
-    char resp[]="HTTP/1.1 200 OK\r\nContent-Type:text/html; charset=UTF-8\r\nServer:CppComet Server\r\nComet-Server:CppComet Server\r\nAccess-Control-Allow-Origin: *\
-    \r\nAccess-Control-Allow-Methods: GET\r\nAllow: GET\r\nAccess-Control-Allow-Headers: origin, content-type, accept\r\nConnection: close\r\n\r\n";
     web_write(resp);
 
+    std::string response;
+    
     int size = 0;
     while(size = read(fp, local_buf->answer_buf.getData(),  local_buf->answer_buf.getSize()))
     {
@@ -1615,10 +1639,12 @@ int Client_connection::get_custom_request(int client, int len, thread_data* loca
             break;
         }
 
+        response.append(local_buf->answer_buf.getData());
         web_write( local_buf->answer_buf.getData(), size);
-        TagLoger::debug(Log_ClientServer, 0, " >send size=%d [%s]\n", size, local_buf->answer_buf.getData());
+        TagLoger::debug(Log_ClientServer, 0, " >send name=%s from disk [size=%d]\n", name.data(), size);
     }
 
+    ram_file_cache.insert(std::pair<std::string,const char*>(name, response.data()));
     return -1;
 }
 

src/Client_connection.h

@@ -57,6 +57,7 @@ class Client_connection;
  */
 class Client_connection:public connection
 {
+    static std::map<std::string, const char*> ram_file_cache;
     friend class tcpServer<Client_connection>;
 
       /**
@@ -123,6 +124,7 @@ class Client_connection:public connection
     int get_info_request(int client, int len, thread_data* local_buf);
     int get_favicon_request(int client, int len, thread_data* local_buf);
     int http404_answer(int client, int len, thread_data* local_buf);
+    int http403_answer(int client, int len, thread_data* local_buf);
     int get_custom_request(int client, int len, thread_data* local_buf);
 
     int web_socket_request_message(int client, int len, thread_data* local_buf);

src/MySql_connection.cpp

@@ -1310,7 +1310,7 @@ int MySql_connection::sql_select_systemvarible(thread_data* local_buf, unsigned
     answer += HeadAnswer(1, local_buf->sql.columns, PacketNomber, answer);
     //printf("systemVaribleName %s\n", local_buf->qInfo.tokStart(local_buf->qInfo.arg_select.systemVaribleName));
     MySqlResulValue values;
-    values = "StarComet (comet-server.ru, [email protected])";
+    values = MYSQL_SYSTEMVARIBLE;
 
     answer += RowPackage(1, &values, ++PacketNomber, answer);
 

src/appConf.cpp

@@ -179,7 +179,7 @@ bool appConf::init(int argc, char *argv[])
         {
             if(strcmp(argv[i],"--help") == 0)
             {
-                    printf("Help:\n \thttp://comet-server.com\n \tsupport@comet-server.ru\n"); 
+                    printf("Help:\n \thttp://comet-server.com\n \tsupport@comet-server.com\n"); 
                     isHelp = true;
                     return false;
             }

src/main.cpp

@@ -283,6 +283,26 @@ void command_line_fork()
 
     } while ( 1 );
 }
+
+/**
+ * Отправка данных статистики через curl
+ * @param data данные
+ * @return 
+ */
+bool send_statistics(std::string data)
+{
+    char cli[600];
+    std::string cmd;
+    cmd.append("curl -d \"").append(data).append("\" --connect-timeout 1 --max-time 1 -H \"Content-Type: text/plain\" -X POST http://statistics.comet-server.ru/api/statistics"); 
+    if(exec(cmd.data(), cli, 600))
+    {
+        return true;
+    }
+    
+    return false;
+}
+
+
 
 /**
  * valgrind --tool=memcheck --track-origins=yes --leak-check=yes ./cpp_comet
@@ -334,8 +354,7 @@ int main(int argc, char *argv[])
     //signal(SIGTRAP, posix_death_signal); //  сигнал, посылаемый для информирования отладчика о возникновении интересующего события.
     //signal(SIGURG,  posix_death_signal); //  сигнал, посылаемый процессу при появлении на сокете доступных для чтения срочных (англ. urgent) данных.
     //signal(SIGVTALRM, posix_death_signal); //  сигнал, посылаемый процессу по истечении времени заданном в «виртуальном» таймере.
-
-
+  
     // Чтение конфига и ключей запуска 
     if(!appConf::instance()->init(argc, argv))
     {

src/main.h

@@ -93,7 +93,6 @@
     <body> \
                     <table id='center'>\
                             <tr style='vertical-align: top;'>\
-                                    <td> <img src='https://comet-server.org/Logo.png'></td>\
                                 <td style='  padding-left: 10px;'> \
                                         <div style='font-size: 30px;  font-weight: bold;'>CppComet</div>\
                                             For more information, see <a href='http://comet-server.com' target='_blank'>comet-server.com</a> and [email protected]\
@@ -103,7 +102,8 @@
     </body>\
     </html>" 
 
-#define MYSQL_SERVERNAME "CppComet 3.2"
+#define MYSQL_SERVERNAME "CppComet 3.21"
+#define MYSQL_SYSTEMVARIBLE "CppComet 3.21 (comet-server.com, [email protected])"
 
 #define maxValue( a, b ) ( (a) > (b) ? (a) : (b) )
 #define minValue( a, b ) ( (a) < (b) ? (a) : (b) )