fit-webview-bridge 0.2.4a1__tar.gz → 0.2.6a1__tar.gz

{fit_webview_bridge-0.2.4a1 → fit_webview_bridge-0.2.6a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fit-webview-bridge
-Version: 0.2.4a1
+Version: 0.2.6a1
 Summary: Qt native WebView bridge with PySide6 bindings
 Author: FIT Project
 License: LGPL-3.0-or-later

{fit_webview_bridge-0.2.4a1 → fit_webview_bridge-0.2.6a1}/examples/macos/wkwebview_demo.py

@@ -63,6 +63,31 @@ class Main(QMainWindow):
         # segnali base
         self.view.titleChanged.connect(self.setWindowTitle)
         self.view.loadProgress.connect(lambda p: print("progress:", p))
+        self.view.setUserAgent(
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4 Safari/605.1.15"
+        )
+
+        def on_load_finished():
+            print("on_load_finished")
+            tok = self.view.evaluateJavaScriptWithResult(
+                "(() => ({ y: window.scrollY,"
+                "         h: Math.max(document.body.scrollHeight, document.documentElement.scrollHeight),"
+                "         vh: window.innerHeight }))()"
+            )
+
+            def on_js(result, token, error):
+                print(f"result: {result}")
+                if token != tok:
+                    return
+                if error:
+                    print("JS error:", error)
+                    return
+                # result è dict serializzato in JSON (se hai scelto la serializzazione)
+                # oppure primitive QVariant: gestiscilo e continua il flow di screenshot
+
+            self.view.javaScriptResult.connect(on_js)
+
+        self.view.loadFinished.connect(on_load_finished)
 
         # abilita/disabilita i bottoni in base alla navigazione
         self.btnBack.setEnabled(False)

{fit_webview_bridge-0.2.4a1 → fit_webview_bridge-0.2.6a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fit-webview-bridge"
-version = "0.2.4a1"
+version = "0.2.6a1"
 description = "Qt native WebView bridge with PySide6 bindings"
 requires-python = ">=3.11,<3.14"
 dependencies = ["PySide6==6.9.0", "shiboken6==6.9.0", "shiboken6-generator==6.9.0"]

{fit_webview_bridge-0.2.4a1 → fit_webview_bridge-0.2.6a1}/src/macos/WKWebViewWidget.h

@@ -23,11 +23,19 @@ public:
     Q_INVOKABLE void stop();
     Q_INVOKABLE void reload();
     Q_INVOKABLE void evaluateJavaScript(const QString& script);
+    Q_INVOKABLE quint64 evaluateJavaScriptWithResult(const QString& script);
+
 
     Q_INVOKABLE void setDownloadDirectory(const QString& dirPath);
     Q_INVOKABLE QString downloadDirectory() const;
     void renderErrorPage(const QUrl& url, const QString& reason, int httpStatus);
 
+     // ==== USER AGENT ====
+    Q_INVOKABLE void setUserAgent(const QString& ua);       // UA completo
+    Q_INVOKABLE QString userAgent() const;                  // restituisce l’override (se presente)
+    Q_INVOKABLE void resetUserAgent();                      // rimuove l’override
+    Q_INVOKABLE void setApplicationNameForUserAgent(const QString& appName); // opzionale
+
 signals:
     void loadFinished(bool ok);
     void urlChanged(const QUrl& url);
@@ -43,10 +51,16 @@ signals:
     void downloadFinished(DownloadInfo* info);
     void downloadFailed(const QString& filePath, const QString& error);
 
+    void javaScriptResult(const QVariant& result, quint64 token, const QString& error);
+
+
 protected:
     void showEvent(QShowEvent*) override;
     void resizeEvent(QResizeEvent*) override;
 
 private:
     struct Impl; Impl* d = nullptr;
+
+     // --- NEW: helper che applica UA
+    void applyUserAgent();
 };

{fit_webview_bridge-0.2.4a1 → fit_webview_bridge-0.2.6a1}/src/macos/WKWebViewWidget.mm

@@ -5,6 +5,11 @@
 #include "WKWebViewWidget.h"
 #include "DownloadInfo.h"
 
+#include <atomic>
+
+#include <QPointer>
+static std::atomic<quint64> s_jsToken{0};
+
 
 static inline void fit_emit_downloadStarted(WKWebViewWidget* owner,
                                             const QString& name,
@@ -53,6 +58,10 @@ struct WKWebViewWidget::Impl {
     WKUserContentController* ucc       = nil;
     FitUrlMsgHandler*        msg       = nil;
     QString                  downloadDir; // es. ~/Downloads
+
+    // --- UA ---
+    QString                  customUA;  // override UA (se non vuoto)
+    QString                  appUA;     // suffix via configuration (opzionale)
 };
 
 // =======================
@@ -854,6 +863,8 @@ WKWebViewWidget::WKWebViewWidget(QWidget* parent)
     d->delegate.webView = d->wk;
     [d->wk setNavigationDelegate:d->delegate];
     [d->wk setUIDelegate:d->delegate];
+
+    applyUserAgent();
 }
 
 WKWebViewWidget::~WKWebViewWidget() {
@@ -904,6 +915,45 @@ void WKWebViewWidget::evaluateJavaScript(const QString& script) {
     }];
 }
 
+quint64 WKWebViewWidget::evaluateJavaScriptWithResult(const QString& script) {
+    if (!d || !d->wk) return 0;
+    const quint64 token = ++s_jsToken;
+
+    NSString* s = [NSString stringWithUTF8String:script.toUtf8().constData()];
+
+    // ✅ usa QPointer invece di __weak
+    QPointer<WKWebViewWidget> guard(this);
+
+    [d->wk evaluateJavaScript:s completionHandler:^(id result, NSError* error) {
+        WKWebViewWidget* self = guard.data();
+        if (!self) return;  // l'oggetto Qt è stato distrutto: esci in sicurezza
+
+        QVariant out;
+        if ([result isKindOfClass:NSString.class]) {
+            out = QString::fromUtf8([(NSString*)result UTF8String]);
+        } else if ([result isKindOfClass:NSNumber.class]) {
+            out = QVariant::fromValue([(NSNumber*)result doubleValue]);
+        } else if (!result || result == (id)kCFNull) {
+            out = QVariant();
+        } else {
+            NSData* data = [NSJSONSerialization dataWithJSONObject:result options:0 error:nil];
+            if (data) out = QString::fromUtf8((const char*)data.bytes, (int)data.length);
+        }
+
+        const QString err = error
+            ? QString::fromUtf8(error.localizedDescription.UTF8String)
+            : QString();
+
+        // rimanda sul main loop Qt; se 'self' muore prima della consegna,
+        // Qt scarta la chiamata perché il receiver non esiste più
+        QMetaObject::invokeMethod(self, [self, out, token, err]{
+            emit self->javaScriptResult(out, token, err);
+        }, Qt::QueuedConnection);
+    }];
+
+    return token;
+}
+
 // =======================
 // Download directory API
 // =======================
@@ -1001,4 +1051,59 @@ void WKWebViewWidget::renderErrorPage(const QUrl& url,
     // Carica l'HTML direttamente nella webview
     [d->wk loadHTMLString:[NSString stringWithUTF8String:html.toUtf8().constData()]
                   baseURL:[NSURL URLWithString:@"about:blank"]];
-}
+}
+
+// --- NEW: metodo privato
+void WKWebViewWidget::applyUserAgent() {
+    if (!(d && d->wk)) return;
+    @autoreleasepool {
+        // Suffix via configuration.applicationNameForUserAgent
+        if (d->appUA.isEmpty()) {
+            @try { [d->wk.configuration setValue:nil forKey:@"applicationNameForUserAgent"]; } @catch(...) {}
+        } else {
+            NSString* s = [NSString stringWithUTF8String:d->appUA.toUtf8().constData()];
+            @try {
+                if ([d->wk.configuration respondsToSelector:@selector(setApplicationNameForUserAgent:)]) {
+                    d->wk.configuration.applicationNameForUserAgent = s;
+                } else {
+                    [d->wk.configuration setValue:s forKey:@"applicationNameForUserAgent"];
+                }
+            } @catch(...) {}
+        }
+
+        // Override totale via customUserAgent
+        if (d->customUA.isEmpty()) {
+            @try { d->wk.customUserAgent = nil; } @catch(...) {
+                @try { [d->wk setValue:nil forKey:@"customUserAgent"]; } @catch(...) {}
+            }
+        } else {
+            NSString* ua = [NSString stringWithUTF8String:d->customUA.toUtf8().constData()];
+            @try { d->wk.customUserAgent = ua; } @catch(...) {
+                @try { [d->wk setValue:ua forKey:@"customUserAgent"]; } @catch(...) {}
+            }
+        }
+    }
+}
+
+// --- API pubblica UA
+void WKWebViewWidget::setUserAgent(const QString& ua) {
+    if (!d) return;
+    d->customUA = ua.trimmed();
+    applyUserAgent();
+}
+
+QString WKWebViewWidget::userAgent() const {
+    return d ? d->customUA : QString();
+}
+
+void WKWebViewWidget::resetUserAgent() {
+    if (!d) return;
+    d->customUA.clear();
+    applyUserAgent();
+}
+
+void WKWebViewWidget::setApplicationNameForUserAgent(const QString& appName) {
+    if (!d) return;
+    d->appUA = appName.trimmed();
+    applyUserAgent();
+}