feat: update convars, readme and logs logic

README.md

@@ -18,7 +18,8 @@ Download the latest release from the
 Add the following to your `server.cfg`:
 
 ```
-set FIVEMANAGE_API_KEY your_api_key
+set FIVEMANAGE_MEDIA_API_KEY your_api_key
+set FIVEMANAGE_LOGS_API_KEY your_api_key
 ```
 
 This is the key for authenticating with our backend.
@@ -63,10 +64,6 @@ print(imageData.url)
 
 #### Levels
 
-## Note
-
-Only users with beta access can use logs right now. We'll update our discord and this readme when it is available for everyone! Hang in there!
-
 - info
 - warn
 - error
@@ -81,8 +78,10 @@ Coming soon
 exports.fivemanage_lib:LogMessage("error", "Failed to roleplay")
 
 -- With metadata
-exports.fivemanage_lib:LogMessage("error", "Failed to roleplay", {
-    playerName = "Dude",
-    playerIdentifier = someFunctionThatReturnsTheID(someArg)
+exports.fivemanage_lib:LogMessage('info', "Someone did a bad thing", {
+    playerSource = 1, -- All identifiers will be automatically added
+    playerName = "John Doe",
+    coords = {x = 1, y = 2, z = 3},
+    -- or any other field you want
 })
 ```

fxmanifest.lua

@@ -21,4 +21,4 @@ server_scripts {
 	"server/main.lua",
 
 	"server/dist/index.js",
-}
+}

server/image/sv_image.js

@@ -43,10 +43,10 @@ onNet("fivemanage:takeImage", (metadata, requestId) => {
 });
 
 function uploadImage(data, metadata) {
-  const apiKey = GetConvar("FIVEMANAGE_API_KEY", "");
+  const apiKey = GetConvar("FIVEMANAGE_MEDIA_API_KEY", "");
 
   if (!apiKey) {
-    console.error("FIVEMANAGE_API_KEY is not set");
+    console.error("FIVEMANAGE_MEDIA_API_KEY is not set");
     return;
   }
 

server/logs/lib.lua

@@ -1,6 +1,6 @@
 Logger = {}
 
-local api_url = "https://api.fivemanage.com/api/logs"
+local api_url = "https://cat-polished-marlin.ngrok-free.app/api/logs" --"https://api.fivemanage.com/api/logs"
 
 local function print_to_console(message, log_level, metadata, resource)
 	local _log_level_color = log_level == "info" and "^2" or log_level == "warn" and "^3" or "^1"
@@ -17,7 +17,7 @@ local function send_http_request(data)
 			return
 		end
 	 end, "POST", json.encode(data), {
-		["Authorization"] = API_KEY,
+		["Authorization"] = LOGS_API_KEY,
 		["Content-Type"] = "application/json",
 	})
 end
@@ -61,14 +61,15 @@ function Process_Log_Request(log_level, message, metadata, resource)
 	-- might have to look into some batching later, in order to reduce the amount of requests sent to the backend
 	-- for testing though, this should be fine
 
-	if not API_KEY then
+	if not LOGS_API_KEY then
 		print("API key is not set, skipping log...")
 		return
  	end
 
 	send_http_request({
 		level = _log_level,
 		message = message,
+		resource = resource,
 		metadata = _metadata,
 	})
 end

shared/init.lua

@@ -1,15 +1,21 @@
 IS_SERVER = IsDuplicityVersion()
-API_KEY = nil
+LOGS_API_KEY = nil
+MEDIA_API_KEY = nil
 
 -- TODO: dont crash, just save data and resend later
 
 if IS_SERVER then
     math.randomseed(os.time())
 
-    API_KEY = GetConvar("FIVEMANAGE_API_KEY", "")
+    MEDIA_API_KEY = GetConvar("FIVEMANAGE_MEDIA_API_KEY", "")
+    LOGS_API_KEY = GetConvar("FIVEMANAGE_LOGS_API_KEY", "")
 
-    if API_KEY == "" then
-        error("FIVEMANAGE_API_KEY is not set, please set it before starting this resource!")
+    if MEDIA_API_KEY == "" then
+        error("FIVEMANAGE_MEDIA_API_KEY is not set, please set it before starting this resource!")
+    end
+
+    if LOGS_API_KEY == "" then
+        error("FIVEMANAGE_LOGS_API_KEY is not set. Logs to Fivemanage will not work without this key.")
     end
 end