improve super for server

3 files changed, 85 insertions, 12 deletions

diff --git a/xmake/plugins/service/config.lua b/xmake/plugins/service/config.lua
new file mode 100644
index 000000000..239759225
--- /dev/null
+++ b/xmake/plugins/service/config.lua
@@ -0,0 +1,54 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        config.lua
+--
+
+-- imports
+import("core.base.object")
+
+-- define module
+local config = config or object()
+
+-- init config
+function config:init()
+end
+
+-- get the listen address
+function config:addr()
+    return "127.0.0.1"
+end
+
+-- get the listen port
+function config:port()
+    return 90091
+end
+
+-- get class
+function config:class()
+    return config
+end
+
+function config:__tostring()
+    return "<config>"
+end
+
+function main()
+    local instance = config()
+    instance:init()
+    return instance
+end
diff --git a/xmake/plugins/service/remote_build_server/main.lua b/xmake/plugins/service/remote_build_server/main.lua
index 2dc89cf95..60a24f0f8 100644
--- a/xmake/plugins/service/remote_build_server/main.lua
+++ b/xmake/plugins/service/remote_build_server/main.lua
@@ -23,20 +23,30 @@ import(".server")
 
 -- define module
 local remote_build_server = remote_build_server or server()
+local super = remote_build_server:class()
 
 -- init server
 function remote_build_server:init()
-    self:super():init(self)
+    super.init(self)
+    super.handler_set(self, self.handler)
 end
 
--- run main loop
-function remote_build_server:runloop()
-    self:super():runloop(self)
+-- the server handler
+function remote_build_server:handler(sock)
+    print("on handler")
+end
+
+-- get class
+function remote_build_server:class()
+    return remote_build_server
+end
+
+function remote_build_server:__tostring()
+    return "<remote_build_server>"
 end
 
 function main()
     local instance = remote_build_server()
-    instance._super = remote_build_server
     instance:init()
     return instance
 end
diff --git a/xmake/plugins/service/server.lua b/xmake/plugins/service/server.lua
index 5fd1cb860..e2ccbbd86 100644
--- a/xmake/plugins/service/server.lua
+++ b/xmake/plugins/service/server.lua
@@ -29,9 +29,9 @@ local server = server or object()
 function server:init()
 end
 
--- get super
-function server:super()
-    return self._super
+-- set handler
+function server:handler_set(handler)
+    self._HANDLER = handler
 end
 
 -- get the listen address
@@ -46,24 +46,33 @@ end
 
 -- run main loop
 function server:runloop()
-    local sock_clients = {}
+    assert(self._HANDLER, "no handler found!")
     local sock = socket.bind(self:addr(), self:port())
     sock:listen(100)
-    print("%s: listening %s:%d ..", sock, self:addr(), self:port())
+    print("%s: listening %s:%d ..", self, self:addr(), self:port())
     while true do
         local sock_client = sock:accept()
         if sock_client then
             scheduler.co_start(function (sock)
-                print("%s: accepted", sock_client)
+                self._HANDLER(self, sock)
+                sock:close()
             end, sock_client)
         end
     end
     sock:close()
 end
 
+-- get class
+function server:class()
+    return server
+end
+
+function server:__tostring()
+    return "<server>"
+end
+
 function main()
     local instance = server()
-    instance._super = server
     instance:init()
     return instance
 end