add java ssl and cors and connect it - java process mediates between express and unreal

Author: paulparkinson

interactive-ai-holograms/python-realtimespeech-selectai/src/AIHoloRest.py

@@ -179,7 +179,7 @@ def doTTSAndAudio2Face(latest_answer, latest_question):
     }
     payload = {
         "a2f_player": "/World/audio2face/Player",
-        "dir_path": "C:/aiholo-app/python-realtimespeech-selectai"
+        "dir_path": "C:/Users/opc/src/github.com/paulparkinson/oracle-ai-for-sustainable-dev/interactive-ai-holograms/python-realtimespeech-selectai"
     }
     response = requests.post(url, json=payload, headers=headers)
     if response.status_code == 200:
@@ -205,8 +205,8 @@ def handleContainsLogic(cummulative_result, logic_array):
             latest_action = item["containsWord"]
             return True
 
-SSL_CERT_FILE = r"C:\aiholo-app\localhost.pem"  # Path to your certificate
-SSL_KEY_FILE = r"C:\aiholo-app\localhost-key.pem"  # Path to your private key
+SSL_CERT_FILE = r"C:\Users\opc\src\github.com\paulparkinson\oracle-ai-for-sustainable-dev\interactive-ai-holograms\localhost.pem"  # Path to your certificate
+SSL_KEY_FILE = r"C:\Users\opc\src\github.com\paulparkinson\oracle-ai-for-sustainable-dev\interactive-ai-holograms\localhost-key.pem"  # Path to your private key
 
 
 async def handle_request(request):

interactive-ai-holograms/react-client/react-client/src/App.tsx

@@ -86,21 +86,35 @@ function App() {
 
     console.log("handleCallSelectAI question:", question);
     const url = `https://130.61.51.75:8443/data?question=${encodeURIComponent(question)}`;
+    const urlJava = `https://130.61.51.75:8444/echo/set?value=question`;
     console.log("handleCallSelectAI url:", url);
     setIsLoading(true);
 
     try {
-      const response = await fetch(url, {
+    //   const response = await fetch(url, {
+    //     method: "GET",
+    //     headers: { Accept: "application/json" },
+    //   });
+
+    //   if (!response.ok) {
+    //     throw new Error(`HTTP error! Status: ${response.status}`);
+    //   }
+    //   const data = await response.json();
+
+
+      const responseUnreal = await fetch(urlJava, {
         method: "GET",
         headers: { Accept: "application/json" },
       });
 
-      if (!response.ok) {
-        throw new Error(`HTTP error! Status: ${response.status}`);
+      if (!responseUnreal.ok) {
+        throw new Error(`HTTP error! Status: ${responseUnreal.status}`);
       }
+      const data2 = await responseUnreal; //currently just thrown away
 
-      const data = await response.json();
-      setAiResponse(JSON.stringify(data, null, 2));
+      
+
+      setAiResponse(JSON.stringify(data2, null, 2));
     } catch (error) {
       console.error("Error fetching AI data:", error.message);
       setAiResponse(`Error: ${error.message}`);

java-ai/src/main/java/oracleai/EchoController.java

@@ -1,36 +1,22 @@
 package oracleai;
 
-
-import com.oracle.bmc.aivision.model.FaceDetectionFeature;
-import oracleai.services.OracleVisionAI;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import oracleai.services.ORDSCalls;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-@Controller
+@RestController
 @RequestMapping("/echo")
 public class EchoController {
-    String theValue;
+    private String theValue = "init";
 
     @GetMapping("/set")
-    public String echo(String value) {
+    public String setValue(@RequestParam("value") String value) {
         theValue = value;
-        System.out.println("EchoController set:" + theValue);
-        return "set successfully:" + theValue;
+        System.out.println("EchoController set: " + theValue);
+        return "set successfully: " + theValue;
     }
 
     @GetMapping("/get")
-    public String echo() {
-        System.out.println("EchoController get:" + theValue);
+    public String getValue() {
+        System.out.println("EchoController get: " + theValue);
         return theValue;
     }
-
-}
+}

java-ai/src/main/java/oracleai/WebConfig.java

@@ -0,0 +1,18 @@
+package oracleai;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") // This will apply to all routes
+                .allowedOrigins("https://130.61.51.75:4884") // Allow this origin
+                .allowedMethods("GET", "POST", "PUT", "DELETE") // Allowed methods
+                .allowedHeaders("*") // Allowed headers
+                .allowCredentials(true); // Allow credentials
+    }
+}

java-ai/src/main/resources/application.yaml

@@ -28,4 +28,10 @@ logging:
     org.springframework.web.cors: DEBUG
 server:
   tomcat:
-    max-swallow-size: 200MB
+    max-swallow-size: 200MB
+  port: 8444
+  ssl:
+    key-store-type: PKCS12
+    key-store: classpath:keystore.p12
+    key-store-password: Welcome1
+    key-alias: springboot