andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-11 22:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

web control/CORS (interim)

Browse Source
This commit is contained in:
Andrey Klimov
2021-10-09 02:12:38 +03:00
parent f96f125fe6
commit 7e14e7143c
8 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lighthub/config.cpp
View File

@@ -1,5 +1,12 @@
#include "config.h"
String systemConfig::getMACString()
{
String res;
for (int i=0; i<6; i++) {res+= (((char)mac[i]>>4)+'0');res+=(((char)mac[i]&0xf)+'0');}
return res;
}
int systemConfig::openStream(char mode)
{
#if defined(FS_STORAGE)
@@ -7,7 +14,7 @@ int systemConfig::openStream(char mode)
#else
stream->open(FN_CONFIG_BIN,mode);
#endif
stream->setSize(SYSCONF_SIZE);
//stream->setSize(SYSCONF_SIZE);
};
bool systemConfig::isValidSysConf()

1
lighthub/config.h
View File

@@ -22,6 +22,7 @@ class systemConfig {
bool isValidSysConf();
bool getMAC();
String getMACString();
bool setMAC(macAddress& mac);
char * getMQTTpwd(char * buffer, uint16_t bufLen);

5
lighthub/flashstream.cpp
View File

@@ -60,9 +60,10 @@ NRFFlashStorage EEPROM;
if (fs = SPIFFS.open(_filename,modestr))
{
openedMode=mode;
streamSize = DEFAULT_FILESIZE_LIMIT;
if (_filename.endsWith(".json")) {contentType=HTTP_TEXT_JSON;textMode=true;}
else if (_filename.endsWith(".bin")) {contentType=HTTP_OCTET_STREAM;textMode=false;}
if (_filename.endsWith(".json")) {contentType=HTTP_TEXT_JSON;textMode=true;streamSize = MAX_JSON_CONF_SIZE; }
else if (_filename.endsWith(".bin")) {contentType=HTTP_OCTET_STREAM;textMode=false;streamSize = SYSCONF_SIZE; }
else if (_filename.endsWith(".txt")) {contentType=HTTP_TEXT_PLAIN;textMode=true;}
else if (_filename.endsWith(".html")) {contentType=HTTP_TEXT_HTML;textMode=true;}
else if (_filename.endsWith(".gif")) {contentType=HTTP_IMAGE_GIF;textMode=false;}

43
lighthub/main.cpp
View File

@@ -48,18 +48,7 @@ Streamlog errorSerial(&debugSerialPort,LOG_ERROR, ledRED);
Streamlog infoSerial (&debugSerialPort,LOG_INFO);
#endif
/*
#if defined(FS_STORAGE)
flashStream sysConfStream("/config.bin");
flashStream JSONStream("/config.json");
#else
flashStream sysConfStream(SYSCONF_OFFSET,EEPROM_offsetJSON);
flashStream JSONStream(EEPROM_offsetJSON,MAX_JSON_CONF_SIZE);
#endif
*/
flashStream sysConfStream;
systemConfig sysConf(&sysConfStream);
extern long timer0_overflow_count;
@@ -242,15 +231,19 @@ bool isNotRetainingStatus() {
// ... same sor other http codes
// if response != "" - put response in http answer
uint16_t httpHandler(Client& client, String request, long contentLength, bool authorized, String& response )
uint16_t httpHandler(Client& client, String request, uint8_t method, long contentLength, bool authorized, String& response )
{
//String response = "";
debugSerial<<request<<endl;
if (request == (F("GET /")))
if (method == HTTP_GET && request == (F("/")))
{
ArduinoOTA.sendHttpResponse(client,301,false); // Send only HTTP header, no close socket
client.println(F("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);}
client.println(
"Location: http://lazyhome.ru/pwa?mac="+sysConf.getMACString()
+"&ip="+Ethernet.localIP()//.toString()
+"&port="+ OTA_PORT
);
//response+=(F("&ip="));
//todo response+=(Ethernet.localIP());
client.println();
@@ -258,11 +251,12 @@ uint16_t httpHandler(Client& client, String request, long contentLength, bool au
client.stop();
return 1;
}
if (!authorized) return 401;
if (request.startsWith(F("POST /item/")))
if (method == HTTP_POST && request.startsWith(F("/item/")))
{
request.remove(0,11);
if (!authorized) return 401;
request.remove(0,6);
String body=client.readStringUntil('\n');
Item item((char*)request.c_str());
if (!item.isValid() || !item.Ctrl((char*) body.c_str())) return 400;
@@ -273,9 +267,10 @@ uint16_t httpHandler(Client& client, String request, long contentLength, bool au
response=ic.toString(buf, sizeof(buf));
return 200 | HTTP_TEXT_PLAIN;
}
else if (request.startsWith(F("GET /item/")))
else if (method == HTTP_GET && request.startsWith(F("/item/")))
{
request.remove(0,10);
if (!authorized) return 401;
request.remove(0,6);
Item item((char*)request.c_str());
if (!item.isValid()) return 400;
@@ -290,9 +285,10 @@ uint16_t httpHandler(Client& client, String request, long contentLength, bool au
return 200 | HTTP_TEXT_PLAIN;
}
else if (request.startsWith(F("POST /command/")))
else if (method == HTTP_POST && request.startsWith(F("/command/")))
{
request.remove(0,14);
if (!authorized) return 401;
request.remove(0,9);
String body=client.readStringUntil('\n');
request+=" ";
@@ -469,11 +465,10 @@ lan_status lanLoop() {
#ifdef NOETHER
lanStatus=DO_NOTHING;//-14;
#endif
//Serial.println(lanStatus);
switch (lanStatus) {
case INITIAL_STATE:
// statusLED.set(ledRED|((configLoaded)?ledBLINK:0));
statusLED.set(ledRED|((configLoaded)?ledBLINK:0));
#if defined(WIFI_ENABLE)

2
lighthub/options.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include <Arduino.h>
#define DEFAULT_FILESIZE_LIMIT 65535
#ifndef MAX_JSON_CONF_SIZE
#if defined(__SAM3X8E__)

1
lighthub/seekablestream.h
View File

@@ -15,6 +15,7 @@ uint16_t contentType;
public:
seekableStream(unsigned int size):Stream(),streamSize(size) {};
virtual bool checkPermissions(char mode) {return true;};
unsigned int getSize() {return streamSize;}
void setSize (unsigned int size) {streamSize = size;};
virtual unsigned int seek(unsigned int _pos = 0) = 0;