删除 bee.lua 兼容性层和相关测试，更新相关模块以直接使用新 API

Author: sumneko

COMPAT_FIXES.md

@@ -1,7 +1,12 @@
-local thread = require 'bee-compat'
+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 taskPad = channelMod.query('taskpad')
+local waiter  = channelMod.query('waiter')
+
+assert(taskPad, 'taskpad channel not found')
+assert(waiter, 'waiter channel not found')
 
 ---@class pub_brave
 local m = {}
@@ -42,11 +47,24 @@ 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
+    local reqPad = privatePad and channelMod.query('req:' .. privatePad) or taskPad
+    local resPad = privatePad and channelMod.query('res:' .. privatePad) or waiter
+    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

script/bee-compat.lua

@@ -1,7 +1,7 @@
 ---@meta
 
 ---@class bee.channel
-local channel_mod = {}
+local channelMod = {}
 
 ---@class bee.channel.object
 local channel = {}
@@ -21,16 +21,16 @@ end
 
 ---@param name string
 ---@return bee.channel.object
-function channel_mod.create(name)
+function channelMod.create(name)
 end
 
 ---@param name string
-function channel_mod.destroy(name)
+function channelMod.destroy(name)
 end
 
 ---@param name string
 ---@return bee.channel.object?
-function channel_mod.query(name)
+function channelMod.query(name)
 end
 
-return channel_mod
+return channelMod

script/brave/brave.lua

@@ -1,14 +1,14 @@
-local thread  = require 'bee-compat'
-local channel = require 'bee.channel'
-local utility = require 'utility'
-local await   = require 'await'
+local thread     = require 'bee.thread'
+local channelMod = require 'bee.channel'
+local selectMod  = require 'bee.select'
+local utility    = require 'utility'
+local await      = require 'await'
 
-thread.newchannel 'taskpad'
-thread.newchannel 'waiter'
+local taskPad = channelMod.create('taskpad')
+local waiter  = channelMod.create('waiter')
+local selector = selectMod.create()
+selector:event_add(waiter:fd(), selectMod.SELECT_READ)
 
-local errLog  = thread.channel 'errlog'
-local taskPad = thread.channel 'taskpad'
-local waiter  = thread.channel 'waiter'
 local type    = type
 local counter = utility.counter()
 
@@ -51,7 +51,7 @@ function m.recruitBraves(num, privatePad)
         log.debug('Create brave:', id)
         m.braves[id] = {
             id      = id,
-            thread  = thread.thread(braveTemplate:format(
+            thread  = thread.create(braveTemplate:format(
                 package.path,
                 package.cpath,
                 DEVELOP,
@@ -67,11 +67,12 @@ function m.recruitBraves(num, privatePad)
         }
     end
     if privatePad and not m.prvtPad[privatePad] then
-        thread.newchannel('req:' .. privatePad)
-        thread.newchannel('res:' .. privatePad)
+        local reqCh = channelMod.create('req:' .. privatePad)
+        local resCh = channelMod.create('res:' .. privatePad)
+        selector:event_add(resCh:fd(), selectMod.SELECT_READ)
         m.prvtPad[privatePad] = {
-            req = thread.channel('req:' .. privatePad),
-            res = thread.channel('res:' .. privatePad),
+            req = reqCh,
+            res = resCh,
         }
     end
 end
@@ -167,11 +168,18 @@ end
 --- 接收反馈
 function m.recieve(block)
     if block then
-        local id, name, result = waiter:bpop()
-        if type(name) == 'string' then
-            m.popReport(m.braves[id], name, result)
-        else
-            m.popTask(m.braves[id], name, result)
+        -- 使用 select 等待数据
+        while true do
+            local ok, id, name, result = waiter:pop()
+            if ok then
+                if type(name) == 'string' then
+                    m.popReport(m.braves[id], name, result)
+                else
+                    m.popTask(m.braves[id], name, result)
+                end
+                break
+            end
+            selector:wait(-1)
         end
     else
         while true do
@@ -195,8 +203,8 @@ end
 --- 检查伤亡情况
 function m.checkDead()
     while true do
-        local suc, err = errLog:pop()
-        if not suc then
+        local err = thread.errlog()
+        if not err then
             break
         end
         log.error('Brave is dead!: ' .. err)