dominus-cli 2.1.0 → 2.2.0

package/plugin/src/BridgeConfig.lua

@@ -0,0 +1,2 @@
+-- Replaced with a user-specific token by dominus-install-plugin.
+return "__DOMINUS_BRIDGE_TOKEN__"

package/plugin/src/ValueCodec.lua

@@ -51,12 +51,13 @@ local function decodeEnum(current, value)
 	if type(value) ~= "string" then
 		error("Enum value must be a string")
 	end
-	local enumName = tostring(current.EnumType):match("Enum%.(.+)")
 	local itemName = value:match("Enum%.[^.]+%.(.+)") or value
-	if not enumName or not Enum[enumName] or not Enum[enumName][itemName] then
-		error("Invalid enum value " .. value)
+	for _, item in current.EnumType:GetEnumItems() do
+		if item.Name == itemName then
+			return item
+		end
 	end
-	return Enum[enumName][itemName]
+	error("Invalid enum value " .. value .. " for " .. tostring(current.EnumType))
 end
 
 function ValueCodec.decodeForCurrent(current, value)
@@ -208,7 +209,7 @@ function ValueCodec.encode(value)
 end
 
 function ValueCodec.setProperty(instance, propertyName, value)
-	if propertyName == "Parent" or propertyName == "ClassName" then
+	if propertyName == "Parent" or propertyName == "ClassName" or propertyName == "Source" then
 		error("Property cannot be changed through setProperties: " .. propertyName)
 	end
 	local readOk, current = pcall(function()

package/plugin/src/WsClient.lua

@@ -4,6 +4,7 @@ local WsClient = {}
 
 local currentConnection = nil
 local currentSignals = {}
+local currentCancel = nil
 local generation = 0
 
 local function disconnectSignals()
@@ -46,6 +47,10 @@ function WsClient.connect(url, callbacks, timeoutSeconds)
 		completed = true
 		completion:Fire(success, reason)
 	end
+	local function cancelPending()
+		finish(false, "Connection cancelled")
+	end
+	currentCancel = cancelPending
 
 	table.insert(
 		currentSignals,
@@ -112,6 +117,9 @@ function WsClient.connect(url, callbacks, timeoutSeconds)
 	end)
 
 	local success, reason = completion.Event:Wait()
+	if currentCancel == cancelPending then
+		currentCancel = nil
+	end
 	completion:Destroy()
 	if not success then
 		closeCandidate(candidate)
@@ -138,6 +146,11 @@ end
 
 function WsClient.disconnect()
 	generation += 1
+	local cancelPending = currentCancel
+	currentCancel = nil
+	if cancelPending then
+		cancelPending()
+	end
 	local connection = currentConnection
 	currentConnection = nil
 	disconnectSignals()

package/plugin/src/init.server.lua

@@ -1,5 +1,6 @@
 local HttpService = game:GetService("HttpService")
 
+local EmbeddedBridgeToken = require(script.BridgeConfig)
 local CommandRouter = require(script.CommandRouter)
 local Protocol = require(script.Protocol)
 local Watcher = require(script.Watcher)
@@ -22,6 +23,7 @@ local shouldReconnect = true
 local reconnectScheduled = false
 local reconnectDelay = 1
 local shuttingDown = false
+local connecting = false
 
 local function getSetting(name, default)
 	local ok, value = pcall(function()
@@ -41,6 +43,12 @@ if type(clientId) ~= "string" then
 	end)
 end
 local bridgeToken = getSetting("Dominus2BridgeToken", nil)
+if type(EmbeddedBridgeToken) == "string" and EmbeddedBridgeToken ~= "__DOMINUS_BRIDGE_TOKEN__" then
+	bridgeToken = EmbeddedBridgeToken
+	pcall(function()
+		plugin:SetSetting("Dominus2BridgeToken", bridgeToken)
+	end)
+end
 local port = tonumber(getSetting("Dominus2Port", DEFAULT_PORT)) or DEFAULT_PORT
 
 local function log(message)
@@ -83,17 +91,6 @@ local function handleMessage(rawMessage)
 		return
 	end
 
-	if message.type == "server:pairing_required" then
-		local payload = message.payload or {}
-		log(
-			"Pairing required. In your MCP client call dominus_pair_studio with connectionId "
-				.. tostring(payload.connectionId)
-				.. " and code "
-				.. tostring(payload.pairingCode)
-		)
-		return
-	end
-
 	if message.type == "server:authenticated" then
 		local payload = message.payload or {}
 		if payload.protocolVersion ~= PROTOCOL_VERSION or type(payload.connectionId) ~= "string" then
@@ -119,7 +116,7 @@ local function handleMessage(rawMessage)
 	end
 
 	if message.type == "server:auth_rejected" then
-		warn("[Dominus 2] Authentication rejected: " .. tostring(message.payload and message.payload.error))
+		warn("[Dominus 2] Authentication failed. Run dominus-install-plugin and restart Studio.")
 		WsClient.disconnect()
 		return
 	end
@@ -135,6 +132,13 @@ local function connect()
 	if shuttingDown or transportOpen then
 		return
 	end
+	if connecting then
+		if shouldReconnect then
+			scheduleReconnect()
+		end
+		return
+	end
+	connecting = true
 	reconnectScheduled = false
 	local success = WsClient.connect("ws://127.0.0.1:" .. port, {
 		onOpen = function()
@@ -156,6 +160,8 @@ local function connect()
 			})
 			if not sent then
 				warn("[Dominus 2] Could not send handshake: " .. tostring(sendErr))
+				stopSession()
+				WsClient.disconnect()
 			end
 		end,
 		onMessage = function(message)
@@ -174,9 +180,15 @@ local function connect()
 		onError = function(statusCode, errorMessage)
 			if transportOpen then
 				warn("[Dominus 2] Bridge error " .. tostring(statusCode) .. ": " .. tostring(errorMessage))
+				stopSession()
+				WsClient.disconnect()
+				if shouldReconnect then
+					scheduleReconnect()
+				end
 			end
 		end,
 	}, 4)
+	connecting = false
 	if not success then
 		stopSession()
 		if shouldReconnect then
@@ -201,16 +213,17 @@ scheduleReconnect = function()
 end
 
 connectButton.Click:Connect(function()
-	if transportOpen or WsClient.isConnected() then
-		shouldReconnect = false
-		WsClient.disconnect()
-		stopSession()
-		log("Automatic connection disabled; click Dominus 2 to reconnect")
-	else
-		shouldReconnect = true
-		reconnectDelay = 1
-		task.spawn(connect)
-	end
+	shouldReconnect = true
+	reconnectDelay = 1
+	stopSession()
+	WsClient.disconnect()
+	log("Reconnecting to the Dominus 2 MCP server")
+	task.spawn(function()
+		while connecting and not shuttingDown do
+			task.wait()
+		end
+		connect()
+	end)
 end)
 
 task.delay(1, function()