Use GetObjects as fallback for instances that can't be created normally

Cargo.toml

@@ -81,7 +81,7 @@ regex = "1.3.1"
 reqwest = "0.9.20"
 ritz = "0.1.0"
 rlua = "0.17.0"
-roblox_install = "0.2.2"
+roblox_install = "0.3.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 structopt = "0.3.5"

plugin/src/ApiContext.lua

@@ -248,4 +248,20 @@ function ApiContext:open(id)
 		end)
 end
 
+function ApiContext:createAssets(assets)
+	local url = ("%s/api/create-assets"):format(self.__baseUrl)
+	local body = Http.jsonEncode({
+		sessionId = self.__sessionId,
+		assets = assets,
+	})
+
+	return Http.post(url, body)
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(responseBody)
+			Log.trace("createAssets response: {:#?}", responseBody)
+			return responseBody.url
+		end)
+end
+
 return ApiContext

plugin/src/Config.lua

@@ -1,6 +1,7 @@
 local strict = require(script.Parent.strict)
 
-local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
+-- local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
+local isDevBuild = true
 
 return strict("Config", {
 	isDevBuild = isDevBuild,

plugin/src/ServeSession.lua

@@ -6,8 +6,10 @@ local t = require(script.Parent.Parent.t)
 
 local InstanceMap = require(script.Parent.InstanceMap)
 local PatchSet = require(script.Parent.PatchSet)
+local Promise = require(script.Parent.Parent.Promise)
 local Reconciler = require(script.Parent.Reconciler)
 local strict = require(script.Parent.strict)
+local tryGetObjects = require(script.Parent.tryGetObjects)
 
 local Status = strict("Session.Status", {
 	NotStarted = "NotStarted",
@@ -242,27 +244,44 @@ function ServeSession:__initialSync(rootInstanceId)
 			local unappliedPatch = self.__reconciler:applyPatch(catchUpPatch)
 
 			if not PatchSet.isEmpty(unappliedPatch) then
-				Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
-					PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
+				return tryGetObjects(self.__instanceMap, self.__apiContext, unappliedPatch)
+					:andThen(function(finallyUnappliedPatch)
+						if not PatchSet.isEmpty(finallyUnappliedPatch) then
+							Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
+								PatchSet.humanSummary(self.__instanceMap, finallyUnappliedPatch))
+						end
+					end)
 			end
 		end)
 end
 
 function ServeSession:__mainSyncLoop()
 	return self.__apiContext:retrieveMessages()
 		:andThen(function(messages)
+			-- TODO: Maybe merge all the patches together?
+			local getObjectsPromises = {}
+
 			for _, message in ipairs(messages) do
 				local unappliedPatch = self.__reconciler:applyPatch(message)
 
 				if not PatchSet.isEmpty(unappliedPatch) then
-					Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
-						PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
+					table.insert(getObjectsPromises,
+						tryGetObjects(self.__instanceMap, self.__apiContext, unappliedPatch)
+							:andThen(function(finallyUnappliedPatch)
+								if not PatchSet.isEmpty(finallyUnappliedPatch) then
+									Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
+										PatchSet.humanSummary(self.__instanceMap, finallyUnappliedPatch))
+								end
+							end)
+					)
 				end
 			end
 
-			if self.__status ~= Status.Disconnected then
-				return self:__mainSyncLoop()
-			end
+			return Promise.all(getObjectsPromises):andThen(function()
+				if self.__status ~= Status.Disconnected then
+					return self:__mainSyncLoop()
+				end
+			end)
 		end)
 end
 

plugin/src/init.server.lua

@@ -24,8 +24,8 @@ plugin.Unloading:Connect(function()
 	Roact.unmount(tree)
 end)
 
-if Config.isDevBuild then
-	local TestEZ = require(script.Parent.TestEZ)
+-- if Config.isDevBuild then
+-- 	local TestEZ = require(script.Parent.TestEZ)
 
-	require(script.runTests)(TestEZ)
-end
+-- 	require(script.runTests)(TestEZ)
+-- end

plugin/src/tryGetObjects.lua

@@ -0,0 +1,88 @@
+local Fmt = require(script.Parent.Parent.Fmt)
+local Log = require(script.Parent.Parent.Log)
+local PatchSet = require(script.Parent.PatchSet)
+local Promise = require(script.Parent.Parent.Promise)
+
+local function tryGetObjects(instanceMap, apiContext, patch)
+	assert(PatchSet.validate(patch))
+
+	local unappliedPatch = PatchSet.newEmpty()
+
+	-- GetObjects won't help with anything that failed to remove
+	unappliedPatch.removed = patch.removed
+	-- TODO: Implement this? Do we have to?
+	unappliedPatch.added = patch.added
+
+	local assetsToRequest = {}
+	local receiveCallbacks = {}
+
+	Log.trace("tryGetObjects({:#?})", patch)
+
+	-- TODO: added?
+
+	-- GetObjects only create instances, we can't update the properties of existing ones.
+	-- Instead, just create them again, move their children, and replace the instance.
+	for _, update in ipairs(patch.updated) do
+		table.insert(assetsToRequest, update.id)
+		table.insert(unappliedPatch.updated, update)
+
+		receiveCallbacks[update.id] = function(newInstance)
+			table.remove(unappliedPatch.updated, table.find(unappliedPatch.updated, update))
+
+			local oldInstance = instanceMap.fromIds[update.id]
+
+			-- TODO: What if oldInstance is nil?
+			-- TODO: This will dupe children if the rbxm is not empty.
+			for _, oldChild in ipairs(oldInstance:GetChildren()) do
+				oldChild.Parent = newInstance
+			end
+
+			local oldParent = oldInstance.Parent
+			instanceMap:destroyInstance(oldInstance)
+			newInstance.Parent = oldParent
+		end
+	end
+
+	if #assetsToRequest == 0 then
+		return Promise.resolve(unappliedPatch)
+	end
+
+	return apiContext:createAssets(assetsToRequest):andThen(function(assetId)
+		--[[
+			The assets Rojo creates that we will be loading is in the following structure:
+
+			Assuming we requested the following IDs:
+			- DOGE: A doge mesh named Doge
+			- ROCK: A rock mesh named MyPet
+
+			Root: Folder
+			* DOGE: Folder
+				* Doge: MeshPart
+			* ROCK: Folder
+				* MyPet: MeshPart
+		]]
+
+		-- GetObjects doesn't yield, it blocks.
+		-- There is no way to promisify this unless GetObjectsAsync is opened up.
+		local createdAssets = game:GetObjects(assetId)[1]
+
+		if createdAssets == nil then
+			Log.warn("Request to create assets returned an asset that was empty.")
+			return unappliedPatch
+		end
+
+		for _, assetFolder in ipairs(createdAssets:GetChildren()) do
+			local requestedId = assetFolder.Name
+
+			-- TODO: Does this need to support multi-rooted instances? Probably not?
+			local assetInstance = assetFolder:GetChildren()[1]
+
+			receiveCallbacks[requestedId](assetInstance)
+			instanceMap:insert(requestedId, assetInstance)
+		end
+
+		return unappliedPatch
+	end)
+end
+
+return tryGetObjects

plugin/src/tryGetObjects.spec.lua

@@ -0,0 +1,39 @@
+-- TODO: Have some documentation/script in order to force the rbxassets to be there
+return function()
+	local InstanceMap = require(script.Parent.InstanceMap)
+	local PatchSet = require(script.Parent.PatchSet)
+	local Promise = require(script.Parent.Parent.Promise)
+	local tryGetObjects = require(script.Parent.tryGetObjects)
+
+	local MESH_DOGE = "rbxassetid://4574885352"
+
+	itFOCUS("should apply updates to existing instances", function()
+		local mockApiContext = {}
+		function mockApiContext:createAssets()
+			return Promise.resolve("rbxasset://rojo-tests/DogeUpdate.rbxm")
+		end
+
+		local instanceMap = InstanceMap.new()
+
+		local oldDoge = Instance.new("MeshPart")
+		instanceMap:insert("DOGE", oldDoge)
+
+		local patch = PatchSet.newEmpty()
+		table.insert(patch.updated, {
+			id = "DOGE",
+			changedProperties = {
+				MeshId = {
+					Type = "Content",
+					Value = MESH_DOGE,
+				},
+			},
+		})
+
+		local _, unappliedPatch = assert(tryGetObjects(instanceMap, mockApiContext, patch):await())
+		assert(PatchSet.isEmpty(unappliedPatch), "expected remaining patch to be empty")
+
+		local newDoge = instanceMap.fromIds["DOGE"]
+		assert(newDoge ~= nil, "no instance with id DOGE")
+		expect(newDoge.MeshId).to.equal(MESH_DOGE)
+	end)
+end

plugin/test-place.project.json

@@ -9,7 +9,7 @@
       },
 
       "TestEZ": {
-        "$path": "modules/testez/lib"
+        "$path": "modules/testez/src"
       }
     },
 

plugin/test.ps1

@@ -0,0 +1,2 @@
+rojo build test-place.project.json -o TestPlace.rbxlx
+run-in-roblox --script run-tests.server.lua --place TestPlace.rbxlx

selene.toml

@@ -1,4 +1,4 @@
-std = "roblox"
+std = "roblox+testez"
 
 [config]
 unused_variable = { allow_unused_self = true }

src/serve_session.rs

@@ -179,6 +179,10 @@ impl ServeSession {
         &self.vfs
     }
 
+    pub fn vfs_handle(&self) -> Arc<Vfs> {
+        Arc::clone(&self.vfs)
+    }
+
     pub fn message_queue(&self) -> &MessageQueue<AppliedPatchSet> {
         &self.message_queue
     }