Improve distributable tests: update start params & clarify log output

Previously the start params used the old Mockttp form, not the
plugin-aware version, and didn't start the WebRTC plugin at all, so when
it broke recently (1.10.2) the tests didn't detect it.

We now include the WebRTC plugin, using near-identical params to the UI,
and also expand the logging so that you can more clearly see what's
going on and spot issues like this in the distributable test output in
future.

Author: pimterry

test/distributables-test/unix.sh

@@ -6,33 +6,41 @@ ls -la *
 
 tar -xvzf ./distributables/v*/httptoolkit-server-*-$1-x64.tar.gz
 
-echo "Starting server..."
+echo "\nStarting server..."
 
 ./httptoolkit-server/bin/httptoolkit-server start &
 SERVER_PID=$!
 
 sleep 5
 
-echo "Testing server..."
+echo "\nTesting server..."
 
 # CSRF protection fully blocks unrecognized/missing origin requests:
+CURL_OPTIONS="--silent --fail -i"
 WITH_ORIGIN="-HOrigin: https://app.httptoolkit.tech"
 AS_JSON="-HContent-Type: application/json"
 
-# Can start a Mockttp server:
-curl "$WITH_ORIGIN" "$AS_JSON" -v --fail 'http://127.0.0.1:45456/start?port=\{"startPort":8000,"endPort":65535\}' -d '{}'
+echo "\nCan start a Mockttp server"?
+# Uses the default config from the UI:
+curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" 'http://127.0.0.1:45456/start' \
+    --data '{"plugins":{"http":{"options":{"cors":false,"suggestChanges":false,"http2":"fallback","https":{"tlsPassthrough":[]}}},"webrtc":{}}}'
 
-# Can query the API server version:
-curl "$WITH_ORIGIN" "$AS_JSON" -v --fail http://127.0.0.1:45457/ -d '{"query": "query getVersion { version }"}'
+echo "\nCan query the API server version?"
+curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
+    --data '{"query": "query getVersion { version }"}'
 
-# Can get config
-curl "$WITH_ORIGIN" "$AS_JSON" -v --fail http://127.0.0.1:45457/ -d '{"query": "query getConfig { config { certificateContent certificatePath certificateFingerprint } }"}'
+echo "\nCan get config?"
+curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
+    --data '{"query": "query getConfig { config { certificateContent certificatePath certificateFingerprint } }"}'
 
-# Can query interceptors
-curl "$WITH_ORIGIN" "$AS_JSON" -v --fail http://127.0.0.1:45457/ -d '{"query": "query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }"}'
+echo "\nCan query interceptors?"
+curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
+    --data '{"query": "query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }"}'
 
-# Can trigger update (can't test that it actually updates, unfortunately)
-curl "$WITH_ORIGIN" "$AS_JSON" -v --fail http://127.0.0.1:45457/ -d '{"query": "mutation TriggerUpdate { triggerUpdate }"}'
+echo "\nCan trigger update?"
+# (can't test that it actually updates, unfortunately)
+curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
+    --data '{"query": "mutation TriggerUpdate { triggerUpdate }"}'
 
 # ^ This will fail if they receive anything but a 200 result.
 # This ensures that the server is startable, and has minimal functionality for launch.

test/distributables-test/windows.bat

@@ -7,33 +7,53 @@ FOR /F "tokens=*" %%i IN (' %GET_TAR% ') DO SET TAR_PATH=%%i
 
 tar -xvzf %TAR_PATH%
 
+echo:
+echo:
 echo Starting server...
 
 START "server" /b .\httptoolkit-server\bin\httptoolkit-server start
 
 REM The closest we can get to a 10 second delay on Windows in CI, ick:
 ping -n 10 127.0.0.1 >NUL
 
+echo:
+echo:
 echo Testing server...
 
+REM --silent (no progress), --fail on errors, --include headers in logs
+set CURL_OPTIONS="-sfi"
 REM CSRF protection fully blocks unrecognized/missing origin requests:
 set WITH_ORIGIN="-HOrigin: https://app.httptoolkit.tech"
 set AS_JSON="-HContent-Type: application/json"
 
-REM Can start a Mockttp server:
-curl %WITH_ORIGIN% %AS_JSON% -v --fail -X POST "http://127.0.0.1:45456/start?port=\{\"startPort\":8000,\"endPort\":65535\}" || goto :error
-
-REM Can query the API server version:
-curl %WITH_ORIGIN% %AS_JSON% -v --fail http://127.0.0.1:45457/ -d "{\"query\": \"query getVersion { version }\"}" || goto :error
-
-REM Can get config
-curl %WITH_ORIGIN% %AS_JSON% -v --fail http://127.0.0.1:45457/ -d "{\"query\": \"query getConfig { config { certificateContent certificatePath certificateFingerprint } }\"}" || goto :error
-
-REM Can query interceptors
-curl %WITH_ORIGIN% %AS_JSON% -v --fail http://127.0.0.1:45457/ -d "{\"query\": \"query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }\"}" || goto :error
-
-REM Can trigger update (can't test that it actually updates, unfortunately)
-curl %WITH_ORIGIN% %AS_JSON% -v --fail http://127.0.0.1:45457/ -d "{\"query\": \"mutation TriggerUpdate { triggerUpdate }\"}" || goto :error
+echo:
+echo:
+echo Can start a Mockttp server?
+REM Uses the default config from the UI:
+curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% -X POST "http://127.0.0.1:45456/start" ^
+  --data "{\"plugins\":{\"http\":{\"options\":{\"cors\":false,\"suggestChanges\":false,\"http2\":\"fallback\",\"https\":{\"tlsPassthrough\":[]}}},\"webrtc\":{}}}" ^
+  || goto :error`
+
+echo:
+echo:
+echo Can query the API server version?
+curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getVersion { version }\"}" || goto :error
+
+echo:
+echo:
+echo Can get config?
+curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getConfig { config { certificateContent certificatePath certificateFingerprint } }\"}" || goto :error
+
+echo:
+echo:
+echo Can query interceptors?
+curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }\"}" || goto :error
+
+echo:
+echo:
+echo Can trigger update?
+REM (can't test that it actually updates, unfortunately)
+curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"mutation TriggerUpdate { triggerUpdate }\"}" || goto :error
 
 REM ^ This will fail if they receive anything but a 200 result.
 REM This ensures that the server is startable, and has minimal functionality for launch.