@@ -22,18 +22,17 @@ ts_format=${SE_LOG_TIMESTAMP_FORMAT:-"%Y-%m-%d %H:%M:%S,%3N"}
22
22
process_name=" video.recorder"
23
23
24
24
if [ " ${SE_VIDEO_RECORD_STANDALONE} " = " true" ]; then
25
- JQ_SESSION_ID_QUERY=" .value.nodes[]?.slots[]?.session?.sessionId"
25
+ JQ_SESSION_ID_QUERY=" .value.nodes[0]?.slots[-1]?.session?.sessionId"
26
+ JQ_SESSION_CAPABILITIES_QUERY=" .value.nodes[0]?.slots[-1]?.session?.capabilities"
26
27
SE_NODE_PORT=${SE_NODE_PORT:- " 4444" }
27
- NODE_STATUS_ENDPOINT=" $( python3 /opt/bin/video_gridUrl.py) /status"
28
- NODE_OWNER_ENDPOINT=" $( python3 /opt/bin/video_gridUrl.py) /se/grid/node/owner"
28
+ NODE_STATUS_ENDPOINT=" ${SE_SERVER_PROTOCOL} ://${DISPLAY_CONTAINER_NAME} :${SE_NODE_PORT} /status"
29
29
else
30
- JQ_SESSION_ID_QUERY=" .[]?.node?.slots | .[0]?.session?.sessionId"
30
+ JQ_SESSION_ID_QUERY=" .value.node?.slots[-1]?.session?.sessionId"
31
+ JQ_SESSION_CAPABILITIES_QUERY=" .value.node?.slots[-1]?.session?.capabilities"
31
32
SE_NODE_PORT=${SE_NODE_PORT:- " 5555" }
32
33
NODE_STATUS_ENDPOINT=" ${SE_SERVER_PROTOCOL} ://${DISPLAY_CONTAINER_NAME} :${SE_NODE_PORT} /status"
33
- NODE_OWNER_ENDPOINT=" ${SE_SERVER_PROTOCOL} ://${DISPLAY_CONTAINER_NAME} :${SE_NODE_PORT} /se/grid/node/owner"
34
34
fi
35
35
36
- /opt/bin/validate_endpoint.sh " ${NODE_STATUS_ENDPOINT} "
37
36
if [ -n " ${SE_ROUTER_USERNAME} " ] && [ -n " ${SE_ROUTER_PASSWORD} " ]; then
38
37
BASIC_AUTH=" $( echo -en " ${SE_ROUTER_USERNAME} :${SE_ROUTER_PASSWORD} " | base64 -w0) "
39
38
BASIC_AUTH=" Authorization: Basic ${BASIC_AUTH} "
@@ -92,6 +91,7 @@ function wait_for_display() {
92
91
function check_if_api_respond() {
93
92
endpoint_checks=$( curl --noproxy " *" -H " ${BASIC_AUTH} " -sk -o /dev/null -w " %{http_code}" " ${NODE_STATUS_ENDPOINT} " )
94
93
if [[ " ${endpoint_checks} " != " 200" ]]; then
94
+ /opt/bin/validate_endpoint.sh " ${NODE_STATUS_ENDPOINT} "
95
95
return 1
96
96
fi
97
97
return 0
@@ -199,8 +199,8 @@ function stop_if_recording_inprogress() {
199
199
}
200
200
201
201
function log_node_response() {
202
- if [[ -f " /tmp/graphQL_ $session_id .json " ]]; then
203
- jq ' .' " /tmp/graphQL_ $session_id .json "
202
+ if [[ -n " ${session_capabilities} " ]]; then
203
+ jq ' .' <<< " ${session_capabilities} "
204
204
fi
205
205
}
206
206
@@ -249,15 +249,14 @@ else
249
249
recorded_count=0
250
250
251
251
wait_for_api_respond
252
- while curl --noproxy " *" -H " ${BASIC_AUTH} " -sk --request GET ${NODE_STATUS_ENDPOINT} > /tmp/status.json; do
253
- session_id=$( jq -r " ${JQ_SESSION_ID_QUERY} " /tmp/status.json)
252
+ while curl --noproxy " *" -H " ${BASIC_AUTH} " -sk --request GET ${NODE_STATUS_ENDPOINT} > " /tmp/status.json" ; do
253
+ session_id=" $( jq -r " ${JQ_SESSION_ID_QUERY} " " /tmp/status.json" ) "
254
254
if [[ " $session_id " != " null" && " $session_id " != " " && " $session_id " != " reserved" && " $recording_started " = " false" ]]; then
255
255
echo " $( date -u +" ${ts_format} " ) [${process_name} ] - Session: $session_id is created"
256
- return_list=($( bash ${VIDEO_CONFIG_DIRECTORY} /video_graphQLQuery.sh " $session_id " ) )
256
+ session_capabilities=" $( jq -r " ${JQ_SESSION_CAPABILITIES_QUERY} " " /tmp/status.json" ) "
257
+ return_list=($( bash " ${VIDEO_CONFIG_DIRECTORY} /video_nodeQuery.sh" " ${session_id} " " ${session_capabilities} " ) )
257
258
caps_se_video_record=" ${return_list[0]} "
258
259
video_file_name=" ${return_list[1]} .mp4"
259
- endpoint_url=" ${return_list[2]} "
260
- /opt/bin/validate_endpoint.sh " ${endpoint_url} " " true"
261
260
if [[ " $caps_se_video_record " = " true" ]]; then
262
261
echo " $( date -u +" ${ts_format} " ) [${process_name} ] - Start recording: $caps_se_video_record , video file name: $video_file_name "
263
262
log_node_response
0 commit comments