feat: upgrade ua-parser to v2

softvisio-node · Nov 20, 2024 · fc1b0d6 · fc1b0d6
1 parent fc59e71
commit fc1b0d6
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/lib/user-agent.js b/lib/user-agent.js
@@ -1,5 +1,5 @@
 import { UAParser } from "ua-parser-js";
-import * as extensions from "ua-parser-js/extensions";
+import * as defaultExtensions from "ua-parser-js/extensions";
 import { isAIBot, isBot, isChromeFamily } from "ua-parser-js/helpers";
 
 export default class UserAgent {
@@ -12,16 +12,29 @@ export default class UserAgent {
     #isAiBot;
     #isChromeFamily;
 
-    constructor ( ua ) {
+    constructor ( ua, { extensions = true, withClientHints } = {} ) {
+        if ( extensions === true ) {
+            extensions = defaultExtensions;
+        }
+
+        // from string
         if ( !ua || typeof ua === "string" ) {
             this.#ua = UAParser( ua, extensions );
         }
+
+        // from headers
         else if ( ua[ "user-agent" ] ) {
-            this.#ua = UAParser( extensions, ua ).withClientHints();
+            this.#ua = UAParser( extensions, ua );
         }
+
+        // from json
         else {
             this.#ua = UAParser( ua.ua, extensions );
         }
+
+        if ( withClientHints && !this.#ua.browser.type ) {
+            this.#ua = this.#ua.withClientHints();
+        }
     }
 
     // static