diff options
author | Vijay A <avijayr@protonmail.com> | 2021-07-15 23:10:08 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-07-15 23:10:08 +0530 |
commit | c3711a2b577a10584bac0fbddfb7bde108eb706c (patch) | |
tree | afd2210823b6e7dbbc250186c21496c19aff1217 /src/helpers | |
parent | Revert 'useragent-generator' to published npm version without github repo ref... (diff) | |
download | ferdium-app-c3711a2b577a10584bac0fbddfb7bde108eb706c.tar.gz ferdium-app-c3711a2b577a10584bac0fbddfb7bde108eb706c.tar.zst ferdium-app-c3711a2b577a10584bac0fbddfb7bde108eb706c.zip |
Minor perf tweaks to evaluate capturing of env-specific values only once in the application.
Diffstat (limited to 'src/helpers')
-rw-r--r-- | src/helpers/userAgent-helpers.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js index 4aa6f92d0..9c9c8f132 100644 --- a/src/helpers/userAgent-helpers.js +++ b/src/helpers/userAgent-helpers.js | |||
@@ -1,13 +1,11 @@ | |||
1 | import os from 'os'; | 1 | import os from 'os'; |
2 | import macosVersion from 'macos-version'; | 2 | import macosVersion from 'macos-version'; |
3 | import { chromeVersion, isMac, isWindows } from '../environment'; | 3 | import { |
4 | chromeVersion, isMac, isWindows, is64Bit, osArch, osRelease, | ||
5 | } from '../environment'; | ||
4 | 6 | ||
5 | const uaGenerator = require('useragent-generator'); | 7 | const uaGenerator = require('useragent-generator'); |
6 | 8 | ||
7 | function is64Bit() { | ||
8 | return os.arch().match(/64/); | ||
9 | } | ||
10 | |||
11 | function macOS() { | 9 | function macOS() { |
12 | const version = macosVersion(); | 10 | const version = macosVersion(); |
13 | let cpuName = os.cpus()[0].model.split(' ')[0]; | 11 | let cpuName = os.cpus()[0].model.split(' ')[0]; |
@@ -18,14 +16,14 @@ function macOS() { | |||
18 | } | 16 | } |
19 | 17 | ||
20 | function windows() { | 18 | function windows() { |
21 | const version = os.release(); | 19 | const version = osRelease; |
22 | const [majorVersion, minorVersion] = version.split('.'); | 20 | const [majorVersion, minorVersion] = version.split('.'); |
23 | const archString = is64Bit() ? 'Win64' : 'Win32'; | 21 | const archString = is64Bit ? 'Win64' : 'Win32'; |
24 | return `Windows NT ${majorVersion}.${minorVersion}; ${archString}; ${os.arch()}`; | 22 | return `Windows NT ${majorVersion}.${minorVersion}; ${archString}; ${osArch}`; |
25 | } | 23 | } |
26 | 24 | ||
27 | function linux() { | 25 | function linux() { |
28 | const archString = is64Bit() ? 'x86_64' : os.arch(); | 26 | const archString = is64Bit ? 'x86_64' : osArch; |
29 | return `X11; Ubuntu; Linux ${archString}`; | 27 | return `X11; Ubuntu; Linux ${archString}`; |
30 | } | 28 | } |
31 | 29 | ||