MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Update k.lua and w.lua #60

Closed
Kan18 wants to merge 1 commits from develop-1.8 into develop-1.8
pull from: develop-1.8
merge into: MayaTheShy:develop-1.8
Conversation 0 Commits 1 Files Changed 2 +24 -16
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f513a45bf - Show all commits

8
swshop/apis/k.lua
View File

@@ -4,9 +4,9 @@ local jua
local json
local await
local endpoint = "krist.ceriat.net"
local wsEndpoint = "ws://"..endpoint
local httpEndpoint = "http://"..endpoint
local endpoint = "krist.dev"
local wsEndpoint = "wss://"..endpoint
local httpEndpoint = "https://"..endpoint
local function asserttype(var, name, vartype, optional)
if not (type(var) == vartype or optional and type(var) == "nil") then
@@ -53,7 +53,7 @@ local function authorize_websocket(cb, privatekey)
asserttype(privatekey, "privatekey", "string", true)
api_request(function(success, data)
cb(success and data and data.ok, data.url and data.url:gsub("wss:", "ws:") or data)
cb(success and data and data.ok, data.url and data.url:gsub("ws:", "wss:") or data)
end, "/ws/start", {
privatekey = privatekey
})

32
swshop/apis/w.lua
View File

@@ -79,10 +79,12 @@ function init(jua)
jua.on("websocket_failure", function(event, url)
local id = findID(url)
if id and callbackRegistry[id].failure then
callbackRegistry[id].failure(id)
if id then
if callbackRegistry[id].failure then
callbackRegistry[id].failure(id)
end
table.remove(callbackRegistry, id)
end
table.remove(callbackRegistry, id)
end)
jua.on("websocket_message", function(event, url, data)
@@ -94,10 +96,12 @@ function init(jua)
jua.on("websocket_closed", function(event, url)
local id = findID(url)
if id and callbackRegistry[id].closed then
callbackRegistry[id].closed(id)
if id then
if callbackRegistry[id].closed then
callbackRegistry[id].closed(id)
end
table.remove(callbackRegistry, id)
end
table.remove(callbackRegistry, id)
end)
else
jua.on("socket_connect", function(event, id)
@@ -107,10 +111,12 @@ function init(jua)
end)
jua.on("socket_error", function(event, id, msg)
if id and callbackRegistry[id].failure then
callbackRegistry[id].failure(id, msg)
if id then
if callbackRegistry[id].failure then
callbackRegistry[id].failure(id)
end
table.remove(callbackRegistry, id)
end
table.remove(callbackRegistry, id)
end)
jua.on("socket_message", function(event, id)
@@ -121,10 +127,12 @@ function init(jua)
end)
jua.on("socket_closed", function(event, id)
if id and callbackRegistry[id].closed then
callbackRegistry[id].closed(id)
if id then
if callbackRegistry[id].closed then
callbackRegistry[id].closed(id)
end
table.remove(callbackRegistry, id)
end
table.remove(callbackRegistry, id)
end)
end
end