Merge pull request #691 from eesast/dev

Maybe Final Version

CAPI/python/requirements.txt

@@ -1,3 +1,3 @@
-grpcio==1.54.2
-grpcio-tools==1.62.1
+grpcio==1.62.2
+grpcio-tools==1.62.2
 numpy

dependency/shell/run.sh

@@ -84,7 +84,7 @@ function retry_command {
 if [ "$TERMINAL" = "SERVER" ]; then
     map_path=$map_dir/$MAP_ID.txt
     # allow spectator always.
-    nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $GAME_TIME --mode $MODE_NUM --mapResource $map_path --url $SCORE_URL --token $TOKEN --fileName $playback_dir/video --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 &
+    nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $GAME_TIME --mode $MODE_NUM --mapResource $map_path --url $SCORE_URL --token $TOKEN --fileName $playback_dir/playback --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 &
     server_pid=$!
     echo "server pid: $server_pid"
     ls $playback_dir
@@ -118,13 +118,13 @@ if [ "$TERMINAL" = "SERVER" ]; then
         read_array get_current_team_label $TEAM_LABELS
         if [[ "${current_team_label}" == "Student" ]]; then
             echo "Parse Success: 1st team is Student"
-            finish_payload='{"result": {"status": "Finished", "scores": ['${score0}', '${score1}']}}'
+            finish_payload='{"status": "Finished", "scores": ['${score0}', '${score1}']}'
         elif [[ "${current_team_label}" == "Tricker" ]]; then
             echo "Parse Success: 1st team is Tricker"
-            finish_payload='{"result": {"status": "Finished", "scores": ['${score1}', '${score0}']}}'
+            finish_payload='{"status": "Finished", "scores": ['${score1}', '${score0}']}'
         else
             echo "Parse Failure: 1st team is Unknown"
-            finish_payload='{"result": {"status": "Crashed", "scores": [0, 0]}}'
+            finish_payload='{"status": "Crashed", "scores": [0, 0]}'
         fi
 
         if [[ -n $finish_payload ]]; then
@@ -139,11 +139,11 @@ if [ "$TERMINAL" = "SERVER" ]; then
         echo "Finish!"
     else
         echo "Failed to start game."
-        touch $playback_dir/finish.lock
+        # touch $playback_dir/finish.lock
         touch temp.lock
-        mv -f temp.lock $playback_dir/video.thuaipb
+        mv -f temp.lock $playback_dir/playback.thuaipb
         kill -9 $server_pid
-        finish_payload='{"result": {"status": "Crashed", "scores": [0, 0]}}'
+        finish_payload='{"status": "Crashed", "scores": [0, 0]}'
         curl $FINISH_URL -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $TOKEN" -d "${finish_payload}" > $playback_dir/send.log 2>&1
     fi