MarcSync/roblox-client
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Updated Table / Removed unused functions

Browse Source
This commit is contained in:
Marcel Lorbeer 2023-07-24 19:13:04 +02:00
parent 3fca233c3e
commit f567caca04
1 changed files with 57 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
src/MarcSync/MarcSyncv0.5.lua
View File

@ -18,23 +18,6 @@ type DefaultResult = {
local HttpService = game:GetService("HttpService") local HttpService = game:GetService("HttpService")
local reqQueue = {}
coroutine.wrap(function()
while wait(5) do
for i,v in pairs(reqQueue) do
local result;
local success, Error = pcall(function() result = v.method(v.arguments) end)
if not success and Error == "Number of requests exceeded limit" then
break
else
v.event:__Fire(result)
table.remove(reqQueue, i)
end
end
end
end)
function signal() function signal()
local RBXSignal = {} local RBXSignal = {}
RBXSignal._bindableEvent = Instance.new("BindableEvent") RBXSignal._bindableEvent = Instance.new("BindableEvent")
@ -53,63 +36,10 @@ function signal()
return RBXSignal return RBXSignal
end end
local marcsync = {} local MarcSyncClient = {}
marcsync.__index = marcsync
marcsync.request = {}
function marcsync.new(token: string)
if not token then warn("Token not provided while creating a new MarcSync Object.") end
if not tokens[token] then warn("Token provided for creating a new MarcSync Object not Found in Token Table, using it as token instead.") else token = tokens[token] end
local self = setmetatable({}, marcsync)
self._token = token
self.request._parent = self
self.request.version._parent = self.request
self.request.database._parent = self.request
self.request.collection._parent = self.request
self.utils._parent = self
return self
end
function marcsync:_checkInstallation() MarcSyncClient.getVersion = function(self:typeof(MarcSyncClient), clientId: number?):{["success"]:boolean,["version"]:string,["update_server"]:string}
if not self then error("Please Setup MarcSync before using MarcSync.") end self:_checkInstallation()
if not self._token then error("[MarcSync] Please set a Token before using MarcSync.") end
--print(HttpService.HttpEnabled)
--if not HttpService.HttpEnabled then error("Please Enable HTTPService in order to use MarcSync.") end
end
function marcsync._errorHandler(RBXSignal: {}, Error: string)
spawn(function()
RBXSignal:_Fire({
["success"] = false,
["errorMessage"] = Error
})
end)
return {["onResult"] = RBXSignal}
end
function marcsync:_requestHandler(result: {}, Error: string):{["onResult"]: {}}
if result == nil then return self._errorHandler(signal(), Error) end
local errorResult;
local signalevent;
if #result.Body == 0 and not result.Success then
errorResult = "HTTP "..result.StatusCode.." ("..result.StatusMessage..")" result = false
elseif not pcall(function() HttpService:JSONDecode(result.Body) end) then
error("Unexpected MarcSync Result.")
else
result = result.Body
signalevent = {["onResult"]=signal()}
end
spawn(function()
if not result then return end
signalevent.onResult:_Fire(result)
end)
return signalevent or self._errorHandler(signal(), errorResult)
end
marcsync.request.version = {}
function marcsync.request.version:get(clientId: number?):{["success"]:boolean,["version"]:string,["update_server"]:string}
if typeof(self) ~= "table" then error("Please use : instead of .") end
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end
self._parent._parent:_checkInstallation()
local url = "" local url = ""
if clientId then url = "/"..clientId end if clientId then url = "/"..clientId end
local result = nil; local result = nil;
@ -117,95 +47,82 @@ function marcsync.request.version:get(clientId: number?):{["success"]:boolean,["
result = any result = any
end) end)
repeat repeat
wait() task.wait()
until result ~= nil until result ~= nil
return result return result
end end
marcsync.request.collection = {} MarcSyncClient.createCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection))
function marcsync.request.collection:create(collectionName: string):typeof(require(script.Parent.Objects.Collection)) if not self._accessToken then error("[MarcSync] Please set a Token before using MarcSync.") end
if typeof(self) ~= "table" then error("Please use : instead of .") end
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end
self._parent._parent:_checkInstallation()
if not collectionName then error("No CollectionName Provided") end if not collectionName then error("No CollectionName Provided") end
local result = nil; local result = nil;
Utils.handleResponse(Utils.makeHTTPRequest("POST", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._parent._parent._token)).onResult:Connect(function(any) Utils.handleResponse(Utils.makeHTTPRequest("POST", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken)).onResult:Connect(function(any)
if not any["success"] then result = false return end if not any["success"] then result = false return end
result = require(script.Parent.Objects.Collection)._new(collectionName, self._parent._parent._token) result = require(script.Parent.Objects.Collection)._new(collectionName, self._accessToken)
end) end)
repeat repeat
wait() task.wait()
until result ~= nil until result ~= nil
return result return result
end end
function marcsync.request.collection:fetch(collectionName: string):typeof(require(script.Parent.Objects.Collection)) MarcSyncClient.fetchCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection))
if typeof(self) ~= "table" then error("Please use : instead of .") end self:_checkInstallation()
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end
self._parent._parent:_checkInstallation()
if not collectionName then error("No CollectionName Provided") end if not collectionName then error("No CollectionName Provided") end
local result = nil; local result = nil;
Utils.handleResponse(Utils.makeHTTPRequest("GET", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._parent._parent._token)).onResult:Connect(function(any) Utils.handleResponse(Utils.makeHTTPRequest("GET", "https://api.marcsync.dev/v0/collection/"..collectionName, {}, self._accessToken)).onResult:Connect(function(any)
if not any["success"] then result = false return end if not any["success"] then result = false return end
result = require(script.Parent.Objects.Collection)._new(collectionName, self._parent._parent._token) result = require(script.Parent.Objects.Collection)._new(collectionName, self._accessToken)
end) end)
repeat repeat
wait() task.wait()
until result ~= nil until result ~= nil
return result return result
end end
function marcsync.request.collection:get(collectionName: string):typeof(require(script.Parent.Objects.Collection)) MarcSyncClient.getCollection = function(self:typeof(MarcSyncClient), collectionName: string):typeof(require(script.Parent.Objects.Collection))
if typeof(self) ~= "table" then error("Please use : instead of .") end if typeof(self) ~= "table" then error("Please use : instead of .") end
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end self:_checkInstallation()
self._parent._parent:_checkInstallation()
if not collectionName then error("No CollectionName Provided") end if not collectionName then error("No CollectionName Provided") end
return require(script.Parent.Objects.Collection)._new(collectionName, self._parent._parent._token) return require(script.Parent.Objects.Collection)._new(collectionName, self._accessToken)
end end
marcsync.request.database = {}
function marcsync.request.database:fetch(databaseId: number):DefaultResult return function(accessToken: string):typeof(MarcSyncClient)
if typeof(self) ~= "table" then error("Please use : instead of .") end if not accessToken then warn("Token not provided while creating a new MarcSync Object.") end
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end if not tokens[accessToken] then warn("Token provided for creating a new MarcSync Object not Found in Token Table, using it as token instead.") else accessToken = tokens[accessToken] end
self._parent._parent:_checkInstallation() local self = setmetatable({}, MarcSyncClient)
if not databaseId then error("No DatabaseId Provided") end self._accessToken = accessToken
local result; self._checkInstallation = function()
local success, Error = pcall(function() result = HttpService:RequestAsync({Url = "https://api.marcthedev.it/marcsync/v0/database/"..databaseId, Headers = {["Authorization"]=self._parent._parent._token}}) end) if not self then error("Please Setup MarcSync before using MarcSync.") end
return self._parent._parent:_requestHandler(result, Error) if not self._accessToken then error("[MarcSync] Please set a Token before using MarcSync.") end
end --print(HttpService.HttpEnabled)
function marcsync.request.database:delete(databaseId: number):DefaultResult --if not HttpService.HttpEnabled then error("Please Enable HTTPService in order to use MarcSync.") end
if typeof(self) ~= "table" then error("Please use : instead of .") end end
if not self._parent then error("[MarcSync] Please set a Token before using MarcSync.") end self._errorHandler = function(RBXSignal: {}, Error: string)
self._parent._parent:_checkInstallation() task.spawn(function()
if not databaseId then error("No DatabaseId Provided") end RBXSignal:_Fire({
local result; ["success"] = false,
local success, Error = pcall(function() result = HttpService:RequestAsync({Url = "https://api.marcthedev.it/marcsync/v0/database/"..databaseId, Headers = {["Authorization"]=self._parent._parent._token}}) end) ["errorMessage"] = Error
return self._parent._parent:_requestHandler(result, Error) })
end end)
marcsync.utils = {} return {["onResult"] = RBXSignal}
function marcsync.utils.safeRequest(method: Function, arguments: {}) end
--_checkInstallation() self._requestHandler = function(result: {}, Error: string):{["onResult"]: {}}
if result == nil then return self._errorHandler(signal(), Error) end
local errorResult;
--[[ local signalevent;
spawn(function() if #result.Body == 0 and not result.Success then
local result; errorResult = "HTTP "..result.StatusCode.." ("..result.StatusMessage..")" result = false
local success, Error = pcall(function() result = method(arguments) end) elseif not pcall(function() HttpService:JSONDecode(result.Body) end) then
if not success and Error == "Number of requests exceeded limit" then error("Unexpected MarcSync Result.")
reqQueue[#reqQueue] = {["method"] = method, ["arguments"] = arguments, ["event"] = RBXSignal} else
elseif success then result = result.Body
RBXSignal:__Fire(result) signalevent = {["onResult"]=signal()}
end end
end) task.spawn(function()
if not result then return end
return { ["onResult"] = RBXSignal} signalevent.onResult:_Fire(result)
--]] end)
end return signalevent or self._errorHandler(signal(), errorResult)
function marcsync.utils.bulkRequest(methods: {}, safeReq: boolean?):{}
--_checkInstallation()
local returns = {}
for i,method in pairs(methods) do if safeReq then marcsync.safeRequest(method[1], method[2]).onResult:Connect(function(result) returns[i] = result end) else returns[i] = method[1](method[2]) end end
while #methods ~= #returns do
wait()
end end
return returns
end
return marcsync return self
end