From 5d40ad3acbf1b20926402a828d77890bcac39326 Mon Sep 17 00:00:00 2001
From: open <open@asus-r751j.mpt.tmplab.org>
Date: Thu, 18 Jan 2024 19:32:12 +0100
Subject: [PATCH] fix: HTTP server should work

---
 esp32-timed-switch.ino | 103 +++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 44 deletions(-)

diff --git a/esp32-timed-switch.ino b/esp32-timed-switch.ino
index d5f9339..f9c8e45 100644
--- a/esp32-timed-switch.ino
+++ b/esp32-timed-switch.ino
@@ -13,7 +13,7 @@
 // --------------------------------------------
 
 
-const char* html_app="<title>ESP32 timed Switch</title><script src=https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.3/angular.js></script><h1>Scheduler</h1><script>class Schedule{constructor(scheduleArray){if(scheduleArray&&scheduleArray.length===24){this.schedule=scheduleArray.slice();}else{this.schedule=[24].fill(0x000)}}loadFromArrayBuffer=function(buffer){var view=new DataView(buffer);for(var i=0;i<24;i+=1){this.schedule[i]=view.getUint32(i*4)}};updateSegment(hour,segment,state){if(hour<0||hour>=24){throw new Error('Hour must be between 0 and 23.')}if(segment<0||segment>=12){throw new Error('Segment must be between 0 and 11.')}const bitPosition=11-segment;if(state){this.schedule[hour]|=(1<<bitPosition)}else{this.schedule[hour]&= ~(1<<bitPosition)}}serializeForDisplay(){return this.schedule.map(hour=>{if(hour===0xFFF){return{displayValue:' ',class:'on'}}else if(hour===0x000){return{displayValue:' ',class:'off'}}else{return{displayValue:' ',class:'partial'}}})}prepareEditMatrix(){const editMatrix=[];for(let hour=0;hour<24;hour+=1){const hourSegments=[];for(let segment=0;segment<12;segment+=1){hourSegments.push({value:(this.schedule[hour]&(1<<segment))!==0?1:0})}editMatrix.push(hourSegments.reverse())}return editMatrix}updateFromEditMatrix(editMatrix){for(let hour=0;hour<24;hour+=1){let hourValue=0;for(let segment=0;segment<12;segment+=1){if(editMatrix[hour][11-segment].value){hourValue|=(1<<segment)}}this.schedule[hour]=hourValue}}serializeToArrayBuffer=function(){var buffer=new ArrayBuffer(24*4);var view=new DataView(buffer);for(var i=0;i<this.schedule.length;i+=1){view.setUint32(i*4,this.schedule[i])}return buffer}}var app=angular.module('plugSchedulerApp',[]);app.controller('PlugScheduleController',['$http',function($http){var ctrl=this;ctrl.editMode=false;ctrl.$onInit=function(){ctrl.scheduleObj=new Schedule();ctrl.getSchedule()};ctrl.getSchedule=function(){if(ctrl.plugId===undefined){throw new Error('plugId is not defined')}var url=`/api/schedule/${ctrl.plugId }`;$http.get(url,{responseType:'arraybuffer'}).then(function(response){ctrl.scheduleObj.loadFromArrayBuffer(response.data);ctrl.displaySchedule=ctrl.scheduleObj.serializeForDisplay()}).catch(function(error){console.error('Error fetching schedule:',error)})};ctrl.modifySchedule=function(){ctrl.editMode=true;ctrl.editMatrix=ctrl.scheduleObj.prepareEditMatrix()};ctrl.saveSchedule=function(){ctrl.editMode=false;ctrl.scheduleObj.updateFromEditMatrix(ctrl.editMatrix);ctrl.updateSchedule()};ctrl.updateSchedule=function(){var url=`/api/schedule/${ctrl.plugId }`;var serializedSchedule=ctrl.scheduleObj.serializeToArrayBuffer();$http.post(url,serializedSchedule,{headers:{'Content-Type':'application/octet-stream'},responseType:'arraybuffer',transformRequest:[]}).then(function(response){console.log(\"successfully updated\");ctrl.displaySchedule=ctrl.scheduleObj.serializeForDisplay()},function(error){console.error('Error updating schedule:',error)})};ctrl.checkAll=function(hourIndex){ctrl.editMatrix[hourIndex].forEach(segment=>{segment.value=1})};ctrl.uncheckAll=function(hourIndex){ctrl.editMatrix[hourIndex].forEach(segment=>{segment.value=0})}}]);app.component('plugScheduleWidget',{bindings:{plugId:'<'},template:`<div class=plug-schedule-widget><h3>Schedule for Plug {{ $ctrl.plugId }}</h3><div ng-if=!$ctrl.editMode><div class=hour-cell ng-class=hour.class ng-repeat=\"hour in $ctrl.displaySchedule track by $index\">{{ hour.displayValue }}</div><button ng-click=$ctrl.modifySchedule()>Modify Schedule</button></div><div ng-if=$ctrl.editMode><table><tr ng-repeat=\"hourSegments in $ctrl.editMatrix track by $index\"><td ng-repeat=\"segment in hourSegments track by $index\"><input ng-false-value=0 ng-model=segment.value ng-true-value=1 type=checkbox><td><button ng-click=$ctrl.checkAll($index)>Check All</button> <button ng-click=$ctrl.uncheckAll($index)>Uncheck All</button></table><button ng-click=$ctrl.saveSchedule()>Save Schedule</button></div></div>`,controller:'PlugScheduleController'});</script><div ng-app=plugSchedulerApp><plug-schedule-widget plug-id=1></plug-schedule-widget><plug-schedule-widget plug-id=2></plug-schedule-widget><plug-schedule-widget plug-id=3></plug-schedule-widget><plug-schedule-widget plug-id=4></plug-schedule-widget><plug-schedule-widget plug-id=5></plug-schedule-widget><plug-schedule-widget plug-id=6></plug-schedule-widget><plug-schedule-widget plug-id=7></plug-schedule-widget><plug-schedule-widget plug-id=8></plug-schedule-widget></div><style>*{font-family:Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;padding:0;border-spacing:0;border:transparent;text-align:center;color:#aaa;font-weight:400}body{width:80%;margin:auto;background:#333340}button{padding:4px 8px;margin-left:5px;vertical-align:top;border-radius:12px;background:#696983;color:eee;margin-top:5px}.hour-cell{display:inline-block;width:10px;height:25px;margin-top:4px}.off{background-color:#eee}.on{background-color:#8e8}.partial{background-color:#bdc}table{margin:auto}</style>";
+const char* html_app="<html><head><title>ESP32 timed Switch</title><script src=https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.3/angular.js></script></head><body><h1>Scheduler</h1><script>class Schedule{constructor(scheduleArray){if(scheduleArray&&scheduleArray.length===24){this.schedule=scheduleArray.slice();}else{this.schedule=[24].fill(0x000)}}loadFromArrayBuffer=function(buffer){var view=new DataView(buffer);for(var i=0;i<24;i+=1){this.schedule[i]=view.getUint32(i*4)}};updateSegment(hour,segment,state){if(hour<0||hour>=24){throw new Error('Hour must be between 0 and 23.')}if(segment<0||segment>=12){throw new Error('Segment must be between 0 and 11.')}const bitPosition=11-segment;if(state){this.schedule[hour]|=(1<<bitPosition)}else{this.schedule[hour]&= ~(1<<bitPosition)}}serializeForDisplay(){return this.schedule.map(hour=>{if(hour===0xFFF){return{displayValue:' ',class:'on'}}else if(hour===0x000){return{displayValue:' ',class:'off'}}else{return{displayValue:' ',class:'partial'}}})}prepareEditMatrix(){const editMatrix=[];for(let hour=0;hour<24;hour+=1){const hourSegments=[];for(let segment=0;segment<12;segment+=1){hourSegments.push({value:(this.schedule[hour]&(1<<segment))!==0?1:0})}editMatrix.push(hourSegments.reverse())}return editMatrix}updateFromEditMatrix(editMatrix){for(let hour=0;hour<24;hour+=1){let hourValue=0;for(let segment=0;segment<12;segment+=1){if(editMatrix[hour][11-segment].value){hourValue|=(1<<segment)}}this.schedule[hour]=hourValue}}serializeToArrayBuffer=function(){var buffer=new ArrayBuffer(24*4);var view=new DataView(buffer);for(var i=0;i<this.schedule.length;i+=1){view.setUint32(i*4,this.schedule[i])}return buffer}}var app=angular.module('plugSchedulerApp',[]);app.controller('PlugScheduleController',['$http',function($http){var ctrl=this;ctrl.editMode=false;ctrl.$onInit=function(){ctrl.scheduleObj=new Schedule();ctrl.getSchedule()};ctrl.getSchedule=function(){if(ctrl.plugId===undefined){throw new Error('plugId is not defined')}var url=`/api/schedule/${ctrl.plugId }`;$http.get(url,{responseType:'arraybuffer'}).then(function(response){ctrl.scheduleObj.loadFromArrayBuffer(response.data);ctrl.displaySchedule=ctrl.scheduleObj.serializeForDisplay()}).catch(function(error){console.error('Error fetching schedule:',error)})};ctrl.modifySchedule=function(){ctrl.editMode=true;ctrl.editMatrix=ctrl.scheduleObj.prepareEditMatrix()};ctrl.saveSchedule=function(){ctrl.editMode=false;ctrl.scheduleObj.updateFromEditMatrix(ctrl.editMatrix);ctrl.updateSchedule()};ctrl.updateSchedule=function(){var url=`/api/schedule/${ctrl.plugId }`;var serializedSchedule=ctrl.scheduleObj.serializeToArrayBuffer();$http.post(url,serializedSchedule,{headers:{'Content-Type':'application/octet-stream'},responseType:'arraybuffer',transformRequest:[]}).then(function(response){console.log(\"successfully updated\");ctrl.displaySchedule=ctrl.scheduleObj.serializeForDisplay()},function(error){console.error('Error updating schedule:',error)})};ctrl.checkAll=function(hourIndex){ctrl.editMatrix[hourIndex].forEach(segment=>{segment.value=1})};ctrl.uncheckAll=function(hourIndex){ctrl.editMatrix[hourIndex].forEach(segment=>{segment.value=0})}}]);app.component('plugScheduleWidget',{bindings:{plugId:'<'},template:`<div class=plug-schedule-widget><h3>Schedule for Plug {{ $ctrl.plugId }}</h3><div ng-if=!$ctrl.editMode><div class=hour-cell ng-class=hour.class ng-repeat=\"hour in $ctrl.displaySchedule track by $index\">{{ hour.displayValue }}</div><button ng-click=$ctrl.modifySchedule()>Modify Schedule</button></div><div ng-if=$ctrl.editMode><table><tr ng-repeat=\"hourSegments in $ctrl.editMatrix track by $index\"><td ng-repeat=\"segment in hourSegments track by $index\"><input ng-false-value=0 ng-model=segment.value ng-true-value=1 type=checkbox><td><button ng-click=$ctrl.checkAll($index)>Check All</button> <button ng-click=$ctrl.uncheckAll($index)>Uncheck All</button></table><button ng-click=$ctrl.saveSchedule()>Save Schedule</button></div></div>`,controller:'PlugScheduleController'});</script><div ng-app=plugSchedulerApp><plug-schedule-widget plug-id=1></plug-schedule-widget><plug-schedule-widget plug-id=2></plug-schedule-widget><plug-schedule-widget plug-id=3></plug-schedule-widget><plug-schedule-widget plug-id=4></plug-schedule-widget><plug-schedule-widget plug-id=5></plug-schedule-widget><plug-schedule-widget plug-id=6></plug-schedule-widget><plug-schedule-widget plug-id=7></plug-schedule-widget><plug-schedule-widget plug-id=8></plug-schedule-widget></div><style>*{font-family:Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;padding:0;border-spacing:0;border:transparent;text-align:center;color:#aaa;font-weight:400}body{width:80%;margin:auto;background:#333340}button{padding:4px 8px;margin-left:5px;vertical-align:top;border-radius:12px;background:#696983;color:eee;margin-top:5px}.hour-cell{display:inline-block;width:10px;height:25px;margin-top:4px}.off{background-color:#eee}.on{background-color:#8e8}.partial{background-color:#bdc}table{margin:auto}</style></body></html>";
 
 
 // PREFERENCES
@@ -22,10 +22,10 @@ Preferences preferences;
 #define RO_MODE true
 
 // WIFI
-// const char* ssid                = "/tmp/lab";
-// const char* password            = "bitte2cucung";
-const char* ssid                = "Wokwi-GUEST";
-const char* password            = "";
+const char* ssid                = "/tmp/lab";
+const char* password            = "bitte2cucung";
+// const char* ssid                = "Wokwi-GUEST";
+// const char* password            = "";
 const uint8_t wifi_loop_max     = 10;
 
 // NTP
@@ -50,9 +50,21 @@ uint32_t current_ts             = 0;
 uint32_t next_event_ts          = 0;
 int scheduler_1[24] ; //       = {A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60};
 int scheduler_2[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_3[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_4[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_5[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_6[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_7[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
+int scheduler_8[24] ; //       = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
 int* scheduler_list[]      = {
   scheduler_1,
-  scheduler_2
+  scheduler_2,
+  scheduler_3,
+  scheduler_4,
+  scheduler_5,
+  scheduler_6,
+  scheduler_7,
+  scheduler_8,
   };
 
 // PINS
@@ -66,7 +78,13 @@ unsigned int PIN_7 = 32;
 unsigned int PIN_8 = 35;
 unsigned int pin_list[2] = {
   PIN_1,
-  PIN_2
+  PIN_2,
+  PIN_3,
+  PIN_4,
+  PIN_5,
+  PIN_6,
+  PIN_7,
+  PIN_8
   };
 
 // HTTP
@@ -156,7 +174,7 @@ void run_scheduler(){
 
   // If not expected to run exit
   current_ts = get_timestamp( current_hour, current_minute, current_second );
-  Serial.printf("onTimer::check event %d %d\n", current_ts, next_event_ts);
+  // Serial.printf("onTimer::check event %d %d\n", current_ts, next_event_ts);
   if( event_keep_waiting( current_ts, next_event_ts  ) ){
     return;
   }
@@ -186,7 +204,6 @@ void run_scheduler(){
     }
     Serial.println(buffer);    // Get the expected status
   }
-
   Serial.println("Reconfiguration over");
   return;
 }
@@ -271,6 +288,7 @@ void setup(){
   Serial.println(WiFi.localIP());
 
   // Todo
+
 }
 
 
@@ -285,6 +303,7 @@ void loop(){
 
   client = http_server.available();
   if (!client) {
+    // Serial.println("Server not available... skip...");
     return;
   }
 
@@ -293,15 +312,17 @@ void loop(){
 
   // GET request
   if (request.indexOf("GET /api/schedule/") >= 0) {
-    int apiIndex = request.indexOf("/api/schedule/");
-    int startIdIndex = apiIndex + strlen("/api/schedule/");
-    int endIdIndex = request.indexOf(" ", startIdIndex);
+    int apiIndex = 4; // request.indexOf("/api/schedule/");
+    int startIdIndex = 18; // apiIndex + strlen("/api/schedule/");
+    int endIdIndex = 19; // request.indexOf(" ", startIdIndex);
+
     String plugIdStr = request.substring(startIdIndex, endIdIndex);
     int plugId = plugIdStr.toInt() - 1; // Adjust for 0 index
-
+    Serial.print("plugId " );
+    Serial.println(plugId);
     if (plugId >= 0 && plugId < 8) {
       client.println("HTTP/1.1 200 OK");
-      client.println("Content-Type: text/plain");
+      client.println("Content-Type: text/html");
       client.println("Connection: close");
       client.println();
 
@@ -314,43 +335,37 @@ void loop(){
   // GET homepage
   } else if (request.indexOf("GET /") >= 0) {
       client.println("HTTP/1.1 200 OK");
-      client.println("Content-Type: text/plain");
+      client.println("Content-Type: text/html");
       client.println("Connection: close");
       client.println();
       client.println(html_app);
-  }
+  } else {
+    
+    // POST request
+    int slashIndex = request.indexOf("POST /api/schedule/");
+    if (slashIndex != -1) {
+      Serial.println("slashIndex " + slashIndex);
+      int nextSlashIndex = slashIndex + 17;
+
+      // Extract the plug ID
+      String plugIdStr = request.substring(slashIndex + 1, nextSlashIndex);
+      Serial.println("plugIdStr " + plugIdStr);
+      int plugId = plugIdStr.toInt();
+      delay(500);
+      // Read the next line which should have the POST body/content
+      String postBody = client.readStringUntil('\n');
+
+      // Update the schedule for the specified plug
+      if (plugId >= 0 && plugId < 8) {
+        // deserializeSchedule(&client, scheduler_list[plugId]);
+        Serial.println("Schedule updated for plug " + plugIdStr);
+      } else {
+        Serial.println("Invalid plug ID");
+      }
 
-  // POST request
-  int slashIndex = request.indexOf("POST /api/schedule/");
-  if (slashIndex != -1) {
-    int nextSlashIndex = request.indexOf("/", slashIndex + 14);
-    if (nextSlashIndex == -1) {
-      nextSlashIndex = request.indexOf(" ", slashIndex + 14);
     }
-
-    // Extract the plug ID
-    String plugIdStr = request.substring(slashIndex + 14, nextSlashIndex);
-    int plugId = plugIdStr.toInt();
-
-    // Read the next line which should have the POST body/content
-    String postBody = client.readStringUntil('\n');
-
-    // Update the schedule for the specified plug
-    if (plugId >= 0 && plugId < 8) {
-      // deserializeSchedule(&client, scheduler_list[plugId]);
-      Serial.println("Schedule updated for plug " + plugIdStr);
-    } else {
-      Serial.println("Invalid plug ID");
-    }
-
   }
 
-  client.println("HTTP/1.1 200 OK");
-  client.println("Content-Type: text/plain");
-  client.println("Connection: close");
-  client.println();
-  client.println(html_app);
-
   client.stop();