diff --git a/package-lock.json b/package-lock.json index 4dc54c8b..c8abb07d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1070,15 +1070,6 @@ "@types/node": "*" } }, - "@types/ip": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@types/ip/-/ip-1.1.0.tgz", - "integrity": "sha512-dwNe8gOoF70VdL6WJBwVHtQmAX4RMd62M+mAB9HQFjG1/qiCLM/meRy95Pd14FYBbEDwCq7jgJs89cHpLBu4HQ==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/istanbul-lib-coverage": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", diff --git a/package.json b/package.json index 6b962dff..2bed38b7 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "devDependencies": { "@types/google.analytics": "0.0.40", "@types/ioredis": "^4.28.0", - "@types/ip": "^1.1.0", "@types/jest": "^27.0.0", "@types/lodash": "^4.14.162", "@typescript-eslint/eslint-plugin": "^4.2.0", diff --git a/src/utils/settingsValidation/runtime.ts b/src/utils/settingsValidation/runtime.ts new file mode 100644 index 00000000..2f53ac54 --- /dev/null +++ b/src/utils/settingsValidation/runtime.ts @@ -0,0 +1,9 @@ +import { ISettings } from '../../types'; + +// For client-side SDKs, machine IP and Hostname are not captured and sent to Split backend. +export function validateRuntime(): ISettings['runtime'] { + return { + ip: false, + hostname: false + }; +} diff --git a/src/utils/settingsValidation/runtime/browser.ts b/src/utils/settingsValidation/runtime/browser.ts deleted file mode 100644 index 8da6ac6a..00000000 --- a/src/utils/settingsValidation/runtime/browser.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ISettings } from '../../../types'; - -export function validateRuntime(): ISettings['runtime'] { - return { - ip: false, - hostname: false - }; -} diff --git a/src/utils/settingsValidation/runtime/node.ts b/src/utils/settingsValidation/runtime/node.ts deleted file mode 100644 index fa97772d..00000000 --- a/src/utils/settingsValidation/runtime/node.ts +++ /dev/null @@ -1,22 +0,0 @@ -import osFunction from 'os'; -import ipFunction from 'ip'; - -import { UNKNOWN, NA, CONSUMER_MODE } from '../../constants'; -import { ISettings } from '../../../types'; - -export function validateRuntime(settings: ISettings): ISettings['runtime'] { - const isIPAddressesEnabled = settings.core.IPAddressesEnabled === true; - const isConsumerMode = settings.mode === CONSUMER_MODE; - - // If the values are not available, default to false (for standalone) or "unknown" (for consumer mode, to be used on Redis keys) - let ip = ipFunction.address() || (isConsumerMode ? UNKNOWN : false); - let hostname = osFunction.hostname() || (isConsumerMode ? UNKNOWN : false); - - if (!isIPAddressesEnabled) { // If IPAddresses setting is not enabled, set as false (for standalone) or "NA" (for consumer mode, to be used on Redis keys) - ip = hostname = isConsumerMode ? NA : false; - } - - return { - ip, hostname - }; -}