Fixes

main.rb

@@ -1,123 +1,93 @@
 require "sinatra"
 require "json"
-
-require_relative "players"
-require_relative "session"
+require "base64"
+require "zlib"
+require "sequel"
+require "xxhash"
+require "net/http"
+require "uri"
 
 ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
 
+env_data = File.read(".env")
+ENV_HASH = {}
+
+env_data.each_line do |line|
+  if (match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/))
+    _, key, val = match
+    ENV_HASH[key] = val
+  end
+end
+
+CODE_ENV = :dev
+
 db_file = File.expand_path("infinsweeper.db")
 DB = Sequel.connect("sqlite:///#{db_file}", single_threaded: false)
 DB.run("PRAGMA foreign_keys = ON;")
+$active_users = DB[:SignedInUsers].all.map { |x| [x[:code], x[:player]] }.to_h
 
-signed_in_users = DB[:SignedInUsers].all.map { |x| [x[:code], x[:player]] }.to_h
-
-Thread.new do
-  loop do
-    now = Time.now
-    fifteen_days_ago = now - (60 * 60 * 24 * 15)
-    six_days_ago = now - (60 * 60 * 24 * 6)
-    old_sessions = (DB[:SignedInUsers].where { created_at < fifteen_days_ago }.all +
-                    DB[:SignedInUsers].where { last_used_at < six_days_ago }.all).uniq { |s| s[:code] }
-    old_sessions.each do |session|
-      begin
-        DB[:SignedInUsers].where(code: session[:code]).delete
-      rescue StandardError => e
-        File.write("log/main.log",
-                   "[#{Time.now}] Thread DB error: #{e.message} on #{session[:code]} for #{session[:player]}\n",
-                   mode: "a")
-      end
-      signed_in_users.delete(session[:code])
-      puts "Auto-logged out: #{session[:player]} (expired session)"
-    end
-  rescue StandardError => e
-    File.write("log/main.log", "[#{Time.now}] Thread error: #{e.message}\n", mode: "a")
-  ensure
-    sleep 60 * 60 * 24
-  end
-end
+load "logman.rb"
+load "mailer.rb"
+load "players.rb"
+load "session.rb"
 
 set :public_folder, "public"
 
 get "/" do
+  session = Sessions.new request, response
+  Logman.log session["message"]
   send_file "index.html"
 end
 
 get "/debug" do
-  return get_session_all(request, response).inspect
+  content_type :json
+  (Sessions.new request, response).all.to_json
 end
 
-post "/new_player" do
+post "/signup" do
+  session = Sessions.new request, response
   data = JSON.parse(request.body.read)
   if data["email"].nil? || data["pass"].nil? || data["username"].nil?
     status 400
     return { "message" => "Bad request made!" }.to_json
   end
-  player = Players.mk_player(data["username"], data["email"], data["pass"])
-  case player
-  when "Successfully registered!"
-    code = Array.new(24) { ALPHANUM.sample }.join
-    set_session(request, response, "user", code, code)
-    signed_in_users[code] = data["email"]
-    begin
-      DB["insert into SignedInUsers (code, player) values (?, ?)", code, data["email"]].insert
-    rescue Sequel::Error => e
-      File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
-      status 500
-      return { "message" => "Internal server error when signing you in!" }.to_json
-    end
-    status 200
-  else
-    status 400
+  signup_status = Players.mk_player(data["username"], data["email"], data["pass"])
+  if signup_status[0] == 200
+    login_status = session.login(data["username"], data["pass"])
+    status login_status[0]
+    return { "message" => login_status[1] }.to_json
   end
-  return { "message" => player }.to_json
+  status signup_status[0]
+  return { "message" => signup_status[1] }.to_json
 end
 
 get "/verify/:code" do
-  if Players.verify(params[:code])
-    status 200
-    return { "message" => "Verified successfully!" }.to_json
-  else
-    status 400
-    return { "message" => "Couldn't verify!" }
-  end
+  session = Sessions.new request, response
+  session["message"] = Players.verify(params[:code]) ? "Verified successfully!" : "Verification failed!"
+  redirect "/"
 end
 
 post "/login" do
   data = JSON.parse(request.body.read)
-  player = Players.authorized?(data["email"], data["pass"])
-  if player
-    code = Array.new(24) { ALPHANUM.sample }.join
-    set_session(request, response, "user", code, code)
-    signed_in_users[code] = data["email"]
-    begin
-      DB["insert into SignedInUsers (code, player) values (?, ?)", code, data["email"]].insert
-    rescue Sequel::Error => e
-      File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
-      status 500
-      return { "message" => "Internal server error when signing you in!" }.to_json
-    end
-    status 200
-    return { "message" => "Remember to verify your email!" }.to_json unless Players.verified?(data["email"])
-    return { "message" => "Signed in successfully!" }.to_json
-  else
-    status 400
-    return { "message" => "Couldn't sign you in!" }.to_json
+  session = Sessions.new request, response
+  uid = session["user"]
+  if $active_users[uid] && !session.logout(uid)
+    status 500
+    return { "message" => "Internal server error when signing the existing session out!" }.to_json
   end
+  login_status = session.login(data["username"], data["pass"])
+  status login_status[0]
+  return { "message" => login_status[1] }.to_json
 end
 
 post "/logout" do
-  uid = get_session(request, response, "user")
-  if signed_in_users[uid].nil?
+  session = Sessions.new request, response
+  uid = session["user"]
+  if $active_users[uid].nil?
     status 400
     return { "message" => "Not signed in!" }.to_json
   end
-  signed_in_users.delete(uid)
-  rm_session(request, response, "user")
-  begin
-    DB["delete from SignedInUsers where code = ?", uid].delete
-  rescue Sequel::Error => e
-    File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
+  unless session.logout(uid)
     status 500
     return { "message" => "Internal server error when signing you out!" }.to_json
   end
@@ -136,6 +106,10 @@ post "/forgot_password" do
   return { "message" => "Email sent successfully!" }.to_json
 end
 
+get "/reset_password/:code" do
+  redirect "/?reset_code=#{params[:code]}"
+end
+
 post "/reset_password/:code" do
   data = JSON.parse(request.body.read)
   if data["pass"].nil? || params[:code].nil?
@@ -152,14 +126,13 @@ post "/reset_password/:code" do
 end
 
 delete "/rm_player" do
-  uid = get_session(request, response, "user")
-  if uid.nil? || signed_in_users[uid].nil?
+  session = Sessions.new request, response
+  uid = session["user"]
+  if uid.nil? || $active_users[uid].nil?
     status 400
     return { "message" => "Not signed in!" }.to_json
   end
-  if Players.rm_player(signed_in_users[uid])
-    signed_in_users.delete(uid)
-    rm_session(request, response, "user")
+  if session.logout(uid) && Players.rm_player($active_users[uid])
     status 200
     return { "message" => "Sorry to see you go.." }.to_json
   else