add reflection hot-reinstall test via cfadmin updateRHExtension

Author: zspitzer

.github/workflows/main.yml

@@ -391,13 +391,14 @@ jobs:
             lucee-express/lucee-server/context/logs/
 
   test-config-override:
-    name: Test - Config override (LUCEE_WEBSOCKET_CONFIG + alt directory)
+    name: Test - Config override + reflection hot-reinstall
     runs-on: ubuntu-latest
     needs: [build-extension]
     env:
       LUCEE_LOGGING_FORCE_APPENDER: console
       LUCEE_LOGGING_FORCE_LEVEL: info
       LUCEE_WEBSOCKET_CONFIG: /tmp/ws-alt-config.json
+      LUCEE_ADMIN_PASSWORD: testadmin
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -455,7 +456,13 @@ jobs:
       - name: Configure Tomcat port
         run: sed -i 's/port="8080"/port="8888"/g' lucee-express/conf/server.xml
 
-      - name: Start Lucee Express (with LUCEE_WEBSOCKET_CONFIG in env)
+      - name: Resolve built .lex absolute path
+        run: |
+          LEX_FILE=$(ls $GITHUB_WORKSPACE/extension/*.lex | head -1)
+          echo "WS_EXT_LEX_PATH=$LEX_FILE" >> $GITHUB_ENV
+          echo "Resolved .lex to: $LEX_FILE"
+
+      - name: Start Lucee Express (with LUCEE_WEBSOCKET_CONFIG + LUCEE_ADMIN_PASSWORD in env)
         run: cd lucee-express && ./bin/catalina.sh start
 
       - name: Wait for server
@@ -479,6 +486,33 @@ jobs:
             echo "CONFIG_OVERRIDE_FAILED=true" >> $GITHUB_OUTPUT
           fi
 
+      - name: Run reflection hot-reinstall test
+        id: reflection-test
+        continue-on-error: true
+        run: |
+          RESPONSE=$(curl -s -w "\n%{http_code}" http://localhost:8888/tests/integration/test-reflection-reinstall.cfm)
+          HTTP_CODE=$(echo "$RESPONSE" | tail -1)
+          BODY=$(echo "$RESPONSE" | sed '$d')
+          echo "$BODY"
+          if [ "$HTTP_CODE" != "200" ] || echo "$BODY" | grep -q "FAILED"; then
+            echo "REFLECTION_FAILED=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Verify reflection warning in catalina.out
+        id: reflection-log-check
+        continue-on-error: true
+        run: |
+          # The reflection fallback path logs "calling [onOpen] via reflection, servlet engine restart needed"
+          # (see BaseWebSocketEndpoint and LDEV-6221). If the hot re-install actually exercised this path,
+          # the warning will appear in catalina.out. If not, the round-trip test is lying.
+          if grep -q "calling \[.*\] via reflection" lucee-express/logs/catalina.out; then
+            echo "Reflection warning found — hot re-install exercised the fallback path"
+            grep "calling \[.*\] via reflection" lucee-express/logs/catalina.out
+          else
+            echo "REFLECTION_LOG_MISSING=true" >> $GITHUB_OUTPUT
+            echo "Reflection warning NOT found in catalina.out — hot re-install did not hit the fallback path"
+          fi
+
       - name: Dump WebSocket event logs
         if: always()
         run: |
@@ -504,8 +538,8 @@ jobs:
             lucee-express/logs/
             lucee-express/lucee-server/context/logs/
 
-      - name: Fail if test failed
-        if: steps.config-override-test.outputs.CONFIG_OVERRIDE_FAILED == 'true'
+      - name: Fail if any sub-test failed
+        if: steps.config-override-test.outputs.CONFIG_OVERRIDE_FAILED == 'true' || steps.reflection-test.outputs.REFLECTION_FAILED == 'true' || steps.reflection-log-check.outputs.REFLECTION_LOG_MISSING == 'true'
         run: exit 1
 
   deploy:

tests/integration/test-reflection-reinstall.cfm

@@ -0,0 +1,75 @@
+<cfscript>
+// Triggers a hot re-install of the websocket extension via cfadmin and verifies
+// the round-trip still works afterwards. The CI job then greps catalina.out for
+// the "calling [onOpen] via reflection" warning to prove the reflection fallback
+// (LDEV-6221) was actually exercised.
+//
+// Preconditions set by the surrounding CI job:
+//   - LUCEE_ADMIN_PASSWORD env var is set and matches Lucee's server admin password
+//   - WS_EXT_LEX_PATH env var points at the built .lex on disk
+//   - A listener (TestListener) is reachable at ws://localhost:8888/ws/TestListener
+
+writeOutput( "=== Reflection Hot-Reinstall Test ===" & chr( 10 ) );
+
+try {
+	if ( !structKeyExists( getFunctionList(), "CreateWebSocketClient" ) )
+		throw( message="CreateWebSocketClient not available", type="TestSetupError" );
+
+	adminPassword = server.system.environment.LUCEE_ADMIN_PASSWORD ?: "";
+	lexPath       = server.system.environment.WS_EXT_LEX_PATH    ?: "";
+
+	if ( adminPassword == "" )
+		throw( message="LUCEE_ADMIN_PASSWORD env var not set", type="TestSetupError" );
+	if ( lexPath == "" || !fileExists( lexPath ) )
+		throw( message="WS_EXT_LEX_PATH does not resolve to a file: [#lexPath#]", type="TestSetupError" );
+
+	writeOutput( "Re-installing extension from: " & lexPath & chr( 10 ) );
+
+	// Trigger re-install via admin API. This is synchronous — when it returns,
+	// the new extension's startup hook has already run and either:
+	//   - re-registered endpoints normally (if Tomcat allowed it), OR
+	//   - fallen back to inject() via reflection (the LDEV-6221 path)
+	cfadmin(
+		action   = "updateRHExtension",
+		type     = "server",
+		password = adminPassword,
+		source   = lexPath
+	);
+
+	writeOutput( "Re-install complete. Running round-trip test..." & chr( 10 ) );
+
+	// Round-trip — must still work post-reinstall
+	wsUrl    = "ws://localhost:8888/ws/TestListener";
+	listener = new tests.integration.ClientListener();
+	ws       = CreateWebSocketClient( wsUrl, listener );
+	sleep( 500 );
+
+	ws.sendText( "reflectionCheck" );
+	sleep( 500 );
+
+	ws.disconnect();
+	sleep( 500 );
+
+	received = listener.getMessages();
+	writeOutput( "Received: " & received.toJSON() & chr( 10 ) );
+
+	errors = [];
+	if ( !received.find( "ECHO:reflectionCheck" ) )
+		arrayAppend( errors, "expected ECHO:reflectionCheck after re-install; got: " & received.toJSON() );
+
+	if ( arrayLen( errors ) ) {
+		writeOutput( chr( 10 ) & "FAILED:" & chr( 10 ) );
+		for ( err in errors )
+			writeOutput( "  - #err#" & chr( 10 ) );
+		cfheader( statuscode=500, statustext="Test Failed" );
+	}
+	else {
+		writeOutput( chr( 10 ) & "SUCCESS: round-trip works after hot re-install — CI will verify the reflection warning in catalina.out" & chr( 10 ) );
+	}
+}
+catch ( any e ) {
+	writeOutput( "FAILED with exception:" & chr( 10 ) );
+	writeOutput( e.stacktrace );
+	cfheader( statuscode=500, statustext="Test Failed" );
+}
+</cfscript>