Added problem in SCCD for Simon to fix

hybrid_server/classes/mvkcontroller.xml

@@ -90,6 +90,8 @@
                         <parameter name="data"/>
                         <script>
                             # No JSON encoding necessary, as it is not complex
+                            print("Take transition!")
+                            print("Data: " + str(data))
                             if data["op"] == "set_input":
                                 if "element_type" in data:
                                     if data["element_type"] == "V":
@@ -106,6 +108,7 @@
                                         d.append([t, v])
                                     self.input_queue[data["username"]].append((source, d))
                             elif data["op"] == "get_output":
+                                print("Registered output listener")
                                 self.output_queue[data["username"]].append(source)
                             else:
                                 raise Exception("DROPPING unknown operation: " + str(data["op"]))
@@ -152,6 +155,7 @@
                                             self.destination = self.output_queue[user].pop(0)
                                             self.value = self.mvk.returnvalue
                                             self.all_failed = False
+                                            print("Send output!")
                             else:
                                 out = self.mvs.read_outgoing(self.root)[0]
                                 for m in out:

hybrid_server/classes/server.xml

@@ -22,6 +22,9 @@
                     <transition event="HTTP_output" target=".">
                         <parameter name="association_name"/>
                         <parameter name="data"/>
+                        <script>
+                            print("Pass from MVI")
+                        </script>
                         <raise event="from_mvi" scope="narrow" target="'parent'">
                             <parameter expr="association_name"/>
                             <parameter expr="data"/>

hybrid_server/classes/socket.xml

@@ -21,6 +21,7 @@
                 <parameter name="association_name"/>
                 <script>
                     self.association_name = association_name
+                    print("Open new")
                 </script>
             </transition>
         </state>
@@ -37,6 +38,7 @@
                         <parameter name="data"/>
                         <script>
                             self.received_data += data
+                            print("Received " + str(self.received_data))
                         </script>
                         <raise event="received_data"/>
                     </transition>
@@ -44,12 +46,23 @@
                         <parameter name="socket"/>
                         <parameter name="data"/>
                         <raise event="received_data"/>
+                        <script>
+                            print("Socket sends 0")
+                        </script>
+                    </transition>
+                    <transition event="received_socket" port="socket_in" cond="self.socket != socket" target=".">
+                        <parameter name="socket"/>
+                        <parameter name="data"/>
+                        <script>
+                            print("Wrong socket received!")
+                        </script>
                     </transition>
                 </state>
                 <state id="closed">
                     <onentry>
                         <script>
                             self.closed = True
+                            print("CLOSE")
                         </script>
                     </onentry>
                 </state>
@@ -94,6 +107,11 @@
 
             <state id="parsing" initial="wait_for_header">
                 <state id="wait_for_header">
+                    <onentry>
+                        <script>
+                            print("Waiting for header!")
+                        </script>
+                    </onentry>
                     <transition cond="'\r\n\r\n' in self.received_data and self.received_data.startswith('POST')" target="../wait_for_payload">
                         <script>
                             header, self.received_data = self.received_data.split("\r\n\r\n", 1)
@@ -107,10 +125,19 @@
                                 self.length = float('inf')
                         </script>
                     </transition>
-                    <transition cond="self.closed and len(self.received_data) == 0" target="../closing"/>
+                    <transition cond="self.closed and len(self.received_data) == 0" target="../closing">
+                        <script>
+                            print("Closing up :(")
+                        </script>
+                    </transition>
                 </state>
                 <state id="closing">
-                    <transition after="0.001" target=".">
+                    <onentry>
+                        <script>
+                            print("CLOSE")
+                        </script>
+                    </onentry>
+                    <transition after="1" target=".">
                         <raise event="close"/>
                     </transition>
                 </state>

hybrid_server/socket2event.py

@@ -28,6 +28,7 @@ def receive_from_socket(controller, sock, recv_event):
         if not run_sockets[sock]:
             break
         data = sock.recv(2**16)
+        print("Forwarding data: " + str(data))
         controller.addInput(Event("received_socket", "socket_in", [sock, data]))
 
 def send_to_socket(controller, sock, data_queue, send_event):