Merge branch 'new-bee'

sumneko · sumneko · commit 401bf3a266f1 · 2025-11-26T21:51:33.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,6 +35,11 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actboy168/setup-luamake@master
+
       - name: Install aarch64-linux-gnu
         if: ${{ matrix.platform == 'linux-arm64' && matrix.libc != 'musl' }}
         run: |
@@ -53,10 +58,6 @@ jobs:
           sudo apt update
           sudo apt install ninja-build
 
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
       - name: Build for Windows
         if: ${{ matrix.target == 'windows' }}
         run: .\make.bat ${{ matrix.platform }}
@@ -69,7 +70,6 @@ jobs:
       - name: Build for macOS
         if: ${{ matrix.target == 'darwin' }}
         run: |
-          brew install ninja
           ./make.sh ${{ matrix.platform }}
 
       - name: Build for x64 glibc
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - uses: actboy168/setup-luamake@master
       - name: Build for Windows
         if: ${{ matrix.target == 'windows' }}
         run: .\make.bat
@@ -26,5 +27,4 @@ jobs:
       - name: Build for macOS
         if: ${{ matrix.target == 'darwin' }}
         run: |
-          brew install ninja
           ./make.sh
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,21 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE"
+            ],
+            "windowsSdkVersion": "10.0.26100.0",
+            "compilerPath": "cl.exe",
+            "cStandard": "c17",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "windows-msvc-x64"
+        }
+    ],
+    "version": 4
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,7 +26,7 @@
 			"type": "lua",
 			"request": "attach",
 			"stopOnEntry": false,
-			"address": "127.0.0.1:11413",
+			"address": "127.0.0.1:11414",
 			"outputCapture": [
 			],
 			"sourceFormat": "string",
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,4 +8,7 @@
         //"--shownode",
         //"--lazy",
     ],
+    "files.associations": {
+        "thread": "cpp"
+    },
 }
diff --git a/3rd/bee.lua b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit 8c01c7d79612d47f47f17d80304e66ae14d7b953
+Subproject commit dd7853f1bd010c701fb5fc4ee0d4082cdbc07ae8
diff --git a/3rd/json.lua b/3rd/json.lua
@@ -1 +1 @@
-Subproject commit 9ae6772870ff0480ec83fc88dc8ffa52880b3a98
+Subproject commit aff2a3d90dd35b5761301de0e2af700266aec41a
diff --git a/3rd/luamake b/3rd/luamake
@@ -1 +1 @@
-Subproject commit c086f35cfad0236f74ba380d51f211c52a2c8abc
+Subproject commit 0e90778390fb11d917c6e4c5cb963356a0780fb0
diff --git a/main.lua b/main.lua
@@ -53,6 +53,9 @@ ROOT     = fs.path(util.expandPath(rootPath))
 LOGPATH  = LOGPATH  and util.expandPath(LOGPATH)  or (ROOT:string() .. '/log')
 METAPATH = METAPATH and util.expandPath(METAPATH) or (ROOT:string() .. '/meta')
 
+util.enableCloseFunction()
+util.enableFormatString()
+
 ---@diagnostic disable-next-line: deprecated
 debug.setcstacklimit(200)
 collectgarbage('generational', 10, 50)
diff --git a/make.lua b/make.lua
@@ -23,22 +23,25 @@ lm:import "make/code_format.lua"
 
 lm:source_set 'lpeglabel' {
     rootdir = '3rd',
-    includes = "bee.lua/3rd/lua",
+    includes = "bee.lua/3rd/lua54",
     sources = "lpeglabel/*.c",
     defines = {
         'MAXRECLEVEL=1000',
     },
+    deps = "source_lua",
 }
 
 lm:executable "lua-language-server" {
     deps = {
+        "source_bee",
+        "source_lua",
         "lpeglabel",
         "source_bootstrap",
         includeCodeFormat and "code_format" or nil,
     },
     includes = {
         "3rd/bee.lua",
-        "3rd/bee.lua/3rd/lua",
+        "3rd/bee.lua/3rd/lua54",
     },
     sources = "make/modules.cpp",
     windows = {
diff --git a/make/code_format.lua b/make/code_format.lua
@@ -9,7 +9,7 @@ lm:source_set 'code_format' {
         "Util/include",
         "CodeFormatCore/include",
         "LuaParser/include",
-        "../bee.lua/3rd/lua",
+        "../bee.lua/3rd/lua54",
         "3rd/wildcards/include"
     },
     sources = {
diff --git a/make/modules.cpp b/make/modules.cpp
@@ -1,7 +1,7 @@
-#include <binding/binding.h>
+#include <bee/lua/module.h>
 
 extern "C" int luaopen_lpeglabel (lua_State *L);
-static ::bee::lua::callfunc _init(::bee::lua::register_module, "lpeglabel", luaopen_lpeglabel);
+static ::bee::lua::callfunc _init_lpeg(::bee::lua::register_module, "lpeglabel", luaopen_lpeglabel);
 
 #ifdef CODE_FORMAT
 extern "C" int luaopen_code_format(lua_State *L);
diff --git a/meta/3rd/bee b/meta/3rd/bee
@@ -1 +1 @@
-Subproject commit c0bc5349e5fa741d7ad8d6d5c7624a54dcfd9ebe
+Subproject commit c8ce19fd5536a7e98ef186d1d75825f0bb8c9216
diff --git a/script/brave/brave.lua b/script/brave/brave.lua
@@ -1,7 +1,9 @@
-local thread = require 'bee.thread'
+local thread     = require 'bee.thread'
+local channelMod = require 'bee.channel'
+local selectMod  = require 'bee.select'
 
-local taskPad = thread.channel('taskpad')
-local waiter  = thread.channel('waiter')
+local reqPad
+local resPad
 
 ---@class pub_brave
 local m = {}
@@ -10,17 +12,26 @@ m.ability = {}
 m.queue = {}
 
 --- 注册成为勇者
-function m.register(id, privatePad)
+---@param id integer
+---@param taskChName string
+---@param replyChName string
+function m.register(id, taskChName, replyChName)
     m.id = id
 
+    reqPad = channelMod.query(taskChName)
+    resPad = channelMod.query(replyChName)
+
+    assert(reqPad, 'task channel not found: ' .. taskChName)
+    assert(resPad, 'reply channel not found: ' .. replyChName)
+
     if #m.queue > 0 then
         for _, info in ipairs(m.queue) do
-            waiter:push(m.id, info.name, info.params)
+            resPad:push(info.name, info.params)
         end
     end
     m.queue = nil
 
-    m.start(privatePad)
+    m.start()
 end
 
 --- 注册能力
@@ -30,8 +41,8 @@ end
 
 --- 报告
 function m.push(name, params)
-    if m.id then
-        waiter:push(m.id, name, params)
+    if m.id and resPad then
+        resPad:push(name, params)
     else
         m.queue[#m.queue+1] = {
             name   = name,
@@ -41,24 +52,35 @@ function m.push(name, params)
 end
 
 --- 开始找工作
-function m.start(privatePad)
-    local reqPad = privatePad and thread.channel('req:' .. privatePad) or taskPad
-    local resPad = privatePad and thread.channel('res:' .. privatePad) or waiter
+function m.start()
+    local selector = selectMod.create()
+    selector:event_add(reqPad:fd(), selectMod.SELECT_READ)
+
     m.push('mem', collectgarbage 'count')
     while true do
-        local name, id, params = reqPad:bpop()
+        -- 使用 select 实现阻塞等待
+        local name, id, params
+        while true do
+            local ok, n, i, p = reqPad:pop()
+            if ok then
+                name, id, params = n, i, p
+                break
+            end
+            selector:wait(-1)
+        end
+
         local ability = m.ability[name]
         -- TODO
         if not ability then
-            resPad:push(m.id, id)
+            resPad:push(id)
             log.error('Brave can not handle this work: ' .. name)
             goto CONTINUE
         end
         local ok, res = xpcall(ability, log.error, params)
         if ok then
-            resPad:push(m.id, id, res)
+            resPad:push(id, res)
         else
-            resPad:push(m.id, id)
+            resPad:push(id)
         end
         m.push('mem', collectgarbage 'count')
         ::CONTINUE::
diff --git a/script/core/diagnostics/global-element.lua b/script/core/diagnostics/global-element.lua
@@ -39,6 +39,7 @@ return function (uri, callback)
         return
     end
 
+    ---@type table<string, boolean?>
     local definedGlobal = util.arrayToHash(config.get(uri, 'Lua.diagnostics.globals'))
     local definedGlobalRegex = config.get(uri, 'Lua.diagnostics.globalsRegex')
 
diff --git a/script/core/diagnostics/lowercase-global.lua b/script/core/diagnostics/lowercase-global.lua
@@ -38,6 +38,7 @@ return function (uri, callback)
         return
     end
 
+    ---@type table<string, boolean?>
     local definedGlobal = util.arrayToHash(config.get(uri, 'Lua.diagnostics.globals'))
     local definedGlobalRegex = config.get(uri, 'Lua.diagnostics.globalsRegex')
 
diff --git a/script/meta/bee/channel.lua b/script/meta/bee/channel.lua
@@ -0,0 +1,36 @@
+---@meta
+
+---@class bee.channel
+local channelMod = {}
+
+---@class bee.channel.object
+local channel = {}
+
+---@param ... any
+function channel:push(...)
+end
+
+---@return boolean success
+---@return ...
+function channel:pop()
+end
+
+---@return userdata
+function channel:fd()
+end
+
+---@param name string
+---@return bee.channel.object
+function channelMod.create(name)
+end
+
+---@param name string
+function channelMod.destroy(name)
+end
+
+---@param name string
+---@return bee.channel.object?
+function channelMod.query(name)
+end
+
+return channelMod
diff --git a/script/meta/bee/filesystem.lua b/script/meta/bee/filesystem.lua
@@ -49,6 +49,7 @@ fs.copy_options = copy_options
 function fs.path(path)
 end
 
+---@deprecated Use bee.sys.exe_path() instead
 ---@return fs.path
 function fs.exe_path()
 end
diff --git a/script/meta/bee/sys.lua b/script/meta/bee/sys.lua
@@ -0,0 +1,14 @@
+---@meta
+
+---@class bee.sys
+local sys = {}
+
+---@return fs.path
+function sys.exe_path()
+end
+
+---@return fs.path
+function sys.dll_path()
+end
+
+return sys
diff --git a/script/meta/bee/thread.lua b/script/meta/bee/thread.lua
@@ -6,26 +6,42 @@ local thread = {}
 ---@param time number
 function thread.sleep(time) end
 
+---@deprecated Use bee.channel.create() instead, or use bee-compat module
 ---@param name string
 function thread.newchannel(name) end
 
+---@deprecated Use bee.channel.query() instead, or use bee-compat module
 ---@param name string
 ---@return bee.thread.channel
 function thread.channel(name) end
 
+---@param script string
+---@return userdata
+function thread.create(script) end
+
+---@deprecated Use thread.create() instead
 ---@param script string
 ---@return bee.thread.thread
 function thread.thread(script) end
 
 ---@return string?
 function thread.errlog() end
 
+---@param handle userdata
+function thread.wait(handle) end
+
+---@param name string
+function thread.setname(name) end
+
+---@type integer
+thread.id = 0
+
 ---@class bee.thread.channel
 local channel = {}
 
 function channel:push(...) end
 
----@return ...
+---@return boolean, ...
 function channel:pop() end
 
 ---@return ...
diff --git a/script/plugins/ffi/init.lua b/script/plugins/ffi/init.lua
@@ -351,12 +351,13 @@ function m.compileCodes(codes)
     return lines
 end
 
+---@param fileDir fs.path
 function m.build_single(codes, fileDir, uri)
     local texts = m.compileCodes(codes)
     if not texts then
         return
     end
-    local fullPath = fileDir /ws.getRelativePath(uri)
+    local fullPath = fileDir / ws.getRelativePath(uri)
 
     if fullPath:stem():string():find '%.' then
         local newPath = fullPath:parent_path() / (fullPath:stem():string():gsub('%.', '/') .. ".lua")
diff --git a/script/pub/pub.lua b/script/pub/pub.lua
diff --git a/script/service/service.lua b/script/service/service.lua
diff --git a/script/utility.lua b/script/utility.lua
diff --git a/test.lua b/test.lua

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,7 @@`
`8`	`8`	`//"--shownode",`
`9`	`9`	`//"--lazy",`
`10`	`10`	`],`
	`11`	`+ "files.associations": {`
	`12`	`+ "thread": "cpp"`
	`13`	`+ },`
`11`	`14`	`}`