feat: add demo

frontend/src/components/armsimulation/ArmSimulation.jsx

@@ -4,7 +4,7 @@ const ArmSimulation = () => {
     const [websocketPort, setWebsocketPort] = useState(0);
 
     const simulation_url = import.meta.env.VITE_ARM_SIMULATION_URL;
-    const websocket_host = import.meta.env.VITE_ARM_SIMULATION_WEBSOCKET_HOST;
+    let websocket_host = import.meta.env.VITE_ARM_SIMULATION_WEBSOCKET_HOST;
 
     useEffect(() => {
         const getWebsocketInfo = async () => {
@@ -16,12 +16,16 @@ const ArmSimulation = () => {
 
         console.log('this is the websocket port');
         console.log(websocketPort, simulation_url, websocket_host);
-    }, []);
+    }, [simulation_url, websocketPort, websocket_host]);
 
+    const protocol = websocket_host === 'localhost' ? 'ws' : 'wss';
+    if (websocket_host !== 'localhost') {
+        websocket_host = `${websocket_host}/w${websocketPort}`;
+    }
     return (
         <div className="relative h-full w-full">
             <iframe
-                src={`${simulation_url}/game.html?ip=${websocket_host}&port=${websocketPort}`}
+                src={`${simulation_url}/game.html?ip=${websocket_host}&port=${websocketPort}&protocol=${protocol}`}
                 className="absolute left-0 top-0 h-full w-full cursor-none border-none"
             ></iframe>
             <div className="absolute inset-0 bg-transparent"></div>

instanciator/backend/.env.template

@@ -0,0 +1,2 @@
+HOST=https://api.demo.ribot.dev
+ORIGIN=https://demo.ribot.dev

instanciator/backend/src/main.py

@@ -10,6 +10,7 @@
 HOST = os.environ.get('HOST', 'http://localhost')
 
 ORIGIN = os.environ.get('ORIGIN', 'http://localhost:3000')
+
 app = FastAPI()
 
 app.add_middleware(

instanciator/nginx/default.conf

@@ -23,7 +23,7 @@ server {
 
     # Proxy requests to your FastAPI application
     location / {
-        proxy_pass http://localhost:6000;
+        proxy_pass http://127.0.0.1:7400;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -33,7 +33,7 @@ server {
     location ~ ^/s(\d+)(/.*)?$ {
         set $port $1;
         set $path $2;
-        proxy_pass http://localhost:$port$path$is_args$args;
+        proxy_pass http://127.0.0.1:$port$path$is_args$args;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -42,8 +42,10 @@ server {
 
 
     # Proxy requests to WebSocket server
-    location /ws {
-        proxy_pass http://localhost:7000;
+    location ~ ^/w(\d+)(/.*)?$ {
+        set $port $1;
+        set $path $2;
+        proxy_pass http://127.0.0.1:$port$path$is_args$args;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";

manage.py

@@ -452,15 +452,18 @@ def runserver(self, **kwargs):
         use_instanciator = kwargs.get('use_instanciator', False)
         if use_instanciator:
             os.environ['VITE_BACKEND_URL'] = 'no_backend'
-
             service_list = ['frontend.yaml']
         else:
 
             service_list = ['backend.yaml', 'unity_webgl_server.yaml', 'frontend.yaml']
+
         if not esp and not use_instanciator:
             service_list.append('firmware.yaml')
-        self.docker_manager.dc_up(service_list, env={
-            "ESP_CONTROLLER_SERVER_HOST": self.current_host_ip ,}, detached=detached)
+
+        if esp:
+            os.environ["ESP_CONTROLLER_SERVER_HOST"] = self.current_host_ip
+
+        self.docker_manager.dc_up(service_list, detached=detached)
 
         if not detached:
             self.docker_manager.dc_down(service_list)

unity_arm_simulation/unity_project/arm_sim/Assets/Plugins/WebSocketInfo.jslib

@@ -24,7 +24,10 @@ mergeInto(LibraryManager.library, {
         const protocol = params.get("protocol");
         if (protocol) {
             console.log("SetWebSocketInfo: " + protocol);
-            return protocol;
+            var bufferSize = lengthBytesUTF8(protocol) + 1;
+            var buffer = _malloc(bufferSize);
+            stringToUTF8(protocol, buffer, bufferSize);
+            return buffer;
         }
     },
 });

unity_arm_simulation/unity_project/arm_sim/Assets/Scenes/MainArm.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.4416632, g: 0.49055576, b: 0.570549, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -97,7 +97,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000000, guid: 26eea3eb254899e01ad6c00f75dd8f96, type: 2}
   m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings: