Speedup hash validation

game/engines/default/engine/Module.lua

@@ -370,6 +370,7 @@ function _M:addonMD5(add, base)
 end
 
 function _M:loadAddons(mod, saveuse)
+	local hashlist = {}
 	local adds = self:listAddons(mod, true)
 
 	if saveuse then saveuse = table.reverse(saveuse) end
@@ -471,15 +472,16 @@ function _M:loadAddons(mod, saveuse)
 			hash_valid, hash_err = false, "cheat mode skipping addon validation"
 		else
 			local fmd5 = self:addonMD5(add)
-			hash_valid, hash_err = profile:checkAddonHash(mod.short_name, add.version_name, fmd5)
+			hashlist[#hashlist+1] = {addon=add.version_name, md5=fmd5}
+--			hash_valid, hash_err = profile:checkAddonHash(mod.short_name, add.version_name, fmd5)
 		end
 
-		if hash_err then hash_err = hash_err .. " [addon: "..add.short_name.."]" end
-		add.hash_valid, add.hash_err = hash_valid, hash_err
+--		if hash_err then hash_err = hash_err .. " [addon: "..add.short_name.."]" end
+--		add.hash_valid, add.hash_err = hash_valid, hash_err
 
 		mod.addons[add.short_name] = add
 	end
---	os.exit()
+	return hashlist
 end
 
 -- Grab some fun facts!
@@ -732,6 +734,7 @@ function _M:instanciate(mod, name, new_game, no_reboot)
 	end
 	local hash_valid, hash_err
 	local t = core.game.getTime()
+	local module_md5 = "--"
 	if config.settings.cheat then
 		hash_valid, hash_err = false, "cheat mode skipping validation"
 	else
@@ -740,30 +743,25 @@ function _M:instanciate(mod, name, new_game, no_reboot)
 			fp("/data")
 			fp("/engine")
 			table.sort(md5s)
-			local fmd5 = md5.sumhexa(table.concat(md5s))
+			module_md5 = md5.sumhexa(table.concat(md5s))
 			print("[MODULE LOADER] module MD5", fmd5, "computed in ", core.game.getTime() - t)
-			hash_valid, hash_err = profile:checkModuleHash(mod.version_name, fmd5)
 		end
 	end
 
-	self:loadAddons(mod, (save_desc and save_desc.addons) or (__module_extra_info.set_addons))
+	local hashlist = self:loadAddons(mod, (save_desc and save_desc.addons) or (__module_extra_info.set_addons))
+
+	-- Check all hashes at once
+	hashlist[#hashlist+1] = {module=true, md5=module_md5}
+	hash_valid, hash_err = profile:checkBatchHash(mod.version_name, hashlist)
+	print("[MODULE] All hashes validation: ", hash_valid, hash_err)
 
 	-- Now that addons are loaded we can load UI definitions
 	for _, file in ipairs(fs.list("/data/gfx/ui/definitions")) do
 		if file:find("%.lua$") then UIBase:loadUIDefinitions("/data/gfx/ui/definitions/"..file) end
 	end
 
-	-- Check addons
-	if hash_valid then
-		for name, add in pairs(mod.addons) do
-			if not add.hash_valid then
-				hash_valid = false
-				hash_err = add.hash_err or "?????? unknown ...."
-				profile.hash_valid = false
-				break
-			end
-		end
-	end
+	-- Validate addons if all is valid
+	if hash_valid then for name, add in pairs(mod.addons) do add.hash_valid = true end end
 
 	local addl = {}
 	for name, add in pairs(mod.addons) do

game/engines/default/engine/PlayerProfile.lua

@@ -665,6 +665,7 @@ function _M:checkModuleHash(module, md5)
 	if game and game:isTainted() then return nil, "savefile tainted" end
 	core.profile.pushOrder(table.serialize{o="CheckModuleHash", module=module, md5=md5})
 
+	local ok = false
 	self:waitEvent("CheckModuleHash", function(e) ok = e.ok end, 10000)
 
 	if not ok then return nil, "bad game version" end
@@ -679,6 +680,7 @@ function _M:checkAddonHash(module, addon, md5)
 	if game and game:isTainted() then return nil, "savefile tainted" end
 	core.profile.pushOrder(table.serialize{o="CheckAddonHash", module=module, addon=addon, md5=md5})
 
+	local ok = false
 	self:waitEvent("CheckAddonHash", function(e) ok = e.ok end, 10000)
 
 	if not ok then return nil, "bad game addon version" end
@@ -686,6 +688,22 @@ function _M:checkAddonHash(module, addon, md5)
 	return true
 end
 
+function _M:checkBatchHash(module, list)
+	if not self.auth then return nil, "no online profile active" end
+	if config.settings.cheat then return nil, "cheat mode active" end
+	if game and game:isTainted() then return nil, "savefile tainted" end
+	core.profile.pushOrder(table.serialize{o="CheckBatchHash", data={module=module, list=list}})
+
+	local ok = false
+	local error = nil
+	self:waitEvent("CheckBatchHash", function(e) ok = e.ok error = e.error end, 10000)
+
+	if not ok then return nil, error or "unknown error" end
+	print("[ONLINE PROFILE] all hashes are valid")
+	self.hash_valid = true
+	return true
+end
+
 function _M:sendError(what, err)
 	print("[ONLINE PROFILE] sending error")
 	core.profile.pushOrder(table.serialize{o="SendError", login=self.login, what=what, err=err, module=game.__mod_info.short_name, version=game.__mod_info.version_name})

game/modules/tome/dialogs/Donation.lua

@@ -37,7 +37,7 @@ function _M:init(source)
 	local desc
 	local recur = false
 
-	if not profile.auth or not tonumber(profile.auth.donated) or tonumber(profile.auth.donated) <= 1) then
+	if not profile.auth or not tonumber(profile.auth.donated) or tonumber(profile.auth.donated) <= 1 then
 		local donation_features = { "#GOLD#Custom character tiles#WHITE#", "#GOLD#Exploration mode (infinite lives)#WHITE#"}
 		self:triggerHook{"DonationDialog:features", list=donation_features}
 

game/profile-thread/Client.lua

@@ -23,7 +23,7 @@ local UserChat = require "profile-thread.UserChat"
 
 module(..., package.seeall, class.make)
 
-local debug = false
+local debug = true
 
 local mport = debug and 2259 or 2257
 local pport = debug and 2260 or 2258
@@ -239,7 +239,7 @@ function _M:run()
 		while order do self:handleOrder(order) order = cprofile.popOrder() end
 
 		self:step()
-		core.game.sleep(20)
+		core.game.sleep(10)
 --	end
 end
 
@@ -384,6 +384,22 @@ function _M:orderCheckAddonHash(o)
 	end
 end
 
+function _M:orderCheckBatchHash(o)
+	if not self.sock then cprofile.pushEvent("e='CheckBatchHash' ok=false not_connected=true") end
+	local data = table.serialize(o.data)
+	self:command("BMD5", #data)
+	if self:read("200") then
+		self.sock:send(data)
+		if self:read("200") then		
+			cprofile.pushEvent("e='CheckBatchHash' ok=true")
+		else
+			cprofile.pushEvent(("e='CheckBatchHash' ok=false error=%q"):format(self.last_error))
+		end
+	else
+		cprofile.pushEvent(("e='CheckBatchHash' ok=false error=%q"):format("unknown error"))
+	end
+end
+
 function _M:orderRegisterNewCharacter(o)
 	self:command("CHAR", "NEW", o.module)
 	if self:read("200") then