Skip to content

Commit 1d5e153

Browse files
authored
Merge pull request LuaLS#705 from Gowa2017/master
delete some variables not in skynet and alias a skynet message handler
2 parents e94c50a + 52492c4 commit 1d5e153

File tree

1 file changed

+28
-38
lines changed

1 file changed

+28
-38
lines changed

meta/3rd/skynet/library/skynet.lua

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---@meta
2-
---@alias MESSAGETYPE
3-
---|+ PTYPE_TEXT = 0 文字类型
42
---@alias MESSAGENAME
53
---|+'"lua"'
64
---|+'"socket"'
@@ -14,42 +12,35 @@
1412
---|+'"debug"'
1513
---|+'"trace"'
1614
---@alias SERVICEADDR '".servicename"' | '":0000000C"' | integer
15+
---@alias MESSAGEHANDLER fun(session:integer, source:integer, ...)
1716
local skynet = {
1817
-- read skynet.h
19-
PTYPE_TEXT = 0,
20-
PTYPE_RESPONSE = 1,
21-
PTYPE_MULTICAST = 2,
22-
PTYPE_CLIENT = 3,
23-
PTYPE_SYSTEM = 4,
24-
PTYPE_HARBOR = 5,
25-
PTYPE_SOCKET = 6,
26-
PTYPE_ERROR = 7,
27-
PTYPE_QUEUE = 8, -- used in deprecated mqueue, use skynet.queue instead
28-
PTYPE_DEBUG = 9,
29-
PTYPE_LUA = 10,
30-
PTYPE_SNAX = 11,
31-
PTYPE_TRACE = 12, -- use for debug trace
32-
--- add by self
33-
PTYPE_CLIENT_MERGE = 13,
34-
--- 域逻辑信息,用与服务间通信
35-
PTYPE_LOGIC = 100,
36-
PTYPE_ROUTER = 101,
37-
PNAME_TEXT = "text",
38-
PNAME_RESPONSE = "response",
39-
PNAME_MULTICAST = "muliticast",
40-
PNAME_CLIENT = "client",
41-
PNAME_SYSTEM = "system",
42-
PNAME_HARBOR = "harbor",
43-
PNAME_SOCKET = "socket",
44-
PNAME_ERROR = "error",
45-
PNAME_QUEUE = "queue",
46-
PNAME_DEBUG = "debug",
47-
PNAME_LUA = "lua",
48-
PNAME_SNAX = "snax",
49-
PNAME_TRACE = "trace",
50-
PNAME_CLIENT_MERGE = "client_merge",
51-
PNAME_LOGIC = "logic",
52-
PNAME_ROUTER = "router",
18+
PTYPE_TEXT = 0,
19+
PTYPE_RESPONSE = 1,
20+
PTYPE_MULTICAST = 2,
21+
PTYPE_CLIENT = 3,
22+
PTYPE_SYSTEM = 4,
23+
PTYPE_HARBOR = 5,
24+
PTYPE_SOCKET = 6,
25+
PTYPE_ERROR = 7,
26+
PTYPE_QUEUE = 8, -- used in deprecated mqueue, use skynet.queue instead
27+
PTYPE_DEBUG = 9,
28+
PTYPE_LUA = 10,
29+
PTYPE_SNAX = 11,
30+
PTYPE_TRACE = 12, -- use for debug trace
31+
PNAME_TEXT = "text",
32+
PNAME_RESPONSE = "response",
33+
PNAME_MULTICAST = "muliticast",
34+
PNAME_CLIENT = "client",
35+
PNAME_SYSTEM = "system",
36+
PNAME_HARBOR = "harbor",
37+
PNAME_SOCKET = "socket",
38+
PNAME_ERROR = "error",
39+
PNAME_QUEUE = "queue",
40+
PNAME_DEBUG = "debug",
41+
PNAME_LUA = "lua",
42+
PNAME_SNAX = "snax",
43+
PNAME_TRACE = "trace",
5344

5445
}
5546

@@ -100,7 +91,7 @@ end
10091
---* f(...)
10192
---* end)
10293
---@param typename MESSAGENAME
103-
---@param func fun(session:integer, source:integer,...)
94+
---@param func MESSAGEHANDLER
10495
function skynet.dispatch(typename, func)
10596
end
10697

@@ -385,7 +376,6 @@ end
385376
function skynet.fork(func, ...)
386377
end
387378

388-
389379
-------------- 日志跟踪 API -------------
390380

391381
---* 写日志

0 commit comments

Comments
 (0)