From 8bcae1937b4aca409fa21064ee3c9578b9e07841 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 1 May 2022 22:47:34 +1000
Subject: [PATCH] tweak(init): store service and name in lib

lib.name for 'ox_lib', and service or 'client' or 'server'.
---
 init.lua | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/init.lua b/init.lua
index 6bd032e..2490bd7 100644
--- a/init.lua
+++ b/init.lua
@@ -30,13 +30,11 @@ end
 -----------------------------------------------------------------------------------------------
 
 local LoadResourceFile = LoadResourceFile
-local file = IsDuplicityVersion() and 'server' or 'client'
-local rawset = rawset
-local rawget = rawget
+local service = IsDuplicityVersion() and 'server' or 'client'
 
 local function loadModule(self, module)
 	local dir = ('imports/%s'):format(module)
-	local chunk = LoadResourceFile(ox_lib, ('%s/%s.lua'):format(dir, file))
+	local chunk = LoadResourceFile(ox_lib, ('%s/%s.lua'):format(dir, service))
 	local shared = LoadResourceFile(ox_lib, ('%s/shared.lua'):format(dir))
 
 	if shared then
@@ -45,7 +43,7 @@ local function loadModule(self, module)
 
 	if chunk then
 		local err
-		chunk, err = load(chunk, ('@@ox_lib/%s/%s.lua'):format(module, file))
+		chunk, err = load(chunk, ('@@ox_lib/%s/%s.lua'):format(module, service))
 		if err then
 			error(('\n^1Error importing module (%s): %s^0'):format(dir, err), 3)
 		else
@@ -81,6 +79,8 @@ local function call(self, index, ...)
 end
 
 lib = setmetatable({
+	name = ox_lib,
+	service = service,
 	exports = {},
 	onCache = setmetatable({}, {
 		__call = function(self, key, cb)
@@ -90,14 +90,9 @@ lib = setmetatable({
 }, {
 	__index = call,
 	__call = call,
-
 	__newindex = function()
 		error('Cannot set index on lib')
 	end,
-
-	__tostring = function()
-		return ox_lib
-	end,
 })
 
 local intervals = {}
@@ -160,9 +155,7 @@ local cache = setmetatable({}, {
 	__call = function(self)
 		table.wipe(self)
 
-		if file == 'server' then
-
-		else
+		if service == 'client' then
 			self.playerId = PlayerId()
 			self.serverId = GetPlayerServerId(self.playerId)
 		end