From 294640989640876ac47159709db841722850f8c0 Mon Sep 17 00:00:00 2001
From: Andrey Klimov <anklimov@gmail.com>
Date: Tue, 5 Oct 2021 03:44:31 +0300
Subject: [PATCH] interim (compiled) commit

---
 lighthub/config.h         |   4 +-
 lighthub/flashstream.h    | 116 +++++++++++++++++++++++---------------
 lighthub/main.cpp         |  69 ++++++++++-------------
 lighthub/seekablestream.h |  25 ++++++++
 4 files changed, 128 insertions(+), 86 deletions(-)
 create mode 100644 lighthub/seekablestream.h

diff --git a/lighthub/config.h b/lighthub/config.h
index 0dd9800..d315aa9 100644
--- a/lighthub/config.h
+++ b/lighthub/config.h
@@ -61,9 +61,9 @@ class systemConfig {
  int openStream(char mode = '\0') 
       {
             #if defined(FS_STORAGE)
-            stream.open("/config.bin",mode);
+            stream->open("/config.bin",mode);
             #else
-            stream.open(EEPROM_offsetJSON,mode);
+            stream->open(EEPROM_offsetJSON,mode);
             #endif
         };
 
diff --git a/lighthub/flashstream.h b/lighthub/flashstream.h
index d538594..d48c3da 100644
--- a/lighthub/flashstream.h
+++ b/lighthub/flashstream.h
@@ -3,6 +3,7 @@
 #define _FLASHSTREAM_H_
 
 #include <main.h>
+#include <WiFiOTA.h>
 
 #if defined(FS_STORAGE)
 #include <FS.h>
@@ -40,21 +41,9 @@ extern NRFFlashStorage EEPROM;
 
 #include <Stream.h>
 #include <Arduino.h>
+#include "seekablestream.h"
 
-class seekableStream : public Stream 
-{
-protected:    
-unsigned int streamSize;  
-bool textMode;
-
-public:
-seekableStream(unsigned int size):Stream(),streamSize(size) {};
-unsigned int getSize() {return streamSize;}
-virtual unsigned int seek(unsigned int _pos = 0) = 0;
-virtual int  open(unsigned int _startPos=0, unsigned int _size=4096, char mode='\0') = 0;
-virtual int  open(String _filename, char mode='\0') = 0; 
-virtual void close() = 0;
-};
+#define EOF 255
 
 #if defined(FS_STORAGE)
 class flashStream : public seekableStream
@@ -64,16 +53,43 @@ String       filename;
 char         openedMode; 
 File         fs;
 public:
-flashStream(String _filename):seekableStream(65535) 
+flashStream():seekableStream(65535) 
             {
-                filename=_filename;
                 openedMode='\0';
-                open('r');
-            } 
-   virtual int open(String _filename, char mode='\0') 
+                //fs = 0;
+                filename = "";
+               // open('r');
+            };
+
+   virtual int open(String _filename, char mode) override
    {
-       textMode = _filename suffix == txt or json
-       open file
+                  char modestr[2];
+                  modestr[0]=mode; modestr[1]=0;
+                  filename=_filename;
+
+                  if (fs =  SPIFFS.open(_filename,modestr))
+                     {
+                        openedMode=mode;
+                        //fs.seek(savedPos);
+
+                        if (_filename.endsWith(".json")) {contentType=HTTP_TEXT_JSON;textMode=true;}
+                           else if (_filename.endsWith(".bin")) {contentType=HTTP_OCTET_STREAM;textMode=false;}
+                                else if (_filename.endsWith(".txt")) {contentType=HTTP_TEXT_PLAIN;textMode=true;}
+
+
+                        debugSerial<<("Opened/")<<modestr<<(":")<<filename<<endl;
+                        return fs;
+                     }
+                  else 
+                     {
+                         openedMode='\0';  
+                         debugSerial<<("Open error/")<<modestr<<(":")<<filename<<endl; 
+                         return 0;
+                     }   
+
+
+
+
    }; 
    virtual int open(char mode='\0') 
             {   
@@ -101,14 +117,21 @@ flashStream(String _filename):seekableStream(65535)
             }
        return fs;
     }                  
-   virtual int available() { if (!fs) return 0; return fs.available();  };
+   virtual int available() override
+                { 
+                    if (!fs) return 0;
+                    if (textMode && peek()==EOF) return 0;  
+                    return fs.available();  
+                };
+                
    virtual int read() {open('r');return fs.read();};
    virtual int peek() {open('r'); return fs.peek();};
-   virtual unsigned int seek(unsigned int _pos = 0){return open();fs.seek(_pos,SeekSet);};         
-   virtual void close() {fs.flush(); open('r'); };
+   virtual unsigned int seek  (unsigned int _pos = 0) override {return open();fs.seek(_pos,SeekSet);};         
+   virtual void close() override {fs.close();  };
+   virtual void flush() override {fs.flush();  };
    virtual size_t write(uint8_t ch) {open('w'); return fs.write(ch);};
    using Print::write;
-   void putEOF(){write (255);};
+   
 virtual ~flashStream () {if (fs) fs.close();} ;
 };
 
@@ -123,10 +146,9 @@ unsigned int startPos;
 
 
 public:
-flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_size) 
+flashStream(unsigned int _size=4096 ):seekableStream(_size) 
             {
-            pos = 0; startPos = _startPos; 
-
+         //   pos = 0; startPos = _startPos; 
             };
 
     void setSize(unsigned int _size) {streamSize=_size;}; 
@@ -139,6 +161,7 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
                         streamSize = _size;  
                         startPos = EEPROM_offsetJSON;
                         textMode = true;
+                        contentType = HTTP_TEXT_JSON;
 
                         return 1;    
                     }
@@ -148,11 +171,13 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
                         startPos = SYSCONF_OFFSET;
                         streamSize = SYSCONF_SIZE;
                         textMode =false;
+                        contentType = HTTP_OCTET_STREAM;
+
                         return 1;
                     }
                   else return 0;    
                 };
-
+/*
     virtual int  open(unsigned int _startPos=0, unsigned int _size=4096 char mode='\0') 
             {
                 pos = 0;
@@ -160,7 +185,7 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
                 streamSize = _size;
                 return 1;
             };       
-
+*/
     virtual unsigned int seek(unsigned int _pos = 0) 
         {   pos=min(_pos, streamSize);
             debugSerial<<F("Seek:")<<pos<<endl;
@@ -168,6 +193,7 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
         };
     virtual int available() { 
             //debugSerial<<pos<<"%"<<streamSize<<";"; 
+            if (textMode && peek()==EOF) return 0; 
             return (pos<streamSize);
             };
     virtual int read() 
@@ -202,15 +228,7 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
                #else 
                   EEPROM.write(startPos+pos++,(char)ch);
                   return 1;  
-               #endif   
-
-     //           #if defined(__SAM3X8E__)
-     //           return EEPROM.write(pos++,(char)ch);
-     //           #else
-     //           EEPROM.update(pos++,(char)ch);
-     //           return 1;
-     //           #endif   
-     //       return 0;                
+               #endif                
             };
     
    #if defined(__SAM3X8E__)
@@ -223,12 +241,20 @@ flashStream(unsigned int _startPos=0, unsigned int _size=4096 ):seekableStream(_
             };
    #else 
    using Print::write;//(const uint8_t *buffer, size_t size);         
-   #endif          
-    void putEOF(){write (255);
-    #if defined(ESP8266) || defined(ESP32)
-    EEPROM.commit();
-    #endif
-    };
+   #endif    
+
+    #if defined(ESP8266) || defined(ESP32)      
+    virtual void putEOF() override 
+            {
+                write (255);
+                EEPROM.commit();
+            };
+    #endif        
+
+virtual void close() override 
+    {
+       flush();
+    }    
 
 };
 #endif
diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 75f6543..90ef48d 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -58,7 +58,7 @@ flashStream JSONStream(EEPROM_offsetJSON,MAX_JSON_CONF_SIZE);
 #endif
 */
 
-flashStream sysConfStream();
+flashStream sysConfStream;
 
 systemConfig sysConf(&sysConfStream);
 
@@ -221,23 +221,28 @@ debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
 bool isNotRetainingStatus() {
   return (lanStatus != RETAINING_COLLECTING);
 }
+// Custom HTTP request handler
+// Return values: 
+// 1 - work completed. Dont need to respond, just close socket
+// 0 - no match continue with default lib behavior
+// 401 - not authorized
+// 400 - bad request
+// 200 | CONTENT_TYPE - ok + content_type
+//  ... same sor other http codes
+// if response != "" - put response in http answer
 
-int httpHandler(Client& client, String request, long contentLength, bool authorized)
+uint16_t httpHandler(Client& client, String request, long contentLength, bool authorized, String& response )
 {
-    String response = "";
-
+    //String response = "";
     debugSerial<<request<<endl;
-
-
     if (request == (F("GET /"))) 
         {
-         client.println(F("HTTP/1.1 301 Moved permanently"));
-         client.print(F("Location: http://lazyhome.ru/pwa?mac="));
-         for (int i=0; i<6; i++) {client.print(sysConf.mac[i]>>4,HEX);client.print(sysConf.mac[i]&0xf,HEX);}
-         client.print(F("&ip="));
-         client.println(Ethernet.localIP());
+         response = "Location: http://lazyhome.ru/pwa?mac=";
+         // todo for (int i=0; i<6; i++) {response+=(sysConf.mac[i]>>4,HEX);response+=(sysConf.mac[i]&0xf,HEX);}
+         response+=(F("&ip="));
+         //todo response+=(Ethernet.localIP());
          delay(100);
-         return 1;
+         return 301;
         }
     if (!authorized) return 401;
 
@@ -251,7 +256,8 @@ int httpHandler(Client& client, String request, long contentLength, bool authori
         itemCmd ic;
         ic.loadItem(&item,SEND_COMMAND|SEND_PARAMETERS);
         char buf[32];
-        response=ic.toString(buf, sizeof(buf));             
+        response=ic.toString(buf, sizeof(buf));    
+        return 200 | HTTP_TEXT_PLAIN;         
        }
     else if (request.startsWith(F("GET /item/")))
        {
@@ -265,6 +271,7 @@ int httpHandler(Client& client, String request, long contentLength, bool authori
            {if (item.isActive()) item.setCmd(CMD_ON); else item.setCmd(CMD_OFF);} 
          char buf[32];
          response=ic.toString(buf, sizeof(buf));
+         return 200 | HTTP_TEXT_PLAIN;  
         
        }  
     else if (request.startsWith(F("POST /command/"))) 
@@ -278,26 +285,10 @@ int httpHandler(Client& client, String request, long contentLength, bool authori
         debugSerial<<F("Cmd: ")<<request<<endl;
         if (request=="reboot ") client.stop();
         const char* res=request.c_str();
-        cmd_parse((char*) res);        
+        cmd_parse((char*) res);     
+        return 200 | HTTP_TEXT_PLAIN;    
         } 
-    else return -1;  //Unknown
-
-        client.println(F("HTTP/1.1 200 OK"));
-        client.println(F("Connection: close"));
-        
-          #ifdef CORS
-          client.print(F("Access-Control-Allow-Origin: "));
-          client.println(F(CORS));
-          #endif
-          
-        if (response!="") {
-              client.println(F("Content-Type: text/plain"));
-              client.println();
-              client.println(response);
-              }
-  
-        delay(100);
-return 1;
+    else return 0;  //Unknown
 }
 
 int inTopic (char * topic,  topicType tt)
@@ -1003,7 +994,7 @@ void Changed(int i, DeviceAddress addr, float currentTemp) {
     //char addrbuf[17];
     //char valstr[16] = "NIL";
     //char *owEmitString = NULL;
-    char *owItem = NULL;
+    //char *owItem = NULL;
 
     SetBytes(addr, 8, addrstr);
     addrstr[17] = 0;
@@ -1240,8 +1231,8 @@ int loadConfigFromEEPROM()
     #endif
 
     //JSONStream.seek();    
-    if (JSONStream.peek() == '{') {
-        aJsonStream as = aJsonStream(&JSONStream);
+    if (sysConfStream.peek() == '{') {
+        aJsonStream as = aJsonStream(&sysConfStream);
         cleanConf();
         root = aJson.parse(&as);
         sysConfStream.close();
@@ -1255,7 +1246,7 @@ int loadConfigFromEEPROM()
         ethClient.stop(); //Refresh MQTT connect to get retained info
         return 1;
     } else {
-        JSONStream.writeEOF(); //truncate garbage
+        sysConfStream.putEOF(); //truncate garbage
         infoSerial<<F("No stored config")<<endl;
         sysConfStream.close();
         return 0;
@@ -1297,11 +1288,11 @@ if (arg_cnt>1)
 #else
     //JSONStream.open('w');
     //JSONStream.seek();
-    aJsonStream jsonEEPROMStream = aJsonStream(&JSONStream);
+    aJsonStream jsonEEPROMStream = aJsonStream(&sysConfStream);
     infoSerial<<F("Saving config to EEPROM..");
     aJson.print(root, &jsonEEPROMStream);
-    JSONStream.putEOF();
-    JSONStream.close();
+    sysConfStream.putEOF();
+    sysConfStream.close();
     infoSerial<<F("Saved to EEPROM")<<endl;
 #endif
 }
diff --git a/lighthub/seekablestream.h b/lighthub/seekablestream.h
new file mode 100644
index 0000000..46b95b8
--- /dev/null
+++ b/lighthub/seekablestream.h
@@ -0,0 +1,25 @@
+#ifndef _SEEKABLESTREAM_H_
+#define _SEEKABLESTREAM_H_
+
+#include <Stream.h>
+#include <Arduino.h>
+
+class seekableStream : public Stream 
+{
+protected:    
+unsigned int streamSize;  
+bool textMode;
+uint16_t contentType;
+
+public:
+seekableStream(unsigned int size):Stream(),streamSize(size) {};
+unsigned int getSize() {return streamSize;}
+virtual unsigned int seek(unsigned int _pos = 0) = 0;
+//virtual int  open(unsigned int _startPos=0, unsigned int _size=4096, char mode='\0') = 0;
+virtual int  open(String _filename, char mode) = 0; 
+virtual void close() = 0;
+virtual uint16_t getContentType() {return contentType;};
+virtual void putEOF() {if (textMode) write (EOF);};
+};
+
+#endif
\ No newline at end of file