3 files changed, 44 insertions, 41 deletions
diff --git a/server-beta/src/pub/brave.lua b/server-beta/src/pub/brave.lua
index 5e4f85ad..c9fd0afe 100644
--- a/server-beta/src/pub/brave.lua
+++ b/server-beta/src/pub/brave.lua
@@ -1,5 +1,6 @@
 local thread = require 'bee.thread'
 
+---@class pub_brave
 local m = {}
 m.type = 'pub.brave'
 
diff --git a/server-beta/src/pub/client.lua b/server-beta/src/pub/client.lua
index 1212adf2..5ac24684 100644
--- a/server-beta/src/pub/client.lua
+++ b/server-beta/src/pub/client.lua
@@ -1,4 +1,6 @@
 local thread  = require 'bee.thread'
+local utility = require 'utility'
+local task    = require 'task'
 
 local braveTemplate = [[
 package.path  = %q
@@ -14,6 +16,7 @@ m.type = 'pub.client'
 m.braves = {}
 
 --- 招募勇者，勇者会从公告板上领取任务，完成任务后到看板娘处交付任务
+---@param num integer
 function m:recruitBraves(num)
     for _ = 1, num do
         local id = #self.braves + 1
@@ -21,6 +24,7 @@ function m:recruitBraves(num)
         thread.newchannel('taskpad' .. id)
         thread.newchannel('waiter'  .. id)
         self.braves[id] = {
+            id      = id,
             taskpad = thread.channel('taskpad' .. id),
             waiter  = thread.channel('waiter'  .. id),
             thread  = thread.thread(braveTemplate:format(
@@ -28,13 +32,50 @@ function m:recruitBraves(num)
                 package.cpath,
                 id
             )),
+            taskList = {},
+            counter  = utility.counter(),
+            currentTask = nil,
         }
     end
 end
 
---- 发布任务
-function m:task()
+--- 勇者是否有空
+function m:isIdle(brave)
+    return brave.currentTask == nil and not next(brave.taskList)
+end
+
+--- 给勇者推送任务
+function m:pushTask(brave, name, ...)
+    local taskID = brave.counter()
+    local co = coroutine.running()
+    brave.taskpad:push(name, taskID, ...)
+    brave.taskList[taskID] = co
+    return coroutine.yield(co)
+end
+
+--- 从勇者处接收任务反馈
+function m:popTask(brave, id, ...)
+    local co = brave.taskList[id]
+    if not co then
+        log.warn(('Brave pushed unknown task result: [%d] => [%d]'):format(brave.id, id))
+        return
+    end
+    brave.taskList[id] = nil
+    coroutine.resume(co, ...)
+end
 
+--- 发布任务
+---@parma name string
+function m:task(name, ...)
+    local _, main = coroutine.running()
+    if main then
+        error('不能在主协程中发布任务')
+    end
+    for _, brave in ipairs(self.braves) do
+        if self:isIdle(brave) then
+            return self:pushTask(brave, name, ...)
+        end
+    end
 end
 
 return m
diff --git a/server-beta/src/pub/pub.lua b/server-beta/src/pub/pub.lua
deleted file mode 100644
index 0fd7945f..00000000
--- a/server-beta/src/pub/pub.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-local thread  = require 'bee.thread'
-local taskpad = require 'pub.taskpad'
-local waiter  = require 'pub.waiter'
-local brave   = require 'pub.brave'
-
----@class pub
-local m = {}
-m.type = 'pub'
-
---- 委托人招募勇者，勇者会从公告板上领取任务，完成任务后到看板娘处交付任务
-function m:recruitBraves(num)
-    if self.mode ~= 'client' then
-        error('只有委托人可以招募勇者')
-    end
-    for _ = 1, num do
-        local n = #self.braves + 1
-        self.braves[n] = brave(n)
-    end
-end
-
---- 委托人发布任务
-function m:task()
-
-end
-
---- 注册成为委托人
-function m:registerClient()
-    self.mode = 'client'
-    self.braves = {}
-end
-
---- 注册成为勇者
-function m:registerBrave(id)
-    self.mode = 'brave'
-    self.taskpad = thread.channel('taskpad' .. id)
-    self.waiter  = thread.channel('waiter'  .. id)
-end
-
-return m