Merge branch 'dev' of github.com:altmp/altv-js-module into dev

Former-commit-id: 57544d3
altmp · Nov 24, 2021 · 5cfd293 · 5cfd293
2 parents 64b5262 + bfc3b22
commit 5cfd293
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/client/src/CV8Resource.cpp b/client/src/CV8Resource.cpp
@@ -291,6 +291,15 @@ bool CV8ResourceImpl::OnEvent(const alt::CEvent* e)
         }
     }
 
+    {
+        if(e->GetType() == alt::CEvent::Type::WEB_VIEW_EVENT)
+        {
+            auto ev = static_cast<const alt::CWebViewEvent*>(e);
+            if (ev->GetName() == "load")
+                HandleWebViewEventQueue(ev->GetTarget());
+        }
+    }
+
     return true;
 }
 
@@ -402,3 +411,19 @@ void CV8ResourceImpl::RemoveWorker(CWorker* worker)
 {
     workers.erase(worker);
 }
+
+void CV8ResourceImpl::HandleWebViewEventQueue(const alt::Ref<alt::IWebView> view)
+{
+    auto& eventQueuesMap = this->GetWebviewsEventQueue();
+    if (!eventQueuesMap.count(view)) return;
+
+    auto& eventQueue = eventQueuesMap.at(view);
+    if (eventQueue.empty()) return;
+
+    for (auto& [evName, mvArgs] : eventQueue)
+    {
+        view->Trigger(evName, mvArgs);
+    }
+
+    eventQueuesMap.erase(view);
+}
diff --git a/client/src/CV8Resource.h b/client/src/CV8Resource.h
@@ -137,13 +137,25 @@ class CV8ResourceImpl : public V8ResourceImpl, public IImportHandler
         return workers.size();
     }
 
+    void AddWebViewEventToQueue(const alt::Ref<alt::IWebView> view, const alt::String& evName, const alt::MValueArgs& mvArgs)
+    {
+        webViewsEventsQueue[view].push_back(std::pair(evName, mvArgs));
+    }
 private:
     using WebViewEvents = std::unordered_multimap<std::string, V8::EventCallback>;
+    using WebViewsEventsQueue = std::unordered_map<alt::Ref<alt::IWebView>, std::vector<std::pair<alt::String, alt::MValueArgs>>>;
 
     std::unordered_map<alt::Ref<alt::IWebView>, WebViewEvents> webViewHandlers;
     std::unordered_map<alt::Ref<alt::IWebSocketClient>, WebViewEvents> webSocketClientHandlers;
     std::unordered_map<alt::Ref<alt::IAudio>, WebViewEvents> audioHandlers;
 
+    WebViewsEventsQueue webViewsEventsQueue;
+    WebViewsEventsQueue& GetWebviewsEventQueue()
+    {
+        return webViewsEventsQueue;
+    }
+    void HandleWebViewEventQueue(const alt::Ref<alt::IWebView> view);
+
     std::unordered_set<alt::Ref<alt::IBaseObject>> ownedObjects;
 
     std::unordered_set<CWorker*> workers;

diff --git a/client/src/bindings/WebView.cpp b/client/src/bindings/WebView.cpp
@@ -74,7 +74,10 @@ static void Emit(const v8::FunctionCallbackInfo<v8::Value>& info)
 
     for(int i = 1; i < info.Length(); ++i) mvArgs.Push(V8Helpers::V8ToMValue(info[i], false));
 
-    view->Trigger(evName, mvArgs);
+    if (!view->IsReady())
+        static_cast<CV8ResourceImpl*>(resource)->AddWebViewEventToQueue(view, evName, mvArgs);
+    else
+        view->Trigger(evName, mvArgs);
 }
 
 static void GetEventListeners(const v8::FunctionCallbackInfo<v8::Value>& info)