upcore-tcp 0.0.3 → 0.0.5

package/README.md

@@ -103,6 +103,7 @@ app.listen();
 - Response: `req.code()`, `req.set()`, `req.http()`, `req.send()`, `req.html()`, `req.json()`, `req.redirect()`, `req.file()`, `req.error()`
 - Request: `req.get(headerKey)`, `req.look(queryKeys)`, `req.u(queryKey)`, `req.load()`, `req.check()`, `req.q()`
 - Cookie: `req.gcookie()`, `req.scookie()`, `req.rcookie()`
+- EventSource (SSE): `req.event(start, close)`
 - Middleware flow: `req.next()`
 - Validation: `req.test({ type, data, core })`
 
@@ -263,6 +264,7 @@ app.routes('./routes');
 - ถ้าชื่อไฟล์มี `@` มากกว่า 1 ตัว (เช่น `get@a@b.js`) ระบบจะไม่ map route ไฟล์นั้น
 
 ตัวอย่างชื่อไฟล์ -> endpoint:
+- `get@.js` => `GET /`
 - `get@home-admin.js` => `GET /home/admin`
 - `get@user-$id.js` => `GET /user/:id`
 - `post@auth-login.js` => `POST /auth/login`
@@ -305,8 +307,48 @@ app.websocket('/ws', async (req) => {
 
 // ws://127.0.0.1/ws?uid=upcore
 ```
+
+### 14) EventSource (SSE) ด้วย `req.event`
+```js
+app.get('/event', (req) => {
+  let timer;
+
+  req.event(() => {
+    req.write('event: ready\n');
+    req.write('data: {"status":"connected"}\n\n');
+
+    timer = setInterval(() => {
+      req.write(`data: ${JSON.stringify({ time: new Date().toISOString() })}\n\n`);
+    }, 2000);
+  }, () => {
+    clearInterval(timer); // เรียกเมื่อ client ปิดการเชื่อมต่อ
+  });
+});
+```
+
+ตัวอย่างฝั่ง client:
+```js
+const source = new EventSource('/event');
+
+source.addEventListener('ready', (e) => {
+  console.log('ready:', e.data);
+});
+
+source.onmessage = (e) => {
+  console.log('message:', JSON.parse(e.data));
+};
+
+source.onerror = () => {
+  source.close();
+};
+```
+
+รูปแบบข้อมูล SSE ที่ต้องส่ง:
+- แต่ละ message ควรลงท้ายด้วย `\n\n`
+- ใช้ `req.write(...)` ส่งข้อมูลตามฟอร์แมต `event:` และ `data:`
+
 ## หมายเหตุสำคัญ
 - ค่า `Host` ต้องตรงกับ domain ที่ลง route (หรือใช้ `*` ถ้าต้องการรับทุก host)
 - ถ้า `req.load(...)` ประเภทไม่ตรงกับ `Content-Type` จะตอบ 400
 - `req.test(...)` จะตอบ error อัตโนมัติเมื่อ type/format ไม่ผ่าน
-- ถ้าใช้ `app.routes(dir)` โฟลเดอร์ต้องมีไฟล์ `.js` ตาม naming convention
+- ถ้าใช้ `app.routes(dir)` โฟลเดอร์ต้องมีไฟล์ `.js` ตาม naming convention

package/lib/headerDecode.js

@@ -4,21 +4,18 @@ module.exports = function(req){
     const src = req.header;
     const out = {};
 
-    for (let i = 0; i < src.length; i++) {
-        const buf = src[i];
+    for(let i = 0; i < src.length; i++){
+        const [buf, split] = src[i];
 
-        let j = 0;
-        while (buf[j] !== 58) j++;
-        const key = buf.toString('ascii', 0, j);
-        j++;
-        if (buf[j] === 32) j++;
+        if(buf[split + 1] === 32){
+            const key = buf.toString('ascii', 0, split);
+            const val = buf.toString('ascii', split + 2, buf.length);
 
-        const val = buf.toString('ascii', j, buf.length);
-
-        if(out[key]){
-            out[key].push(val);
-        }else{
-            out[key] = [val];
+            if(out[key]){
+                out[key].push(val);
+            }else{
+                out[key] = [val];
+            }
         }
     }
 

package/lib/{checkHeader.js → headerRead.js}

@@ -37,7 +37,7 @@ module.exports = function(chunk){
     let port = false;
     let length = 0;
     let type = false;
-    let connection = 0;
+    let connection = 1;
     
 
     while(p + 3 < len){
@@ -48,21 +48,31 @@ module.exports = function(chunk){
             break;
         }
 
-        while(p < len && !(chunk[p] === 13 && chunk[p+1] === 10)) p++;
+        let check = true;
+        let split = -1;
+        while(p < len && !(chunk[p] === 13 && chunk[p + 1] === 10)){
+            if(chunk[p] == 58){
+                split = p;
+                check = false;
+            }else if(check && chunk[p] >= 65 && chunk[p] <= 90){
+                chunk[p] = chunk[p] + 32;
+            }
+            p++;
+        }
 
         const h = chunk.subarray(lineStart, p);
 
         switch((h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3]){
-            case 0x436F6E74:{ // "Cont"
-                if(h[8] === 76 && h[14] === 58 && h[15] === 32){ // Content-Length: 
+            case 0x636F6E74:{ // "cont"
+                if(h[8] === 108 && h[14] === 58 && h[15] === 32){ // content-length: 
                     length = parseInt(h.subarray(16));
                     break;
-                }else if(h[8] === 84 && h[12] === 58 && h[13] === 32){ // Content-Type:
+                }else if(h[8] === 116 && h[12] === 58 && h[13] === 32){ // content-type:
                     type = h.subarray(14);
                     break;
                 }
             }
-            case 0x486F7374:{ // "Host"
+            case 0x686F7374:{ // "host"
                 if(h[4] === 58 && h[5] === 32){
                     let colon = -1;
                     for(let i = h.length - 1; i > 5; i--){
@@ -81,19 +91,19 @@ module.exports = function(chunk){
                     break;
                 }
             }
-            case 0x436F6E6E:{ // "Conn"
-                // Connection
+            case 0x636F6E6E:{ // "conn"
+                // connection
                 if(h[10] === 58 && h[11] === 32){
-                    if(h[12] === 107 && h.length === 22){ // Connection: keep-alive
-                        connection = 1
-                    }else if(h[12] === 85 && h.length === 19){ // Connection: Upgrade
+                    if(h[12] === 99 && h.length === 17){ // connection: close
+                        connection = 0
+                    }else if(h[12] === 85 && h.length === 19){ // connection: Upgrade
                         connection = 2
                     }
                     break;
                 }
             }
             default:{
-                header.push(h);
+                header.push([h, split - lineStart]);
             }
         }
 

package/lib/httpHeader.js

@@ -5,9 +5,14 @@ const version = package.version;
 let CACHE_HTTP = {};
 for(let x in http.STATUS_CODES){
     CACHE_HTTP[x] = Buffer.from(
-        `HTTP/1.1 ${x} ${http.STATUS_CODES[x]}\r\nX-Powered-By: r938-upcore/${version}\r\n`
+        `HTTP/1.1 ${x} ${http.STATUS_CODES[x]}\r\nx-powered-by: r938-upcore/${version}\r\n`
     );
 }
+let CONNECTION = {
+    0:Buffer.from('connection: close\r\n'),
+    1:Buffer.from('connection: keep-alive\r\n'),
+    2:Buffer.from('connection: Upgrade\r\nupgrade: websocket\r\n'),
+}
 
 module.exports = (code)=>{
     if(CACHE_HTTP[code]){
@@ -17,10 +22,15 @@ module.exports = (code)=>{
     }
 }
 
-module.exports.CONNECTION_UPGRADE = Buffer.from('Connection: Upgrade\r\nUpgrade: websocket\r\n');
+module.exports.connection = (state)=>{
+    return CONNECTION[state] || '';
+ }
+
+
 module.exports.CRLF = Buffer.from('\r\n');
 module.exports.CRLF2 = Buffer.from('\r\n\r\n');
-module.exports.CONTENT_LENGTH = Buffer.from('Content-Length: ');
-module.exports.CONTENT_TYPE_PLAIN = Buffer.from('Content-Type: text/plain; charset=utf-8\r\n');
-module.exports.CONTENT_TYPE_HTML = Buffer.from('Content-Type: text/html; charset=utf-8\r\n');
-module.exports.CONTENT_TYPE_JSON = Buffer.from('Content-Type: application/json; charset=utf-8\r\n');
+module.exports.CONTENT_LENGTH = Buffer.from('content-length: ');
+module.exports.CONTENT_TYPE_PLAIN = Buffer.from('content-Type: text/plain; charset=utf-8\r\n');
+module.exports.CONTENT_TYPE_HTML = Buffer.from('content-Type: text/html; charset=utf-8\r\n');
+module.exports.CONTENT_TYPE_JSON = Buffer.from('content-Type: application/json; charset=utf-8\r\n');
+module.exports.CONTENT_TYPE_EVENT_STREAM = Buffer.from('content-Type: text/event-stream\r\n');

package/lib/parameterFile.js

@@ -28,10 +28,8 @@ module.exports = function(req, filePath, parameter, error){
                         parameter?.[key] ?? ''
                     );
 
-                    req
-                    .set('Content-Type', type)
-                    .set('Content-Length', Buffer.byteLength(data))
-                    .http(data);
+                    req.response.header.push(`content-type: ${type}\r\n`);
+                    req.http(data);
                 });
             }else{
                 error(400);

package/lib/server.js

@@ -7,7 +7,7 @@ const version = package.version;
 
 const routeContext = require('./routeContext');
 
-const checkHeader = require('./checkHeader');
+const headerRead = require('./headerRead');
 
 const headerDecode = require('./headerDecode');
 const cookieDecode = require('./cookieDecode');
@@ -120,13 +120,17 @@ module.exports = class{
                 .setTimeout(this.config.timeout)
                 .on('data', (chunk)=>{
                     if(focus == 1){
-                        req = checkHeader(chunk);
+                        req = headerRead(chunk);
                         if(req === false){
                             socket.destroy();
                             return false;
                         }
         
                         switch(req.connection){
+                            case 0:{
+                                socket.setKeepAlive(false, 0);
+                                break;
+                            }
                             case 2:{
                                 socket.setTimeout(0);
                                 focus = 3;
@@ -204,6 +208,11 @@ module.exports = class{
             header:[],
         };
         
+        req.gets = ()=>{
+            headerDecode(req);
+
+            return req.header;
+        }
         req.get = (key)=>{
             headerDecode(req);
     
@@ -221,11 +230,11 @@ module.exports = class{
         }
         req.http = (data)=>{
             if(data !== undefined){
-                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.CONTENT_LENGTH + Buffer.byteLength(data) + httpHeader.CRLF2 + data);
+                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.connection(req.connection) + httpHeader.CONTENT_LENGTH + Buffer.byteLength(data) + httpHeader.CRLF2 + data);
             }else if(req.connection === 2){
-                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.CONNECTION_UPGRADE + httpHeader.CRLF);
+                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.connection(req.connection) + httpHeader.CRLF);
             }else{
-                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.CRLF); 
+                socket.write(httpHeader(req.response.status) + req.response.header.join('') + httpHeader.connection(req.connection) + httpHeader.CRLF); 
             }
         }
         req.socket = (call)=>{
@@ -258,7 +267,7 @@ module.exports = class{
                     }
                 }
             }
-            req.set('Set-Cookie', text.join('; '));
+            req.response.header.push(`set-cookie: ${text.join('; ')}\r\n`);
     
             return req;
         }
@@ -322,9 +331,9 @@ module.exports = class{
             });
     
             req.start = async(uid)=>{
-                let seckey = req.get('Sec-WebSocket-Key');
-                let protocol = req.get('Sec-WebSocket-Protocol');
-                let version = parseInt(req.get('Sec-WebSocket-Version'));
+                let seckey = req.get('sec-websocket-key');
+                let protocol = req.get('sec-websocket-protocol');
+                let version = parseInt(req.get('sec-websocket-version'));
     
                 if(version !== 13){
                     req.error(400);
@@ -345,10 +354,10 @@ module.exports = class{
                 req.userIn();
     
                 req.code(101)
-                .set('Sec-WebSocket-Accept', acceptKey);
+                req.response.header.push(`sec-websocket-accept: ${acceptKey}\r\n`);
     
                 if(protocol){
-                    req.set('Sec-WebSocket-Protocol', protocol);
+                    req.response.header.push(`sec-websocket-protocol: ${protocol}\r\n`);
                 }
     
                 req.http();
@@ -449,14 +458,16 @@ module.exports = class{
                     (type == 'formdata' && !TYPE_TEST.startsWith('multipart/form-data')) ||
                     (type == 'wwwform' && !TYPE_TEST.startsWith('application/x-www-form-urlencoded'))
                 ){
-                    req.code(415).set('Content-Length', 79).set('Content-Type', 'application/json').http('{"status":false,"err":"Request Content-Type does not match the expected type."}');
+                    req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
+                    req.code(415).http('{"status":false,"err":"Request Content-Type does not match the expected type."}');
                     return false;
                 }
     
                 if(typeof core == 'object'){
                     for(let id in core){
                         if(req[id] !== core[id]){
-                            req.code(400).set('Content-Length', 78).set('Content-Type', 'application/json').http('{"status":false,"err":"The request does not satisfy the required conditions."}');
+                            req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
+                            req.code(400).http('{"status":false,"err":"The request does not satisfy the required conditions."}');
                             return false;
                         }
                     }
@@ -464,7 +475,8 @@ module.exports = class{
     
                 if(typeof data == 'object'){
                     if(typeof req.body != 'object'){
-                        req.code(415).set('Content-Length', 61).set('Content-Type', 'application/json').http('{"status":false,"err":"Request body must be a valid object."}');
+                        req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
+                        req.code(415).http('{"status":false,"err":"Request body must be a valid object."}');
                         return false;
                     }
     
@@ -474,13 +486,15 @@ module.exports = class{
                             let value = type == 'json' ? req.body[id] : req.q(id);
                             let test = checkType(this.TYPE_TREE[t] || {}, value);
                             if(!test){
-                                req.code(400).set('Content-Length', 54).set('Content-Type', 'application/json').http('{"status":false,"err":"Invalid format for parameter."}');
+                                req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
+                                req.code(400).http('{"status":false,"err":"Invalid format for parameter."}');
                                 return false;
                             }
 
                             parameter[id] = value;
                         }else if(r === true){
-                            req.code(400).set('Content-Length', 54).set('Content-Type', 'application/json').http('{"status":false,"err":"Missing or invalid parameter."}');
+                            req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
+                            req.code(400).http('{"status":false,"err":"Missing or invalid parameter."}');
                             return false;
                         }
                     }
@@ -547,7 +561,7 @@ module.exports = class{
                 }
     
                 req.code(status)
-                req.set('Location', location)
+                req.response.header.push(`location: ${location}\r\n`);
                 req.http();
                 socket.destroy();
             }
@@ -562,7 +576,7 @@ module.exports = class{
                     }
                 }
                 if(op.download){
-                    req.set('Content-Disposition', `attachment; filename="${op.download || path.basename(op.file)}"`);
+                    req.response.header.push(`content-disposition: attachment; filename="${op.download || path.basename(op.file)}"\r\n`);
                 }
     
                 if(op.parameter){
@@ -603,6 +617,18 @@ module.exports = class{
                     req.error(400);
                 }
             }
+            req.event = (start, close)=>{
+                if(typeof start == 'function' && typeof close == 'function'){
+                    req.response.header.push(httpHeader.CONTENT_TYPE_EVENT_STREAM);
+        
+                    req.http();
+                    socket.pause();
+
+                    req.userOut = close;
+
+                    start(socket);
+                }
+            }
         }
     }
     handle(req, socket){

package/lib/streamFile.js

@@ -38,15 +38,8 @@ module.exports = function(req, filePath, error){
 
             const contentLength = end - start + 1;
 
-            req
-            .code(status)
-            .set('Content-Type', type)
-            .set('Accept-Ranges', 'bytes')
-            .set('Content-Length', contentLength)
-
-            if(status === 206){
-                req.set('Content-Range', `bytes ${start}-${end}/${size}`);
-            }
+            req.code(status)
+            req.response.header.push((status === 206 ? `content-range: bytes ${start}-${end}/${size}\r\n` : '') + `content-type: ${type}\r\naccept-ranges: bytes\r\ncontent-length: ${contentLength}\r\n`);
             req.http();
 
             const stream = fs.createReadStream(filePath, { start, end });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "upcore-tcp",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Upcore Web framework support http websocket",
   "keywords": [
     "upcore",