Preserve inherited server URLs when switching to custom streaming

Author: aleksandr-voitenko

js/module.ts

@@ -2456,6 +2456,9 @@ interface INodeObs {
 
     /**
      * Saves a complete legacy settings category, including native field metadata.
+     * Converting a common RTMP service to custom restores the exact native URL
+     * when the submitted server matches the previous form value. Inherited automatic
+     * selections are resolved to a URL; explicitly edited server values are preserved.
      * @param category - Category name, such as `Stream` or `StreamSecond`
      * @param settings - The `data` array from `OBS_settings_getSettings(category)`,
      * with edited `currentValue` fields; keep the stream type field first

obs-studio-server/source/nodeobs_settings.cpp

@@ -973,18 +973,23 @@ bool OBS_settings::saveStreamSettings(std::vector<SubCategory> streamSettings, S
 	if (currentStreamType == "rtmp_common" && newserviceTypeValue == "rtmp_custom") {
 		const std::string server = obs_data_get_string(settings, "server");
 		const std::string currentServer = obs_data_get_string(currentSettings, "server");
-		// Automatic selections belong to the common provider. Resolve an inherited
-		// selection before replacing that service; an explicitly entered URL wins.
-		if (!server.empty() && server == currentServer && server.find("://") == std::string::npos) {
-			// Fresh profiles populate the settings object before the service has
-			// received an update. Resolve from that snapshot without mutating it.
-			OBSServiceAutoRelease resolver = obs_service_create("rtmp_common", "stream_settings_resolver", currentSettings, nullptr);
-			if (!resolver)
-				return false;
-			const char *resolvedServer = obs_service_get_connect_info(resolver, OBS_SERVICE_CONNECT_INFO_SERVER_URL);
-			if (!resolvedServer || std::string(resolvedServer).find("://") == std::string::npos)
-				return false;
-			obs_data_set_string(settings, "server", resolvedServer);
+		// Compare against the previous form value, which omits a trailing slash.
+		// Keep the submitted spelling intact when the user explicitly changes it.
+		if (!server.empty() && server == getStreamSettingListValue(currentServer.c_str())) {
+			if (currentServer.find("://") != std::string::npos) {
+				obs_data_set_string(settings, "server", currentServer.c_str());
+			} else {
+				// Automatic selections belong to the common provider. Fresh profiles
+				// populate settings before updating the service, so resolve from that
+				// snapshot without mutating the current service.
+				OBSServiceAutoRelease resolver = obs_service_create("rtmp_common", "stream_settings_resolver", currentSettings, nullptr);
+				if (!resolver)
+					return false;
+				const char *resolvedServer = obs_service_get_connect_info(resolver, OBS_SERVICE_CONNECT_INFO_SERVER_URL);
+				if (!resolvedServer || std::string(resolvedServer).find("://") == std::string::npos)
+					return false;
+				obs_data_set_string(settings, "server", resolvedServer);
+			}
 		}
 	}
 
@@ -1007,7 +1012,7 @@ bool OBS_settings::saveStreamSettings(std::vector<SubCategory> streamSettings, S
 				continue;
 
 			// Match the form's normalized spelling, but retain the exact native
-			// endpoint: providers such as Facebook require its trailing slash.
+			// endpoint, including any trailing slash in the catalog.
 			std::string value = obs_property_list_item_string(property, i);
 			if (value.empty())
 				continue;

tests/osn-tests/src/test_nodeobs_settings.ts

@@ -248,8 +248,8 @@ describe(testName, function() {
                 const selectedServer = choices[0];
                 expect(selectedServer.endsWith('/rtmp')).to.equal(true);
 
-                // Facebook validates the exact native URL, including its final slash.
-                // The generic form exposes that same choice without the final slash.
+                // The Facebook catalog URL includes a final slash that the generic
+                // form omits from the displayed choice.
                 save({ server: selectedServer, key: dummyKey });
                 expectSaved({ service: 'Facebook Live', server: selectedServer, key: dummyKey }, `${selectedServer}/`);
                 save({ show_all: true });
@@ -273,6 +273,44 @@ describe(testName, function() {
                 expectSaved({ streamType: 'rtmp_custom', server: youtubeServer, key: dummyKey });
             });
 
+            it('Preserves the Facebook catalog URL when switching to custom streaming', function() {
+                save({ service: 'Facebook Live' });
+                save({ key: dummyKey });
+                const formServer = field('server').currentValue;
+                const nativeServer = JSON.parse(fs.readFileSync(configPath, 'utf8')).settings.server;
+                expect(nativeServer).to.equal(`${formServer}/`);
+
+                save({ streamType: 'rtmp_custom' });
+
+                expectSaved({ streamType: 'rtmp_custom', server: nativeServer, key: dummyKey });
+
+                // After conversion the custom field exposes the exact URL, so a
+                // deliberate removal of its trailing slash must remain possible.
+                save({ server: formServer });
+                expectSaved({ streamType: 'rtmp_custom', server: formServer, key: dummyKey });
+            });
+
+            it('Keeps an explicit replacement URL when leaving Facebook common streaming', function() {
+                save({ service: 'Facebook Live' });
+                save({ key: dummyKey });
+                const server = 'rtmps://custom.example.invalid:443/application/';
+
+                save({ streamType: 'rtmp_custom', server });
+
+                expectSaved({ streamType: 'rtmp_custom', server, key: dummyKey });
+            });
+
+            it('Keeps an explicitly added trailing slash when switching to custom streaming', function() {
+                save({ service: 'YouTube - RTMPS' });
+                save({ server: youtubeServer, key: dummyKey });
+                expect(field('server').currentValue).to.equal(youtubeServer);
+                const server = `${youtubeServer}/`;
+
+                save({ streamType: 'rtmp_custom', server });
+
+                expectSaved({ streamType: 'rtmp_custom', server, key: dummyKey });
+            });
+
             it('Resolves the automatic Twitch server when switching to custom streaming', function() {
                 save({ key: dummyKey });
                 expect(field('server').currentValue).to.equal('auto');