run event handler registered by strategy after running system handler

rqalpha/api/api_base.py

@@ -940,4 +940,4 @@ def get_position(order_book_id, direction):
 )
 def subscribe_event(event_type, handler):
     env = Environment.get_instance()
-    env.event_bus.add_listener(event_type, handler)
+    env.event_bus.add_listener(event_type, handler, user=True)

rqalpha/events.py

@@ -30,19 +30,23 @@ def __repr__(self):
 class EventBus(object):
     def __init__(self):
         self._listeners = defaultdict(list)
+        self._user_listeners = defaultdict(list)
 
-    def add_listener(self, event_type, listener):
-        self._listeners[event_type].append(listener)
+    def add_listener(self, event_type, listener, user=False):
+        (self._user_listeners if user else self._listeners)[event_type].append(listener)
 
-    def prepend_listener(self, event_type, listener):
-        self._listeners[event_type].insert(0, listener)
+    def prepend_listener(self, event_type, listener, user=False):
+        (self._user_listeners if user else self._listeners)[event_type].insert(0, listener)
 
     def publish_event(self, event):
         for listener in self._listeners[event.event_type]:
             # 如果返回 True ，那么消息不再传递下去
             if listener(event):
                 break
 
+        for listener in self._user_listeners[event.event_type]:
+            listener(event)
+
 
 class EVENT(Enum):
     # 系统初始化后触发