Update to newer netstream

lua/advdupe2/sv_file.lua

@@ -1,17 +1,17 @@
 --Save a file to the client
 local function SaveFile(ply, cmd, args)
 	if(not ply.AdvDupe2 or not ply.AdvDupe2.Entities or next(ply.AdvDupe2.Entities)==nil)then AdvDupe2.Notify(ply,"Duplicator is empty, nothing to save.", NOTIFY_ERROR) return end
 	if(not game.SinglePlayer() and CurTime()-(ply.AdvDupe2.FileMod or 0) < 0)then
 		AdvDupe2.Notify(ply,"Cannot save at the moment. Please Wait...", NOTIFY_ERROR)
 		return
 	end
 
 	if(ply.AdvDupe2.Pasting || ply.AdvDupe2.Downloading)then
 		AdvDupe2.Notify(ply,"Advanced Duplicator 2 is busy.",NOTIFY_ERROR)
 		return false
 	end
 
 	ply.AdvDupe2.FileMod = CurTime()+tonumber(GetConVarString("AdvDupe2_FileModificationDelay")+2)
 
 	local name = string.Explode("/", args[1])
 	ply.AdvDupe2.Name = name[#name]
@@ -49,7 +49,7 @@
 	net.WriteBool(autosave)
 	net.WriteStream(data, function()
 		ply.AdvDupe2.Downloading = false
-	end)
+	end, nil, {ply})
 	net.Send(ply)
 end
 
@@ -62,8 +62,8 @@
 	end
 
 	if(not game.SinglePlayer())then
 		if(tonumber(GetConVarString("AdvDupe2_MaxConstraints"))~=0 and #dupe["Constraints"]>tonumber(GetConVarString("AdvDupe2_MaxConstraints")))then
 			AdvDupe2.Notify(ply,"Amount of constraints is greater than "..GetConVarString("AdvDupe2_MaxConstraints"),NOTIFY_ERROR)
 			return false
 		end
 	end

lua/autorun/netstream.lua

@@ -66,6 +66,19 @@
 				timer.Remove("netstream_queueclean")
 			end
 		end,
+
+		CleanStream = function(self, cleanStream)
+			for k, stream in pairs(self.queue) do
+				if stream == cleanStream then
+					stream:Remove()
+					self.queue[k] = nil
+					break
+				end
+			end
+			if next(self.queue)==nil then
+				timer.Remove("netstream_queueclean")
+			end
+		end,
 	},
 	__call = function(t)
 		return setmetatable({
@@ -87,7 +100,7 @@
 				ErrorNoHalt("Receiving too many ReadStream requests!")
 				return
 			end
-
+			
 			for _, v in ipairs(queue) do
 				if v.identifier == stream.identifier then
 					ErrorNoHalt("Tried to start a new ReadStream for an already existing stream!")
@@ -146,7 +159,7 @@
 	__index = {
 		Write = function(self, ply, chunkidx)
 			local client = self.clients[ply]
-			if client.finished then return false end
+			if client==nil or client.finished then return false end
 			if chunkidx == #self.chunks+1 then self:Finished(ply) return true end
 
 			if client.downloads+#self.chunks-client.progress >= net.Stream.MaxTries * #self.chunks then self:Finished(ply) return false end
@@ -170,14 +183,24 @@
 
 		Finished = function(self, ply)
 			self.clients[ply].finished = true
+			if self.protected then
+				local readyToClean = true
+				for _, client in pairs(self.clients) do
+					if not client.finished then readyToClean = false break end
+				end
+				if readyToClean then
+					net.Stream.WriteStreams:CleanStream(self)
+				end
+			end
 			if self.callback then
 				local ok, err = xpcall(self.callback, debug.traceback, ply)
 				if not ok then ErrorNoHalt(err) end
 			end
 		end,
 
 		GetProgress = function(self, ply)
-			return self.clients[ply].progress / #self.chunks
+			local client = self.clients[ply]
+			return client and (client.progress / #self.chunks) or 0
 		end,
 
 		Remove = function(self)
@@ -196,28 +219,45 @@
 				net.WriteUInt(0, 32)
 				if SERVER then net.Send(sendTo) else net.SendToServer() end
 			end
-		end
+		end,
 
 	},
-	__call = function(t, data, callback)
+	__call = function(t, data, callback, recipients)
 		local chunks = {}
 		for i=1, math.ceil(#data / net.Stream.SendSize) do
 			local datachunk = string.sub(data, (i - 1) * net.Stream.SendSize + 1, i * net.Stream.SendSize)
 			chunks[i] = { data = datachunk, crc = util.CRC(datachunk) }
 		end
 
-		return setmetatable({
-			timeout = CurTime()+net.Stream.Timeout,
-			chunks = chunks,
-			callback = callback,
-			lasttouched = 0,
+		local clients, protected
+		if recipients then
+			clients = {}
+			for k, v in ipairs(recipients) do
+				clients[v] = {
+					finished = false,
+					downloads = 0,
+					progress = 0
+				}
+			end
+			protected = true
+		else
 			clients = setmetatable({},{__index = function(t,k)
 				local r = {
 					finished = false,
 					downloads = 0,
 					progress = 0,
 				} t[k]=r return r
 			end})
+			protected = false
+		end
+
+		return setmetatable({
+			timeout = CurTime()+net.Stream.Timeout,
+			chunks = chunks,
+			callback = callback,
+			lasttouched = 0,
+			clients = clients,
+			protected = protected,
 		}, t)
 	end
 }
@@ -297,7 +337,7 @@
 setmetatable(ReadingDataItem, ReadingDataItem)
 
 
-function net.WriteStream(data, callback, dontcompress)
+function net.WriteStream(data, callback, dontcompress, recipients)
 	if not isstring(data) then
 		error("bad argument #1 to 'WriteStream' (string expected, got " .. type(data) .. ")", 2)
 	end
@@ -309,6 +349,14 @@
 	if compressed then
 		data = util.Compress(data) or ""
 	end
+	if recipients ~= nil then
+		if not istable(recipients) then error("bad argument #4 to 'WriteStream' (table expected, got " .. type(recipients) .. ")", 2) end
+		if CLIENT then error("recipients argument can't be used in clientside!", 2) end
+		if #recipients==0 then error("recipients argument is empty!", 2) end
+		for k, v in ipairs(recipients) do
+			if not v:IsPlayer() then error("recipients contains non-player entry in key ("..k..")!", 2) end
+		end
+	end
 
 	if #data == 0 then
 		net.WriteUInt(0, 32)
@@ -321,9 +369,9 @@
 		return
 	end
 
-	local stream = net.Stream.WriteStreams:Add(WritingDataItem(data, callback, compressed))
+	local stream = net.Stream.WriteStreams:Add(WritingDataItem(data, callback, compressed, recipients))
 	if not stream then return end
-
+	
 	--print("WriteStream", #stream.chunks, stream.identifier, compressed)
 	net.WriteUInt(#stream.chunks, 32)
 	net.WriteUInt(stream.identifier, 32)
@@ -347,7 +395,7 @@
 	if not isfunction(callback) then
 		error("bad argument #2 to 'ReadStream' (function expected, got " .. type(callback) .. ")", 2)
 	end
-
+	
 	local numchunks = net.ReadUInt(32)
 	if numchunks == nil then
 		return