Merge tag '2.0.3' into pro-personal

- `HuaweiBrowser` => `Huawei Browser`,
- `Miui Browser` => `MIUI Browser`,
- `OperaMobile` => `Opera Mobi`,
- `YaBrowser` => `Yandex`

.github/workflows/test-ci.yml

@@ -10,14 +10,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: [amd64, ppc64le]
+        arch: [amd64]
+        node-version: ['22.13', 'lts/*']
+        include:
+          - arch: ppc64le
+            node-version: 20
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with: 
-          node-version: 'lts/*'
+          node-version:  ${{ matrix.node-version }}
       - name: Run the test
         run: |
+          echo "Running on ubuntu-latest-${{ matrix.arch }} with node version set as ${{ matrix.node-version }}"
           npm ci
           npx playwright install --with-deps
           npm test

CHANGELOG.md

@@ -65,6 +65,59 @@
 
 --- 
 
+## Version 2.0.3
+
+- Add new browser: Dooble, Ecosia, LG Browser, Otter, qutebrowser, Surf
+- Add new device: BLU, Facebook Portal TV
+- Improve device detection: Archos, LG, Meta Quest
+- Remove jazzer.js fuzz test
+- Improve `withClientHints()`:
+    - Browser naming adjustments:
+        - `HuaweiBrowser` => `Huawei Browser`
+        - `Miui Browser` => `MIUI Browser`
+        - `OperaMobile` => `Opera Mobi`
+        - `YaBrowser` => `Yandex`
+- `extensions` submodule:
+    - Add new Crawler: AdIdxBot, Linespider, LinkedInBot, OpenAI Image Downloader, SemrushBot, Yahoo! Slurp
+    - Add new Fetcher: Better Uptime Bot, Google-PageRenderer, GoogleImageProxy, MicrosoftPreview, Snap URL Preview, SkypeUriPreview, TelegramBot
+    - Add new Vehicles: BMW, Jeep
+    - Add OS detection of WhatsApp user-agent
+
+## Version 2.0.2
+
+- Fix TypeScript dependency issue
+
+## Version 2.0.1
+
+- Add new browser: Ladybird, Daum
+- Add new device: Apple HomePod
+- Add new device vendor: HMD
+- Add new OS: Ubuntu Touch, Windows IoT
+- Improve CPU detection: ARM, x86
+- Improve device detection: Lenovo, Nokia, Nvidia, Xiaomi
+    - Tablet: Google, Honor, Huawei, Infinix, Nokia, OnePlus, Xiaomi
+    - Wearable: Asus, Google, LG, Motorola, OnePlus, Oppo, Samsung, Sony
+    - Smart-TV: Xiaomi, unidentified vendors
+    - Improve detection for unknown VR devices
+    - Improve device model detection for Generic devices
+- Improve OS detection: Linux, Symbian
+- Improve TypeScript definitions for Headers
+- Improve `withClientHints()`:
+    - `engine.version` also get updated
+    - Infer `device.vendor` & `device.type` by guessing from `device.model`
+    - Browser naming adjustments:
+        - `Google Chrome` => `Chrome`
+        - `Microsoft Edge` => `Edge`
+        - `Android WebView` => `Chrome WebView`
+        - `HeadlessChrome` => `Chrome Headless`
+- `enums` submodule:
+    - Add TypeScript definitions
+- `extensions` submodule:
+    - Add new list: 
+        - `Vehicles`: BYD, Rivian, Volvo
+    - Add new Fetcher: Bluesky
+    - Add new Library: Apache-HttpClient, go-http-client, got, GuzzleHttp, Java-http-client, libwww-perl, lua-resty-http, Needle, OkHttp, node-fetch, PHP-SOAP, PostmanRuntime, superagent
+
 ## Version 2.0.0
 
 - `ua-parser-js/extensions` submodule:
@@ -166,6 +219,15 @@
 
 ---
 
+## Version 0.7.40 / 1.0.40
+- Add new browser: 115, LibreWolf, Slimboat, Slimjet
+- Add new device: Advan, Cat, Energizer, IMO, Micromax, Smartfren
+- Add new engine: ArkWeb, Servo
+- Add new os: OpenHarmony
+- Improve browser detection: 2345, 360, Dragon, Iron, Maxthon
+- Recognize Honor as a separate device vendor from Huawei
+- Fix Python Request mistakenly identified as Meta Quest
+
 ## Version 0.7.39 / 1.0.39
 - Add new feature: executable command using `npx ua-parser-js "[INSERT-UA-HERE]"`
 - Add new browser: Helio, Pico Browser, Wolvic

LICENSE.md

@@ -1,616 +1,73 @@
-# GNU AFFERO GENERAL PUBLIC LICENSE
-
-Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc.
-<https://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-## Preamble
-
-The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains
-free software for all its users.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing
-under this license.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-## TERMS AND CONDITIONS
-
-### 0. Definitions.
-
-"This License" refers to version 3 of the GNU Affero General Public
-License.
-
-"Copyright" also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of
-an exact copy. The resulting work is called a "modified version" of
-the earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user
-through a computer network, with no transfer of a copy, is not
-conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to
-the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-### 1. Source Code.
-
-The "source code" for a work means the preferred form of the work for
-making modifications to it. "Object code" means any non-source form of
-a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can
-regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same
-work.
-
-### 2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey,
-without conditions so long as your license otherwise remains in force.
-You may convey covered works to others for the sole purpose of having
-them make modifications exclusively for you, or provide you with
-facilities for running those works, provided that you comply with the
-terms of this License in conveying all material for which you do not
-control copyright. Those thus making or running the covered works for
-you must do so exclusively on your behalf, under your direction and
-control, on terms that prohibit them from making any copies of your
-copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the
-conditions stated below. Sublicensing is not allowed; section 10 makes
-it unnecessary.
-
-### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such
-circumvention is effected by exercising rights under this License with
-respect to the covered work, and you disclaim any intention to limit
-operation or modification of the work as a means of enforcing, against
-the work's users, your or third parties' legal rights to forbid
-circumvention of technological measures.
-
-### 4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-### 5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these
-conditions:
-
--   a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
--   b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under
-    section 7. This requirement modifies the requirement in section 4
-    to "keep intact all notices".
--   c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
--   d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-### 6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of
-sections 4 and 5, provided that you also convey the machine-readable
-Corresponding Source under the terms of this License, in one of these
-ways:
-
--   a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
--   b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the Corresponding
-    Source from a network server at no charge.
--   c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
--   d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
--   e) Convey the object code using peer-to-peer transmission,
-    provided you inform other peers where the object code and
-    Corresponding Source of the work are being offered to the general
-    public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal,
-family, or household purposes, or (2) anything designed or sold for
-incorporation into a dwelling. In determining whether a product is a
-consumer product, doubtful cases shall be resolved in favor of
-coverage. For a particular product received by a particular user,
-"normally used" refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way
-in which the particular user actually uses, or expects or is expected
-to use, the product. A product is a consumer product regardless of
-whether the product has substantial commercial, industrial or
-non-consumer uses, unless such uses represent the only significant
-mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to
-install and execute modified versions of a covered work in that User
-Product from a modified version of its Corresponding Source. The
-information must suffice to ensure that the continued functioning of
-the modified object code is in no case prevented or interfered with
-solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or
-updates for a work that has been modified or installed by the
-recipient, or for the User Product in which it has been modified or
-installed. Access to a network may be denied when the modification
-itself materially and adversely affects the operation of the network
-or violates the rules and protocols for communication across the
-network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-### 7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders
-of that material) supplement the terms of this License with terms:
-
--   a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
--   b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
--   c) Prohibiting misrepresentation of the origin of that material,
-    or requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
--   d) Limiting the use for publicity purposes of names of licensors
-    or authors of the material; or
--   e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
--   f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions
-    of it) with contractual assumptions of liability to the recipient,
-    for any liability that these contractual assumptions directly
-    impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions; the
-above requirements apply either way.
-
-### 8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-### 9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run
-a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-### 10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-### 11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned
-or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the
-scope of its coverage, prohibits the exercise of, or is conditioned on
-the non-exercise of one or more of the rights that are specifically
-granted under this License. You may not convey a covered work if you
-are a party to an arrangement with a third party that is in the
-business of distributing software, under which you make payment to the
-third party based on the extent of your activity of conveying the
-work, and under which the third party grants, to any of the parties
-who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by
-you (or copies made from those copies), or (b) primarily for and in
-connection with specific products or compilations that contain the
-covered work, unless you entered into that arrangement, or that patent
-license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-### 12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under
-this License and any other pertinent obligations, then as a
-consequence you may not convey it at all. For example, if you agree to
-terms that obligate you to collect a royalty for further conveying
-from those to whom you convey the Program, the only way you could
-satisfy both those terms and this License would be to refrain entirely
-from conveying the Program.
-
-### 13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your
-version supports such interaction) an opportunity to receive the
-Corresponding Source of your version by providing access to the
-Corresponding Source from a network server at no charge, through some
-standard or customary means of facilitating copying of software. This
-Corresponding Source shall include the Corresponding Source for any
-work covered by version 3 of the GNU General Public License that is
-incorporated pursuant to the following paragraph.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-### 14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU Affero General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever
-published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions
-of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-### 15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-### 16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-### 17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+# UAPARSER.JS PRO PERSONAL LICENSE
+
+Version 2, July 2024
+
+Copyright (C) 2023-2024 Faisal Salman <f+ua-parser-js@faisalman.com>
+
+---
+
+## Definitions
+
+"We" are the team behind UAParser.js.
+
+"You" are the individual who is responsible for purchasing this license.
+
+"The Code" is UAParser.js.
+
+"Project" is what you built with The Code.
+
+---
+
+## License
+
+We retain all title, intellectual property, and ownership rights to The Code.
+
+The Code is licensed, not sold, to You for use solely subject to the terms and conditions detailed here.
+
+We grant You (and only You) a personal, limited, non-exclusive, non-transferable, non-sublicensable, royalty-free right to use, copy, and modify The Code.
+
+This license is only valid for You as one (1) individual and cannot be transferred to another individual or organization.
+
+---
+
+## Rights
+
+You may use and modify The Code to create as many personal, hobby, educational, and other non-profit projects as you want for yourself.
+
+You may create any number of copies of The Code for yourself.
+
+You have the right to get lifetime updates and one (1) year of support, starting from the time you make the purchase.
+
+---
+
+## Restrictions
+
+You may not use or modify The Code in such a way that it may be used directly for commercial purposes.
+
+You may not redistribute The Code, as-is or modified, except as a part of a Project that you made for yourself.
+
+You may not deliver a Project that contains The Code as an open-source Project that might be used for commercial purposes by the general public, except with our written consent.
+
+You may not use The Code for unlawful, inappropriate, illegal, or offensive purposes.
+
+---
+
+## Limitations
+
+The Code is provided 'as is' without warranty of any kind, expressed or implied.
+
+We shall not be liable for any damages, including but not limited to, direct, indirect, special, incidental, or consequential damages or losses that occur by the use of The Code.
+
+We reserve the right to discontinue the lifetime updates for The Code at any time, with or without notice.
+
+We offer support only for questions within the scope of The Code's functionality or related issues at our sole discretion.
+
+---
+
+## Termination
+
+This license is effective indefinitely but can be revoked at any time if there is a violation of any of the terms.
+
+---
 
 END OF TERMS AND CONDITIONS

README.md

@@ -1,242 +1,29 @@
-[![https://uaparser.dev](https://raw.githubusercontent.com/faisalman/ua-parser-js/gh-pages/images/uap-header.png)](https://uaparser.dev)
-[![https://uaparser.dev](https://github.com/user-attachments/assets/9f30f3d4-5cfe-441c-8f86-ead7c955f940)](https://uaparser.dev)
-[![https://uaparser.dev](https://github.com/user-attachments/assets/50da50fc-7c8a-46e3-a2bc-6a8249914372)](https://uaparser.dev)
-[![https://uaparser.dev](https://github.com/user-attachments/assets/9f2aaff0-a9b4-4ac9-bdf3-eea8081a2582)](https://uaparser.dev)
-    
-<p align="center">
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/dw/ua-parser-js?color=red&logo=npm&label=NPM%20DOWNLOADS&style=for-the-badge"></a>
-<a href="https://www.jsdelivr.com/package/npm/ua-parser-js"><img src="https://img.shields.io/jsdelivr/gh/hw/faisalman/ua-parser-js?logo=jsdelivr&style=for-the-badge"></a>
-<a href="https://github.com/faisalman/ua-parser-js"><img src="https://img.shields.io/github/stars/faisalman/ua-parser-js?color=yellow&logo=github&style=for-the-badge"></a>
-<a href="https://bundlephobia.com/package/ua-parser-js@1.0.35"><img src="https://img.shields.io/bundlephobia/minzip/ua-parser-js?logo=hackthebox&logoColor=white&style=for-the-badge"/></a>
-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors"><img src="https://img.shields.io/github/contributors/faisalman/ua-parser-js?color=purple&logo=githubsponsors&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/ua-parser-js"><img src="https://img.shields.io/npm/v/ua-parser-js.svg?logo=npm&color=red&style=for-the-badge"></a>
-<a href="https://cdnjs.com/libraries/UAParser.js"><img src="https://img.shields.io/cdnjs/v/UAParser.js.svg?color=orange&style=for-the-badge"></a>
-<img src="https://img.shields.io/ossf-scorecard/github.com/faisalman/ua-parser-js?label=openssf%20scorecard&style=for-the-badge">
-</p>
+# UAParser.js PRO Personal License
 
-# UAParser.js
+Thank you for choosing the UAParser.js PRO Personal License. 
 
-The most comprehensive, compact, & up-to-date isomorphic JavaScript library to detect 
-user's Browser, Engine, OS, CPU, and Device type/model. Runs either in browser 
-(client-side) or node.js (server-side).
+Please be aware that using this package without a valid license purchase is strictly prohibited and constitutes a violation of applicable copyright laws. 
 
-# Demo
+An exception applies if the package is used solely as a part of a product developed by a valid license holder, in accordance with their license terms. 
 
-  * Live demo: https://uaparser.dev
+If you have not yet purchased a license, you may do so at https://store.faisalman.com.
 
+# Download
+
+```sh
+npm install @ua-parser-js/pro-personal
+```
 
 # Documentation
 
-  * `version 1.x` : https://github.com/faisalman/ua-parser-js/tree/1.0.x#documentation
-  * `version 2.x` : https://docs.uaparser.dev
+https://docs.uaparser.dev 
 
-Before upgrading from `v0.7` / `v1.0`, please read [CHANGELOG](CHANGELOG.md) to 
-see what's new & breaking.
+```js
+import { UAParser } from '@ua-parser-js/pro-personal';
+```
 
-# License Options
+# License
 
-<table>
-    <thead>
-        <tr>
-            <th></th>
-            <th colspan="2">Open-Source Editions</th>
-            <th colspan="3">PRO / Commercial Editions</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>License options</td>
-            <td>MIT (v0.7~v1.0)</td>
-            <td>AGPL (&gt;=v2.0)</td>
-            <td>PRO Personal</td>
-            <td>PRO Business</td>
-            <td>PRO Enterprise</td>
-        </tr>
-        <tr>
-            <td>Browser detection</td>
-            <td><a href="#demo" title="Basic detection">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>CPU detection</td>
-            <td><a href="#demo" title="Basic detection">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Device detection</td>
-            <td><a href="#demo" title="Basic detection">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Engine detection</td>
-            <td><a href="#demo" title="Basic detection">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>OS detection</td>
-            <td><a href="#demo" title="Basic detection">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Bot detection</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>AI Bot detection</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Extras (Apps, Libs, Emails, Media Players, etc) detection</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Enhanced detection result</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Client Hints support</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>CommonJS support</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>ES modules support</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>npm module</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>TypeScript declarations</td>
-            <td><a href="#demo" title="Community version">⚠️</a></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Allows commercial use</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Permissive (non-copyleft) license</td>
-            <td>✅</td>
-            <td><strong title="Copyleft license">❌</strong></td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Unlimited use per 1 license</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td><strong title="1 project per 1 license">❌</strong></td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>1-year product support</td>
-            <td>❌</td>
-            <td>❌</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Lifetime updates</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-            <td>✅</td>
-        </tr>
-        <tr>
-            <td>Price</td>
-            <td><strong title="Pay as you want">FREE (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/1.0.x/license.md">License</a>)</strong></td>
-            <td><strong title="Pay as you want">FREE (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/master/LICENSE.md">License</a>)</strong></td>
-            <td><strong title="$14 (one-time fee)">$14 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-personal/LICENSE.md">License</a>)</strong></td>
-            <td><strong title="$29 (one-time fee)">$29 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-business/LICENSE.md">License</a>)</strong></td>
-            <td><strong title="$599 (one-time fee)">$599 (<a target="_blank" href="https://raw.githubusercontent.com/faisalman/ua-parser-js/pro-enterprise/LICENSE.md">License</a>)</strong></td>
-        </tr>
-    </tbody>
-    <tfoot>
-        <tr>
-            <th align="right" colspan="6">
-                <h3><a target="_blank" href="https://store.faisalman.com/checkout/buy/e236ea87-9b2b-400e-9683-24367f731b35"> GET THE PRO PACKAGES 📥</a></h3>
-            </th>
-        </tr>
-    </tfoot>
-</table>
+UAParser.js PRO Personal
 
-# Development
-
-## Contributors
-
-Please read [CONTRIBUTING](CONTRIBUTING.md) guide first for the instruction details.
-
-<a href="https://github.com/faisalman/ua-parser-js/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=faisalman/ua-parser-js" />
-</a>
-
-Made with [contributors-img](https://contrib.rocks).
-
-## Backers & Sponsors
-
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/organizations.svg?avatarHeight=64"></a>
-<a href="https://opencollective.com/ua-parser-js"><img src="https://opencollective.com/ua-parser-js/individuals.svg?avatarHeight=64"></a>
-
-Support the open-source editions of UAParser.js on [OpenCollective](https://opencollective.com/ua-parser-js) or [GitHub Sponsors](https://github.com/sponsors/faisalman).
+Copyright (c) 2023-2024 Faisal Salman <<f@faisalman.com>>

package.json

@@ -1,7 +1,7 @@
 {
-  "title": "UAParser.js",
-  "name": "ua-parser-js",
-  "version": "2.0.0",
+  "title": "UAParser.js PRO Personal",
+  "name": "@ua-parser-js/pro-personal",
+  "version": "2.0.3",
   "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
   "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
   "keywords": [
@@ -25,14 +25,17 @@
   "contributors": [
     "Aamir Poonawalla <aamir@urx.com>",
     "Admas <mollases@users.noreply.github.com>",
+    "Aiyush <aiyushdhar85@gmail.com>",
     "algenon <m@antonz.ru>",
     "Alvin Portillo <alvin@8thwall.com>",
     "Amumu <yoyo837@hotmail.com>",
+    "Andreas Kogler <andreas.kogler@bitmovin.com>",
     "Andrea Vaghi <andrea.vaghi@jobrapido.com>",
     "Anton Zhiyanov <m@antonz.ru>",
     "Arturo Mejia <amejia@blim.com>",
     "Arun Rama Reddy <arunramareddy@gmail.com>",
     "Austin Pray <austin@austinpray.com>",
+    "Beat YT <66485277+Beat-YT@users.noreply.github.com>",
     "Bendeguz <symunona@gmail.com>",
     "Benjamin Bertrand <bertrand.design@gmail.com>",
     "Benjamin Urban <benjamin.urban@sueddeutsche.de>",
@@ -44,6 +47,8 @@
     "chenyuan-new <53860479+chenyuan-new@users.noreply.github.com>",
     "Christopher De Cairos <chris.decairos@gmail.com>",
     "Cyrille David <cyrille@qonto.eu>",
+    "Dai Jie <daijie@php.net>",
+    "Danila Rodichkin <daniluk4000@outlook.com>",
     "Dante <duanjl.china@gmail.com>",
     "Dario Vladovic <d.vladimyr@gmail.com>",
     "David Annez <david.annez@gmail.com>",
@@ -73,11 +78,15 @@
     "Grigory Dmitrenko <grigory@snsk.ru>",
     "gulpin <gulping.gulpin@gmail.com>",
     "Hans Ott <hansott@hotmail.be>",
+    "Harald Reingruber <74898239+haraldreingruber-dedalus@users.noreply.github.com>",
     "Hendrik Helwich <h.helwich@iplabs.de>",
     "Hermann Ebert <ebbmo@HE.local>",
     "hr6r <hedian@gmail.com>",
+    "Hyewon Kang <gpffps369@gmail.com>",
+    "Hyunbin <47051820+hyunbinseo@users.noreply.github.com>",
     "Igor Topal <i.topal@smartweb.com.ua>",
     "Ildar Kamalov <i.kamalov@adguard.com>",
+    "Ilya Daraseliya <idarase@gmail.com>",
     "insanehong <insane.hong@navercorp.com>",
     "jackpoll <jackpoll123456@gmail.com>",
     "Jacky Choo <jackychoo@adly-macbook.local>",
@@ -98,6 +107,7 @@
     "Liam Quinn <lquinn@blackberry.com>",
     "Lithin <lithin@webklipper.com>",
     "liujunlve <liujunlve@henhaoji.com>",
+    "lj0812 <xoyljlj@163.com>",
     "ll-syber <670159357@qq.com>",
     "Loris Guignard <loris.guignard@gmail.com>",
     "Lukas Drgon <lukas.drgon@gmail.com>",
@@ -111,6 +121,7 @@
     "Max Maurer <maxemanuel.maurer@gmail.com>",
     "Max Nordlund <max.nordlund@gmail.com>",
     "Michael Hess <mhess@connectify.me>",
+    "Mike <mikehuebner@me.com>",
     "MimyyK <michele.marais@hakisa.com>",
     "Mok <mok@moekm.com>",
     "nabetama <mao.nabeta@gmail.com>",
@@ -124,6 +135,7 @@
     "o.drapeza <o.drapeza@tinkoff.ru>",
     "Oscar Becerra <oscarbecerra@google.com>",
     "otakuSiD <otakusid@gmail.com>",
+    "Pablo Osés <opablo@gmail.com>",
     "Paris Morgan <paris@8thwall.com>",
     "patrick-nurt <github@pereira.dk>",
     "Pavel Studeny <studeny@avast.com>",
@@ -209,33 +221,31 @@
     "test:jshint": "jshint src/main",
     "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
     "test:mocha": "mocha test/unit",
-    "test:playwright": "playwright test test/e2e --browser all"
+    "test:playwright": "npx playwright install && playwright test test/e2e --browser all"
   },
   "dependencies": {
     "detect-europe-js": "^0.1.2",
     "is-standalone-pwa": "^0.1.1",
-    "ua-is-frozen": "^0.1.2"
+    "ua-is-frozen": "^0.1.2",
+    "node-fetch": "^2.7.0",
+    "@types/node-fetch": "^2.6.12"
   },
   "devDependencies": {
     "@babel/parser": "7.15.8",
     "@babel/traverse": "7.23.2",
-    "@jazzer.js/core": "^1.4.0",
     "@playwright/test": "^1.49.0",
-    "@types/node": "^22.9.1",
-    "@types/node-fetch": "^2.6.12",
     "jshint": "~2.13.6",
     "mocha": "~8.2.0",
-    "node-fetch": "^2.7.0",
     "requirejs": "2.3.2",
     "safe-regex": "^2.1.1",
     "tsd": "^0.29.0",
-    "uglify-js": "~3.12.0"
+    "uglify-js": "~3.19.3"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/faisalman/ua-parser-js.git"
   },
-  "license": "AGPL-3.0-or-later",
+  "license": "SEE LICENSE IN LICENSE.md",
   "engines": {
     "node": "*"
   },

script/build-dist.sh

@@ -4,10 +4,20 @@ SRC_PATH="src/main/ua-parser.js"
 MIN_PATH="dist/ua-parser.min.js"
 PACK_PATH="dist/ua-parser.pack.js"
 
+SRC_PATH_MJS="src/main/ua-parser.mjs"
+MIN_PATH_MJS="dist/ua-parser.min.mjs"
+PACK_PATH_MJS="dist/ua-parser.pack.mjs"
+
 # minified
 echo "Generate ${MIN_PATH}"
 uglifyjs $SRC_PATH -o $MIN_PATH --comments "/^ UA/"
 
+echo "Generate ${MIN_PATH_MJS}"
+uglifyjs $SRC_PATH_MJS -o $MIN_PATH_MJS --comments "/^ UA/" --module
+
 # packed
 echo "Generate ${PACK_PATH}"
-uglifyjs $SRC_PATH -o $PACK_PATH --comments "/^ UA/" --compress --mangle
+uglifyjs $SRC_PATH -o $PACK_PATH --comments "/^ UA/" --compress --mangle
+
+echo "Generate ${PACK_PATH_MJS}"
+uglifyjs $SRC_PATH_MJS -o $PACK_PATH_MJS --comments "/^ UA/" --compress --mangle --module

src/enums/ua-parser-enums.d.ts

@@ -0,0 +1,374 @@
+// Type definitions for Enums submodule of UAParser.js v2.0.3
+// Project: https://github.com/faisalman/ua-parser-js
+// Definitions by: Faisal Salman <https://github.com/faisalman>
+
+export const Browser: Readonly<{
+    '115': "115";
+    '2345': "2345";
+    '360': "360";
+    ALIPAY: "Alipay";
+    AMAYA: "Amaya";
+    ANDROID: "Android Browser";
+    ARORA: "Arora";
+    AVANT: "Avant";
+    AVAST: "Avast Secure Browser";
+    AVG: "AVG Secure Browser";
+    BAIDU: "Baidu Browser";
+    BASILISK: "Basilisk";
+    BLAZER: "Blazer";
+    BLU: "BLU";
+    BOLT: "Bolt";
+    BOWSER: "Bowser";
+    BRAVE: "Brave";
+    CAMINO: "Camino";
+    CHIMERA: "Chimera";
+    CHROME: "Chrome";
+    CHROME_HEADLESS: "Chrome Headless";
+    CHROME_MOBILE: "Mobile Chrome";
+    CHROME_WEBVIEW: "Chrome WebView";
+    CHROMIUM: "Chromium";
+    COBALT: "Cobalt";
+    COC_COC: "Coc Coc";
+    CONKEROR: "Conkeror";
+    DAUM: "Daum";
+    DILLO: "Dillo";
+    DOLPHIN: "Dolphin";
+    DOOBLE: 'Dooble',
+    DORIS: "Doris";
+    DRAGON: "Dragon";
+    DUCKDUCKGO: "DuckDuckGo";
+    ECOSIA: "Ecosia";
+    EDGE: "Edge";
+    EPIPHANY: "Epiphany";
+    FACEBOOK: "Facebook";
+    FALKON: "Falkon";
+    FIREBIRD: "Firebird";
+    FIREFOX: "Firefox";
+    FIREFOX_FOCUS: "Firefox Focus";
+    FIREFOX_MOBILE: "Mobile Firefox";
+    FIREFOX_REALITY: "Firefox Reality";
+    FENNEC: "Fennec";
+    FLOCK: "Flock";
+    FLOW: "Flow";
+    GO: "GoBrowser";
+    GOOGLE_SEARCH: "GSA";
+    HELIO: "Helio";
+    HEYTAP: "HeyTap";
+    HONOR: "Honor";
+    HUAWEI: "Huawei Browser";
+    ICAB: "iCab";
+    ICE: "ICE Browser";
+    ICEAPE: "IceApe";
+    ICECAT: "IceCat";
+    ICEDRAGON: "IceDragon";
+    ICEWEASEL: "IceWeasel";
+    IE: "IE";
+    INSTAGRAM: "Instagram";
+    IRIDIUM: "Iridium";
+    IRON: "Iron";
+    JASMINE: "Jasmine";
+    KONQUEROR: "Konqueror";
+    KAKAO: "KakaoTalk";
+    KHTML: "KHTML";
+    K_MELEON: "K-Meleon";
+    KLAR: "Klar";
+    KLARNA: "Klarna";
+    KINDLE: "Kindle";
+    LENOVO: "Smart Lenovo Browser";
+    LADYBIRD: "Ladybird";
+    LG: "LG Browser";
+    LIBREWOLF: "LibreWolf";
+    LIEBAO: "LBBROWSER";
+    LINE: "Line";
+    LINKEDIN: "LinkedIn";
+    LINKS: "Links";
+    LUNASCAPE: "Lunascape";
+    LYNX: "Lynx";
+    MAEMO: "Maemo Browser";
+    MAXTHON: "Maxthon";
+    MIDORI: "Midori";
+    MINIMO: "Minimo";
+    MIUI: "MIUI Browser";
+    MOZILLA: "Mozilla";
+    MOSAIC: "Mosaic";
+    NAVER: "Naver";
+    NETFRONT: "NetFront";
+    NETSCAPE: "Netscape";
+    NETSURF: "Netsurf";
+    NOKIA: "Nokia Browser";
+    OBIGO: "Obigo";
+    OCULUS: "Oculus Browser";
+    OMNIWEB: "OmniWeb";
+    OPERA: "Opera";
+    OPERA_COAST: "Opera Coast";
+    OPERA_GX: "Opera GX",
+    OPERA_MINI: "Opera Mini";
+    OPERA_MOBI: "Opera Mobi";
+    OPERA_TABLET: "Opera Tablet";
+    OPERA_TOUCH: "Opera Touch";
+    OTTER: "Otter";
+    OVI: "OviBrowser";
+    PALEMOON: "PaleMoon";
+    PHANTOMJS: "PhantomJS";
+    PHOENIX: "Phoenix";
+    PICOBROWSER: "Pico Browser";
+    POLARIS: "Polaris";
+    PUFFIN: "Puffin";
+    QQ: "QQBrowser";
+    QQ_LITE: "QQBrowserLite";
+    QUARK: "Quark";
+    QUPZILLA: "QupZilla";
+    QUTEBROWSER: "qutebrowser";
+    REKONQ: "rekonq";
+    ROCKMELT: "Rockmelt";
+    SAFARI: "Safari";
+    SAFARI_MOBILE: "Mobile Safari";
+    SAILFISH: "Sailfish Browser";
+    SAMSUNG: "Samsung Internet";
+    SEAMONKEY: "SeaMonkey";
+    SILK: "Silk";
+    SKYFIRE: "Skyfire";
+    SLEIPNIR: "Sleipnir";
+    SLIMBOAT: "SlimBoat";
+    SLIMBROWSER: "SlimBrowser";
+    SLIMJET: "Slimjet";
+    SNAPCHAT: "Snapchat";
+    SOGOU_EXPLORER: "Sogou Explorer";
+    SOGOU_MOBILE: "Sogou Mobile";
+    SURF: "Surf";
+    SWIFTFOX: "Swiftfox";
+    TESLA: "Tesla";
+    TIKTOK: "TikTok";
+    TIZEN: "Tizen Browser";
+    TWITTER: "Twitter";
+    UC: "UCBrowser";
+    UP: "UP.Browser";
+    VIVALDI: "Vivaldi";
+    VIVO: "Vivo Browser";
+    W3M: "w3m";
+    WATERFOX: "Waterfox";
+    WEBKIT: "WebKit";
+    WECHAT: "WeChat";
+    WEIBO: "Weibo";
+    WHALE: "Whale";
+    WOLVIC: "Wolvic";
+    YANDEX: "Yandex";
+}>;
+export const BrowserType: Readonly<{
+    CRAWLER: "crawler";
+    CLI: "cli";
+    EMAIL: "email";
+    FETCHER: "fetcher";
+    INAPP: "inapp";
+    MEDIAPLAYER: "mediaplayer";
+    LIBRARY: "library";
+}>;
+export const CPU: Readonly<{
+    '68K': "68k";
+    ARM: "arm";
+    ARM_64: "arm64";
+    ARM_HF: "armhf";
+    AVR: "avr";
+    AVR_32: "avr32";
+    IA64: "ia64";
+    IRIX: "irix";
+    IRIX_64: "irix64";
+    MIPS: "mips";
+    MIPS_64: "mips64";
+    PA_RISC: "pa-risc";
+    PPC: "ppc";
+    SPARC: "sparc";
+    SPARC_64: "sparc64";
+    X86: "ia32";
+    X86_64: "amd64";
+}>;
+export const Device: Readonly<{
+    CONSOLE: "console";
+    DESKTOP: "desktop";
+    EMBEDDED: "embedded";
+    MOBILE: "mobile";
+    SMARTTV: "smarttv";
+    TABLET: "tablet";
+    WEARABLE: "wearable";
+    XR: "xr";
+}>;
+export const Vendor: Readonly<{
+    ACER: "Acer";
+    ADVAN: "Advan";
+    ALCATEL: "Alcatel";
+    APPLE: "Apple";
+    AMAZON: "Amazon";
+    ARCHOS: "Archos";
+    ASUS: "ASUS";
+    ATT: "AT&T";
+    BENQ: "BenQ";
+    BLACKBERRY: "BlackBerry";
+    CAT: "Cat";
+    DELL: "Dell";
+    ENERGIZER: "Energizer";
+    ESSENTIAL: "Essential";
+    FACEBOOK: "Facebook";
+    FAIRPHONE: "Fairphone";
+    GEEKSPHONE: "GeeksPhone";
+    GENERIC: "Generic";
+    GOOGLE: "Google";
+    HMD: "HMD";
+    HP: "HP";
+    HTC: "HTC";
+    HUAWEI: "Huawei";
+    IMO: "IMO";
+    INFINIX: "Infinix";
+    ITEL: "itel";
+    JOLLA: "Jolla";
+    KOBO: "Kobo";
+    LENOVO: "Lenovo";
+    LG: "LG";
+    MEIZU: "Meizu";
+    MICROMAX: "Micromax";
+    MICROSOFT: "Microsoft";
+    MOTOROLA: "Motorola";
+    NEXIAN: "Nexian";
+    NINTENDO: "Nintendo";
+    NOKIA: "Nokia";
+    NOTHING: "Nothing";
+    NVIDIA: "Nvidia";
+    ONEPLUS: "OnePlus";
+    OPPO: "OPPO";
+    OUYA: "Ouya";
+    PALM: "Palm";
+    PANASONIC: "Panasonic";
+    PEBBLE: "Pebble";
+    PICO: "Pico";
+    POLYTRON: "Polytron";
+    REALME: "Realme";
+    RIM: "RIM";
+    ROKU: "Roku";
+    SAMSUNG: "Samsung";
+    SHARP: "Sharp";
+    SIEMENS: "Siemens";
+    SMARTFREN: "Smartfren";
+    SONY: "Sony";
+    SPRINT: "Sprint";
+    TCL: "TCL";
+    TECHNISAT: "TechniSAT";
+    TECNO: "Tecno";
+    TESLA: "Tesla";
+    ULEFONE: "Ulefone";
+    VIVO: "Vivo";
+    VODAFONE: "Vodafone";
+    XBOX: "Xbox";
+    XIAOMI: "Xiaomi";
+    ZEBRA: "Zebra";
+    ZTE: "ZTE";
+}>;
+export const Engine: Readonly<{
+    AMAYA: "Amaya";
+    ARKWEB: "ArkWeb";
+    BLINK: "Blink";
+    EDGEHTML: "EdgeHTML";
+    FLOW: "Flow";
+    GECKO: "Gecko";
+    GOANNA: "Goanna";
+    ICAB: "iCab";
+    KHTML: "KHTML";
+    LIBWEB: "LibWeb";
+    LINKS: "Links";
+    LYNX: "Lynx";
+    NETFRONT: "NetFront";
+    NETSURF: "NetSurf";
+    PRESTO: "Presto";
+    SERVO: "Servo";
+    TASMAN: "Tasman";
+    TRIDENT: "Trident";
+    W3M: "w3m";
+    WEBKIT: "WebKit";
+}>;
+export const OS: Readonly<{
+    AIX: "AIX";
+    AMIGA_OS: "Amiga OS";
+    ANDROID: "Android";
+    ANDROID_X86: "Android-x86";
+    ARCH: "Arch";
+    BADA: "Bada";
+    BEOS: "BeOS";
+    BLACKBERRY: "BlackBerry";
+    CENTOS: "CentOS";
+    CHROME_OS: "Chrome OS";
+    CHROMECAST: "Chromecast";
+    CHROMECAST_ANDROID: "Chromecast Android";
+    CHROMECAST_FUCHSIA: "Chromecast Fuchsia";
+    CHROMECAST_LINUX: "Chromecast Linux";
+    CHROMECAST_SMARTSPEAKER: "Chromecast SmartSpeaker";
+    CONTIKI: "Contiki";
+    DEBIAN: "Debian";
+    DEEPIN: "Deepin";
+    DRAGONFLY: "DragonFly";
+    ELEMENTARY_OS: "elementary OS";
+    FEDORA: "Fedora";
+    FIREFOX_OS: "Firefox OS";
+    FREEBSD: "FreeBSD";
+    FUCHSIA: "Fuchsia";
+    GENTOO: "Gentoo";
+    GHOSTBSD: "GhostBSD";
+    GNU: "GNU";
+    HAIKU: "Haiku";
+    HARMONYOS: "HarmonyOS";
+    HP_UX: "HP-UX";
+    HURD: "Hurd";
+    IOS: "iOS";
+    JOLI: "Joli";
+    KAIOS: "KaiOS";
+    KUBUNTU: "Kubuntu";
+    LINPUS: "Linpus";
+    LINSPIRE: "Linspire";
+    LINUX: "Linux";
+    MACOS: "macOS";
+    MAEMO: "Maemo";
+    MAGEIA: "Mageia";
+    MANDRIVA: "Mandriva";
+    MANJARO: "Manjaro";
+    MEEGO: "MeeGo";
+    MINIX: "Minix";
+    MINT: "Mint";
+    MORPH_OS: "Morph OS";
+    NETBSD: "NetBSD";
+    NETRANGE: "NetRange";
+    NETTV: "NetTV";
+    NINTENDO: "Nintendo";
+    OPENHARMONY: "OpenHarmony";
+    OPENBSD: "OpenBSD";
+    OPENVMS: "OpenVMS";
+    OS2: "OS/2";
+    PALM: "Palm";
+    PC_BSD: "PC-BSD";
+    PCLINUXOS: "PCLinuxOS";
+    PICO: "Pico";
+    PLAN9: "Plan9";
+    PLAYSTATION: "PlayStation";
+    QNX: "QNX";
+    RASPBIAN: "Raspbian";
+    REDHAT: "RedHat";
+    RIM_TABLET_OS: "RIM Tablet OS";
+    RISC_OS: "RISC OS";
+    SABAYON: "Sabayon";
+    SAILFISH: "Sailfish";
+    SERENITYOS: "SerenityOS";
+    SERIES40: "Series40";
+    SLACKWARE: "Slackware";
+    SOLARIS: "Solaris";
+    SUSE: "SUSE";
+    SYMBIAN: "Symbian";
+    TIZEN: "Tizen";
+    UBUNTU: "Ubuntu";
+    UBUNTU_TOUCH: "Ubuntu Touch",
+    UNIX: "Unix";
+    VECTORLINUX: "VectorLinux";
+    WATCHOS: "watchOS";
+    WEBOS: "WebOS";
+    WINDOWS: "Windows";
+    WINDOWS_IOT: "Windows IoT";
+    WINDOWS_MOBILE: "Windows Mobile";
+    WINDOWS_PHONE: "Windows Phone";
+    XBOX: "Xbox";
+    ZENWALK: "Zenwalk";
+}>;

src/enums/ua-parser-enums.js

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.0
+/*  Enums for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -21,6 +21,7 @@ const Browser = Object.freeze({
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
     BLAZER: 'Blazer',
+    BLU: 'BLU',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
     BRAVE: 'Brave',
@@ -34,11 +35,14 @@ const Browser = Object.freeze({
     COBALT: 'Cobalt',
     COC_COC: 'Coc Coc',
     CONKEROR: 'Conkeror',
+    DAUM: 'Daum',
     DILLO: 'Dillo',
     DOLPHIN: 'Dolphin',
+    DOOBLE: 'Dooble',
     DORIS: 'Doris',
     DRAGON: 'Dragon',
     DUCKDUCKGO: 'DuckDuckGo',
+    ECOSIA: 'Ecosia',
     EDGE: 'Edge',
     EPIPHANY: 'Epiphany',
     FACEBOOK: 'Facebook',
@@ -76,6 +80,8 @@ const Browser = Object.freeze({
     KLARNA: 'Klarna',
     KINDLE: 'Kindle',
     LENOVO: 'Smart Lenovo Browser',
+    LADYBIRD: 'Ladybird',
+    LG: 'LG Browser',
     LIBREWOLF: 'LibreWolf',
     LIEBAO: 'LBBROWSER',
     LINE: 'Line',
@@ -100,10 +106,12 @@ const Browser = Object.freeze({
     OMNIWEB: 'OmniWeb',
     OPERA: 'Opera',
     OPERA_COAST: 'Opera Coast',
+    OPERA_GX: 'Opera GX',
     OPERA_MINI: 'Opera Mini',
     OPERA_MOBI: 'Opera Mobi',
     OPERA_TABLET: 'Opera Tablet',
     OPERA_TOUCH: 'Opera Touch',
+    OTTER: 'Otter',
     OVI: 'OviBrowser',
     PALEMOON: 'PaleMoon',
     PHANTOMJS: 'PhantomJS',
@@ -115,6 +123,7 @@ const Browser = Object.freeze({
     QQ_LITE: 'QQBrowserLite',
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
+    QUTEBROWSER: 'qutebrowser',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -131,6 +140,7 @@ const Browser = Object.freeze({
     SNAPCHAT: 'Snapchat',
     SOGOU_EXPLORER: 'Sogou Explorer',
     SOGOU_MOBILE: 'Sogou Mobile',
+    SURF: 'Surf',
     SWIFTFOX: 'Swiftfox',
     TESLA: 'Tesla',
     TIKTOK: 'TikTok',
@@ -365,11 +375,13 @@ const OS = Object.freeze({
     SYMBIAN: 'Symbian',
     TIZEN: 'Tizen',
     UBUNTU: 'Ubuntu',
+    UBUNTU_TOUCH: 'Ubuntu Touch',
     UNIX: 'Unix',
     VECTORLINUX: 'VectorLinux',
     WATCHOS: 'watchOS',
     WEBOS: 'WebOS',
     WINDOWS: 'Windows',
+    WINDOWS_IOT: 'Windows IoT',
     WINDOWS_MOBILE: 'Windows Mobile',
     WINDOWS_PHONE: 'Windows Phone',
     XBOX: 'Xbox',

src/enums/ua-parser-enums.mjs

@@ -3,10 +3,10 @@
 // Source: /src/enums/ua-parser-enums.js
 
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.0
+/*  Enums for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -25,6 +25,7 @@ const Browser = Object.freeze({
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
     BLAZER: 'Blazer',
+    BLU: 'BLU',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
     BRAVE: 'Brave',
@@ -38,11 +39,14 @@ const Browser = Object.freeze({
     COBALT: 'Cobalt',
     COC_COC: 'Coc Coc',
     CONKEROR: 'Conkeror',
+    DAUM: 'Daum',
     DILLO: 'Dillo',
     DOLPHIN: 'Dolphin',
+    DOOBLE: 'Dooble',
     DORIS: 'Doris',
     DRAGON: 'Dragon',
     DUCKDUCKGO: 'DuckDuckGo',
+    ECOSIA: 'Ecosia',
     EDGE: 'Edge',
     EPIPHANY: 'Epiphany',
     FACEBOOK: 'Facebook',
@@ -80,6 +84,8 @@ const Browser = Object.freeze({
     KLARNA: 'Klarna',
     KINDLE: 'Kindle',
     LENOVO: 'Smart Lenovo Browser',
+    LADYBIRD: 'Ladybird',
+    LG: 'LG Browser',
     LIBREWOLF: 'LibreWolf',
     LIEBAO: 'LBBROWSER',
     LINE: 'Line',
@@ -104,10 +110,12 @@ const Browser = Object.freeze({
     OMNIWEB: 'OmniWeb',
     OPERA: 'Opera',
     OPERA_COAST: 'Opera Coast',
+    OPERA_GX: 'Opera GX',
     OPERA_MINI: 'Opera Mini',
     OPERA_MOBI: 'Opera Mobi',
     OPERA_TABLET: 'Opera Tablet',
     OPERA_TOUCH: 'Opera Touch',
+    OTTER: 'Otter',
     OVI: 'OviBrowser',
     PALEMOON: 'PaleMoon',
     PHANTOMJS: 'PhantomJS',
@@ -119,6 +127,7 @@ const Browser = Object.freeze({
     QQ_LITE: 'QQBrowserLite',
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
+    QUTEBROWSER: 'qutebrowser',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -135,6 +144,7 @@ const Browser = Object.freeze({
     SNAPCHAT: 'Snapchat',
     SOGOU_EXPLORER: 'Sogou Explorer',
     SOGOU_MOBILE: 'Sogou Mobile',
+    SURF: 'Surf',
     SWIFTFOX: 'Swiftfox',
     TESLA: 'Tesla',
     TIKTOK: 'TikTok',
@@ -217,6 +227,7 @@ const Vendor = Object.freeze({
     GEEKSPHONE: 'GeeksPhone',
     GENERIC: 'Generic',
     GOOGLE: 'Google',
+    HMD: 'HMD',
     HP: 'HP',
     HTC: 'HTC',
     HUAWEI: 'Huawei',
@@ -326,6 +337,7 @@ const OS = Object.freeze({
     IOS: 'iOS',
     JOLI: 'Joli',
     KAIOS: 'KaiOS',
+    KUBUNTU: 'Kubuntu',
     LINPUS: 'Linpus',
     LINSPIRE: 'Linspire',
     LINUX: 'Linux',
@@ -367,11 +379,13 @@ const OS = Object.freeze({
     SYMBIAN: 'Symbian',
     TIZEN: 'Tizen',
     UBUNTU: 'Ubuntu',
+    UBUNTU_TOUCH: 'Ubuntu Touch',
     UNIX: 'Unix',
     VECTORLINUX: 'VectorLinux',
     WATCHOS: 'watchOS',
     WEBOS: 'WebOS',
     WINDOWS: 'Windows',
+    WINDOWS_IOT: 'Windows IoT',
     WINDOWS_MOBILE: 'Windows Mobile',
     WINDOWS_PHONE: 'Windows Phone',
     XBOX: 'Xbox',

src/extensions/ua-parser-extensions.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Helpers submodule of UAParser.js v2.0.0
+// Type definitions for Helpers submodule of UAParser.js v2.0.3
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
@@ -12,4 +12,5 @@ export const Emails: UAParserExt;
 export const Fetchers: UAParserExt;
 export const InApps: UAParserExt;
 export const Libraries: UAParserExt;
-export const MediaPlayers: UAParserExt;
+export const MediaPlayers: UAParserExt;
+export const Vehicles: UAParserExt;

src/extensions/ua-parser-extensions.js

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.0
+/*  Extensions for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -42,25 +42,25 @@ const Crawlers = Object.freeze({
         [
             // AhrefsBot - https://ahrefs.com/robot
             // Amazonbot - https://developer.amazon.com/amazonbot
-            // Bingbot - http://www.bing.com/bingbot.htm
+            // Bingbot / AdIdxBot - https://www.bing.com/webmasters/help/which-crawlers-does-bing-use-8c184ec0
             // CCBot - https://commoncrawl.org/faq
             // Dotbot - https://moz.com/help/moz-procedures/crawlers/dotbot
             // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
             // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
             // GPTBot - https://platform.openai.com/docs/gptbot
+            // LinkedInBot - http://www.linkedin.com
             // MJ12bot - https://mj12bot.com/
             // MojeekBot - https://www.mojeek.com/bot.html
             // OpenAI's SearchGPT - https://platform.openai.com/docs/bots
             // PerplexityBot - https://perplexity.ai/perplexitybot
-            // SemrushBot - http://www.semrush.com/bot.html
             // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
-            /((?:ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,
+            /((?:adidx|ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|linkedin|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,
 
             // Applebot - http://apple.com/go/applebot
-            /(applebot(?:-extended)?)\/([\w\.]+)/i,
+            /(applebot(?:-extended)?)\/?([\w\.]*)/i,
 
             // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
-            /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,
+            /(baiduspider[-imagevdonwsfcpr]{0,7})\/?([\w\.]*)/i,
 
             // ClaudeBot (Anthropic)
             /(claude(?:bot|-web)|anthropic-ai)\/?([\w\.]*)/i, 
@@ -78,6 +78,9 @@ const Crawlers = Object.freeze({
             // Internet Archive (archive.org)
             /(ia_archiver|archive\.org_bot)\/?([\w\.]*)/i,
 
+            // SemrushBot - http://www.semrush.com/bot.html
+            /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
+
             // Sogou Spider
             /(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i, 
 
@@ -90,8 +93,8 @@ const Crawlers = Object.freeze({
             // Yeti (Naver)
             /(yeti)\/([\w\.]+)/i,
 
-            // aiHitBot / Diffbot / Magpie-Crawler / Omgilibot / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
-            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |yisou)spider)\/?([\w\.]*)/i
+            // aiHitBot / Diffbot / Linespider / Magpie-Crawler / Omgilibot / OpenAI Image Downloader / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
+            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|openai image downloader|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |line|yisou)spider)\/?([\w\.]*)/i
         ],
 
         [NAME, VERSION, [TYPE, CRAWLER]],
@@ -108,7 +111,7 @@ const Crawlers = Object.freeze({
             // Qihoo 360Spider
             // TurnitinBot - https://www.turnitin.com/robot/crawlerinfo.html
             // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
-            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|(?=yahoo! )slurp)/i
+            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|yahoo! slurp)/i
         ], 
         [NAME, [TYPE, CRAWLER]]
     ]
@@ -217,33 +220,35 @@ const Fetchers = Object.freeze({
             // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
             // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
             // DuckAssistBot - https://duckduckgo.com/duckassistbot/
-            // BingPreview / Mastodon / Pinterestbot / Redditbot / Rogerbot / Telegrambot / Twitterbot / UptimeRobot
-            /(ahrefssiteaudit|bingpreview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|telegram|twitter|uptimero)bot)\/([\w\.]+)/i,
+            // Better Uptime / BingPreview / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
+            // Google Site Verifier / Meta / Yahoo! Japan
+            // Yandex Bots - https://yandex.com/bots
+            /(ahrefssiteaudit|(?:bing|microsoft)preview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero)bot|google-site-verification|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
 
-            // Google Site Verifier
-            /(google-site-verification)\/([\w\.]+)/i,
+            // Bluesky
+            /(bluesky) cardyb\/([\w\.]+)/i,
 
-            // Meta
-            /(meta-externalfetcher)\/([\w\.]+)/i,
+            // Skype
+            /(skypeuripreview) preview\/([\w\.]+)/i,
 
             // Slackbot - https://api.slack.com/robots
             /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
             
             // WhatsApp
-            /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
-
-            // Yahoo! Japan
-            /(y!?j-dlc)\/([\w\.]+)/i,
-
-            // Yandex Bots - https://yandex.com/bots
-            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
-            /(yandex(?:sitelinks|userproxy))/i
+            /(whatsapp)\/([\w\.]+)/i
         ], 
         [NAME, VERSION, [TYPE, FETCHER]],
 
-        // Google Bots / Cohere / Snapchat / Vercelbot
-        [/(cohere-ai|vercelbot|feedfetcher-google|google(?:-read-aloud|producer)|(?=bot; )snapchat)/i], 
+        [
+            // Google Bots / Cohere / Snapchat / Vercelbot / Yandex Bots
+            /((?:better uptime |telegram|vercel)bot|cohere-ai|feedfetcher-google|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|yandex(?:sitelinks|userproxy))/i
+        ], 
         [NAME, [TYPE, FETCHER]],
+    ],
+
+    os : [
+        [/whatsapp\/[\d\.]+ (a|i)/i],
+        [[NAME, os => os == 'A' ? 'Android' : 'iOS' ]]
     ]
 });
 
@@ -254,10 +259,12 @@ const Fetchers = Object.freeze({
 const InApps = Object.freeze({
     browser : [
         // Slack
-        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],
+        [/(?:slack(?=.+electron|.+ios)|chatlyio)\/([\d\.]+)/i], 
+        [VERSION, [NAME, 'Slack'], [TYPE, INAPP]],
 
         // Yahoo! Japan
-        [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
+        [/jp\.co\.yahoo\.(?:android\.yjtop|ipn\.appli)\/([\d\.]+)/i], 
+        [VERSION, [NAME, 'Yahoo! Japan'], [TYPE, INAPP]]
     ]
 });
 
@@ -327,6 +334,29 @@ const Libraries = Object.freeze({
     ]
 });
 
+/////////////
+// VEHICLES
+////////////
+
+const Vehicles = Object.freeze({
+    device : [
+        [/aftlbt962e2/i],                                                   // BMW
+        [[VENDOR, 'BMW']],
+
+        [/dilink.+(byd) auto/i],                                            // BYD
+        [VENDOR],
+
+        [/aftlft962x3/i],                                                   // Jeep
+        [[VENDOR, 'Jeep'], [MODEL, 'Wagooner']],
+        
+        [/(rivian) (r1t)/i],                                                // Rivian
+        [VENDOR, MODEL],
+
+        [/vcc.+netfront/i],                                                 // Volvo
+        [[VENDOR, 'Volvo']]
+    ]
+});
+
 //////////
 // BOTS
 /////////
@@ -337,6 +367,9 @@ const Bots = Object.freeze({
         ...Crawlers.browser,
         ...Fetchers.browser,
         ...Libraries.browser
+    ],
+    os : [
+        ...Fetchers.os
     ]
 });
 
@@ -349,5 +382,6 @@ module.exports = {
     Fetchers,
     InApps,
     Libraries,
-    MediaPlayers
+    MediaPlayers,
+    Vehicles
 };

src/extensions/ua-parser-extensions.mjs

@@ -3,10 +3,10 @@
 // Source: /src/extensions/ua-parser-extensions.js
 
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.0
+/*  Extensions for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -46,25 +46,25 @@ const Crawlers = Object.freeze({
         [
             // AhrefsBot - https://ahrefs.com/robot
             // Amazonbot - https://developer.amazon.com/amazonbot
-            // Bingbot - http://www.bing.com/bingbot.htm
+            // Bingbot / AdIdxBot - https://www.bing.com/webmasters/help/which-crawlers-does-bing-use-8c184ec0
             // CCBot - https://commoncrawl.org/faq
             // Dotbot - https://moz.com/help/moz-procedures/crawlers/dotbot
             // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
             // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
             // GPTBot - https://platform.openai.com/docs/gptbot
+            // LinkedInBot - http://www.linkedin.com
             // MJ12bot - https://mj12bot.com/
             // MojeekBot - https://www.mojeek.com/bot.html
             // OpenAI's SearchGPT - https://platform.openai.com/docs/bots
             // PerplexityBot - https://perplexity.ai/perplexitybot
-            // SemrushBot - http://www.semrush.com/bot.html
             // SeznamBot - http://napoveda.seznam.cz/seznambot-intro
-            /((?:ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,
+            /((?:adidx|ahrefs|amazon|bing|cc|dot|duckduck|exa|facebook|gpt|linkedin|mj12|mojeek|oai-search|perplexity|semrush|seznam)bot)\/([\w\.-]+)/i,
 
             // Applebot - http://apple.com/go/applebot
-            /(applebot(?:-extended)?)\/([\w\.]+)/i,
+            /(applebot(?:-extended)?)\/?([\w\.]*)/i,
 
             // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
-            /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,
+            /(baiduspider[-imagevdonwsfcpr]{0,7})\/?([\w\.]*)/i,
 
             // ClaudeBot (Anthropic)
             /(claude(?:bot|-web)|anthropic-ai)\/?([\w\.]*)/i, 
@@ -82,6 +82,9 @@ const Crawlers = Object.freeze({
             // Internet Archive (archive.org)
             /(ia_archiver|archive\.org_bot)\/?([\w\.]*)/i,
 
+            // SemrushBot - http://www.semrush.com/bot.html
+            /((?:semrush|splitsignal)bot[-abcfimostw]*)\/?([\w\.-]*)/i,
+
             // Sogou Spider
             /(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i, 
 
@@ -94,8 +97,8 @@ const Crawlers = Object.freeze({
             // Yeti (Naver)
             /(yeti)\/([\w\.]+)/i,
 
-            // aiHitBot / Diffbot / Magpie-Crawler / Omgilibot / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
-            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |yisou)spider)\/?([\w\.]*)/i
+            // aiHitBot / Diffbot / Linespider / Magpie-Crawler / Omgilibot / OpenAI Image Downloader / Webzio-Extended / Screaming Frog SEO Spider / Timpibot / VelenPublicWebCrawler / YisouSpider / YouBot
+            /((?:aihit|diff|timpi|you)bot|omgili(?:bot)?|openai image downloader|(?:magpie-|velenpublicweb)crawler|webzio-extended|(?:screaming frog seo |line|yisou)spider)\/?([\w\.]*)/i
         ],
 
         [NAME, VERSION, [TYPE, CRAWLER]],
@@ -112,7 +115,7 @@ const Crawlers = Object.freeze({
             // Qihoo 360Spider
             // TurnitinBot - https://www.turnitin.com/robot/crawlerinfo.html
             // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
-            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|(?=yahoo! )slurp)/i
+            /\b(360spider-?(?:image|video)?|bytespider|(?:ai2|aspiegel|dataforseo|imagesift|petal|turnitin)bot|teoma|yahoo! slurp)/i
         ], 
         [NAME, [TYPE, CRAWLER]]
     ]
@@ -165,7 +168,7 @@ const ExtraDevices = Object.freeze({
         /\b(zur\d{3}) b/i                                                   // Swiss ZUR Tablet
         ], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
 
-        /\b((zeki)?tb.*\b) b/i                                              // Zeki Tablets
+        /^((zeki)?tb.*\b) b/i                                               // Zeki Tablets
         ], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
 
         /\b([yr]\d{2}) b/i,
@@ -221,33 +224,35 @@ const Fetchers = Object.freeze({
             // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
             // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
             // DuckAssistBot - https://duckduckgo.com/duckassistbot/
-            // BingPreview / Mastodon / Pinterestbot / Redditbot / Rogerbot / Telegrambot / Twitterbot / UptimeRobot
-            /(ahrefssiteaudit|bingpreview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|telegram|twitter|uptimero)bot)\/([\w\.]+)/i,
+            // Better Uptime / BingPreview / Mastodon / MicrosoftPreview / Pinterestbot / Redditbot / Rogerbot / SiteAuditBot / Telegrambot / Twitterbot / UptimeRobot
+            // Google Site Verifier / Meta / Yahoo! Japan
+            // Yandex Bots - https://yandex.com/bots
+            /(ahrefssiteaudit|(?:bing|microsoft)preview|chatgpt-user|mastodon|(?:discord|duckassist|linkedin|pinterest|reddit|roger|siteaudit|twitter|uptimero)bot|google-site-verification|meta-externalfetcher|y!?j-dlc|yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
 
-            // Google Site Verifier
-            /(google-site-verification)\/([\w\.]+)/i,
+            // Bluesky
+            /(bluesky) cardyb\/([\w\.]+)/i,
 
-            // Meta
-            /(meta-externalfetcher)\/([\w\.]+)/i,
+            // Skype
+            /(skypeuripreview) preview\/([\w\.]+)/i,
 
             // Slackbot - https://api.slack.com/robots
             /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
             
             // WhatsApp
-            /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
-
-            // Yahoo! Japan
-            /(y!?j-dlc)\/([\w\.]+)/i,
-
-            // Yandex Bots - https://yandex.com/bots
-            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
-            /(yandex(?:sitelinks|userproxy))/i
+            /(whatsapp)\/([\w\.]+)/i
         ], 
         [NAME, VERSION, [TYPE, FETCHER]],
 
-        // Google Bots / Cohere / Snapchat / Vercelbot
-        [/(cohere-ai|vercelbot|feedfetcher-google|google(?:-read-aloud|producer)|(?=bot; )snapchat)/i], 
+        [
+            // Google Bots / Cohere / Snapchat / Vercelbot / Yandex Bots
+            /((?:better uptime |telegram|vercel)bot|cohere-ai|feedfetcher-google|google(?:imageproxy|-read-aloud|-pagerenderer|producer)|snap url preview|yandex(?:sitelinks|userproxy))/i
+        ], 
         [NAME, [TYPE, FETCHER]],
+    ],
+
+    os : [
+        [/whatsapp\/[\d\.]+ (a|i)/i],
+        [[NAME, os => os == 'A' ? 'Android' : 'iOS' ]]
     ]
 });
 
@@ -258,10 +263,12 @@ const Fetchers = Object.freeze({
 const InApps = Object.freeze({
     browser : [
         // Slack
-        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],
+        [/(?:slack(?=.+electron|.+ios)|chatlyio)\/([\d\.]+)/i], 
+        [VERSION, [NAME, 'Slack'], [TYPE, INAPP]],
 
         // Yahoo! Japan
-        [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
+        [/jp\.co\.yahoo\.(?:android\.yjtop|ipn\.appli)\/([\d\.]+)/i], 
+        [VERSION, [NAME, 'Yahoo! Japan'], [TYPE, INAPP]]
     ]
 });
 
@@ -271,104 +278,48 @@ const InApps = Object.freeze({
 
 const MediaPlayers = Object.freeze({
     browser : [[
-
-        /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
-        /(coremedia) v([\w\._]+)/i
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
-                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
+        /(apple(?:coremedia|tv))\/([\w\._]+)/i,                             // Generic Apple CoreMedia
+        /(coremedia) v([\w\._]+)/i,         
+                                                                            // Ares/Nexplayer/OSSProxy
+        /(ares|clementine|music player daemon|nexplayer|ossproxy) ([\w\.-]+)/i, 
+                                                                            // Aqualung/Lyssna/BSPlayer/Clementine/MPD
+                                                                            // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/GnomeMplayer/MoC
                                                                             // NSPlayer/PSP-InternetRadioPlayer/Videos
-        /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
-        /(lg player|nexplayer)\s([\d\.]+)/i,
-        /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-        /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
+                                                                            // Nero Home/Nero Scout/Nokia
+                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
+                                                                            // SoundTap/Totem/Stagefright/Streamium
+                                                                            // XBMC/gvfs/Xine/XMMS/irapp
+        /^(aqualung|audacious|audimusicstream|amarok|bass|bsplayer|core|gnomemplayer|gvfs|irapp|lyssna|music on console|nero (?:home|scout)|nokia\d+|nsplayer|psp-internetradioplayer|quicktime|rma|radioapp|radioclientapplication|soundtap|stagefright|streamium|totem|videos|xbmc|xine|xmms)\/([\w\.-]+)/i,
+        /(lg player|nexplayer) ([\d\.]+)/i,
+        /player\/(nexplayer|lg player) ([\w\.-]+)/i,                        // NexPlayer/LG Player
+        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i,                    // Gstreamer
+        /(htc streaming player) [\w_]+ \/ ([\d\.]+)/i,                      // HTC Streaming Player
+        /(lavf)([\d\.]+)/i,                                                 // Lavf (FFMPEG)
+                                                                            // MPlayer SVN
+        /(mplayer)(?: |\/)(?:(?:sherpya-){0,1}svn)(?:-| )(r\d+(?:-\d+[\w\.-]+))/i,
+        / (songbird)\/([\w\.-]+)/i,                                         // Songbird/Philips-Songbird
+        /(winamp)(?:3 version|mpeg| ) ([\w\.-]+)/i,                         // Winamp
+        /(vlc)(?:\/| media player - version )([\w\.-]+)/i,                  // VLC Videolan
+        /^(foobar2000|itunes|smp)\/([\d\.]+)/i,                             // Foobar2000/iTunes/SMP
+        /com\.(riseupradioalarm)\/([\d\.]*)/i,                              // RiseUP Radio Alarm
+        /(mplayer)(?:\s|\/| unknown-)([\w\.\-]+)/i,                         // MPlayer
+                                                                            // Windows Media Server
+        /(windows)\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ home media server/i
         ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(flrp)\/([\w\.-]+)/i                                               // Flip Player
         ], [[NAME, 'Flip Player'], VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(fstream|nativehost|queryseekspider)/i
                                                                             // FStream/NativeHost/QuerySeekSpider
+                                                                            // MPlayer (no other info)/Media Player Classic/Nero ShowTime
+                                                                            // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
+                                                                            // inlight radio / YourMuze
+        /(fstream|media player classic|inlight radio|mplayer|nativehost|nero showtime|ocms-bot|queryseekspider|tapinradio|tunein radio|winamp|yourmuze)/i                                                                          
         ], [NAME, [TYPE, MEDIAPLAYER]], [
 
-        /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
-                                                                            // Gstreamer
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
+        /(htc_one_s|windows-media-player|wmplayer)\/([\w\.-]+)/i,           // HTC One S / Windows Media Player
+        ], [[NAME, /[_-]/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
 
-        /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
-        /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
-        ], [[NAME, /_/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
-                                                                            // MPlayer SVN
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
-        /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(mplayer)/i,                                                       // MPlayer (no other info)
-        /(yourmuze)/i,                                                      // YourMuze
-        /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
-        ], [NAME, [TYPE, MEDIAPLAYER]], [
-
-        /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
-        /(winamp)\s([\w\.-]+)/i,
-        /(winamp)mpeg\/([\w\.-]+)/i
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
-                                                                            // inlight radio
-        ], [NAME, [TYPE, MEDIAPLAYER]], [
-
-        /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
-                                                                            // QuickTime/RealMedia/RadioApp/RadioClientApplication/
-                                                                            // SoundTap/Totem/Stagefright/Streamium
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(smp)([\d\.]+)/i                                                   // SMP
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
-        /(vlc)\/([\w\.-]+)/i,
-        /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
-        /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
-        /(itunes)\/([\d\.]+)/i                                              // iTunes
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
-        /(windows-media-player)\/([\w\.-]+)/i
-        ], [[NAME, /-/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
-                                                                            // Windows Media Server
-        ], [VERSION, [NAME, 'Windows'], [TYPE, MEDIAPLAYER]], [
-
-        /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
-        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
-
-        /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
-        /(radio.(?:de|at|fr))\s([\d\.]+)/i
+        /(rad.io|radio.(?:de|at|fr)) ([\d\.]+)/i                            // Rad.io
         ], [[NAME, 'rad.io'], VERSION, [TYPE, MEDIAPLAYER]]
     ]
 });
@@ -387,6 +338,29 @@ const Libraries = Object.freeze({
     ]
 });
 
+/////////////
+// VEHICLES
+////////////
+
+const Vehicles = Object.freeze({
+    device : [
+        [/aftlbt962e2/i],                                                   // BMW
+        [[VENDOR, 'BMW']],
+
+        [/dilink.+(byd) auto/i],                                            // BYD
+        [VENDOR],
+
+        [/aftlft962x3/i],                                                   // Jeep
+        [[VENDOR, 'Jeep'], [MODEL, 'Wagooner']],
+        
+        [/(rivian) (r1t)/i],                                                // Rivian
+        [VENDOR, MODEL],
+
+        [/vcc.+netfront/i],                                                 // Volvo
+        [[VENDOR, 'Volvo']]
+    ]
+});
+
 //////////
 // BOTS
 /////////
@@ -397,6 +371,9 @@ const Bots = Object.freeze({
         ...Crawlers.browser,
         ...Fetchers.browser,
         ...Libraries.browser
+    ],
+    os : [
+        ...Fetchers.os
     ]
 });
 
@@ -409,5 +386,6 @@ export {
     Fetchers,
     InApps,
     Libraries,
-    MediaPlayers
+    MediaPlayers,
+    Vehicles
 };

src/helpers/ua-parser-helpers.d.ts

@@ -1,8 +1,8 @@
-// Type definitions for Helpers submodule of UAParser.js v2.0.0
+// Type definitions for Helpers submodule of UAParser.js v2.0.3
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
-import { IResult } from "../main/ua-parser";
+import type { IResult } from "../main/ua-parser";
 
 declare function getDeviceVendor(model: string): string | undefined;
 declare function isAppleSilicon(resultOrUA: IResult | string): boolean;

src/helpers/ua-parser-helpers.js

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0
+/*  Helpers for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -93,6 +93,9 @@ const isAIBot = (resultOrUA) => [
     // Perplexity
     'perplexitybot',
 
+    // Semrush
+    'semrushbot-ocob',
+
     // Timpi
     'timpibot',
 

src/helpers/ua-parser-helpers.mjs

@@ -3,10 +3,10 @@
 // Source: /src/helpers/ua-parser-helpers.js
 
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0
+/*  Helpers for UAParser.js v2.0.3
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
-    AGPLv3 License */
+    UAParser.js PRO Personal License */
 //////////////////////////////////////////////
 
 /*jshint esversion: 6 */ 
@@ -97,6 +97,9 @@ const isAIBot = (resultOrUA) => [
     // Perplexity
     'perplexitybot',
 
+    // Semrush
+    'semrushbot-ocob',
+
     // Timpi
     'timpibot',
 

src/main/ua-parser.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for UAParser.js v2.0.0
+// Type definitions for UAParser.js v2.0.3
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 

src/main/ua-parser.js

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0
-   Copyright © 2012-2024 Faisal Salman <f@faisalman.com>
-   AGPLv3 License *//*
+/* UAParser.js v2.0.3
+   Copyright © 2012-2025 Faisal Salman <f@faisalman.com>
+   UAParser.js PRO Personal License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
    Supports browser & node.js environment. 
    Demo   : https://uaparser.dev
@@ -19,20 +19,35 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '2.0.0',
+    var LIBVERSION  = '2.0.3',
+        UA_MAX_LENGTH = 500,
+        USER_AGENT  = 'user-agent',
         EMPTY       = '',
         UNKNOWN     = '?',
+
+        // typeof
         FUNC_TYPE   = 'function',
         UNDEF_TYPE  = 'undefined',
         OBJ_TYPE    = 'object',
         STR_TYPE    = 'string',
-        MAJOR       = 'major',
-        MODEL       = 'model',
+
+        // properties
+        UA_BROWSER  = 'browser',
+        UA_CPU      = 'cpu',
+        UA_DEVICE   = 'device',
+        UA_ENGINE   = 'engine',
+        UA_OS       = 'os',
+        UA_RESULT   = 'result',
+        
         NAME        = 'name',
         TYPE        = 'type',
         VENDOR      = 'vendor',
         VERSION     = 'version',
         ARCHITECTURE= 'architecture',
+        MAJOR       = 'major',
+        MODEL       = 'model',
+
+        // device types
         CONSOLE     = 'console',
         MOBILE      = 'mobile',
         TABLET      = 'tablet',
@@ -40,9 +55,11 @@
         WEARABLE    = 'wearable',
         XR          = 'xr',
         EMBEDDED    = 'embedded',
+
+        // browser types
         INAPP       = 'inapp',
-        USER_AGENT  = 'user-agent',
-        UA_MAX_LENGTH = 500,
+
+        // client hints
         BRANDS      = 'brands',
         FORMFACTORS = 'formFactors',
         FULLVERLIST = 'fullVersionList',
@@ -59,12 +76,8 @@
         CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
         CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
         CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
-        UA_BROWSER  = 'browser',
-        UA_CPU      = 'cpu',
-        UA_DEVICE   = 'device',
-        UA_ENGINE   = 'engine',
-        UA_OS       = 'os',
-        UA_RESULT   = 'result',
+
+        // device vendors
         AMAZON      = 'Amazon',
         APPLE       = 'Apple',
         ASUS        = 'ASUS',
@@ -76,6 +89,7 @@
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
+        NVIDIA      = 'Nvidia',
         ONEPLUS     = 'OnePlus',
         OPPO        = 'OPPO',
         SAMSUNG     = 'Samsung',
@@ -83,8 +97,8 @@
         SONY        = 'Sony',
         XIAOMI      = 'Xiaomi',
         ZEBRA       = 'Zebra',
-        PREFIX_MOBILE  = 'Mobile ',
-        SUFFIX_BROWSER = ' Browser',
+
+        // browsers
         CHROME      = 'Chrome',
         CHROMIUM    = 'Chromium',
         CHROMECAST  = 'Chromecast',
@@ -93,6 +107,11 @@
         OPERA       = 'Opera',
         FACEBOOK    = 'Facebook',
         SOGOU       = 'Sogou',
+
+        PREFIX_MOBILE  = 'Mobile ',
+        SUFFIX_BROWSER = ' Browser',
+
+        // os
         WINDOWS     = 'Windows';
    
     var isWindow            = typeof window !== UNDEF_TYPE,
@@ -334,11 +353,11 @@
             /(avant|iemobile|slim(?:browser|boat|jet))[\/ ]?([\d\.]*)/i,        // Avant/IEMobile/SlimBrowser/SlimBoat/Slimjet
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
-            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon)\/([-\w\.]+)/i,
+            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble
+            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser)\/([-\w\.]+)/i,
                                                                                 // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
-            /(heytap|ovi|115)browser\/([\d\.]+)/i,                              // HeyTap/Ovi/115
-            /(weibo)__([\d\.]+)/i                                               // Weibo
+            /(heytap|ovi|115|surf)browser\/([\d\.]+)/i,                         // HeyTap/Ovi/115/Surf
+            /(ecosia|weibo)(?:__| \w+@)([\d\.]+)/i                              // Ecosia/Weibo
             ], [NAME, VERSION], [
             /quark(?:pc)?\/([-\w\.]+)/i                                         // Quark
             ], [VERSION, [NAME, 'Quark']], [
@@ -402,6 +421,7 @@
             /(Klarna)\/([\w\.]+)/i,                                             // Klarna Shopping Browser for iOS & Android
             /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
             /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
+            /(daum)apps[\/ ]([\w\.]+)/i,                                        // Daum App
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
             /(alipay)client\/([\w\.]+)/i,                                       // Alipay
@@ -464,8 +484,8 @@
             /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla
 
             // Other
-            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
-                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser
+            /(amaya|dillo|doris|icab|ladybird|lynx|mosaic|netsurf|obigo|polaris|w3m|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
+                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser/Ladybird
             /\b(links) \(([\w\.]+)/i                                            // Links
             ], [NAME, [VERSION, /_/g, '.']], [
             
@@ -475,30 +495,30 @@
 
         cpu : [[
 
-            /\b(?:(amd|x|x86[-_]?|wow|win)64)\b/i                               // AMD64 (x64)
+            /\b((amd|x|x86[-_]?|wow|win)64)\b/i                                 // AMD64 (x64)
             ], [[ARCHITECTURE, 'amd64']], [
 
             /(ia32(?=;))/i,                                                     // IA32 (quicktime)
-            /\b((?:i[346]|x)86)\b/i                                             // IA32 (x86)
+            /\b((i[346]|x)86)(pc)?\b/i                                          // IA32 (x86)
             ], [[ARCHITECTURE, 'ia32']], [
 
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                  // ARM64
+            /\b(aarch64|arm(v?[89]e?l?|_?64))\b/i                               // ARM64
             ], [[ARCHITECTURE, 'arm64']], [
 
-            /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
+            /\b(arm(v[67])?ht?n?[fl]p?)\b/i                                     // ARMHF
             ], [[ARCHITECTURE, 'armhf']], [
 
             // PocketPC mistakenly identified as PowerPC
-            /windows (ce|mobile); ppc;/i
+            /( (ce|mobile); ppc;|\/[\w\.]+arm\b)/i
             ], [[ARCHITECTURE, 'arm']], [
 
-            /((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i                            // PowerPC
+            /((ppc|powerpc)(64)?)( mac|;|\))/i                                  // PowerPC
             ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
 
-            /(sun4\w)[;\)]/i                                                    // SPARC
+            / sun4\w[;\)]/i                                                     // SPARC
             ], [[ARCHITECTURE, 'sparc']], [
 
-            /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
+            /\b(avr32|ia64(?=;)|68k(?=\))|\barm(?=v([1-7]|[5-7]1)l?|;|eabi)|(irix|mips|sparc)(64)?\b|pa-risc)/i
                                                                                 // IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
             ], [[ARCHITECTURE, lowerize]]
         ],
@@ -565,8 +585,11 @@
             /\b(opd2(\d{3}a?))(?: bui|\))/i
             ], [MODEL, [VENDOR, strMapper, { 'OnePlus' : ['304', '403', '203'], '*' : OPPO }], [TYPE, TABLET]], [
 
+            // BLU Vivo Series
+            /(vivo (5r?|6|8l?|go|one|s|x[il]?[2-4]?)[\w\+ ]*)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'BLU'], [TYPE, MOBILE]], [            
             // Vivo
-            /vivo (\w+)(?: bui|\))/i,
+            /; vivo (\w+)(?: bui|\))/i,
             /\b(v[12]\d{3}\w?[at])(?: bui|;)/i
             ], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
 
@@ -586,7 +609,7 @@
             /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i
             ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [
             /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i,
-            /\blg[-e;\/ ]+((?!browser|netcast|android tv|watch)\w+)/i,
+            /\blg[-e;\/ ]+(?!.*(?:browser|netcast|android tv|watch))(\w+)/i,
             /\blg-?([\d\w]+) bui/i
             ], [MODEL, [VENDOR, LG], [TYPE, MOBILE]], [
 
@@ -598,8 +621,8 @@
             // Nokia
             /(nokia) (t[12][01])/i
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
-            /(?:maemo|nokia).*(n900|lumia \d+)/i,
-            /nokia[-_ ]?(([-\w\.]*))/i
+            /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
+            /nokia[-_ ]?(([-\w\. ]*))/i
             ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
@@ -693,6 +716,14 @@
             /droid.+; (a(?:015|06[35]|142p?))/i
             ], [MODEL, [VENDOR, 'Nothing'], [TYPE, MOBILE]], [
 
+            // Archos
+            /; (x67 5g|tikeasy \w+|ac[1789]\d\w+)( b|\))/i,
+            /archos ?(5|gamepad2?|([\w ]*[t1789]|hello) ?\d+[\w ]*)( b|\))/i
+            ], [MODEL, [VENDOR, 'Archos'], [TYPE, TABLET]], [
+            /archos ([\w ]+)( b|\))/i,
+            /; (ac[3-6]\d\w{2,8})( b|\))/i 
+            ], [MODEL, [VENDOR, 'Archos'], [TYPE, MOBILE]], [
+
             // MIXED
             /(imo) (tab \w+)/i,                                                 // IMO
             /(infinix) (x1101b?)/i                                              // Infinix XPad
@@ -700,7 +731,7 @@
 
             /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus(?! zenw)|dell|jolla|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Infinix/Tecno/Micromax/Advan
-            /; (hmd|imo) ([\w ]+?)(?: bui|\))/i,                                // HMD/IMO
+            /; (blu|hmd|imo|tcl)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,               // BLU/HMD/IMO/TCL
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
             /(lenovo)[-_ ]?([-\w ]+?)(?: bui|\)|\/)/i,                          // Lenovo
@@ -708,7 +739,6 @@
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
             /(kobo)\s(ereader|touch)/i,                                         // Kobo
-            /(archos) (gamepad2?)/i,                                            // Archos
             /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
             /(kindle)\/([\w\.]+)/i                                              // Kindle
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
@@ -717,8 +747,8 @@
             ], [MODEL, [VENDOR, MICROSOFT], [TYPE, TABLET]], [
             /droid [\d\.]+; (fp\du?)(?: b|\))/i                                 // Fairphone
             ], [MODEL, [VENDOR, 'Fairphone'], [TYPE, MOBILE]], [
-            /(shield[\w ]+) b/i                                                 // Nvidia Shield Tablets
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, TABLET]], [
+            /((?:tegranote|shield t(?!.+d tv))[\w- ]*?)(?: b|\))/i              // Nvidia Tablets
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, TABLET]], [
             /(sprint) (\w+)/i                                                   // Sprint Phones
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
             /(kin\.[onetw]{3})/i                                                // Microsoft Kin
@@ -736,7 +766,9 @@
             ], [VENDOR, [TYPE, SMARTTV]], [
             /hbbtv.+maple;(\d+)/i
             ], [[MODEL, /^/, 'SmartTV'], [VENDOR, SAMSUNG], [TYPE, SMARTTV]], [
-            /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i        // LG SmartTV
+            /tcast.+(lg)e?. ([-\w]+)/i                                          // LG SmartTV
+            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
+            /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i
             ], [[VENDOR, LG], [TYPE, SMARTTV]], [
             /(apple) ?tv/i                                                      // Apple TV
             ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
@@ -748,8 +780,12 @@
             ], [[MODEL, CHROMECAST+' Nest Hub'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
             /crkey/i                                                            // Google Chromecast, Linux-based or unknown
             ], [[MODEL, CHROMECAST], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+            /(portaltv)/i                                                       // Facebook Portal TV
+            ], [MODEL, [VENDOR, FACEBOOK], [TYPE, SMARTTV]], [
             /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
+            /(shield \w+ tv)/i                                                  // Nvidia Shield TV
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i,
             /(aquos-tv[\w ]+)\)/i                                               // Sharp
             ], [MODEL, [VENDOR, SHARP], [TYPE, SMARTTV]],[
@@ -762,7 +798,10 @@
             /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i,                          // Roku
             /hbbtv\/\d+\.\d+\.\d+ +\([\w\+ ]*; *([\w\d][^;]*);([^;]*)/i         // HbbTV devices
             ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
-            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i                   // SmartTV from Unidentified Vendors
+                                                                                // SmartTV from Unidentified Vendors
+            /droid.+; ([\w- ]+) (?:android tv|smart[- ]?tv)/i
+            ], [MODEL, [TYPE, SMARTTV]], [
+            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i
             ], [[TYPE, SMARTTV]], [
 
             ///////////////////
@@ -772,8 +811,8 @@
             /(ouya)/i,                                                          // Ouya
             /(nintendo) (\w+)/i                                                 // Nintendo
             ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield) bui/i                                            // Nvidia
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
+            /droid.+; (shield)( bui|\))/i                                       // Nvidia Portable
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, CONSOLE]], [
             /(playstation \w+)/i                                                // Playstation
             ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
             /\b(xbox(?: one)?(?!; xbox))[\); ]/i                                // Microsoft Xbox
@@ -811,7 +850,7 @@
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, XR]], [
             /(pico) (4|neo3(?: link|pro)?)/i                                    // Pico
             ], [VENDOR, MODEL, [TYPE, XR]], [
-            /; (quest( \d| pro)?)/i                                             // Oculus Quest
+            /(quest( \d| pro)?s?).+vr/i                                         // Meta Quest
             ], [MODEL, [VENDOR, FACEBOOK], [TYPE, XR]], [
 
             ///////////////////
@@ -822,20 +861,22 @@
             ], [VENDOR, [TYPE, EMBEDDED]], [
             /(aeobc)\b/i                                                        // Echo Dot
             ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
+            /(homepod).+mac os/i                                                // Apple HomePod
+            ], [MODEL, [VENDOR, APPLE], [TYPE, EMBEDDED]], [
+            /windows iot/i
+            ], [[TYPE, EMBEDDED]], [
 
             ////////////////////
             // MIXED (GENERIC)
             ///////////////////
 
-            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+? mobile safari/i    // Android Phones from Unidentified Vendors
-            ], [MODEL, [TYPE, MOBILE]], [
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i       // Android Tablets from Unidentified Vendors
-            ], [MODEL, [TYPE, TABLET]], [
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+?(mobile|vr|\d) safari/i
+            ], [MODEL, [TYPE, strMapper, { 'mobile' : 'Mobile', 'xr' : 'VR', '*' : TABLET }]], [
             /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i                      // Unidentifiable Tablet
             ], [[TYPE, TABLET]], [
             /(phone|mobile(?:[;\/]| [ \w\/\.]*safari)|pda(?=.+windows ce))/i    // Unidentifiable Mobile
             ], [[TYPE, MOBILE]], [
-            /(android[-\w\. ]{0,9});.+buil/i                                    // Generic Android Device
+            /droid .+?; ([\w\. -]+)( bui|\))/i                                  // Generic Android Device
             ], [MODEL, [VENDOR, 'Generic']]
         ],
 
@@ -855,8 +896,11 @@
             /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
             /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
             /(icab)[\/ ]([23]\.[\d\.]+)/i,                                      // iCab
-            /\b(libweb)/i
+
+            /\b(libweb)/i                                                       // LibWeb
             ], [NAME, VERSION], [
+            /ladybird\//i
+            ], [[NAME, 'LibWeb']], [
 
             /rv\:([\w\.]{1,9})\b.+(gecko)/i                                     // Gecko
             ], [VERSION, NAME]
@@ -867,15 +911,15 @@
             // Windows
             /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
             ], [NAME, VERSION], [
-            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i             // Windows Phone
+            /(windows (?:phone(?: os)?|mobile|iot))[\/ ]?([\d\.\w ]*)/i         // Windows Phone
             ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /windows nt 6\.2; (arm)/i,                                        // Windows RT
-            /windows[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i,
+            /windows nt 6\.2; (arm)/i,                                          // Windows RT
+            /windows[\/ ]([ntce\d\. ]+\w)(?!.+xbox)/i,
             /(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
             ], [[VERSION, strMapper, windowsVersionMap], [NAME, WINDOWS]], [
 
             // iOS/macOS
-            /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
+            /[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i,             // iOS
             /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
@@ -897,15 +941,15 @@
 
             // Mobile OSes
             /droid ([\w\.]+)\b.+(android[- ]x86|harmonyos)/i                    // Android-x86/HarmonyOS
-            ], [VERSION, NAME], [                                               // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS/OpenHarmony
-            /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish|openharmony)[-\/ ]?([\w\.]*)/i,
-            /(blackberry)\w*\/([\w\.]*)/i,                                      // Blackberry
-            /(tizen|kaios)[\/ ]([\w\.]+)/i,                                     // Tizen/KaiOS
-            /\((series40);/i                                                    // Series 40
+            ], [VERSION, NAME], [                                               
+            /(ubuntu) ([\w\.]+) like android/i                                  // Ubuntu Touch
+            ], [[NAME, /(.+)/, '$1 Touch'], VERSION], [
+                                                                                // Android/Blackberry/WebOS/QNX/Bada/RIM/KaiOS/Maemo/MeeGo/S40/Sailfish OS/OpenHarmony/Tizen
+            /(android|bada|blackberry|kaios|maemo|meego|openharmony|qnx|rim tablet os|sailfish|series40|symbian|tizen|webos)\w*[-\/\.; ]?([\d\.]*)/i
             ], [NAME, VERSION], [
             /\(bb(10);/i                                                        // BlackBerry 10
             ], [VERSION, [NAME, BLACKBERRY]], [
-            /(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i         // Symbian
+            /(?:symbian ?os|symbos|s60(?=;)|series ?60)[-\/ ]?([\w\.]*)/i       // Symbian
             ], [VERSION, [NAME, 'Symbian']], [
             /mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
             ], [VERSION, [NAME, FIREFOX+' OS']], [
@@ -935,7 +979,7 @@
             /(mageia|vectorlinux)[; ]/i,                                        // Mageia/VectorLinux
             /([kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?= linux)|slackware|fedora|mandriva|centos|pclinuxos|red ?hat|zenwalk|linpus|raspbian|plan 9|minix|risc os|contiki|deepin|manjaro|elementary os|sabayon|linspire)(?: gnu\/linux)?(?: enterprise)?(?:[- ]linux)?(?:-gnu)?[-\/ ]?(?!chrom|package)([-\w\.]*)/i,
                                                                                 // Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware/Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus/Raspbian/Plan9/Minix/RISCOS/Contiki/Deepin/Manjaro/elementary/Sabayon/Linspire
-            /(hurd|linux) ?([\w\.]*)/i,                                         // Hurd/Linux
+            /(hurd|linux)(?: arm\w*| x86\w*| ?)([\w\.]*)/i,                     // Hurd/Linux
             /(gnu) ?([\w\.]*)/i,                                                // GNU
             /\b([-frentopcghs]{0,5}bsd|dragonfly)[\/ ]?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/GhostBSD/DragonFly
             /(haiku) (\w+)/i                                                    // Haiku
@@ -1183,7 +1227,11 @@
                                     'Chrome' : 'Google Chrome',
                                     'Edge' : 'Microsoft Edge',
                                     'Chrome WebView' : 'Android WebView',
-                                    'Chrome Headless' : 'HeadlessChrome'
+                                    'Chrome Headless' : 'HeadlessChrome',
+                                    'Huawei Browser' : 'HuaweiBrowser',
+                                    'MIUI Browser' : 'Miui Browser',
+                                    'Opera Mobi' : 'OperaMobile',
+                                    'Yandex' : 'YaBrowser'
                                 });
                                 this.set(NAME, brandName)
                                     .set(VERSION, brandVersion)

src/main/ua-parser.mjs

@@ -3,9 +3,9 @@
 // Source: /src/main/ua-parser.js
 
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0
-   Copyright © 2012-2024 Faisal Salman <f@faisalman.com>
-   AGPLv3 License *//*
+/* UAParser.js v2.0.3
+   Copyright © 2012-2025 Faisal Salman <f@faisalman.com>
+   UAParser.js PRO Personal License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
    Supports browser & node.js environment. 
    Demo   : https://uaparser.dev
@@ -21,20 +21,35 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '2.0.0',
+    var LIBVERSION  = '2.0.3',
+        UA_MAX_LENGTH = 500,
+        USER_AGENT  = 'user-agent',
         EMPTY       = '',
         UNKNOWN     = '?',
+
+        // typeof
         FUNC_TYPE   = 'function',
         UNDEF_TYPE  = 'undefined',
         OBJ_TYPE    = 'object',
         STR_TYPE    = 'string',
-        MAJOR       = 'major',
-        MODEL       = 'model',
+
+        // properties
+        UA_BROWSER  = 'browser',
+        UA_CPU      = 'cpu',
+        UA_DEVICE   = 'device',
+        UA_ENGINE   = 'engine',
+        UA_OS       = 'os',
+        UA_RESULT   = 'result',
+        
         NAME        = 'name',
         TYPE        = 'type',
         VENDOR      = 'vendor',
         VERSION     = 'version',
         ARCHITECTURE= 'architecture',
+        MAJOR       = 'major',
+        MODEL       = 'model',
+
+        // device types
         CONSOLE     = 'console',
         MOBILE      = 'mobile',
         TABLET      = 'tablet',
@@ -42,9 +57,11 @@
         WEARABLE    = 'wearable',
         XR          = 'xr',
         EMBEDDED    = 'embedded',
+
+        // browser types
         INAPP       = 'inapp',
-        USER_AGENT  = 'user-agent',
-        UA_MAX_LENGTH = 500,
+
+        // client hints
         BRANDS      = 'brands',
         FORMFACTORS = 'formFactors',
         FULLVERLIST = 'fullVersionList',
@@ -61,12 +78,8 @@
         CH_HEADER_PLATFORM  = CH_HEADER + '-' + PLATFORM,
         CH_HEADER_PLATFORM_VER = CH_HEADER_PLATFORM + '-version',
         CH_ALL_VALUES       = [BRANDS, FULLVERLIST, MOBILE, MODEL, PLATFORM, PLATFORMVER, ARCHITECTURE, FORMFACTORS, BITNESS],
-        UA_BROWSER  = 'browser',
-        UA_CPU      = 'cpu',
-        UA_DEVICE   = 'device',
-        UA_ENGINE   = 'engine',
-        UA_OS       = 'os',
-        UA_RESULT   = 'result',
+
+        // device vendors
         AMAZON      = 'Amazon',
         APPLE       = 'Apple',
         ASUS        = 'ASUS',
@@ -78,20 +91,29 @@
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
+        NVIDIA      = 'Nvidia',
+        ONEPLUS     = 'OnePlus',
+        OPPO        = 'OPPO',
         SAMSUNG     = 'Samsung',
         SHARP       = 'Sharp',
         SONY        = 'Sony',
         XIAOMI      = 'Xiaomi',
         ZEBRA       = 'Zebra',
-        PREFIX_MOBILE  = 'Mobile ',
-        SUFFIX_BROWSER = ' Browser',
+
+        // browsers
         CHROME      = 'Chrome',
+        CHROMIUM    = 'Chromium',
         CHROMECAST  = 'Chromecast',
         EDGE        = 'Edge',
         FIREFOX     = 'Firefox',
         OPERA       = 'Opera',
         FACEBOOK    = 'Facebook',
         SOGOU       = 'Sogou',
+
+        PREFIX_MOBILE  = 'Mobile ',
+        SUFFIX_BROWSER = ' Browser',
+
+        // os
         WINDOWS     = 'Windows';
    
     var isWindow            = typeof window !== UNDEF_TYPE,
@@ -333,11 +355,11 @@
             /(avant|iemobile|slim(?:browser|boat|jet))[\/ ]?([\d\.]*)/i,        // Avant/IEMobile/SlimBrowser/SlimBoat/Slimjet
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
-            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon)\/([-\w\.]+)/i,
+            // Blink/Webkit/KHTML based                                         // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon/LG Browser/Otter/qutebrowser/Dooble
+            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio|(?=comodo_)?dragon|otter|dooble|(?:lg |qute)browser)\/([-\w\.]+)/i,
                                                                                 // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio/Dragon
-            /(heytap|ovi|115)browser\/([\d\.]+)/i,                              // HeyTap/Ovi/115
-            /(weibo)__([\d\.]+)/i                                               // Weibo
+            /(heytap|ovi|115|surf)browser\/([\d\.]+)/i,                         // HeyTap/Ovi/115/Surf
+            /(ecosia|weibo)(?:__| \w+@)([\d\.]+)/i                              // Ecosia/Weibo
             ], [NAME, VERSION], [
             /quark(?:pc)?\/([-\w\.]+)/i                                         // Quark
             ], [VERSION, [NAME, 'Quark']], [
@@ -401,6 +423,7 @@
             /(Klarna)\/([\w\.]+)/i,                                             // Klarna Shopping Browser for iOS & Android
             /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
             /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
+            /(daum)apps[\/ ]([\w\.]+)/i,                                        // Daum App
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
             /(alipay)client\/([\w\.]+)/i,                                       // Alipay
@@ -463,8 +486,8 @@
             /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,                         // Mozilla
 
             // Other
-            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
-                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser
+            /(amaya|dillo|doris|icab|ladybird|lynx|mosaic|netsurf|obigo|polaris|w3m|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
+                                                                                // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser/Ladybird
             /\b(links) \(([\w\.]+)/i                                            // Links
             ], [NAME, [VERSION, /_/g, '.']], [
             
@@ -474,30 +497,30 @@
 
         cpu : [[
 
-            /\b(?:(amd|x|x86[-_]?|wow|win)64)\b/i                               // AMD64 (x64)
+            /\b((amd|x|x86[-_]?|wow|win)64)\b/i                                 // AMD64 (x64)
             ], [[ARCHITECTURE, 'amd64']], [
 
             /(ia32(?=;))/i,                                                     // IA32 (quicktime)
-            /((?:i[346]|x)86)[;\)]/i                                            // IA32 (x86)
+            /\b((i[346]|x)86)(pc)?\b/i                                          // IA32 (x86)
             ], [[ARCHITECTURE, 'ia32']], [
 
-            /\b(aarch64|arm(v?8e?l?|_?64))\b/i                                  // ARM64
+            /\b(aarch64|arm(v?[89]e?l?|_?64))\b/i                               // ARM64
             ], [[ARCHITECTURE, 'arm64']], [
 
-            /\b(arm(?:v[67])?ht?n?[fl]p?)\b/i                                   // ARMHF
+            /\b(arm(v[67])?ht?n?[fl]p?)\b/i                                     // ARMHF
             ], [[ARCHITECTURE, 'armhf']], [
 
             // PocketPC mistakenly identified as PowerPC
-            /windows (ce|mobile); ppc;/i
+            /( (ce|mobile); ppc;|\/[\w\.]+arm\b)/i
             ], [[ARCHITECTURE, 'arm']], [
 
-            /((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i                            // PowerPC
+            /((ppc|powerpc)(64)?)( mac|;|\))/i                                  // PowerPC
             ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
 
-            /(sun4\w)[;\)]/i                                                    // SPARC
+            / sun4\w[;\)]/i                                                     // SPARC
             ], [[ARCHITECTURE, 'sparc']], [
 
-            /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
+            /\b(avr32|ia64(?=;)|68k(?=\))|\barm(?=v([1-7]|[5-7]1)l?|;|eabi)|(irix|mips|sparc)(64)?\b|pa-risc)/i
                                                                                 // IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
             ], [[ARCHITECTURE, lowerize]]
         ],
@@ -531,37 +554,44 @@
             ], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
 
             // Honor
-            /(?:honor)([-\w ]+)[;\)]/i
+            /\b((?:brt|eln|hey2?|gdi|jdn)-a?[lnw]09|(?:ag[rm]3?|jdn2|kob2)-a?[lw]0[09]hn)(?: bui|\)|;)/i
+            ], [MODEL, [VENDOR, HONOR], [TYPE, TABLET]], [
+            /honor([-\w ]+)[;\)]/i
             ], [MODEL, [VENDOR, HONOR], [TYPE, MOBILE]], [
 
             // Huawei
-            /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
+            /\b((?:ag[rs][2356]?k?|bah[234]?|bg[2o]|bt[kv]|cmr|cpn|db[ry]2?|jdn2|got|kob2?k?|mon|pce|scm|sht?|[tw]gr|vrd)-[ad]?[lw][0125][09]b?|605hw|bg2-u03|(?:gem|fdr|m2|ple|t1)-[7a]0[1-4][lu]|t1-a2[13][lw]|mediapad[\w\. ]*(?= bui|\)))\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
             /(?:huawei)([-\w ]+)[;\)]/i,
             /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
             // Xiaomi
+            /oid[^\)]+; (2[\dbc]{4}(182|283|rp\w{2})[cgl]|m2105k81a?c)(?: bui|\))/i,
+            /\b((?:red)?mi[-_ ]?pad[\w- ]*)(?: bui|\))/i                                // Mi Pad tablets
+            ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
+
             /\b(poco[\w ]+|m2\d{3}j\d\d[a-z]{2})(?: bui|\))/i,                  // Xiaomi POCO
             /\b; (\w+) build\/hm\1/i,                                           // Xiaomi Hongmi 'numeric' models
             /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i,                             // Xiaomi Hongmi
             /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i,                   // Xiaomi Redmi
             /oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i,        // Xiaomi Redmi 'numeric' models
-            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i // Xiaomi Mi
+            /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i, // Xiaomi Mi
+            / ([\w ]+) miui\/v?\d/i
             ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
-            /oid[^\)]+; (2\d{4}(283|rpbf)[cgl])( bui|\))/i,                     // Redmi Pad
-            /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i                        // Mi Pad tablets
-            ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
 
             // OPPO
             /; (\w+) bui.+ oppo/i,
             /\b(cph[12]\d{3}|p(?:af|c[al]|d\w|e[ar])[mt]\d0|x9007|a101op)\b/i
-            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [
-            /\b(opd2\d{3}a?) bui/i
-            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, TABLET]], [
+            ], [MODEL, [VENDOR, OPPO], [TYPE, MOBILE]], [
+            /\b(opd2(\d{3}a?))(?: bui|\))/i
+            ], [MODEL, [VENDOR, strMapper, { 'OnePlus' : ['304', '403', '203'], '*' : OPPO }], [TYPE, TABLET]], [
 
+            // BLU Vivo Series
+            /(vivo (5r?|6|8l?|go|one|s|x[il]?[2-4]?)[\w\+ ]*)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'BLU'], [TYPE, MOBILE]], [            
             // Vivo
-            /vivo (\w+)(?: bui|\))/i,
+            /; vivo (\w+)(?: bui|\))/i,
             /\b(v[12]\d{3}\w?[at])(?: bui|;)/i
             ], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
 
@@ -572,7 +602,7 @@
             // Motorola
             /\b(milestone|droid(?:[2-4x]| (?:bionic|x2|pro|razr))?:?( 4g)?)\b[\w ]+build\//i,
             /\bmot(?:orola)?[- ](\w*)/i,
-            /((?:moto[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
+            /((?:moto(?! 360)[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
             ], [MODEL, [VENDOR, MOTOROLA], [TYPE, MOBILE]], [
             /\b(mz60\d|xoom[2 ]{0,2}) build\//i
             ], [MODEL, [VENDOR, MOTOROLA], [TYPE, TABLET]], [
@@ -581,22 +611,24 @@
             /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i
             ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [
             /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i,
-            /\blg[-e;\/ ]+((?!browser|netcast|android tv)\w+)/i,
+            /\blg[-e;\/ ]+(?!.*(?:browser|netcast|android tv|watch))(\w+)/i,
             /\blg-?([\d\w]+) bui/i
             ], [MODEL, [VENDOR, LG], [TYPE, MOBILE]], [
 
             // Lenovo
-            /(ideatab[-\w ]+)/i,
-            /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
+            /(ideatab[-\w ]+|602lv|d-42a|a101lv|a2109a|a3500-hv|s[56]000|pb-6505[my]|tb-?x?\d{3,4}(?:f[cu]|xu|[av])|yt\d?-[jx]?\d+[lfmx])( bui|;|\)|\/)/i,
+            /lenovo ?(b[68]0[08]0-?[hf]?|tab(?:[\w- ]+?)|tb[\w-]{6,7})( bui|;|\)|\/)/i
             ], [MODEL, [VENDOR, LENOVO], [TYPE, TABLET]], [
 
             // Nokia
-            /(?:maemo|nokia).*(n900|lumia \d+)/i,
-            /nokia[-_ ]?([-\w\.]*)/i
-            ], [[MODEL, /_/g, ' '], [VENDOR, 'Nokia'], [TYPE, MOBILE]], [
+            /(nokia) (t[12][01])/i
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+            /(?:maemo|nokia).*(n900|lumia \d+|rm-\d+)/i,
+            /nokia[-_ ]?(([-\w\. ]*))/i
+            ], [[MODEL, /_/g, ' '], [TYPE, MOBILE], [VENDOR, 'Nokia']], [
 
             // Google
-            /(pixel c)\b/i                                                      // Google Pixel C
+            /(pixel (c|tablet))\b/i                                             // Google Pixel C/Tablet
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, TABLET]], [
             /droid.+; (pixel[\daxl ]{0,6})(?: bui|\))/i                         // Google Pixel
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [
@@ -611,7 +643,7 @@
             // OnePlus
             / (kb2005|in20[12]5|be20[12][59])\b/i,
             /(?:one)?(?:plus)? (a\d0\d\d)(?: b|\))/i
-            ], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [
+            ], [MODEL, [VENDOR, ONEPLUS], [TYPE, MOBILE]], [
 
             // Amazon
             /(alexa)webm/i,
@@ -686,21 +718,29 @@
             /droid.+; (a(?:015|06[35]|142p?))/i
             ], [MODEL, [VENDOR, 'Nothing'], [TYPE, MOBILE]], [
 
+            // Archos
+            /; (x67 5g|tikeasy \w+|ac[1789]\d\w+)( b|\))/i,
+            /archos ?(5|gamepad2?|([\w ]*[t1789]|hello) ?\d+[\w ]*)( b|\))/i
+            ], [MODEL, [VENDOR, 'Archos'], [TYPE, TABLET]], [
+            /archos ([\w ]+)( b|\))/i,
+            /; (ac[3-6]\d\w{2,8})( b|\))/i 
+            ], [MODEL, [VENDOR, 'Archos'], [TYPE, MOBILE]], [
+
             // MIXED
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
+            /(imo) (tab \w+)/i,                                                 // IMO
+            /(infinix) (x1101b?)/i                                              // Infinix XPad
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus(?! zenw)|dell|jolla|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
                                                                                 // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Infinix/Tecno/Micromax/Advan
-            /; (imo) ((?!tab)[\w ]+?)(?: bui|\))/i,                             // IMO
+            /; (blu|hmd|imo|tcl)[_ ]([\w\+ ]+?)(?: bui|\)|; r)/i,               // BLU/HMD/IMO/TCL
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
-            /(asus)-?(\w+)/i,                                                   // Asus
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
-            /(lenovo)[-_ ]?([-\w]+)/i,                                          // Lenovo
-            /(jolla)/i,                                                         // Jolla
+            /(lenovo)[-_ ]?([-\w ]+?)(?: bui|\)|\/)/i,                          // Lenovo
             /(oppo) ?([\w ]+) bui/i                                             // OPPO
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
-            /(imo) (tab \w+)/i,                                                 // IMO
             /(kobo)\s(ereader|touch)/i,                                         // Kobo
-            /(archos) (gamepad2?)/i,                                            // Archos
             /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
             /(kindle)\/([\w\.]+)/i                                              // Kindle
             ], [VENDOR, MODEL, [TYPE, TABLET]], [
@@ -709,8 +749,8 @@
             ], [MODEL, [VENDOR, MICROSOFT], [TYPE, TABLET]], [
             /droid [\d\.]+; (fp\du?)(?: b|\))/i                                 // Fairphone
             ], [MODEL, [VENDOR, 'Fairphone'], [TYPE, MOBILE]], [
-            /(shield[\w ]+) b/i                                                 // Nvidia Shield Tablets
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, TABLET]], [
+            /((?:tegranote|shield t(?!.+d tv))[\w- ]*?)(?: b|\))/i              // Nvidia Tablets
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, TABLET]], [
             /(sprint) (\w+)/i                                                   // Sprint Phones
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
             /(kin\.[onetw]{3})/i                                                // Microsoft Kin
@@ -728,7 +768,9 @@
             ], [VENDOR, [TYPE, SMARTTV]], [
             /hbbtv.+maple;(\d+)/i
             ], [[MODEL, /^/, 'SmartTV'], [VENDOR, SAMSUNG], [TYPE, SMARTTV]], [
-            /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i        // LG SmartTV
+            /tcast.+(lg)e?. ([-\w]+)/i                                          // LG SmartTV
+            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
+            /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i
             ], [[VENDOR, LG], [TYPE, SMARTTV]], [
             /(apple) ?tv/i                                                      // Apple TV
             ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
@@ -740,21 +782,28 @@
             ], [[MODEL, CHROMECAST+' Nest Hub'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
             /crkey/i                                                            // Google Chromecast, Linux-based or unknown
             ], [[MODEL, CHROMECAST], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+            /(portaltv)/i                                                       // Facebook Portal TV
+            ], [MODEL, [VENDOR, FACEBOOK], [TYPE, SMARTTV]], [
             /droid.+aft(\w+)( bui|\))/i                                         // Fire TV
             ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
+            /(shield \w+ tv)/i                                                  // Nvidia Shield TV
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, SMARTTV]], [
             /\(dtv[\);].+(aquos)/i,
             /(aquos-tv[\w ]+)\)/i                                               // Sharp
             ], [MODEL, [VENDOR, SHARP], [TYPE, SMARTTV]],[
             /(bravia[\w ]+)( bui|\))/i                                          // Sony
             ], [MODEL, [VENDOR, SONY], [TYPE, SMARTTV]], [
-            /(mitv-\w{5}) bui/i                                                 // Xiaomi
+            /(mi(tv|box)-?\w+) bui/i                                            // Xiaomi
             ], [MODEL, [VENDOR, XIAOMI], [TYPE, SMARTTV]], [
             /Hbbtv.*(technisat) (.*);/i                                         // TechniSAT
             ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
             /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i,                          // Roku
             /hbbtv\/\d+\.\d+\.\d+ +\([\w\+ ]*; *([\w\d][^;]*);([^;]*)/i         // HbbTV devices
             ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
-            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i                   // SmartTV from Unidentified Vendors
+                                                                                // SmartTV from Unidentified Vendors
+            /droid.+; ([\w- ]+) (?:android tv|smart[- ]?tv)/i
+            ], [MODEL, [TYPE, SMARTTV]], [
+            /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i
             ], [[TYPE, SMARTTV]], [
 
             ///////////////////
@@ -764,8 +813,8 @@
             /(ouya)/i,                                                          // Ouya
             /(nintendo) (\w+)/i                                                 // Nintendo
             ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
-            /droid.+; (shield) bui/i                                            // Nvidia
-            ], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
+            /droid.+; (shield)( bui|\))/i                                       // Nvidia Portable
+            ], [MODEL, [VENDOR, NVIDIA], [TYPE, CONSOLE]], [
             /(playstation \w+)/i                                                // Playstation
             ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
             /\b(xbox(?: one)?(?!; xbox))[\); ]/i                                // Microsoft Xbox
@@ -775,12 +824,23 @@
             // WEARABLES
             ///////////////////
 
-            /\b(sm-[lr]\d\d[05][fnuw]?s?)\b/i                                   // Samsung Galaxy Watch
+            /\b(sm-[lr]\d\d[0156][fnuw]?s?|gear live)\b/i                       // Samsung Galaxy Watch
             ], [MODEL, [VENDOR, SAMSUNG], [TYPE, WEARABLE]], [
-            /((pebble))app/i                                                    // Pebble
+            /((pebble))app/i,                                                   // Pebble
+            /(asus|google|lg|oppo) ((pixel |zen)?watch[\w ]*)( bui|\))/i        // Asus ZenWatch / LG Watch / Pixel Watch
             ], [VENDOR, MODEL, [TYPE, WEARABLE]], [
+            /(ow(?:19|20)?we?[1-3]{1,3})/i                                      // Oppo Watch
+            ], [MODEL, [VENDOR, OPPO], [TYPE, WEARABLE]], [
             /(watch)(?: ?os[,\/]|\d,\d\/)[\d\.]+/i                              // Apple Watch
             ], [MODEL, [VENDOR, APPLE], [TYPE, WEARABLE]], [
+            /(opwwe\d{3})/i                                                     // OnePlus Watch
+            ], [MODEL, [VENDOR, ONEPLUS], [TYPE, WEARABLE]], [
+            /(moto 360)/i                                                       // Motorola 360
+            ], [MODEL, [VENDOR, MOTOROLA], [TYPE, WEARABLE]], [
+            /(smartwatch 3)/i                                                   // Sony SmartWatch
+            ], [MODEL, [VENDOR, SONY], [TYPE, WEARABLE]], [
+            /(g watch r)/i                                                      // LG G Watch R
+            ], [MODEL, [VENDOR, LG], [TYPE, WEARABLE]], [
             /droid.+; (wt63?0{2,3})\)/i
             ], [MODEL, [VENDOR, ZEBRA], [TYPE, WEARABLE]], [
 
@@ -792,7 +852,7 @@
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, XR]], [
             /(pico) (4|neo3(?: link|pro)?)/i                                    // Pico
             ], [VENDOR, MODEL, [TYPE, XR]], [
-            /; (quest( \d| pro)?)/i                                             // Oculus Quest
+            /(quest( \d| pro)?s?).+vr/i                                         // Meta Quest
             ], [MODEL, [VENDOR, FACEBOOK], [TYPE, XR]], [
 
             ///////////////////
@@ -803,20 +863,22 @@
             ], [VENDOR, [TYPE, EMBEDDED]], [
             /(aeobc)\b/i                                                        // Echo Dot
             ], [MODEL, [VENDOR, AMAZON], [TYPE, EMBEDDED]], [
+            /(homepod).+mac os/i                                                // Apple HomePod
+            ], [MODEL, [VENDOR, APPLE], [TYPE, EMBEDDED]], [
+            /windows iot/i
+            ], [[TYPE, EMBEDDED]], [
 
             ////////////////////
             // MIXED (GENERIC)
             ///////////////////
 
-            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+? mobile safari/i    // Android Phones from Unidentified Vendors
-            ], [MODEL, [TYPE, MOBILE]], [
-            /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i       // Android Tablets from Unidentified Vendors
-            ], [MODEL, [TYPE, TABLET]], [
+            /droid .+?; ([^;]+?)(?: bui|; wv\)|\) applew).+?(mobile|vr|\d) safari/i
+            ], [MODEL, [TYPE, strMapper, { 'mobile' : 'Mobile', 'xr' : 'VR', '*' : TABLET }]], [
             /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i                      // Unidentifiable Tablet
             ], [[TYPE, TABLET]], [
             /(phone|mobile(?:[;\/]| [ \w\/\.]*safari)|pda(?=.+windows ce))/i    // Unidentifiable Mobile
             ], [[TYPE, MOBILE]], [
-            /(android[-\w\. ]{0,9});.+buil/i                                    // Generic Android Device
+            /droid .+?; ([\w\. -]+)( bui|\))/i                                  // Generic Android Device
             ], [MODEL, [VENDOR, 'Generic']]
         ],
 
@@ -836,8 +898,11 @@
             /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
             /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
             /(icab)[\/ ]([23]\.[\d\.]+)/i,                                      // iCab
-            /\b(libweb)/i
+
+            /\b(libweb)/i                                                       // LibWeb
             ], [NAME, VERSION], [
+            /ladybird\//i
+            ], [[NAME, 'LibWeb']], [
 
             /rv\:([\w\.]{1,9})\b.+(gecko)/i                                     // Gecko
             ], [VERSION, NAME]
@@ -848,15 +913,15 @@
             // Windows
             /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
             ], [NAME, VERSION], [
-            /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i             // Windows Phone
+            /(windows (?:phone(?: os)?|mobile|iot))[\/ ]?([\d\.\w ]*)/i         // Windows Phone
             ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
-            /windows nt 6\.2; (arm)/i,                                        // Windows RT
-            /windows[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i,
+            /windows nt 6\.2; (arm)/i,                                          // Windows RT
+            /windows[\/ ]([ntce\d\. ]+\w)(?!.+xbox)/i,
             /(?:win(?=3|9|n)|win 9x )([nt\d\.]+)/i
             ], [[VERSION, strMapper, windowsVersionMap], [NAME, WINDOWS]], [
 
             // iOS/macOS
-            /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i,              // iOS
+            /[adehimnop]{4,7}\b(?:.*os ([\w]+) like mac|; opera)/i,             // iOS
             /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
             /cfnetwork\/.+darwin/i
             ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
@@ -878,15 +943,15 @@
 
             // Mobile OSes
             /droid ([\w\.]+)\b.+(android[- ]x86|harmonyos)/i                    // Android-x86/HarmonyOS
-            ], [VERSION, NAME], [                                               // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS/OpenHarmony
-            /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish|openharmony)[-\/ ]?([\w\.]*)/i,
-            /(blackberry)\w*\/([\w\.]*)/i,                                      // Blackberry
-            /(tizen|kaios)[\/ ]([\w\.]+)/i,                                     // Tizen/KaiOS
-            /\((series40);/i                                                    // Series 40
+            ], [VERSION, NAME], [                                               
+            /(ubuntu) ([\w\.]+) like android/i                                  // Ubuntu Touch
+            ], [[NAME, /(.+)/, '$1 Touch'], VERSION], [
+                                                                                // Android/Blackberry/WebOS/QNX/Bada/RIM/KaiOS/Maemo/MeeGo/S40/Sailfish OS/OpenHarmony/Tizen
+            /(android|bada|blackberry|kaios|maemo|meego|openharmony|qnx|rim tablet os|sailfish|series40|symbian|tizen|webos)\w*[-\/\.; ]?([\d\.]*)/i
             ], [NAME, VERSION], [
             /\(bb(10);/i                                                        // BlackBerry 10
             ], [VERSION, [NAME, BLACKBERRY]], [
-            /(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i         // Symbian
+            /(?:symbian ?os|symbos|s60(?=;)|series ?60)[-\/ ]?([\w\.]*)/i       // Symbian
             ], [VERSION, [NAME, 'Symbian']], [
             /mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
             ], [VERSION, [NAME, FIREFOX+' OS']], [
@@ -916,7 +981,7 @@
             /(mageia|vectorlinux)[; ]/i,                                        // Mageia/VectorLinux
             /([kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?= linux)|slackware|fedora|mandriva|centos|pclinuxos|red ?hat|zenwalk|linpus|raspbian|plan 9|minix|risc os|contiki|deepin|manjaro|elementary os|sabayon|linspire)(?: gnu\/linux)?(?: enterprise)?(?:[- ]linux)?(?:-gnu)?[-\/ ]?(?!chrom|package)([-\w\.]*)/i,
                                                                                 // Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware/Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus/Raspbian/Plan9/Minix/RISCOS/Contiki/Deepin/Manjaro/elementary/Sabayon/Linspire
-            /(hurd|linux) ?([\w\.]*)/i,                                         // Hurd/Linux
+            /(hurd|linux)(?: arm\w*| x86\w*| ?)([\w\.]*)/i,                     // Hurd/Linux
             /(gnu) ?([\w\.]*)/i,                                                // GNU
             /\b([-frentopcghs]{0,5}bsd|dragonfly)[\/ ]?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/GhostBSD/DragonFly
             /(haiku) (\w+)/i                                                    // Haiku
@@ -1153,17 +1218,31 @@
     
             switch (this.itemType) {
                 case UA_BROWSER:
+                case UA_ENGINE:
                     var brands = uaCH[FULLVERLIST] || uaCH[BRANDS], prevName;
                     if (brands) {
                         for (var i in brands) {
-                            var brandName = strip(/(Google|Microsoft) /, brands[i].brand || brands[i]),
+                            var brandName = brands[i].brand || brands[i],
                                 brandVersion = brands[i].version;
-                            if (!/not.a.brand/i.test(brandName) && (!prevName || (/chrom/i.test(prevName) && !/chromi/i.test(brandName)))) {
+                            if (this.itemType == UA_BROWSER && !/not.a.brand/i.test(brandName) && (!prevName || (/chrom/i.test(prevName) && brandName != CHROMIUM))) {
+                                brandName = strMapper(brandName, {
+                                    'Chrome' : 'Google Chrome',
+                                    'Edge' : 'Microsoft Edge',
+                                    'Chrome WebView' : 'Android WebView',
+                                    'Chrome Headless' : 'HeadlessChrome',
+                                    'Huawei Browser' : 'HuaweiBrowser',
+                                    'MIUI Browser' : 'Miui Browser',
+                                    'Opera Mobi' : 'OperaMobile',
+                                    'Yandex' : 'YaBrowser'
+                                });
                                 this.set(NAME, brandName)
                                     .set(VERSION, brandVersion)
                                     .set(MAJOR, majorize(brandVersion));
                                 prevName = brandName;
                             }
+                            if (this.itemType == UA_ENGINE && brandName == CHROMIUM) {
+                                this.set(VERSION, brandVersion);
+                            }
                         }
                     }
                     break;
@@ -1180,11 +1259,16 @@
                     }
                     if (uaCH[MODEL]) {
                         this.set(MODEL, uaCH[MODEL]);
-                    }
-                    // Xbox-Specific Detection
-                    if (uaCH[MODEL] == 'Xbox') {
-                        this.set(TYPE, CONSOLE)
-                            .set(VENDOR, MICROSOFT);
+                        if (!this.get(TYPE) || !this.get(VENDOR)) {
+                            var reParse = {};
+                            rgxMapper.call(reParse, 'droid 9; ' + uaCH[MODEL] + ')', rgxMap);
+                            if (!this.get(TYPE) && !!reParse.type) {
+                                this.set(TYPE, reParse.type);
+                            }
+                            if (!this.get(VENDOR) && !!reParse.vendor) {
+                                this.set(VENDOR, reParse.vendor);
+                            }
+                        }
                     }
                     if (uaCH[FORMFACTORS]) {
                         var ff;

test/data/ua/browser/browser-all.json

@@ -511,6 +511,16 @@
             "major"   : "2"
         }
     },
+    {
+        "desc"    : "Dooble",
+        "ua"      : "Mozilla/5.0 (X11; Haiku BePC) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.15.17 Chrome/87.0.4280.144 Safari/537.36 Dooble/2023.12.25 Dooble/2023.12.25",
+        "expect"  :
+        {
+            "name"    : "Dooble",
+            "version" : "2023.12.25",
+            "major"   : "2023"
+        }
+    },
     {
         "desc"    : "Doris",
         "ua"      : "Doris/1.15 [en] (Symbian)",
@@ -541,6 +551,26 @@
             "major"   : "5"
         }
     },
+    {
+        "desc"    : "Ecosia on Android",
+        "ua"      : "Mozilla/5.0 (Linux; Android 10; SM-G975U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36 (Ecosia android@85.0.4183.127)",
+        "expect"  :
+        {
+            "name"    : "Ecosia",
+            "version" : "85.0.4183.127",
+            "major"   : "85"
+        }
+    },
+    {
+        "desc"    : "Ecosia on iOS",
+        "ua"      : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Mobile/14G60 (Ecosia ios@3.0.1.533)",
+        "expect"  :
+        {
+            "name"    : "Ecosia",
+            "version" : "3.0.1.533",
+            "major"   : "3"
+        }
+    },
     {
         "desc"    : "Epiphany",
         "ua"      : "Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7) Gecko/20040628 Epiphany/1.2.6",
@@ -1006,6 +1036,16 @@
             "major"   : "5"
         }
     },
+    {
+        "desc"    : "Otter",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/602.1 (KHTML, like Gecko) Otter/1.0.81",
+        "expect"  :
+        {
+            "name"    : "Otter",
+            "version" : "1.0.81",
+            "major"   : "1"
+        }
+    },
     {
         "desc"    : "PicoBrowser",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64; Pico Neo3 Link OS5.8.4.0 like Quest) AppleWebKit/537.36 (KHTML, like Gecko) PicoBrowser/3.3.22 Chrome/105.0.5195.68 VR Safari/537.36",
@@ -1067,13 +1107,33 @@
         }
     },
     {
-        "desc"    : "LibreWolf",
-        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 LibreWolf/91.0",
+        "desc"    : "Surf Browser",
+        "ua"      : "Mozilla/5.0 (Android 6.0; HUAWEI ALE-L21) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 SurfBrowser/3.0",
         "expect"  :
         {
-            "name"    : "LibreWolf",
-            "version" : "91.0",
-            "major"   : "91"
+            "name"    : "Surf",
+            "version" : "3.0",
+            "major"   : "3"
+        }
+    },
+    {
+        "desc"    : "LG Browser",
+        "ua"      : "Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ LG Browser/6.00.00(+mouse+3D+SCREEN+TUNER; LGE; 47LA621V-ZD; 04.28.17; 0x00000001;); LG NetCast.TV-2013 /04.28.17 (LG, 47LA621V-ZD, wired)",
+        "expect"  :
+        {
+            "name"    : "LG Browser",
+            "version" : "6.00.00",
+            "major"   : "6"
+        }
+    },
+    {
+        "desc"    : "Ladybird",
+        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
+        "expect"  :
+        {
+            "name"    : "Ladybird",
+            "version" : "1.0",
+            "major"   : "1"
         }
     },
     {
@@ -1618,6 +1678,16 @@
             "major"   : "1"
         }
     },
+    {
+        "desc"    : "qutebrowser",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) qutebrowser/2.4.0 QtWebEngine/5.15.6 Chrome/95.0.4628.2 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "qutebrowser",
+            "version" : "2.4.0",
+            "major"   : "2"
+        }
+    },
     {
         "desc"    : "Rekonq 2",
         "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.2.1 Safari/537.21",
@@ -2493,6 +2563,26 @@
             "type"    : "inapp"
         }
     },
+    {
+      "desc"     : "Daum App Android",
+      "ua"       : "Mozilla/5.0 (Linux; Android 11; SM-G970N Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 DaumApps/7.5.0 DaumDevice/mobile",
+      "expect"   : {
+        "name"   : "Daum",
+        "version": "7.5.0",
+        "major"  : "7",
+        "type"    : "inapp"
+      }
+    },
+    {
+      "desc"     : "Daum App iOS",
+      "ua"       : "Mozilla/5.0 (iPhone; CPU iPhone OS 18_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Safari/605.1.15 Mobile/15E148 DaumApps/7.5.1 DaumDevice/mobile",
+      "expect"   : {
+        "name"   : "Daum",
+        "version": "7.5.1",
+        "major"  : "7",
+        "type"    : "inapp"
+      }
+    },
     {
         "desc"     : "TikTok",
         "ua"       : "Mozilla/5.0 (Linux; Android 11; 21061119AG Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/92.0.4515.131 Mobile Safari/537.36 trill_2022109040 JsSdk/1.0 NetType/MOBILE Channel/googleplay AppName/musical_ly app_version/21.9.4 ByteLocale/ru-RU ByteFullLocale/ru-RU Region/KG BytedanceWebview/d8a21c6",

test/data/ua/cpu/cpu-all.json

@@ -175,6 +175,14 @@
             "architecture"  : "arm64"
         }
     },
+    {
+        "desc"    : "Google Search App",
+        "ua"      : "Mozilla/5.0 (Linux; Android 9; JAT-LX1 Build/HONORJAT-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.96 Mobile Safari/537.36 GoogleApp/11.11.10.21.arm",
+        "expect"  :
+        {
+            "architecture"  : "arm"
+        }
+    },
     {
         "desc"    : "Google Search App",
         "ua"      : "Mozilla/5.0 (Linux; Android 6.0; M5s Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.147 Mobile Safari/537.36 GSA/12.40.17.23.arm64",
@@ -270,5 +278,13 @@
         {
             "architecture"  : "68k"
         }
+    },
+    {
+        "desc"    : "x86",
+        "ua"      : "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.8.1.20) Gecko/20090127 BonEcho/2.0.0.20",
+        "expect"  : 
+        {
+            "architecture"  : "ia32"
+        }
     }
 ]

test/data/ua/device/_others.json

@@ -1,10 +1,18 @@
 [
+    {
+        "desc": "Generic Android Device",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 9; X96mini_RP Build/X96mini_RP)",
+        "expect": {
+            "vendor": "Generic",
+            "model": "X96mini_RP"
+        }
+    },
     {
         "desc": "Generic Android Device",
         "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; i980 Build/MRA58K)",
         "expect": {
             "vendor": "Generic",
-            "model": "Android 6.0.1"
+            "model": "i980"
         }
     },
     {
@@ -16,6 +24,14 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Unknown VR Device",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; Unknown Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile VR Safari/537.36",
+        "expect": {
+            "model": "Unknown",
+            "type": "xr"
+        }
+    },
     {
         "desc": "Desktop (IE11 with Tablet string)",
         "ua": "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; .NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; .NET CLR 3.0.30729; Tablet PC 2.0; GWX:MANAGED; rv:11.0) like Gecko",
@@ -34,6 +50,33 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "ChangHong Android TV",
+        "ua": "Mozilla/5.0 (Linux; U; Android 5.1.1; zh-cn; ChangHong Android TV Build/LMY49J) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/10.8 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "ChangHong",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "MStar Android TV",
+        "ua": "Mozilla/5.0 (Linux; Android 4.3.1; MStar Android TV Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.95 Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "MStar",
+            "type": "smarttv"
+        }
+    },
+    {
+        "desc": "ONIDA Android TV",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; ONIDA Android TV Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/48.0.2542.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "undefined",
+            "model": "ONIDA",
+            "type": "smarttv"
+        }
+    },
     {
         "desc": "JVC LT-43V55LFA Smart TV",
         "ua": "Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36 OPR/40.0.2207.0 OMI/4.9.0.237.DOM3-OPT.245 Model/Vestel-MB211 VSTVB MB200 HbbTV/1.2.1 (; JVC; MB211; 3.19.4.2; _TV_NT72563_2017 SmartTvA/3.0.0",
@@ -246,5 +289,14 @@
             "model": "undefined",
             "type": "mobile"
         }
+    },
+    {
+        "desc"    : "Windows IoT",
+        "ua"      : "Mozilla/5.0 (Windows IoT 10.0; Android 6.0.1; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Mobile Safari/537.36 Edge/18.17763",
+        "expect": {
+            "vendor": "undefined",
+            "model": "undefined",
+            "type": "embedded"
+        }
     }
 ]

test/data/ua/device/alcatel.json

@@ -1,6 +1,15 @@
 [
     {
-        "desc": "Alcatel",
+        "desc": "Alcatel 4056W",
+        "ua": "Mozilla/5.0 (Mobile; ALCATEL 4056W; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0",
+        "expect": {
+            "vendor": "ALCATEL",
+            "model": "4056W",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Alcatel A564C",
         "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ALCATEL A564C Build/KVT49L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Mobile Safari/537.36",
         "expect": {
             "vendor": "ALCATEL",

test/data/ua/device/apple.json

@@ -116,6 +116,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Apple HomePod",
+        "ua": "AppleCoreMedia/1.0.0.15D61 (HomePod; U; CPU OS 11_2_5 like Mac OS X; en_us)",
+        "expect": {
+            "vendor": "Apple",
+            "model": "HomePod",
+            "type": "embedded"
+        }
+    },
     {
         "desc": "Issue #519",
         "ua": "ios/iPhone/14.2/SOME_CUSTOM_APP_VERSION",

test/data/ua/device/archos.json

@@ -0,0 +1,227 @@
+[
+    {
+        "desc": "Archos 5",
+        "ua": "Mozilla/5.0 (Linux; U; Android 1.6; fr-fr; Archos5 Build/Donut) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1",
+        "expect": {
+            "vendor": "Archos",
+            "model": "5",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 40b Titanium Surround",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Archos 40b Titanium Surround Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "40b Titanium Surround",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 40c Titanium v2",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; ARCHOS 40C TIv2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "40C TIv2",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 45 Neon",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45 Neon Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.83 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "45 Neon",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 45 Neon",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; AC45NE Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.152 YaBrowser/15.6.2311.6088.00 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC45NE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 45B Helium",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; AC45BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.109 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC45BHE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 45B Titanium",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.2; Archos 45B Titanium) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "45B Titanium",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 50 Cesium",
+        "ua": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; ARCHOS; AC50CE) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.10586",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC50CE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 50B Helium 4G",
+        "ua": "Mozilla/5.0 (Linux; Android 4.4.4; AC50BHE Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC50BHE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 55 diamond Selfie",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0.1; Archos 55 diamond Selfie Build/MMB29M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/68.0.3440.91 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "55 diamond Selfie",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Archos 80 G9",
+        "ua": "Mozilla/5.0 (Linux; U; Android 4.0.4; zh-tw; ARCHOS 80G9 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+        "expect": {
+            "vendor": "Archos",
+            "model": "80G9",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 80 Xenon",
+        "ua": "Mozilla/5.0 (Linux; Android 4.1.2; Archos 80 Xenon Build/JZO54K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.99 Safari/537.36 OPR/50.6.2426.201126",
+        "expect": {
+            "vendor": "Archos",
+            "model": "80 Xenon",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 97c Platinum",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; Archos 97c Platinum Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "97c Platinum",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 101 Access 3G V2",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; Archos Access 101 3G V2 Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/114.0.5735.130 Safari/537.36[FBAN/EMA;FBLC/pt_PT;FBAV/360.0.0.7.53;]",
+        "expect": {
+            "vendor": "Archos",
+            "model": "Access 101 3G V2",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 101 Oxygen 4G",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos 101 Oxygen 4G Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.71 Safari/537.36 [FB_IAB/FB4A;FBAV/374.0.0.20.109;]",
+        "expect": {
+            "vendor": "Archos",
+            "model": "101 Oxygen 4G",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 101 Platinum 3G V2",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; AC101PL3GV2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC101PL3GV2",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 101B Helium 4G",
+        "ua": "Mozilla/5.0 (Linux; Android 6.0; AC101BHE Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "AC101BHE",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos 101s Oxygen Ardoiz",
+        "ua": "Mozilla/5.0 (Linux; Android 9; Archos Oxygen 101S ARDOIZ Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.102 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "Oxygen 101S ARDOIZ",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos GAMEPAD2",
+        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; ARCHOS GAMEPAD2 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.94 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "GAMEPAD2",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos Hello 7",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Archos Hello 7 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.53 Safari/537.36 GoogleApp/13.24.9.26.arm64",
+        "expect": {
+            "vendor": "Archos",
+            "model": "Hello 7",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos Sense 101 X",
+        "ua": "Mozilla/5.0 (Linux; arm; Android 7.0; Archos Sense 101 X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 YaBrowser/20.2.0.215.01 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "Sense 101 X",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos T101 FHD WiFi",
+        "ua": "Mozilla/5.0 (Linux; Android 13; ARCHOS T101 FHD WiFi Build/T00624; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.6367.159 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "T101 FHD WiFi",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos Tikeasy 10d",
+        "ua": "Mozilla/5.0 (Linux; Android 13; Tikeasy 10d Build/TP1A.220624.014; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/131.0.6778.260 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "Tikeasy 10d",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos T96 WIFI",
+        "ua": "Mozilla/5.0 (Linux; Android 11; ARCHOS T96 WIFI_EEA Build/RP1A.201005.001; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/102.0.5005.78 Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "T96 WIFI_EEA",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Archos X67 5G",
+        "ua": "Mozilla/5.0 (Linux; Android 10; X67 5G Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/130.0.6723.58 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Archos",
+            "model": "X67 5G",
+            "type": "tablet"
+        }
+    }
+]

test/data/ua/device/blu.json

@@ -0,0 +1,101 @@
+[
+    {
+        "desc": "BLU Grand X LTE",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; BLU Grand X LTE Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "BLU",
+            "model": "Grand X LTE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU Neo Energy Mini",
+        "ua": "Mozilla/5.0 (Linux; Android 10; BLU_NEO_ENERGY_MINI Build/LMY47I; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/101.0.4951.54 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "BLU",
+            "model": "NEO_ENERGY_MINI",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU NEO X PLUS",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; BLU NEO X PLUS Build/N090U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.109 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "BLU",
+            "model": "NEO X PLUS",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU STUDIO X MINI",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; BLU STUDIO X MINI Build/S0150UU) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.93 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "BLU",
+            "model": "STUDIO X MINI",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU Tank Mega",
+        "ua": "Mozilla/5.0 (Mobile; BLU_TankMega_3G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.1.1",
+        "expect": {
+            "vendor": "BLU",
+            "model": "TankMega_3G",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU TOUCHBOOK G7",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0; BLU TOUCHBOOK G7 Build/LRX21M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.107 Safari/537.36 OPR/29.0.1809.91837",
+        "expect": {
+            "vendor": "BLU",
+            "model": "TOUCHBOOK G7",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU Vivo 5 Mini",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; Vivo 5 Mini Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "BLU",
+            "model": "Vivo 5 Mini",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU VIVO AIR LTE",
+        "ua": "Mozilla/5.0 (Linux; Android 5.0.2; BLU VIVO AIR LTE Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.107 Mobile Safari/537.36 OPR/29.0.1809.91837",
+        "expect": {
+            "vendor": "BLU",
+            "model": "VIVO AIR LTE",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU VIVO GO",
+        "ua": "Mozilla/5.0 (Linux; U; Android 9; VIVO GO Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/72.0.3626.121 Mobile Safari/537.36 OPR/50.0.2254.149182",
+        "expect": {
+            "vendor": "BLU",
+            "model": "VIVO GO",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU Vivo One Plus 2019",
+        "ua": "Mozilla/5.0 (Linux; Android 8.1.0; Vivo One Plus 2019 Build/O11019; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/277.0.0.41.126;]",
+        "expect": {
+            "vendor": "BLU",
+            "model": "Vivo One Plus 2019",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "BLU VIVO SELFIE",
+        "ua": "Mozilla/5.0 (Linux; U; Android 5.0; es-LA; BLU VIVO SELFIE Build/LRX21M) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 UCBrowser/11.3.5.972 U3/0.8.0 Mobile Safari/534.30",
+        "expect": {
+            "vendor": "BLU",
+            "model": "VIVO SELFIE",
+            "type": "mobile"
+        }
+    }
+]

test/data/ua/device/facebook.json

@@ -34,5 +34,14 @@
             "model": "Quest Pro",
             "type": "xr"
         }
+    },
+    {
+        "desc": "Portal TV",
+        "ua": "Mozilla/5.0 (Linux; Android 9; PortalTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.120 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Facebook",
+            "model": "PortalTV",
+            "type": "smarttv"
+        }
     }
 ]

test/data/ua/device/hmd.json

@@ -1,4 +1,13 @@
 [
+    {
+        "desc": "HMD Barbie Phone",
+        "ua": "Mozilla/5.0 (Mobile; HMD Barbie Phone; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.1",
+        "expect": {
+            "vendor": "HMD",
+            "model": "Barbie Phone",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "HMD Pulse",
         "ua": "Mozilla/5.0 (Linux; Android 14; HMD Pulse) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Mobile Safari/537.36",

test/data/ua/device/lg.json

@@ -134,6 +134,15 @@
             "type": "smarttv"
         }
     },
+    {
+        "desc": "LG Smart TV",
+        "ua": "Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen Safari/537.41 LG Browser/7.00.00(LGE; 42LB670V-ZA; 05.05.90; 1); webOS.TV-2014; LG NetCast.TV-2013 Compatible (LGE, 42LB670V-ZA, wireless)",
+        "expect": {
+            "vendor": "LG",
+            "model": "42LB670V-ZA",
+            "type": "smarttv"
+        }
+    },
     {
         "desc": "LG Android TV",
         "ua": "Mozilla/5.0 (Linux; U; Android 4.2.2; zh-cn; LG Android TV Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",

test/data/ua/device/nokia.json

@@ -17,6 +17,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Nokia 5800 XpressMusic",
+        "ua": "Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1/10.4.016; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "5800d-1",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Nokia 7",
         "ua": "Mozilla/5.0 (Linux; Android 11; Nokia 7.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Mobile Safari/537.36",
@@ -26,6 +35,33 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Nokia 808 PureView",
+        "ua": "Mozilla/5.0 (Symbian; U; Nokia808 PureView; en-GB) AppleWebKit/534.3 (KHTML, like Gecko) Version/3.0 Mobile/1A543a Mobile Safari/534.3",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "808 PureView",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Nokia 808 PureView",
+        "ua": "Mozilla/5.0 (Symbian/3; Series60/5.5 Nokia808PureView/113.010.1508; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.2.21 Mobile Safari/535.1 3gpp-gba",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "808PureView",
+            "type": "mobile"
+        }
+    },
+    {
+        "desc": "Nokia Lumia 630",
+        "ua": "UCWEB/2.0 (Windows; U; wds 8.10; en-IN; NOKIA; RM-978_1046) U2/1.0.0 UCBrowser/4.2.0.524 U2/1.0.0 Mobile",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "RM-978",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Nokia N9",
         "ua": "Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13",
@@ -35,6 +71,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "Nokia N900",
+        "ua": "Mozilla/5.0 (Linux; Maemo 5.0; Nokia N900; Build/4.0.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Nokia",
+            "model": "N900",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "Nokia T20",
         "ua": "Mozilla/5.0 (Linux; Android 12; Nokia T20) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36",

test/data/ua/device/nvidia.json

@@ -1,4 +1,22 @@
 [
+    {
+        "desc": "Tegra Note 7",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; TegraNote-P1640 Build/LMY47D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.133 Safari/537.36",
+        "expect": {
+            "vendor": "Nvidia",
+            "model": "TegraNote-P1640",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Nvidia Shield",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1; SHIELD) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.74 Mobile Safari/537.36",
+        "expect": {
+            "vendor": "Nvidia",
+            "model": "SHIELD",
+            "type": "console"
+        }
+    },
     {
         "desc": "Nvidia Shield Tablet",
         "ua": "Mozilla/5.0 (Linux; Android 5.1.1; SHIELD Tablet Build/LVY48E; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/45.0.2454.19 Safari/537.36",
@@ -7,5 +25,23 @@
             "model": "SHIELD Tablet",
             "type": "tablet"
         }
+    },
+    {
+        "desc": "Nvidia Shield Tablet K1",
+        "ua": "Mozilla/5.0 (Linux; Android 7.0; SHIELD Tablet K1 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.98 Safari/537.36",
+        "expect": {
+            "vendor": "Nvidia",
+            "model": "SHIELD Tablet K1",
+            "type": "tablet"
+        }
+    },
+    {
+        "desc": "Nvidia Shield TV",
+        "ua": "Mozilla/5.0 (Linux; Android 11; SHIELD Android TV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36  ",
+        "expect": {
+            "vendor": "Nvidia",
+            "model": "SHIELD Android TV",
+            "type": "smarttv"
+        }
     }
 ]

test/data/ua/device/tcl.json

@@ -296,6 +296,15 @@
             "type": "mobile"
         }
     },
+    {
+        "desc": "TCL 4056S",
+        "ua": "Mozilla/5.0 (Mobile; TCL 4056S; rv:84.0) Gecko/84.0 Firefox/84.0 KAIOS/3.0",
+        "expect": {
+            "vendor": "TCL",
+            "model": "4056S",
+            "type": "mobile"
+        }
+    },
     {
         "desc": "TCL A3",
         "ua": "Mozilla/5.0 (Linux; Android 11; A509DL Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/101.0.4951.61 Mobile Safari/537.36 GSA/13.18.7.23.arm64",

test/data/ua/engine/engine-all.json

@@ -62,6 +62,15 @@
             "version" : "4.5.4"
         }
     },
+    {
+        "desc"    : "LibWeb",
+        "ua"      : "Mozilla/5.0 (Linux; x86_64) Ladybird/1.0",
+        "expect"  :
+        {
+            "name"    : "LibWeb",
+            "version" : "undefined"
+        }
+    },
     {
         "desc"    : "LibWeb",
         "ua"      : "Mozilla/4.0 (SerenityOS; x86) LibWeb+LibJS (Not KHTML, nor Gecko) LibWeb",

test/data/ua/extension/crawler.json

@@ -9,6 +9,16 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "AdIdxBot",
+        "ua"      : "Mozilla/5.0 (compatible; adidxbot/2.0; +http://www.bing.com/bingbot.htm)",
+        "expect"  :
+        {
+            "name"    : "adidxbot",
+            "version" : "2.0",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "AdsBot Mobile Web",
         "ua"      : "AdsBot-Google (+http://www.google.com/adsbot.html)",
@@ -79,6 +89,16 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "Applebot-Extended",
+        "ua"      : "Applebot-Extended",
+        "expect"  :
+        {
+            "name"    : "Applebot-Extended",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "Amazonbot",
         "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Amazonbot/0.1; +https://developer.amazon.com/support/amazonbot)",
@@ -89,6 +109,126 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "Anthropic AI",
+        "ua"      : "anthropic-ai",
+        "expect"  :
+        {
+            "name"    : "anthropic-ai",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Archive.org Bot",
+        "ua"      : "ia_archiver/8.1 (Windows 2000 1.9; en-US;)",
+        "expect"  :
+        {
+            "name"    : "ia_archiver",
+            "version" : "8.1",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Archive.org Bot",
+        "ua"      : "Mozilla/5.0 (compatible; archive.org_bot/3.3.0 +https://archive.org/details/archive.org_bot)",
+        "expect"  :
+        {
+            "name"    : "archive.org_bot",
+            "version" : "3.3.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider",
+        "ua"      : "Mozilla/5.0 (compatible; Baiduspider/2.0; +http://www.baidu.com/search/spider.html)",
+        "expect"  :
+        {
+            "name"    : "Baiduspider",
+            "version" : "2.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-ads",
+        "ua"      : "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0; Baiduspider-ads) Gecko/17.0 Firefox/17.0",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-ads",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-cpro",
+        "ua"      : "Mozilla/5.0 (compatible; Baiduspider-cpro; +http://www.baidu.com/search/spider.html)",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-cpro",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-favo",
+        "ua"      : "Baiduspider-favo",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-favo",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-image",
+        "ua"      : "Baiduspider-image+(+http://www.baidu.com/search/spider.htm)",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-image",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-news",
+        "ua"      : "Baiduspider-news",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-news",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-render",
+        "ua"      : "Mozilla/5.0 (compatible; Baiduspider-render/2.0; +http://www.baidu.com/search/spider.html)",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-render",
+            "version" : "2.0",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Baiduspider-video",
+        "ua"      : "Baiduspider-video",
+        "expect"  :
+        {
+            "name"    : "Baiduspider-video",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "Bingbot",
+        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm) Chrome/",
+        "expect"  :
+        {
+            "name"    : "bingbot",
+            "version" : "2.0",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "Bytespider",
         "ua"      : "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.1511.1269 Mobile Safari/537.36; Bytespider",
@@ -179,6 +319,16 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "DuckDuckBot",
+        "ua"      : "DuckDuckBot/1.1; ( http://duckduckgo.com/duckduckbot.html)",
+        "expect"  :
+        {
+            "name"    : "DuckDuckBot",
+            "version" : "1.1",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "Exabot",
         "ua"      : "Mozilla/5.0 (compatible; Exabot/3.0; +http://www.exabot.com/go/robot)",
@@ -339,26 +489,6 @@
             "type"    : "crawler"
         }
     },
-    {
-        "desc"    : "Archive.org Bot",
-        "ua"      : "ia_archiver/8.1 (Windows 2000 1.9; en-US;)",
-        "expect"  :
-        {
-            "name"    : "ia_archiver",
-            "version" : "8.1",
-            "type"    : "crawler"
-        }
-    },
-    {
-        "desc"    : "Archive.org Bot",
-        "ua"      : "Mozilla/5.0 (compatible; archive.org_bot/3.3.0 +https://archive.org/details/archive.org_bot)",
-        "expect"  :
-        {
-            "name"    : "archive.org_bot",
-            "version" : "3.3.0",
-            "type"    : "crawler"
-        }
-    },
     {
         "desc"    : "ImagesiftBot",
         "ua"      : "Mozilla/5.0 (compatible; ImagesiftBot; +imagesift.com)",
@@ -369,6 +499,26 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "Linespider",
+        "ua"      : "Mozilla/5.0 (compatible; Linespider/1.1; +https://lin.ee/4dwXkTH)",
+        "expect"  :
+        {
+            "name"    : "Linespider",
+            "version" : "1.1",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "LinkedInBot",
+        "ua"      : "LinkedInBot/1.0 (compatible; Mozilla/5.0; Apache-HttpClient +http://www.linkedin.com)",
+        "expect"  :
+        {
+            "name"    : "LinkedInBot",
+            "version" : "1.0",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "magpie-crawler",
         "ua"      : "magpie-crawler/1.1 (robots-txt-checker; +http://www.brandwatch.net)",
@@ -462,7 +612,7 @@
     },
     {
         "desc"    : "PetalBot",
-        "ua"      : "Mozilla/5.0 (Linux; Android 7.0;) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Safari/537.36 (compatible; PetalBot;+https://webmaster.petalsearch.com/site/petalbot) ",
+        "ua"      : "Mozilla/5.0 (Linux; Android 7.0;) AppleWebKit/537.36 (KHTML, like Gecko) Mobile Safari/537.36 (compatible; PetalBot;+https://webmaster.petalsearch.com/site/petalbot)",
         "expect"  :
         {
             "name"    : "PetalBot",
@@ -480,6 +630,36 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "SemrushBot for Backlink Audit tool",
+        "ua"      : "Mozilla/5.0 (compatible; SemrushBot-BA; +http://www.semrush.com/bot.html)",
+        "expect"  :
+        {
+            "name"    : "SemrushBot-BA",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "SemrushBot for On Page SEO Checker tool",
+        "ua"      : "Mozilla/5.0 (compatible; SemrushBot-SI/0.97; +http://www.semrush.com/bot.html)",
+        "expect"  :
+        {
+            "name"    : "SemrushBot-SI",
+            "version" : "0.97",
+            "type"    : "crawler"
+        }
+    },
+    {
+        "desc"    : "SemrushBot for ContentShake AI tool",
+        "ua"      : "Mozilla/5.0 (compatible; SemrushBot-OCOB/1; +https://www.semrush.com/bot/)",
+        "expect"  :
+        {
+            "name"    : "SemrushBot-OCOB",
+            "version" : "1",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "SeznamBot",
         "ua"      : "Mozilla/5.0 (compatible; SeznamBot/4.0-RC1; +http://napoveda.seznam.cz/seznambot-intro/)",
@@ -490,6 +670,16 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "Sogou",
+        "ua"      : "Sogou web spider/4.0(+http://www.sogou.com/docs/help/webmasters.htm#07)",
+        "expect"  :
+        {
+            "name"    : "Sogou web spider",
+            "version" : "4.0",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "Teoma",
         "ua"      : "Mozilla/2.0 (compatible; Ask Jeeves/Teoma; +http://sp.ask.com/docs/about/tech_crawling.html)",
@@ -540,6 +730,16 @@
             "type"    : "crawler"
         }
     },
+    {
+        "desc"    : "Yahoo! Slurp",
+        "ua"      : "Mozilla/5.0 (compatible; Yahoo! Slurp; http://help.yahoo.com/help/us/ysearch/slurp)  ",
+        "expect"  :
+        {
+            "name"    : "Yahoo! Slurp",
+            "version" : "undefined",
+            "type"    : "crawler"
+        }
+    },
     {
         "desc"    : "YandexBot",
         "ua"      : "Mozilla/5.0 (compatible; YandexBot/3.0; +http://yandex.com/bots)",

test/data/ua/extension/fetcher.json

@@ -9,6 +9,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Better Uptime Bot",
+        "ua"      : "Better Uptime Bot Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Better Uptime Bot",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "BingPreview",
         "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534+ (KHTML, like Gecko) BingPreview/1.0b",
@@ -19,6 +29,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Bluesky",
+        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; Bluesky Cardyb/1.1; +mailto:support@bsky.app) Chrome/100.0.0.0 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Bluesky",
+            "version" : "1.1",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "ChatGPT-User",
         "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko); compatible; ChatGPT-User/1.0; +https://openai.com/bot",
@@ -49,6 +69,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Google Image Proxy",
+        "ua"      : "Mozilla/5.0 (Windows NT 5.1; rv:11.0) Gecko Firefox/11.0 (via ggpht.com GoogleImageProxy)",
+        "expect"  :
+        {
+            "name"    : "GoogleImageProxy",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Google Read Aloud - Mobile agent",
         "ua"      : "Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36 (compatible; Google-Read-Aloud; +https://support.google.com/webmasters/answer/1061943)",
@@ -69,6 +99,16 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "Google Page Renderer",
+        "ua"      : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 Google-PageRenderer Google (+https://developers.google.com/+/web/snippet/) ",
+        "expect"  :
+        {
+            "name"    : "Google-PageRenderer",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Google Publisher Center",
         "ua"      : "GoogleProducer; (+https://developers.google.com/search/docs/crawling-indexing/google-producer)",
@@ -99,6 +139,26 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "MicrosoftPreview",
+        "ua"      : "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; MicrosoftPreview/2.0; +https://aka.ms/MicrosoftPreview) Chrome/W.X.Y.Z Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "MicrosoftPreview",
+            "version" : "2.0",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "Pinterestbot",
+        "ua"      : "Mozilla/5.0 (compatible; Pinterestbot/1.0; +http://www.pinterest.com/bot.html)",
+        "expect"  :
+        {
+            "name"    : "Pinterestbot",
+            "version" : "1.0",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "Rogerbot",
         "ua"      : "Mozilla/5.0 (compatible; rogerBot/1.0; UrlCrawler; http://www.seomoz.org/dp/rogerbot)",
@@ -109,6 +169,46 @@
             "type"    : "fetcher"
         }
     },
+    {
+        "desc"    : "SiteAuditBot",
+        "ua"      : "Mozilla/5.0 (compatible; SiteAuditBot/0.97; +http://www.semrush.com/bot.html)",
+        "expect"  :
+        {
+            "name"    : "SiteAuditBot",
+            "version" : "0.97",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "Snap URL Preview",
+        "ua"      : "Snap URL Preview Service; bot; snapchat; https://developers.snap.com/robots  ",
+        "expect"  :
+        {
+            "name"    : "Snap URL Preview",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "SkypeUriPreview",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.1; WOW64) SkypeUriPreview Preview/0.5 skype-url-preview@microsoft.com",
+        "expect"  :
+        {
+            "name"    : "SkypeUriPreview",
+            "version" : "0.5",
+            "type"    : "fetcher"
+        }
+    },
+    {
+        "desc"    : "TelegramBot",
+        "ua"      : "TelegramBot (like TwitterBot)",
+        "expect"  :
+        {
+            "name"    : "TelegramBot",
+            "version" : "undefined",
+            "type"    : "fetcher"
+        }
+    },
     {
         "desc"    : "UptimeRobot",
         "ua"      : "Mozilla/5.0 (compatible; UptimeRobot/2.0; http://www.uptimerobot.com/)",
@@ -128,5 +228,15 @@
             "version" : "undefined",
             "type"    : "fetcher"
         }
+    },
+    {
+        "desc"    : "WhatsApp",
+        "ua"      : "WhatsApp/2.23.20.0",
+        "expect"  :
+        {
+            "name"    : "WhatsApp",
+            "version" : "2.23.20.0",
+            "type"    : "fetcher"
+        }
     }
 ]

test/data/ua/extension/inapp.json

@@ -0,0 +1,32 @@
+[
+    {
+        "desc"    : "Slack on mac",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Slack/4.39.90 Chrome/127.0.6533.72 Electron/13.1.9 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Slack",
+            "version" : "4.39.90",
+            "type"    : "inapp"
+        }
+    },
+    {
+        "desc"    : "Yahoo! Japan on Android",
+        "ua"      : "Mozilla/5.0 (Linux; Android 13; SH-M20 Build/TKQ1.220915.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/132.0.6834.163 Mobile Safari/537.36 YJApp-ANDROID jp.co.yahoo.android.yjtop/3.187.0",
+        "expect"  :
+        {
+            "name"    : "Yahoo! Japan",
+            "version" : "3.187.0",
+            "type"    : "inapp"
+        }
+    },
+    {
+        "desc"    : "Yahoo! Japan on iOS",
+        "ua"      : "Mozilla/5.0 (iPad; CPU OS 18_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 YJApp-IOS jp.co.yahoo.ipn.appli/4.131.0",
+        "expect"  :
+        {
+            "name"    : "Yahoo! Japan",
+            "version" : "4.131.0",
+            "type"    : "inapp"
+        }
+    }
+]

test/data/ua/extension/vehicle.json

@@ -0,0 +1,62 @@
+[
+    {
+        "desc"    : "BMW",
+        "ua"      : "Mozilla/5.0 (Linux; Android 9; AFTLBT962E2) AppleWebKit/537.36 (KHTML, like Gecko) Silk/118.3.1 like Chrome/118.0.5993.155 Safari/537.36",
+        "expect"  :
+        {
+            "vendor" : "BMW",
+            "model"  : "undefined",
+            "type"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "BYD",
+        "ua"      : "Mozilla/5.0 (Linux; Android 10; DiLink3.0 For BYD AUTO Build/QKQ1.200816.002; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/74.0.3729.186 Safari/537.36",
+        "expect"  :
+        {
+            "vendor" : "BYD",
+            "model"  : "undefined",
+            "type"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Jeep",
+        "ua"      : "Mozilla/5.0 (Linux; Android 9; AFTLFT962X3) AppleWebKit/537.36 (KHTML, like Gecko) Silk/124.5.2 like Chrome/124.0.6367.248 Safari/537.36",
+        "expect"  :
+        {
+            "vendor" : "Jeep",
+            "model"  : "Wagooner",
+            "type"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Rivian",
+        "ua"      : "Dalvik/2.1.0 (Linux; U; Android 10; Rivian R1T Build/QQ3A.200605.002)",
+        "expect"  :
+        {
+            "vendor" : "Rivian",
+            "model"  : "R1T",
+            "type"   : "undefined"
+        }
+    },
+    {
+        "desc"    : "Tesla",
+        "ua"      : "Mozilla/5.0 (X11; GNU/Linux) AppleWebKit/537.36 (KHTML, like Gecko) Chromium/79.0.3945.130 Chrome/79.0.3945.130 Safari/537.36 Tesla/2020.36.16-3e9e4e8dd287",
+        "expect"  :
+        {
+            "vendor" : "Tesla",
+            "model"  : "undefined",
+            "type"   : "embedded"
+        }
+    },
+    {
+        "desc"    : "Volvo",
+        "ua"      : "Mozilla/5.0 (VCC; 1.0; like Gecko) NetFront/4.2",
+        "expect"  :
+        {
+            "vendor" : "Volvo",
+            "model"  : "undefined",
+            "type"   : "undefined"
+        }
+    }
+]

test/data/ua/os/ios.json

@@ -52,5 +52,14 @@
             "name"    : "iOS",
             "version" : "7.0.2"
         }
+    },
+    {
+        "desc": "Apple HomePod",
+        "ua": "AppleCoreMedia/1.0.0.15D61 (HomePod; U; CPU OS 11_2_5 like Mac OS X; en_us)",
+        "expect"  :
+        {
+            "name"    : "iOS",
+            "version" : "11.2.5"
+        }
     }
 ]

test/data/ua/os/linux.json

@@ -5,7 +5,16 @@
         "expect"  :
         {
             "name"    : "Linux",
-            "version" : "x86_64"
+            "version" : "undefined"
+        }
+    },
+    {
+        "desc"    : "Linux",
+        "ua"      : "Mozilla/5.0 (X11; U; Linux armv61; en-US; rv:1.9.1b2pre) Gecko/20081015 Fennec/1.0a1",
+        "expect"  :
+        {
+            "name"    : "Linux",
+            "version" : "undefined"
         }
     }
 ]

test/data/ua/os/maemo.json

@@ -7,5 +7,23 @@
             "name"    : "Maemo",
             "version" : "undefined"
         }
+    },
+    {
+        "desc"    : "Nokia N900 Linux mobile, on the Maemo browser",
+        "ua"      : "Mozilla/5.0(X11; U; Linux armv7l; fr-FR; rv:1.9.2a1pre) Gecko/20091127 Firefox/3.5 Maemo Browser 1.5.6 RX-51 N900",
+        "expect"  :
+        {
+            "name"    : "Maemo",
+            "version" : "undefined"
+        }
+    },
+    {
+        "desc"    : "Nokia N900 Linux mobile, on the Maemo browser",
+        "ua"      : "Mozilla/5.0 (Linux; Maemo 5.0; Nokia N900; Build/4.0.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Maemo",
+            "version" : "5.0"
+        }
     }
 ]

test/data/ua/os/qnx.json

@@ -5,7 +5,7 @@
         "expect"  :
         {
             "name"    : "QNX",
-            "version" : "x86pc"
+            "version" : "undefined"
         }
     }
 ]

test/data/ua/os/symbian.json

@@ -1,6 +1,6 @@
 [
     {
-        "desc"    : "Symbian",
+        "desc"    : "Nokia 5250",
         "ua"      : "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba",
         "expect"  :
         {
@@ -9,12 +9,57 @@
         }
     },
     {
-        "desc"    : "Symbian",
+        "desc"    : "Nokia N79",
+        "ua"      : "Mozilla/5.0 (SymbianOS/9.3; U; Series60/3.2 NokiaN79-1/32.001; Profile/MIDP-2.1 Configuration/CLDC-1",
+        "expect"  :
+        {
+            "name"    : "Symbian",
+            "version" : "9.3"
+        }
+    },
+    {
+        "desc"    : "Nokia E71",
+        "ua"      : "Mozilla/5.0 (SymbianOS/9.2; U; Series60/3.1 NokiaE71-1/110.07.127; Profile/MIDP-2.0 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413",
+        "expect"  :
+        {
+            "name"    : "Symbian",
+            "version" : "9.2"
+        }
+    },
+    {
+        "desc"    : "Opera Mini on S60",
+        "ua"      : "Opera/9.80 (Series 60; Opera Mini/7.1.32444/191.361; U; de) Presto/2.12.423 Version/12.16",
+        "expect"  :
+        {
+            "name"    : "Symbian",
+            "version" : "undefined"
+        }
+    },
+    {
+        "desc"    : "NokiaBrowser on Nokia C7",
         "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaC7-00/024.001; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/533.4 (KHTML, like Gecko) NokiaBrowser/7.3.1.37 Mobile Safari/533.4 3gpp-gba",
         "expect"  :
         {
             "name"    : "Symbian",
-            "version" : "5.2"
+            "version" : "3"
+        }
+    },
+    {
+        "desc"    : "Nokia 808 PureView",
+        "ua"      : "Mozilla/5.0 (Symbian/3; Series60/5.5 Nokia808PureView/113.010.1508; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/535.1 (KHTML, like Gecko) NokiaBrowser/8.3.2.21 Mobile Safari/535.1 3gpp-gba",
+        "expect"  :
+        {
+            "name"    : "Symbian",
+            "version" : "3"
+        }
+    },
+    {
+        "desc"    : "Nokia 808 PureView",
+        "ua"      : "Mozilla/5.0 (Symbian; U; Nokia808 PureView; en-GB) AppleWebKit/534.3 (KHTML, like Gecko) Version/3.0 Mobile/1A543a Mobile Safari/534.3",
+        "expect"  :
+        {
+            "name"    : "Symbian",
+            "version" : "undefined"
         }
     }
 ]

test/data/ua/os/ubuntu-touch.json

@@ -0,0 +1,11 @@
+[
+    {
+        "desc"    : "Ubuntu Touch",
+        "ua"      : "Mozilla/5.0 (Linux; Ubuntu 16.04 like Android 4.4) AppleWebKit/537.36 Chromium/65.0.3325.151 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Ubuntu Touch",
+            "version" : "16.04"
+        }
+    }
+]

test/data/ua/os/windows-iot.json

@@ -0,0 +1,11 @@
+[
+    {
+        "desc"    : "Windows IoT",
+        "ua"      : "Mozilla/5.0 (Windows IoT 10.0; Android 6.0.1; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Mobile Safari/537.36 Edge/18.17763",
+        "expect"  :
+        {
+            "name"    : "Windows IoT",
+            "version" : "10.0"
+        }
+    }
+]

test/unit/extensions.js

@@ -4,29 +4,33 @@ const parseJS = require('@babel/parser').parse;
 const traverse = require('@babel/traverse').default;
 const safe = require('safe-regex');
 const { UAParser } = require('../../src/main/ua-parser');
-const clis = require('../data/ua/extension/cli.json');
-const crawlers = require('../data/ua/extension/crawler.json');
-const emails = require('../data/ua/extension/email.json');
-const fetchers = require('../data/ua/extension/fetcher.json');
-const libraries = require('../data/ua/extension/library.json');
-const { Bots, CLIs, Crawlers, Emails, Fetchers, Libraries } = require('../../src/extensions/ua-parser-extensions');
+const { Bots, CLIs, Crawlers, Emails, Fetchers, InApps, Libraries, Vehicles } = require('../../src/extensions/ua-parser-extensions');
 
 describe('Extensions', () => {
     [   
-        ['CLIs', clis, CLIs], 
-        ['Crawlers', crawlers, Crawlers], 
-        ['Emails', emails, Emails], 
-        ['Fetchers', fetchers, Fetchers],
-        ['Libraries', libraries, Libraries]
+        ['CLIs', 'cli', CLIs], 
+        ['Crawlers', 'crawler', Crawlers], 
+        ['Emails', 'email', Emails], 
+        ['Fetchers', 'fetcher', Fetchers],
+        ['InApps', 'inapp', InApps],
+        ['Libraries', 'library', Libraries],
+        ['Vehicles', 'vehicle', Vehicles]
     ]
-    .forEach((list) => {
-        describe(list[0], () => {
-            list[1].forEach((agent) => {
-                it(`Can detect ${agent.desc}: "${agent.ua}"`, () => {
-                    let browser = UAParser(agent.ua, list[2]).browser;
-                    assert.strictEqual(String(browser.name), agent.expect.name);
-                    assert.strictEqual(String(browser.version), agent.expect.version);
-                    assert.strictEqual(String(browser.type), agent.expect.type);
+    .forEach(([desc, path, ext]) => {
+        const tests = require(`../data/ua/extension/${path}.json`);
+        describe(desc, () => {
+            tests.forEach((test) => {
+                it(`Can detect ${test.desc}: "${test.ua}"`, () => {
+                    const { browser, device } = UAParser(test.ua, ext);
+                    if ('browser' in ext) {
+                        assert.strictEqual(String(browser.name), test.expect.name);
+                        assert.strictEqual(String(browser.version), test.expect.version);
+                        assert.strictEqual(String(browser.type), test.expect.type);
+                    } else if ('device' in ext) {
+                        assert.strictEqual(String(device.vendor), test.expect.vendor);
+                        assert.strictEqual(String(device.model), test.expect.model);
+                        assert.strictEqual(String(device.type), test.expect.type);
+                    }
                 });
             });
         });
@@ -48,6 +52,21 @@ describe('Extensions', () => {
     assert.deepEqual(libraryParser.setUA(axios).getBrowser(), {name: "axios", version: "1.3.5", major: "1", type: "library"});
     assert.deepEqual(libraryParser.setUA(jsdom).getBrowser(), {name: "jsdom", version: "20.0.3", major: "20", type: "library"});
     assert.deepEqual(libraryParser.setUA(scrapy).getBrowser(), {name: "Scrapy", version: "1.5.0", major: "1", type: "library"});
+
+    // Bluesky
+    const bluesky = 'Mozilla/5.0 (compatible; Bluesky Cardyb/1.1; +mailto:support@bsky.app)';
+    assert.deepEqual(new UAParser(bluesky, Bots).getBrowser(), {
+        name: 'Bluesky',
+        version: '1.1',
+        major: '1',
+        type: 'fetcher'
+    });
+
+    const whatsapp = "WhatsApp/2.0 A";
+    assert.deepEqual(new UAParser(whatsapp, Fetchers).getOS(), {
+        name : 'Android',
+        version : undefined
+    });
 });
 
 describe('Merge', () => {

test/unit/helpers.js

@@ -9,13 +9,11 @@ describe('getDeviceVendor', () => {
         const modelSM = 'SM-A605G';
         const modelRedmi = 'Redmi Note 8';
         const modelNexus = 'Nexus 6P';
-        const modelQuest = 'Quest 3';
         const modelAquos = 'AQUOS-TVX19B';
 
         assert.equal(getDeviceVendor(modelSM), 'Samsung');
         assert.equal(getDeviceVendor(modelRedmi), 'Xiaomi');
         assert.equal(getDeviceVendor(modelNexus), 'Huawei');
-        assert.equal(getDeviceVendor(modelQuest), 'Facebook');
         assert.equal(getDeviceVendor(modelAquos), 'Sharp');
     });
 });
@@ -40,11 +38,13 @@ describe('isAIBot', () => {
         const claudeBot = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)';
         const firefox = 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/111.0';
         const searchGPT = 'Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko); compatible; OAI-SearchBot/1.0; +https://openai.com/searchbot';
+        const semrushAI = 'Mozilla/5.0 (compatible; SemrushBot-OCOB/1; +https://www.semrush.com/bot/)';
 
         assert.equal(isAIBot(UAParser(claudeBot, Bots)), true);
         assert.equal(isAIBot(claudeBot), true);
         assert.equal(isAIBot(firefox), false);
         assert.equal(isAIBot(searchGPT), true);
+        assert.equal(isAIBot(semrushAI), true);
     });
 });
 

test/unit/ua-ch.js

@@ -68,7 +68,7 @@ describe('Map UA-CH headers', () => {
         assert.strictEqual(uap.engine.name, 'Blink');
         assert.strictEqual(uap.engine.version, '110.0.0.0');
         assert.strictEqual(uap.os.name, "Linux");
-        assert.strictEqual(uap.os.version, "x86_64");
+        assert.strictEqual(uap.os.version, undefined);
     });
 
     it('Fallback to user-agent header when using `withClientHints()` but found no client hints-related headers',  () => {  
@@ -90,7 +90,7 @@ describe('Map UA-CH headers', () => {
         assert.strictEqual(uap.engine.name, 'Blink');
         assert.strictEqual(uap.engine.version, '110.0.0.0');
         assert.strictEqual(uap.os.name, "Linux");
-        assert.strictEqual(uap.os.version, "x86_64");
+        assert.strictEqual(uap.os.version, undefined);
     });
 
     it('Can detect Apple silicon from client hints data', () => {  
@@ -220,45 +220,220 @@ describe('Map UA-CH headers', () => {
     });
 });
 
-describe('Browser naming adjustments', () => {
+describe('UA-CH Headers tests', () => {
     [
         {
-            ua_ch: '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"',
+            headers : {
+                'sec-ch-ua': '"Avast Secure Browser";v="131", "Chromium";v="131", "Not_A Brand";v="24"'
+            },
             expect: {
-                before: 'Google Chrome',
-                after: 'Chrome'
+                browser : {
+                    name : 'Avast Secure Browser',
+                    version : '131',
+                    major : '131',
+                    type : undefined
+                }
             }
         },
         {
-            ua_ch: '"Not_A Brand";v="8", "Chromium";v="120", "Microsoft Edge";v="120"',
+            headers : {
+                'sec-ch-ua': '"Not A(Brand";v="8", "Chromium";v="132", "Brave";v="132"'
+            },
             expect: {
-                before: "Microsoft Edge",
-                after: "Edge"
+                browser : {
+                    name : 'Brave',
+                    version : '132',
+                    major : '132',
+                    type : undefined
+                }
             }
         },
         {
-            ua_ch: '"Android WebView";v="123", "Not:A-Brand";v="8", "Chromium";v="123"',
+            headers : {
+                'sec-ch-ua': '"Google Chrome";v="111", "Not(A:Brand";v="8", "Chromium";v="111"'
+            },
             expect: {
-                before: "Android WebView",
-                after: "Chrome WebView"
+                browser : {
+                    name : 'Chrome',
+                    version : '111',
+                    major : '111',
+                    type : undefined
+                }
             }
         },
         {
-            ua_ch: '"Chromium";v="124", "HeadlessChrome";v="124", "Not-A.Brand";v="99"',
+            headers : {
+                'sec-ch-ua': '"Chromium";v="124", "HeadlessChrome";v="124", "Not-A.Brand";v="99"'
+            },
             expect: {
-                before: "HeadlessChrome",
-                after: "Chrome Headless"
+                browser : {
+                    name : 'Chrome Headless',
+                    version : '124',
+                    major : '124',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Android WebView";v="123", "Not:A-Brand";v="8", "Chromium";v="123"'
+            },
+            expect: {
+                browser : {
+                    name : 'Chrome WebView',
+                    version : '123',
+                    major : '123',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"DuckDuckGo";v="131", "Chromium";v="131", "Not_A Brand";v="24"'
+            },
+            expect : {
+                browser : {
+                    name : 'DuckDuckGo',
+                    version : '131',
+                    major : '131',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Microsoft Edge";v="120"'
+            },
+            expect: {
+                browser : {
+                    name : 'Edge',
+                    version : '120',
+                    major : '120',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "HuaweiBrowser";v="114"'
+            },
+            expect: {
+                browser : {
+                    name : 'Huawei Browser',
+                    version : '114',
+                    major : '114',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Miui Browser";v="123", "Not:A-Brand";v="8", "Chromium";v="123"'
+            },
+            expect: {
+                browser : {
+                    name : 'MIUI Browser',
+                    version : '123',
+                    major : '123',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Chromium";v="130", "Oculus Browser";v="36", "Not?A_Brand";v="99"'
+            },
+            expect: {
+                browser : {
+                    name : 'Oculus Browser',
+                    version : '36',
+                    major : '36',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Opera";v="116", "Chromium";v="131", "Not_A Brand";v="24"'
+            },
+            expect: {
+                browser : {
+                    name : 'Opera',
+                    version : '116',
+                    major : '116',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Chromium";v="128", "Not;A=Brand";v="24", "Opera GX";v="114"'
+            },
+            expect: {
+                browser : {
+                    name : 'Opera GX',
+                    version : '114',
+                    major : '114',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"OperaMobile";v="86", ";Not A Brand";v="99", "Opera";v="115", "Chromium";v="130"'
+            },
+            expect: {
+                browser : {
+                    name : 'Opera Mobi',
+                    version : '86',
+                    major : '86',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Chromium";v="132", "OperaMobile";v="87", "Opera";v="117", " Not A;Brand";v="99"'
+            },
+            expect: {
+                browser : {
+                    name : 'Opera Mobi',
+                    version : '87',
+                    major : '87',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Chromium";v="125", "Not.A/Brand";v="24", "Samsung Internet";v="27.0"'
+            },
+            expect: {
+                browser : {
+                    name : 'Samsung Internet',
+                    version : '27.0',
+                    major : '27',
+                    type : undefined
+                }
+            }
+        },
+        {
+            headers : {
+                'sec-ch-ua': '"Chromium";v="130", "YaBrowser";v="24.12", "Not?A_Brand";v="99", "Yowser";v="2.5"'
+            },
+            expect: {
+                browser : {
+                    name : 'Yandex',
+                    version : '24.12',
+                    major : '24',
+                    type : undefined
+                }
             }
         },
     ]
     .forEach(test => {
-        it(`"${test.expect.before}" => "${test.expect.after}"`, () => {
-            const headers = {
-                'sec-ch-ua' : test.ua_ch,
-            };
-            const { browser } = UAParser(headers).withClientHints();
-            assert.strictEqual(browser.name, test.expect.after);
-        });
+        const { browser } = UAParser(test.headers).withClientHints();
+        assert.deepEqual(browser, test.expect.browser);
     });
 });