View difference between Paste ID: EFYpUTmy and X5Fysdi4

-local args = { ... }
+--I DID NOT MAKE THIS PROGRAM IM MAKING SLIGHT EDITS TO MY NEEDS
 local tArgs = { ... }
 
 local connections = {}
 
 local nshAPI = {
 	connList = connections
 }
-local bufferDirs = {"/","/LyqydOS/","/usr/apis/","/disk/"}
+
 nshAPI.getRemoteID = function()
-if not framebuffer then
+
-	for i = 1, #bufferDirs do
+
-		if fs.exists(bufferDirs[i].."framebuffer") and os.loadAPI(bufferDirs[i].."framebuffer") then
+		if cInfo.thread == coroutine.running() then
 			if cNum == "localShell" then
 				--if we are a client running on the server, return the remote server ID.
 				if nshAPI.serverNum then
 					return nshAPI.serverNum
-if not framebuffer then
+
-	print("Couldn't find framebuffer API, using fallback")
+
 				end
 			end
-local function rawSend(id, msg)
+
-	if term.current then
+
-		return rednet.send(id, msg, "tror")
+
 	--client running without local server, return remote server ID.
 	if nshAPI.serverNum then return nshAPI.serverNum end
 	return nil
 end
 
-local function rawRecv(id, timeout)
+
-	if type(timeout) == "number" then timeout = os.startTimer(timeout) end
+
 	if id then
 		return rednet.send(id, msg)
-		if event[1] == "rednet_message" and (id == nil and true or event[2] == id) and (not term.current and true or event[4] == "tror") then
+
 	return nil
 end
 
 nshAPI.receive = function(timeout)
 	if type(timeout) == number then timeout = os.startTimer(timeout) end
 	while true do
 		event = {os.pullEvent()}
 		if event[1] == "rednet_message" and event[2] == nshAPI.getRemoteID() then
 			return event[3]
 		elseif event[1] == "timer" and event[2] == timeout then
 			return nil
-		if cInfo and type(cInfo) == "table" and cInfo.thread == coroutine.running() then
+
 	end
 end
 
 nshAPI.getClientCapabilities = function()
 	if nshAPI.clientCapabilities then return nshAPI.clientCapabilities end
 	nshAPI.send("SP:;clientCapabilities")
 	return nshAPI.receive(1)
 end
 
 nshAPI.getRemoteConnections = function()
 	local remotes = {}
 	for cNum, cInfo in pairs(nshAPI.connList) do
 		table.insert(remotes, cNum)
 		if cInfo.outbound then
 			table.insert(remotes, cInfo.outbound)
 		end
 	end
 	return remotes
 end
-		return rawSend(id, msg)
+
 local packetConversion = {
 	query = "SQ",
 	response = "SR",
 	data = "SP",
 	close = "SC",
-	return rawRecv(nshAPI.getRemoteID(), timeout)
+
 	fileSend = "FS",
 	fileResponse = "FR",
 	fileHeader = "FH",
 	fileData = "FD",
 	fileEnd = "FE",
 	textWrite = "TW",
 	textCursorPos = "TC",
 	textGetCursorPos = "TG",
 	textGetSize = "TD",
 	textInfo = "TI",
 	textClear = "TE",
 	textClearLine = "TL",
 	textScroll = "TS",
 	textBlink = "TB",
 	textColor = "TF",
 	textBackground = "TK",
 	textIsColor = "TA",
 	event = "EV",
 	SQ = "query",
-nshAPI.packFile = function(path)
+
-	local data = {}
+
-	local count = 0
+
-	local handle = io.open(path, "rb")
+
-	if handle then
+
-		local byte = handle:read()
+
-		repeat
+
-			data[#data + 1] = byte
+
-			count = count + 1
+
-			if count % 1000 == 0 then
+
-				os.queueEvent("yield")
+
-				os.pullEvent("yield")
+
 	TD = "textGetSize",
-			byte = handle:read()
+
-		until not byte
+
-		handle:close()
+
 	TS = "textScroll",
 	TB = "textBlink",
 	TF = "textColor",
-	local outputTable = {}
+
-	for i = 1, #data, 3 do
+
-		local num1, num2, num3 = data[i], data[i + 1] or 0, data[i + 2] or 0
+
-		table.insert(outputTable, string.char(bit.band(bit.brshift(num1, 2), 63)))
+
-		table.insert(outputTable, string.char(bit.bor(bit.band(bit.blshift(num1, 4), 48), bit.band(bit.brshift(num2, 4), 15))))
+
-		table.insert(outputTable, string.char(bit.bor(bit.band(bit.blshift(num2, 2), 60), bit.band(bit.brshift(num3, 6), 3))))
+
-		table.insert(outputTable, string.char(bit.band(num3, 63)))
+
 	for _, side in ipairs(rs.getSides()) do
-	--mark non-data (invalid) bytes
+
-	if #data % 3 == 1 then
+
-		outputTable[#outputTable] = "="
+
-		outputTable[#outputTable - 1] = "="
+
-	elseif #data % 3 == 2 then
+
-		outputTable[#outputTable] = "="
+
 	return modemFound
-	return table.concat(outputTable, "")
+
 
 local function send(id, type, message)
-nshAPI.unpackAndSaveFile = function(path, data)
+	return rednet.send(id, packetConversion[type]..":;"..message)
-	local outputTable = {}
+
-	for i=1, #data, 4 do
+
-		local char1, char2, char3, char4 = string.byte(string.sub(data, i, i)), string.byte(string.sub(data, i + 1, i + 1)), string.byte(string.sub(data, i + 2, i + 2)), string.byte(string.sub(data, i + 3, i + 3))
+
-		table.insert(outputTable, bit.band(bit.bor(bit.blshift(char1, 2), bit.brshift(char2, 4)), 255))
+
-		table.insert(outputTable, bit.band(bit.bor(bit.blshift(char2, 4), bit.brshift(char3, 2)), 255))
+
-		table.insert(outputTable, bit.band(bit.bor(bit.blshift(char3, 6), char4), 255))
+
 	if time then listenTimeOut = os.startTimer(time) end
-	--clean invalid bytes if marked
+
-	if string.sub(data, #data, #data) == "=" then
+
-		table.remove(outputTable)
+
-		if string.sub(data, #data - 1, #data - 1) == "=" then
+
-			table.remove(outputTable)
+
 			sender, message = p1, p2
 			if id == sender and message then
-	local handle = io.open(path, "wb")
+
-	if handle then
+
-		for i = 1, #outputTable do
+
-			handle:write(outputTable[i])
+
-			if i % 10 == 0 then
+
-				os.startTimer(0.1)
+
-				os.pullEvent("timer")
+
 end
 
-		handle:close()
+
 	if not pType then return false end
 	if pType == "textWrite" and value then
 		term.write(value)
 	elseif pType == "textClear" then
 		term.clear()
 	elseif pType == "textClearLine" then
 		term.clearLine()
 	elseif pType == "textGetCursorPos" then
 		local x, y = term.getCursorPos()
 		send(conn, "textInfo", math.floor(x)..","..math.floor(y))
 	elseif pType == "textCursorPos" then
 		local x, y = string.match(value, "(%d+),(%d+)")
 		term.setCursorPos(tonumber(x), tonumber(y))
 	elseif pType == "textBlink" then
 		if value == "true" then
 			term.setCursorBlink(true)
 		else
 			term.setCursorBlink(false)
 		end
 	elseif pType == "textGetSize" then
 		x, y = term.getSize()
 		send(conn, "textInfo", x..","..y)
 	elseif pType == "textScroll" and value then
 		term.scroll(tonumber(value))
 	elseif pType == "textIsColor" then
 		send(conn, "textInfo", tostring(term.isColor()))
-	textTable = "TT",
+
 		value = tonumber(value)
 		if (value == 1 or value == 32768) or term.isColor() then
 			term.setTextColor(value)
 		end
 	elseif pType == "textBackground" and value then
 		value = tonumber(value)
 		if (value == 1 or value == 32768) or term.isColor() then
 			term.setBackgroundColor(value)
 		end
 	end
 	return
 end
 
 local function textRedirect (id)
 	local textTable = {}
 	textTable.id = id
 	textTable.write = function(text)
 		return send(textTable.id, "textWrite", text)
 	end
 	textTable.clear = function()
 		return send(textTable.id, "textClear", "nil")
 	end
 	textTable.clearLine = function()
-	TT = "textTable",
+
 	end
 	textTable.getCursorPos = function()
 		send(textTable.id, "textGetCursorPos", "nil")
 		local pType, message = awaitResponse(textTable.id, 2)
 		if pType and pType == "textInfo" then
 			local x, y = string.match(message, "(%d+),(%d+)")
 			return tonumber(x), tonumber(y)
 		end
 	end
 	textTable.setCursorPos = function(x, y)
 		return send(textTable.id, "textCursorPos", math.floor(x)..","..math.floor(y))
 	end
 	textTable.setCursorBlink = function(b)
 		if b then
 			return send(textTable.id, "textBlink", "true")
-local function send(id, pType, message)
+
-	if pType and message then
+
-		return rawSend(id, packetConversion[pType]..":;"..message)
+
 	end
 	textTable.getSize = function()
 		send(textTable.id, "textGetSize", "nil")
 		local pType, message = awaitResponse(textTable.id, 2)
 		if pType and pType == "textInfo" then
 			local x, y = string.match(message, "(%d+),(%d+)")
 			return tonumber(x), tonumber(y)
 		end
 	end
 	textTable.scroll = function(lines)
 		return send(textTable.id, "textScroll", lines)
 	end
 	textTable.isColor = function()
 		send(textTable.id, "textIsColor", "nil")
 		local pType, message = awaitResponse(textTable.id, 2)
 		if pType and pType == "textInfo" then
 			if message == "true" then
 				return true
 			end
 		end
 		return false
 	end
 	textTable.isColour = textTable.isColor
 	textTable.setTextColor = function(color)
 		return send(textTable.id, "textColor", tostring(color))
 	end
 	textTable.setTextColour = textTable.setTextColor
 	textTable.setBackgroundColor = function(color)
 		return send(textTable.id, "textBackground", tostring(color))
 	end
 	textTable.setBackgroundColour = textTable.setBackgroundColor
 	return textTable
 end
 
 local eventFilter = {
 	key = true,
-		local x, y = string.match(value, "(%-?%d+),(%-?%d+)")
+
 	mouse_click = true,
 	mouse_drag = true,
 	mouse_scroll = true,
 }
 
 local function newSession()
 	local path = "/shell"
 	if #tArgs >= 2 and shell.resolveProgram(tArgs[2]) then path = shell.resolveProgram(tArgs[2]) end
 	local sessionThread = coroutine.create(function() shell.run(path) end)
 	return sessionThread
 end
 
 if #tArgs >= 1 and tArgs[1] == "host" then
 	_G.nsh = nshAPI
 	_G.nsh = nshAPI
 	if not openModem() then return end
 	local connInfo = {}
 	connInfo.target = term.native
 	local path = "/shell"
 	if #tArgs >= 3 and shell.resolveProgram(tArgs[3]) then path = shell.resolveProgram(tArgs[3]) end
 	connInfo.thread = coroutine.create(function() shell.run(path) end)
 	connections.localShell = connInfo
 	term.clear()
 	term.setCursorPos(1,1)
-	elseif pType == "textTable" then
+
-		local linesTable = textutils.unserialize(value)
+
-		for i=1, linesTable.sizeY do
+
-			term.setCursorPos(1,i)
+
-			local lineEnd = false
+
-			local offset = 1
+
-			while not lineEnd do
+
-				local textColorString = string.match(string.sub(linesTable.textColor[i], offset), string.sub(linesTable.textColor[i], offset, offset).."*")
+
-				local backColorString = string.match(string.sub(linesTable.backColor[i], offset), string.sub(linesTable.backColor[i], offset, offset).."*")
+
-				term.setTextColor(2 ^ tonumber(string.sub(textColorString, 1, 1), 16))
+
-				term.setBackgroundColor(2 ^ tonumber(string.sub(backColorString, 1, 1), 16))
+
-				term.write(string.sub(linesTable.text[i], offset, offset + math.min(#textColorString, #backColorString) - 1))
+
-				offset = offset + math.min(#textColorString, #backColorString)
+
-				if offset > linesTable.sizeX then lineEnd = true end
+
 							eventTable = textutils.unserialize(message)
 						else
-		term.setCursorPos(linesTable.cursorX, linesTable.cursorY)
+
-		term.setCursorBlink(linesTable.cursorBlink)
+
 						end
 						if not connections[conn].filter or eventTable[1] == connections[conn].filter then
 							connections[conn].filter = nil
 							term.redirect(connections[conn].target)
-local function textRedirect(id)
+							passback = {coroutine.resume(connections[conn].thread, unpack(eventTable))}
 							if passback[1] and passback[2] then
 								connections[conn].filter = passback[2]
 							end
 							if coroutine.status(connections[conn].thread) == "dead" then
 								send(conn, "close", "disconnect")
 								table.remove(connections, conn)
 							end
 							term.restore()
 						end
 					elseif packetType == "query" then
 						--reset connection
 						connections[conn].status = "open"
 						connections[conn].target = textRedirect(conn)
 						connections[conn].thread = newSession()
 						send(conn, "response", "OK")
-			local x, y = string.match(message, "(%-?%d+),(%-?%d+)")
+						term.redirect(connections[conn].target)
 						coroutine.resume(connections[conn].thread)
 						term.restore()
 					elseif packetType == "close" then
 						table.remove(connections, conn)
 						send(conn, "close", "disconnect")
 						--close connection
 					else
 						--we got a packet, have an open connection, but despite it being in the conversion table, don't handle it ourselves. Send it onward.
 						if not connections[conn].filter or eventTable[1] == connections[conn].filter then
 							connections[conn].filter = nil
 							term.redirect(connections[conn].target)
 							passback = {coroutine.resume(connections[conn].thread, unpack(event))}
 							if passback[2] then
 								connections[conn].filter = passback[2]
 							end
 							if coroutine.status(connections[conn].thread) == "dead" then
 								send(conn, "close", "disconnect")
 								table.remove(connections, conn)
 							end
 							term.restore()
 						end
 					end
 				elseif packetType ~= "query" then
 					--usually, we would send a disconnect here, but this prevents one from hosting nsh and connecting to other computers.  Pass these to all shells as well.
 					for cNum, cInfo in pairs(connections) do
 						if not cInfo.filter or event[1] == cInfo.filter then
 							cInfo.filter = nil
 							term.redirect(cInfo.target)
 							passback = {coroutine.resume(cInfo.thread, unpack(event))}
 							if passback[2] then
 								cInfo.filter = passback[2]
 							end
 							term.restore()
 						end
 					end
 				else
 					--open new connection
 					local connInfo = {}
 					connInfo.status = "open"
 					connInfo.target = textRedirect(conn)
 					connInfo.thread = newSession()
 					send(conn, "response", "OK")
 					connections[conn] = connInfo
 					term.redirect(connInfo.target)
 					coroutine.resume(connInfo.thread)
 					term.restore()
-local function getServerID(server)
+
-	if tonumber(server) then
+
-		return tonumber(server)
+
-	elseif term.current then
+
-		return rednet.lookup("tror", args[1])
+					if not cInfo.filter or event[1] == cInfo.filter then
 						cInfo.filter = nil
 						term.redirect(cInfo.target)
 						passback = {coroutine.resume(cInfo.thread, unpack(event))}
-local function resumeThread(conn, event)
+						if passback[2] then
-	local cInfo = connections[conn]
+							cInfo.filter = passback[2]
-	if connections[conn] and (not connections[conn].filter or event[1] == connections[conn].filter) then
+
-		connections[conn].filter = nil
+						term.restore()
-		local _oldTerm = term.redirect(connections[conn].target)
+
-		local passback = {coroutine.resume(connections[conn].thread, unpack(event))}
+
-		if passback[1] and passback[2] then
+
-			connections[conn].filter = passback[2]
+
 			--user interaction.
-		if coroutine.status(connections[conn].thread) == "dead" then
+
-			send(conn, "close", "disconnect")
+
-			connections[conn] = false
+
 					if cNum ~= "localShell" then
-		if _oldTerm then
+
-			term.redirect(_oldTerm)
+
 				end
-			term.restore()
+
 			end
-		if connections[conn] and conn ~= "localShell" and framebuffer and connections[conn].target.changed then
+
-			send(conn, "textTable", textutils.serialize(connections[conn].target.buffer))
+			_G.nsh = nil
-			connections[conn].target.changed = false
+
 		else
 			--dispatch all other events to all shells
 			for cNum, cInfo in pairs(connections) do
 				if not cInfo.filter or event[1] == cInfo.filter then
 					cInfo.filter = nil
 					term.redirect(cInfo.target)
 					passback = {coroutine.resume(cInfo.thread, unpack(event))}
 					if passback[2] then
 						cInfo.filter = passback[2]
 					end
 					term.restore()
 				end
-local function newSession(conn, x, y, color)
+
-	local session = {}
+
-	local path = "/rom/programs/shell"
+
-	if #args >= 2 and shell.resolveProgram(args[2]) then path = shell.resolveProgram(args[2]) end
+
-	session.thread = coroutine.create(function() shell.run(path) end)
+elseif #tArgs == 1 and nsh and nsh.getRemoteID() then
-	if framebuffer then
+
-		local target = {}
+
-		local _target = framebuffer.new(x, y, color)
+
-		for k, v in pairs(_target) do
+
-			if type(k) == "string" and type(v) == "function" then
+
-				target[k] = function(...)
+
-					target.changed = true
+
-					return _target[k](...)
+
 	end
 	local fileTransferState = nil
-				target[k] = _target[k]
+
 	local serverNum = tonumber(tArgs[1])
 	send(serverNum, "query", "connect")
-		session.target = target
+
 	if pType ~= "response" then
-		session.target = textRedirect(conn)
+
 		return
-	session.status = "open"
+
-	_oldTerm = term.redirect(session.target)
+
-	coroutine.resume(session.thread)
+
-	if _oldTerm then
+
-		term.redirect(_oldTerm)
+
 	local clientID = nsh.getRemoteID()
-		term.restore()
+	local serverID = tonumber(tArgs[1])
 	while true do
-	if framebuffer then
+
-		send(conn, "textTable", textutils.serialize(session.target.buffer))
+
-		session.target.changed = false
+
 				if event[2] == serverID and string.sub(event[3], 1, 2) == "SC" then break end
-	return session
+
 			end
 		elseif eventFilter[event[1]] then
-if #args >= 1 and args[1] == "host" then
+
 		end
 	end
-	if term.current then
+
-		if args[4] then
+
-			rednet.host("tror", args[4])
+
-		elseif os.getComputerLabel() then
+
-			rednet.host("tror", os.getComputerLabel())
+
 elseif #tArgs == 1 then --either no server running or we are the local shell on the server.
-			print("No label or hostname provided!")
+	local serverNum = tonumber(tArgs[1])
 	if nsh then
 		local conns = nsh.getRemoteConnections()
 		for i = 1, #conns do
 			if conns[i] == serverNum then
-	connInfo.target = term.current and term.current() or term.native
+
-	local path = "/rom/programs/shell"
+
-	if #args >= 3 and shell.resolveProgram(args[3]) then path = shell.resolveProgram(args[3]) end
+
 		end
 	end
 	local fileTransferState = nil
 	local fileData = nil
 	if not openModem() then return end
 	send(serverNum, "query", "connect")
 	local pType, message = awaitResponse(serverNum, 2)
 	if pType ~= "response" then
 		print("Connection failed.")
-			if type(event[3]) == "string" and packetConversion[string.sub(event[3], 1, 2)] then
+
 	else
 		if nsh then nshAPI = nsh end
 		if nshAPI.connList and nshAPI.connList.localShell then nshAPI.connList.localShell.outbound = serverNum end
 		nshAPI.serverNum = serverNum
 		nshAPI.clientCapabilities = "-fileTransfer-extensions-"
 		term.clear()
 		term.setCursorPos(1,1)
 	end
 
 	while true do
 		event = {os.pullEventRaw()}
 		if event[1] == "rednet_message" and event[2] == serverNum then
 			if packetConversion[string.sub(event[3], 1, 2)] then
-						resumeThread(conn, eventTable)
+
 				message = string.match(event[3], ";(.*)")
-						local connType, color, x, y = string.match(message, "(%a+):(%a+);(%d+),(%d+)")
+
-						if connType == "connect" or (connType == "resume" and (not framebuffer)) then
+
-							--reset connection
+
-							send(conn, "response", "OK")
+
-							connections[conn] = newSession(conn, tonumber(x), tonumber(y), color == "true")
+
-						elseif connType == "resume" and connections[conn] and tonumber(x) == connections[conn].target.buffer.sizeX and tonumber(y) == connections[conn].target.buffer.sizeY then
+
-							--restore connection
+
-							send(conn, "response", "OK")
+
-							send(conn, "textTable", textutils.serialize(connections[conn].target.buffer))
+					if fs.exists(message) then
 						send(serverNum, "fileHeader", message)
 						local file = io.open(message, "r")
-						connections[conn] = nil
+						if file then
 							send(serverNum, "fileData", file:read("*a"))
 							file:close()
 						end
 					else
-						resumeThread(conn, event)
+
 					end
 					send(serverNum, "fileEnd", "end")
 				elseif packetType == "fileSend" then
 					--receive a file from the server, but don't overwrite existing files.
-						resumeThread(cNum, event)
+					if not fs.exists(message) then
 						fileTransferState = "receive_wait:"..message
 						send(serverNum, "fileResponse", "ok")
 						fileData = ""
 					else
-					local color, x, y = string.match(message, "connect:(%a+);(%d+),(%d+)")
+
-					local connInfo = newSession(conn, tonumber(x), tonumber(y), color == "true")
+
 				elseif packetType == "fileHeader" then
 					if message == "fileNotFound" then
 						fileTransferState = nil
 					end
 				elseif packetType == "fileData" then
-					resumeThread(cNum, event)
+
 						fileData = fileData..message
 					end
 				elseif packetType == "fileEnd" then
 					if fileTransferState and string.match(fileTransferState, "(.-):") == "receive_wait" then
 						local file = io.open(string.match(fileTransferState, ":(.*)"), "w")
 						if file then
 							file:write(fileData)
 							file:close()
 						end
 						fileTransferState = nil
 					end
 				elseif packetType == "close" then
 					if term.isColor() then
 						term.setBackgroundColor(colors.black)
 						term.setTextColor(colors.white)
 					end
-				resumeThread(cNum, event)
+
 					term.setCursorPos(1, 1)
 					print("Connection closed by server.")
 					nshAPI.serverNum = nil
 					if nshAPI.connList and nshAPI.connList.localShell then nshAPI.connList.localShell.outbound = nil end
-elseif #args <= 2 and nsh and nsh.getRemoteID() then
+
 				end
 			end
 		elseif event[1] == "mouse_click" or event[1] == "mouse_drag" or event[1] == "mouse_scroll" or event[1] == "key" or event[1] == "char" then
 			--pack up event
 			send(serverNum, "event", textutils.serialize(event))
 		elseif event[1] == "terminate" then
 			nshAPI.serverNum = nil
 			if nshAPI.localShell then nshAPI.localShell.outbound = nil end
 			return
 		end
 	end
-	local serverNum = getServerID(args[1])
+
-	if not serverNum then
+	print("Usage: nsh <serverID>")
-		print("Server Not Found")
+	print("       nsh host [remote [local]]")
 end