mq, refactor: Support for automatic conversion of string to fileHandl…

…er or HttpRepeater.
fibjs · Oct 20, 2019 · 9188041 · 9188041
1 parent f485ddb
commit 9188041
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/fibjs/include/ifs/Handler.h b/fibjs/include/ifs/Handler.h
@@ -24,6 +24,7 @@ class Handler_base : public object_base {
     static result_t _new(v8::Local<v8::Array> hdlrs, obj_ptr<Handler_base>& retVal, v8::Local<v8::Object> This = v8::Local<v8::Object>());
     static result_t _new(v8::Local<v8::Object> map, obj_ptr<Handler_base>& retVal, v8::Local<v8::Object> This = v8::Local<v8::Object>());
     static result_t _new(v8::Local<v8::Function> hdlr, obj_ptr<Handler_base>& retVal, v8::Local<v8::Object> This = v8::Local<v8::Object>());
+    static result_t _new(exlib::string hdlr, obj_ptr<Handler_base>& retVal, v8::Local<v8::Object> This = v8::Local<v8::Object>());
     virtual result_t invoke(object_base* v, obj_ptr<Handler_base>& retVal, AsyncEvent* ac) = 0;
 
 public:
@@ -89,6 +90,12 @@ void Handler_base::__new(const T& args)
 
     hr = _new(v0, vr, args.This());
 
+    METHOD_OVER(1, 1);
+
+    ARG(exlib::string, 0);
+
+    hr = _new(v0, vr, args.This());
+
     CONSTRUCT_RETURN();
 }
 

diff --git a/fibjs/src/mq/JSHandler.cpp b/fibjs/src/mq/JSHandler.cpp
@@ -119,17 +119,7 @@ result_t JSHandler::invoke(object_base* v, obj_ptr<Handler_base>& retVal,
             return CALL_RETURN_NULL;
     }
 
-    retVal = Handler_base::getInstance(hdlr);
-    if (retVal)
-        return 0;
-
-    if (hdlr->IsArray())
-        return Handler_base::_new(v8::Local<v8::Array>::Cast(hdlr), retVal);
-
-    if (IsJSObject(hdlr))
-        return Handler_base::_new(v8::Local<v8::Object>::Cast(hdlr), retVal);
-
-    return CHECK_ERROR(CALL_E_BADVARTYPE);
+    return GetArgumentValue(hdlr, retVal);
 }
 
 } /* namespace fibjs */
diff --git a/fibjs/src/mq/mq.cpp b/fibjs/src/mq/mq.cpp
@@ -8,15 +8,33 @@
 #include "object.h"
 #include "JSHandler.h"
 #include "ifs/mq.h"
+#include "ifs/HttpRepeater.h"
 #include "NullHandler.h"
 #include "HttpHandler.h"
 #include "Chain.h"
 #include "Routing.h"
+#include "HttpFileHandler.h"
 
 namespace fibjs {
 
 DECLARE_MODULE(mq);
 
+result_t Handler_base::_new(exlib::string hdlr, obj_ptr<Handler_base>& retVal,
+    v8::Local<v8::Object> This)
+{
+    if (!qstrcmp(hdlr.c_str(), "http:", 5) || !qstrcmp(hdlr.c_str(), "https:", 6)) {
+        obj_ptr<HttpRepeater_base> repeater;
+        result_t hr = HttpRepeater_base::_new(hdlr, repeater, This);
+        if (hr < 0)
+            return hr;
+
+        retVal = repeater;
+    } else
+        retVal = new HttpFileHandler(hdlr, false);
+
+    return 0;
+}
+
 result_t Handler_base::_new(v8::Local<v8::Array> hdlrs, obj_ptr<Handler_base>& retVal,
     v8::Local<v8::Object> This)
 {

diff --git a/idl/zh-cn/Handler.idl b/idl/zh-cn/Handler.idl
@@ -16,6 +16,11 @@ interface Handler : object
      */
     Handler(Function hdlr);
 
+    /*! @brief 构造一个 fileHandler 或者 HttpRepeater
+     @param hdlr 处理器的地址参数
+     */
+    Handler(String hdlr);
+
     /*! @brief 处理一个消息或对象
      @param v 指定处理的消息或对象
      @return 返回下一步的处理器