Skip to content

Refactor: updated internal modules #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
],
"rules": {
"no-restricted-syntax": ["error", "ForOfStatement", "ForInStatement", "ArrayPattern"],
"compat/compat": ["error", "defaults, ie 10, node 6"],
"compat/compat": ["error", "defaults, node >=14"],
"no-throw-literal": "error",
"import/no-default-export": "error",
"import/no-self-import": "error"
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"node": ">=14.0.0"
},
"dependencies": {
"@splitsoftware/splitio-commons": "2.0.0-rc.1",
"@splitsoftware/splitio-commons": "2.0.0-rc.3",
"@types/ioredis": "^4.28.0",
"bloom-filters": "^3.0.0",
"ioredis": "^4.28.0",
Expand Down
3 changes: 2 additions & 1 deletion src/factory/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { __InLocalStorageMockFactory } from '@splitsoftware/splitio-commons/src/
import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
import { LOCALHOST_MODE, STORAGE_LOCALSTORAGE } from '@splitsoftware/splitio-commons/src/utils/constants';
import { createUserConsentAPI } from '@splitsoftware/splitio-commons/src/consent/sdkUserConsent';
import { localhostFromObjectFactory } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject';

import { settingsFactory } from '../settings/browser';
import { platform, SignalListener } from '../platform';
Expand Down Expand Up @@ -60,7 +61,7 @@ function getModules(settings) {
switch (settings.mode) {
case LOCALHOST_MODE:
modules.splitApiFactory = undefined;
modules.syncManagerFactory = settings.sync.localhostMode;
modules.syncManagerFactory = localhostFromObjectFactory;
modules.SignalListener = undefined;
break;
}
Expand Down
3 changes: 2 additions & 1 deletion src/factory/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { impressionObserverSSFactory } from '@splitsoftware/splitio-commons/src/
import { sdkFactory } from '@splitsoftware/splitio-commons/src/sdkFactory';
import { CONSUMER_MODE, LOCALHOST_MODE } from '@splitsoftware/splitio-commons/src/utils/constants';

import { localhostFromFileFactory } from '../sync/offline/LocalhostFromFile';
import { settingsFactory } from '../settings/node';
import { platform, SignalListener } from '../platform';
import { bloomFilterFactory } from '../platform/filter/bloomFilter';
Expand Down Expand Up @@ -53,7 +54,7 @@ function getModules(settings) {
switch (settings.mode) {
case LOCALHOST_MODE:
modules.splitApiFactory = undefined;
modules.syncManagerFactory = settings.sync.localhostMode;
modules.syncManagerFactory = localhostFromFileFactory;
modules.SignalListener = undefined;
break;
case CONSUMER_MODE:
Expand Down
2 changes: 0 additions & 2 deletions src/settings/browser.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation';
import { validateRuntime } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/runtime';
import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger';
import { LocalhostFromObject } from '@splitsoftware/splitio-commons/src/sync/offline/LocalhostFromObject';
import { validateConsent } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/consent';

import { defaults } from './defaults/browser';
Expand All @@ -13,7 +12,6 @@ const params = {
runtime: validateRuntime,
storage: validateStorage,
logger: validateLogger,
localhost: () => LocalhostFromObject(),
consent: validateConsent,
};

Expand Down
2 changes: 0 additions & 2 deletions src/settings/node.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { settingsValidation } from '@splitsoftware/splitio-commons/src/utils/settingsValidation';
import { validateLogger } from '@splitsoftware/splitio-commons/src/utils/settingsValidation/logger/builtinLogger';
import { LocalhostFromFile } from '../sync/offline/LocalhostFromFile';

import { defaults } from './defaults/node';
import { validateStorage } from './storage/node';
Expand All @@ -13,7 +12,6 @@ const params = {
runtime: validateRuntime,
storage: validateStorage,
logger: validateLogger,
localhost: () => LocalhostFromFile(),
flagSpec: () => FLAG_SPEC_VERSION
// In Node.js the SDK ignores `config.integrations`, so a validator for integrations is not required
};
Expand Down
9 changes: 2 additions & 7 deletions src/sync/offline/LocalhostFromFile.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { splitsParserFromFileFactory } from './splitsParserFromFile';
import { syncManagerOfflineFactory } from '@splitsoftware/splitio-commons/src/sync/offline/syncManagerOffline';

// Singleton instance of the factory function for offline SyncManager from YAML file (a.k.a. localhostFromFile)
// Singleton instance of the factory function for offline SyncManager from YAML file
// It uses NodeJS APIs.
const localhostFromFile = syncManagerOfflineFactory(splitsParserFromFileFactory);
localhostFromFile.type = 'LocalhostFromFile';

export function LocalhostFromFile() {
return localhostFromFile;
}
export const localhostFromFileFactory = syncManagerOfflineFactory(splitsParserFromFileFactory);
Loading