Block REST API calls till resource is ready (#1609)

* Block REST API call till ressource is ready * Update * Update * Update
2025-12-11 22:16:56 +03:00 · 2022-12-17 20:38:24 +01:00
parent 4088e9ee75
commit 6083fe6151
4 changed files with 496 additions and 407 deletions
--- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp
+++ b/code/components/jomjol_controlcamera/ClassControllCamera.cpp
@@ -164,6 +164,7 @@ static size_t jpg_encode_stream(void * arg, size_t index, const void* data, size
    return len;
 }

+
 bool CCamera::SetBrightnessContrastSaturation(int _brightness, int _contrast, int _saturation)
 {
    bool result = false;
@@ -281,7 +282,6 @@ void CCamera::EnableAutoExposure(int flashdauer)
 }


-
 esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
 {
    string ftype;
@@ -543,6 +543,7 @@ esp_err_t CCamera::CaptureToHTTP(httpd_req_t *req, int delay)
    return res;
 }

+
 void CCamera::LightOnOff(bool status)
 {
    GpioHandler* gpioHandler = gpio_handler_get();
@@ -578,6 +579,7 @@ void CCamera::LightOnOff(bool status)
    }
 }

+
 void CCamera::LEDOnOff(bool status)
 {
 	// Init the GPIO
@@ -638,6 +640,7 @@ void CCamera::GetCameraParameter(httpd_req_t *req, int &qual, framesize_t &resol
    };
 }

+
 framesize_t CCamera::TextToFramesize(const char * _size)
 {
    if (strcmp(_size, "QVGA") == 0)
@@ -669,6 +672,7 @@ CCamera::CCamera()
    ledc_init();    
 }

+
 esp_err_t CCamera::InitCam()
 {
    ESP_LOGD(TAG, "Init Camera");
@@ -682,9 +686,11 @@ esp_err_t CCamera::InitCam()
        return err;
    }

+    CameraInitSuccessful = true;
    return ESP_OK;
 }

+
 void CCamera::SetLEDIntensity(float _intrel)
 {
    _intrel = min(_intrel, (float) 100);
@@ -694,3 +700,9 @@ void CCamera::SetLEDIntensity(float _intrel)
    ESP_LOGD(TAG, "Set led_intensity to %d of 8191", led_intensity);

 }
+
+
+bool CCamera::getCameraInitSuccessful() 
+{
+    return CameraInitSuccessful;
+}
--- a/code/components/jomjol_controlcamera/ClassControllCamera.h
+++ b/code/components/jomjol_controlcamera/ClassControllCamera.h
@@ -26,6 +26,7 @@ class CCamera {
        int led_intensity = 4095;

        void ledc_init(void);
+        bool CameraInitSuccessful = false;

    public:
        int image_height, image_width;
@@ -42,6 +43,7 @@ class CCamera {
        void SetLEDIntensity(float _intrel);

        void EnableAutoExposure(int flashdauer);
+        bool getCameraInitSuccessful();
        

        framesize_t TextToFramesize(const char * text);
--- a/code/components/jomjol_controlcamera/server_camera.cpp
+++ b/code/components/jomjol_controlcamera/server_camera.cpp
@@ -17,7 +17,8 @@ char scratch2[SCRATCH_BUFSIZE2];
 //#define DEBUG_DETAIL_ON   


-void PowerResetCamera(){
+void PowerResetCamera()
+{
        ESP_LOGD(TAG, "Resetting camera by power down line");
        gpio_config_t conf;
        conf.intr_type = GPIO_INTR_DISABLE;
@@ -37,182 +38,223 @@ void PowerResetCamera(){

 esp_err_t handler_lightOn(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_lightOn - Start");
-    ESP_LOGD(TAG, "handler_lightOn uri: %s", req->uri);
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOn - Start");
+        ESP_LOGD(TAG, "handler_lightOn uri: %s", req->uri);
+    #endif

-    Camera.LightOnOff(true);
-    const char* resp_str = (const char*) req->user_ctx;
-    httpd_resp_send(req, resp_str, strlen(resp_str));  
+    if (Camera.getCameraInitSuccessful()) 
+    {
+        Camera.LightOnOff(true);
+        const char* resp_str = (const char*) req->user_ctx;
+        httpd_resp_send(req, resp_str, strlen(resp_str));
+    }
+    else 
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera Light On API not yet initialized. Please retry later...");
+        return ESP_ERR_NOT_FOUND;
+    }

-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_lightOn - Done");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOn - Done");
+    #endif

    return ESP_OK;
-};
+}
+

 esp_err_t handler_lightOff(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_lightOff - Start");
-    ESP_LOGD(TAG, "handler_lightOff uri: %s", req->uri);
-#endif
-    Camera.LightOnOff(false);
-    const char* resp_str = (const char*) req->user_ctx;
-    httpd_resp_send(req, resp_str, strlen(resp_str));       
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOff - Start");
+        ESP_LOGD(TAG, "handler_lightOff uri: %s", req->uri);
+    #endif

-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_lightOff - Done");
-#endif
+    if (Camera.getCameraInitSuccessful()) 
+    {
+        Camera.LightOnOff(false);
+        const char* resp_str = (const char*) req->user_ctx;
+        httpd_resp_send(req, resp_str, strlen(resp_str));       
+    }
+    else 
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera Light Off API not yet initialized. Please retry later...");
+        return ESP_ERR_NOT_FOUND;
+    }
+
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOff - Done");
+    #endif

    return ESP_OK;
-};
+}
+

 esp_err_t handler_capture(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_capture - Start");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_capture - Start");
+    #endif

-    int quality;
-    framesize_t res;
+    if (Camera.getCameraInitSuccessful()) 
+    {
+        int quality;
+        framesize_t res;

-    Camera.GetCameraParameter(req, quality, res);
+        Camera.GetCameraParameter(req, quality, res);

-#ifdef DEBUG_DETAIL_ON   
-    ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif

-    Camera.SetQualitySize(quality, res);
+        Camera.SetQualitySize(quality, res);

-    esp_err_t ressult;
-    ressult = Camera.CaptureToHTTP(req);
+        esp_err_t result;
+        result = Camera.CaptureToHTTP(req);

-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_capture - Done");
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture - Done");
+        #endif

-    return ressult;
-};
+        return result;
+    }
+        else 
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera Capture API not yet initialized. Please retry later...");
+        return ESP_ERR_NOT_FOUND;
+    }
+}


 esp_err_t handler_capture_with_ligth(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON  
-    LogFile.WriteHeapInfo("handler_capture_with_ligth - Start");
-#endif
-    char _query[100];
-    char _delay[10];
-
-    int quality;
-    framesize_t res;    
-    int delay = 2500;
-
-    if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
+    #ifdef DEBUG_DETAIL_ON  
+        LogFile.WriteHeapInfo("handler_capture_with_ligth - Start");
+    #endif
+    
+    if (Camera.getCameraInitSuccessful()) 
    {
-        ESP_LOGD(TAG, "Query: %s", _query);
-        if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
+        char _query[100];
+        char _delay[10];
+
+        int quality;
+        framesize_t res;    
+        int delay = 2500;
+
+        if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
        {
-#ifdef DEBUG_DETAIL_ON   
-            ESP_LOGD(TAG, "Delay: %s", _delay);
-#endif        
-            delay = atoi(_delay);
+            ESP_LOGD(TAG, "Query: %s", _query);
+            if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
+            {
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Delay: %s", _delay);
+                #endif        
+                delay = atoi(_delay);

-            if (delay < 0)
-                delay = 0;
+                if (delay < 0)
+                    delay = 0;
+            }
        }
-    };

-    Camera.GetCameraParameter(req, quality, res);
+        Camera.GetCameraParameter(req, quality, res);

-#ifdef DEBUG_DETAIL_ON   
-    ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif

-    Camera.SetQualitySize(quality, res);
-    Camera.LightOnOff(true);
-    const TickType_t xDelay = delay / portTICK_PERIOD_MS;
-    vTaskDelay( xDelay );
+        Camera.SetQualitySize(quality, res);
+        Camera.LightOnOff(true);
+        const TickType_t xDelay = delay / portTICK_PERIOD_MS;
+        vTaskDelay( xDelay );

-    esp_err_t ressult;
-    ressult = Camera.CaptureToHTTP(req);  
+        esp_err_t result;
+        result = Camera.CaptureToHTTP(req);  

-    Camera.LightOnOff(false);
+        Camera.LightOnOff(false);

-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_capture_with_ligth - Done");
-#endif
-
-    return ressult;
-};
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture_with_ligth - Done");
+        #endif

+        return result;
+    }
+        else 
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera Capture + flashlight API not yet initialized. Please retry later...");
+        return ESP_ERR_NOT_FOUND;
+    }
+}


 esp_err_t handler_capture_save_to_file(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_capture_save_to_file - Start");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_capture_save_to_file - Start");
+    #endif

-    char _query[100];
-    char _delay[10];
-    int delay = 0;
-    char filename[100];
-    std::string fn = "/sdcard/";
-
-
-    int quality;
-    framesize_t res;    
-
-    if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
+    if (Camera.getCameraInitSuccessful()) 
    {
-        ESP_LOGD(TAG, "Query: %s", _query);
-        if (httpd_query_key_value(_query, "filename", filename, 100) == ESP_OK)
+        char _query[100];
+        char _delay[10];
+        int delay = 0;
+        char filename[100];
+        std::string fn = "/sdcard/";
+
+
+        int quality;
+        framesize_t res;    
+
+        if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
        {
-            fn.append(filename);
-#ifdef DEBUG_DETAIL_ON   
-            ESP_LOGD(TAG, "Filename: %s", fn.c_str());
-#endif
+            ESP_LOGD(TAG, "Query: %s", _query);
+            if (httpd_query_key_value(_query, "filename", filename, 100) == ESP_OK)
+            {
+                fn.append(filename);
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Filename: %s", fn.c_str());
+                #endif
+            }
+            else
+                fn.append("noname.jpg");
+
+            if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
+            {
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Delay: %s", _delay);
+                #endif
+                delay = atoi(_delay);
+
+                if (delay < 0)
+                    delay = 0;
+            }
        }
        else
            fn.append("noname.jpg");

-        if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
-        {
-#ifdef DEBUG_DETAIL_ON   
-            ESP_LOGD(TAG, "Delay: %s", _delay);
-#endif
-            delay = atoi(_delay);
+        Camera.GetCameraParameter(req, quality, res);
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif
+        Camera.SetQualitySize(quality, res);

-            if (delay < 0)
-                delay = 0;
-        }
+        esp_err_t result;
+        result = Camera.CaptureToFile(fn, delay);  

+        const char* resp_str = (const char*) fn.c_str();
+        httpd_resp_send(req, resp_str, strlen(resp_str));
+
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture_save_to_file - Done");
+        #endif
+
+        return result;
    }
-    else
-        fn.append("noname.jpg");
-
-    Camera.GetCameraParameter(req, quality, res);
-#ifdef DEBUG_DETAIL_ON   
-    ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
-    Camera.SetQualitySize(quality, res);
-
-    esp_err_t ressult;
-    ressult = Camera.CaptureToFile(fn, delay);  
-
-    const char* resp_str = (const char*) fn.c_str();
-    httpd_resp_send(req, resp_str, strlen(resp_str));  
-  
-#ifdef DEBUG_DETAIL_ON   
-    LogFile.WriteHeapInfo("handler_capture_save_to_file - Done");
-#endif
-
-    return ressult;
-};
-
+    else 
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera Capture + save API not yet initialized. Please retry later...");
+        return ESP_ERR_NOT_FOUND;
+    }
+}


 void register_server_camera_uri(httpd_handle_t server)