goldsync 0.1.12 → 0.1.14

package/assets/GoldSync.rbxmx

@@ -22,7 +22,7 @@ local CLIENT_HEADERS = {
 }
 local SETTINGS_PREFIX = "GoldSync:v2:"
 local UI_SETTINGS_PREFIX = "GoldSync:ui:v1:"
-local VERSION = "0.1.11"
+local VERSION = "0.1.14"
 local REQUEST_INTERVAL_SECONDS = 0.15
 local REQUEST_RETRY_DELAYS = { 1, 2, 4 }
 
@@ -340,6 +340,8 @@ local lastRequestAt = 0
 local serverConfig
 local states = {}
 local groups = {}
+local batchingStatusUpdates = false
+local splitRootConnections = {}
 local refreshConfig
 local updateGroupSummaries
 local refreshStatusSummary
@@ -369,6 +371,31 @@ local function collectSplitPaths(root, depth)
 	return paths
 end
 
+local function collectSplitInstances(root, depth)
+	local current = { root }
+	for _ = 1, depth do
+		local nextLevel = {}
+		for _, parent in current do
+			for _, child in parent:GetChildren() do
+				table.insert(nextLevel, child)
+			end
+		end
+		current = nextLevel
+	end
+	return current
+end
+
+local function isAtSplitDepth(root, instance, depth)
+	local current = instance
+	for _ = 1, depth do
+		if not current or current == root then
+			return false
+		end
+		current = current.Parent
+	end
+	return current == root
+end
+
 local function acquireRequestLock()
 	if requestLocked then
 		local waiter = Instance.new("BindableEvent")
@@ -464,6 +491,113 @@ local function resolveParent(studioPath)
 	return current
 end
 
+local function disconnectSplitRoot(id)
+	local watched = splitRootConnections[id]
+	if not watched then
+		return
+	end
+	for _, connection in watched.connections do
+		connection:Disconnect()
+	end
+	for _, connection in watched.nameConnections do
+		connection:Disconnect()
+	end
+	splitRootConnections[id] = nil
+end
+
+local function disconnectSplitRoots()
+	local ids = {}
+	for id in splitRootConnections do
+		table.insert(ids, id)
+	end
+	for _, id in ids do
+		disconnectSplitRoot(id)
+	end
+end
+
+local function discoverSplitRoot(splitRoot, root)
+	if not serverConfig or splitRootConnections[splitRoot.id] == nil then
+		return
+	end
+	local existingPaths = {}
+	for _, manifest in serverConfig.roots do
+		if manifest.splitRootId == splitRoot.id then
+			existingPaths[table.concat(manifest.studioPath, "\0")] = true
+		end
+	end
+	local missingPaths = {}
+	for _, relativePath in collectSplitPaths(root, splitRoot.splitDepth) do
+		local fullPath = table.clone(splitRoot.studioPath)
+		for _, segment in relativePath do
+			table.insert(fullPath, segment)
+		end
+		if not existingPaths[table.concat(fullPath, "\0")] then
+			table.insert(missingPaths, relativePath)
+		end
+	end
+	if #missingPaths > 0 then
+		request("POST", "/v1/splits/" .. splitRoot.id .. "/discover", HttpService:JSONEncode({ paths = missingPaths }), {
+			["Content-Type"] = "application/json",
+		})
+	end
+end
+
+local function watchSplitRoot(splitRoot)
+	local root = resolveRoot(splitRoot.studioPath)
+	local watched = splitRootConnections[splitRoot.id]
+	if watched and watched.root == root then
+		return
+	end
+	disconnectSplitRoot(splitRoot.id)
+	if not root then
+		return
+	end
+
+	local entry = {
+		root = root,
+		generation = 0,
+		connections = {},
+		nameConnections = {},
+	}
+	splitRootConnections[splitRoot.id] = entry
+	local function scheduleDiscovery()
+		entry.generation += 1
+		local generation = entry.generation
+		task.delay(0.1, function()
+			if running and splitRootConnections[splitRoot.id] == entry and entry.generation == generation then
+				discoverSplitRoot(splitRoot, root)
+			end
+		end)
+	end
+	local function watchName(instance)
+		if entry.nameConnections[instance] or not isAtSplitDepth(root, instance, splitRoot.splitDepth) then
+			return
+		end
+		entry.nameConnections[instance] = instance:GetPropertyChangedSignal("Name"):Connect(scheduleDiscovery)
+	end
+	for _, instance in collectSplitInstances(root, splitRoot.splitDepth) do
+		watchName(instance)
+	end
+	table.insert(entry.connections, root.DescendantAdded:Connect(function(descendant)
+		watchName(descendant)
+		scheduleDiscovery()
+	end))
+	table.insert(entry.connections, root.DescendantRemoving:Connect(function(descendant)
+		local connection = entry.nameConnections[descendant]
+		if connection then
+			connection:Disconnect()
+			entry.nameConnections[descendant] = nil
+		end
+		scheduleDiscovery()
+	end))
+	table.insert(entry.connections, root.AncestryChanged:Connect(function()
+		if resolveRoot(splitRoot.studioPath) ~= root then
+			disconnectSplitRoot(splitRoot.id)
+		end
+	end))
+	discoverSplitRoot(splitRoot, root)
+end
+
 local function applyClassIcon(image, className)
 	local success, icon = pcall(function()
 		return StudioService:GetClassIcon(className)
@@ -499,12 +633,8 @@ local function findCode(root)
 end
 
 local function setStatus(state, text, color)
-	local previousStatusKind = state.statusKind
-	state.status.Text = text
-	state.status.TextColor3 = color or Color3.fromRGB(180, 180, 190)
-	state.dot.TextColor3 = color or Color3.fromRGB(180, 180, 190)
-	state.searchQuery = nil
-	state.statusKind = if string.sub(text, 1, 6) == "Synced"
+	local statusColor = color or Color3.fromRGB(180, 180, 190)
+	local statusKind = if string.sub(text, 1, 6) == "Synced"
 		then "synced"
 		elseif string.find(text, "syncing")
 			or string.find(text, "Serializing")
@@ -514,7 +644,16 @@ local function setStatus(state, text, color)
 		then "working"
 		elseif string.find(text, "Rojo") and string.find(text, "offline") then "paused"
 		else "issue"
-	if updateGroupSummaries then
+	if state.status.Text == text and state.status.TextColor3 == statusColor and state.statusKind == statusKind then
+		return
+	end
+	local previousStatusKind = state.statusKind
+	state.status.Text = text
+	state.status.TextColor3 = statusColor
+	state.dot.TextColor3 = statusColor
+	state.searchQuery = nil
+	state.statusKind = statusKind
+	if updateGroupSummaries and not batchingStatusUpdates then
 		if previousStatusKind ~= state.statusKind then
 			updateGroupSummaries()
 		elseif refreshStatusSummary then
@@ -2393,6 +2532,19 @@ searchBox:GetPropertyChangedSignal("Text"):Connect(function()
 	end)
 end)
 
+local function manifestChanged(previous, current)
+	return not previous
+		or previous.hash ~= current.hash
+		or previous.exists ~= current.exists
+		or previous.deleted ~= current.deleted
+		or previous.revision ~= current.revision
+		or previous.gitConflict ~= current.gitConflict
+		or previous.conflictToken ~= current.conflictToken
+		or previous.file ~= current.file
+		or previous.splitRootId ~= current.splitRootId
+		or table.concat(previous.studioPath, "\0") ~= table.concat(current.studioPath, "\0")
+end
+
 refreshConfig = function()
 	local response, requestError = request("GET", "/v1/config")
 	if not response or not response.Success then
@@ -2407,13 +2559,15 @@ refreshConfig = function()
 	end
 
 	local decoded = HttpService:JSONDecode(response.Body)
-	if serverConfig
+	local projectChanged = serverConfig
 		and (serverConfig.projectId ~= decoded.projectId or serverConfig.workspaceId ~= decoded.workspaceId)
-	then
+	local connectionChanged = serverConfig and serverConfig.rojoConnected ~= decoded.rojoConnected
+	if projectChanged then
 		for _, state in states do
 			disconnectRoot(state)
 			destroyConflictWorkspace(state)
 		end
+		disconnectSplitRoots()
 		table.clear(states)
 		for _, child in rootsContainer:GetChildren() do
 			if child ~= rootsLayout then
@@ -2432,36 +2586,38 @@ refreshConfig = function()
 	end
 	connectionDot.TextColor3 = connectionStatus.TextColor3
 
-	local existingSplitPaths = {}
-	for _, manifest in decoded.roots do
-		if manifest.splitRootId then
-			existingSplitPaths[manifest.splitRootId .. "\0" .. table.concat(manifest.studioPath, "\0")] = true
-		end
-	end
+	local currentSplitRootIds = {}
 	for _, splitRoot in decoded.splitRoots do
-		local root = resolveRoot(splitRoot.studioPath)
-		if root then
-			local missingPaths = {}
-			for _, relativePath in collectSplitPaths(root, splitRoot.splitDepth) do
-				local fullPath = table.clone(splitRoot.studioPath)
-				for _, segment in relativePath do
-					table.insert(fullPath, segment)
-				end
-				if not existingSplitPaths[splitRoot.id .. "\0" .. table.concat(fullPath, "\0")] then
-					table.insert(missingPaths, relativePath)
-				end
-			end
-			if #missingPaths > 0 then
-				request("POST", "/v1/splits/" .. splitRoot.id .. "/discover", HttpService:JSONEncode({ paths = missingPaths }), {
-					["Content-Type"] = "application/json",
-				})
-			end
+		currentSplitRootIds[splitRoot.id] = true
+		watchSplitRoot(splitRoot)
+	end
+	local staleSplitRootIds = {}
+	for id in splitRootConnections do
+		if not currentSplitRootIds[id] then
+			table.insert(staleSplitRootIds, id)
 		end
 	end
+	for _, id in staleSplitRootIds do
+		disconnectSplitRoot(id)
+	end
 
+	local treeChanged = projectChanged == true or connectionChanged == true
+	batchingStatusUpdates = true
 	for order, manifest in decoded.roots do
-		local state = states[manifest.id] or createRootRow(manifest, order)
-		reconcile(state, manifest)
+		local state = states[manifest.id]
+		local created = state == nil
+		if created then
+			state = createRootRow(manifest, order)
+		end
+		local resolvedRoot = resolveRoot(manifest.studioPath)
+		local rootChanged = state.observedRoot ~= resolvedRoot
+		state.observedRoot = resolvedRoot
+		if created or connectionChanged or rootChanged or manifestChanged(state.manifest, manifest) then
+			reconcile(state, manifest)
+			treeChanged = true
+		else
+			state.manifest = manifest
+		end
 	end
 	local currentIds = {}
 	for _, manifest in decoded.roots do
@@ -2479,9 +2635,13 @@ refreshConfig = function()
 		destroyConflictWorkspace(state)
 		state.row:Destroy()
 		states[id] = nil
+		treeChanged = true
+	end
+	batchingStatusUpdates = false
+	if treeChanged then
+		updateGroupSummaries()
+		applyTreeFilter()
 	end
-	updateGroupSummaries()
-	applyTreeFilter()
 	return true
 end
 
@@ -2497,6 +2657,7 @@ end)
 
 plugin.Unloading:Connect(function()
 	running = false
+	disconnectSplitRoots()
 	for _, state in states do
 		disconnectRoot(state)
 		destroyConflictWorkspace(state)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldsync",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Automatic native Roblox asset synchronization for Rojo projects.",
   "author": "tay",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -20,6 +20,7 @@
   "scripts": {
     "test": "node --test",
     "package:companion": "node scripts/package-companion.mjs",
+    "prepublishOnly": "npm test",
     "prepack": "node scripts/prepare-npm-package.mjs",
     "postpack": "node scripts/cleanup-npm-package.mjs"
   },