Skip to content

Commit d614b96

Browse files
committed
fix: address PR review feedback
1 parent 6dcf6be commit d614b96

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

src/forwarders.interfaces.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ export interface UnregisteredKit {
3939
suffix?: string;
4040
}
4141

42+
export interface SideloadedKit {
43+
kitInstance: UnregisteredKit;
44+
filterDictionary: IKitFilterSettings;
45+
}
46+
4247
// The state of the kit after being added to forwarderConstructors in the CDN
4348
// or after registered to SDKConfig.kits via NPM
4449
// Sideloaded Kits would also be considered registered
@@ -190,7 +195,7 @@ export interface IForwarders {
190195
configuration: IKitConfigs,
191196
kits: Dictionary<RegisteredKit>
192197
): void;
193-
processSideloadedKits(mpConfig: IConfigResponse): void;
198+
processSideloadedKits(mpConfig: IConfigResponse & { sideloadedKits?: SideloadedKit[] }): void;
194199
configureSideloadedKit(kitConstructor: RegisteredKit): void;
195200
returnConfiguredKit(
196201
forwarder: RegisteredKit,

src/forwarders.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import filteredMparticleUser from './filteredMparticleUser';
2-
import { isEmpty, extend } from './utils';
2+
import { isEmpty, extend, Dictionary } from './utils';
33
import KitFilterHelper from './kitFilterHelper';
44
import Constants from './constants';
55
import APIClient, { IForwardingStatsData } from './apiClient';
@@ -19,7 +19,7 @@ import {
1919
MPForwarder,
2020
RegisteredKit,
2121
forwardingStatsCallback as ForwardingStatsCallback,
22-
ConfiguredKit,
22+
SideloadedKit,
2323
} from './forwarders.interfaces';
2424
import {
2525
IConfigResponse,
@@ -31,7 +31,6 @@ import { IPixelConfiguration } from './cookieSyncManager';
3131
import { Batch } from '@mparticle/event-models';
3232
import { IMParticleUser, ISDKUserIdentity } from './identity-user-interfaces';
3333
import KitBlocker from './kitBlocking';
34-
import { Dictionary } from './utils';
3534

3635
const { Modify, Identify, Login, Logout } = Constants.IdentityMethods;
3736

@@ -238,13 +237,7 @@ export default function Forwarders(
238237
event.EventCategory
239238
);
240239

241-
for (
242-
let i = 0;
243-
i < mpInstance._Store.activeForwarders.length;
244-
i++
245-
) {
246-
const forwarder = mpInstance._Store.activeForwarders[i];
247-
240+
for (const forwarder of mpInstance._Store.activeForwarders) {
248241
if (
249242
(isBlockedByForwardingRule as Function)(
250243
event.EventDataType,
@@ -356,7 +349,7 @@ export default function Forwarders(
356349
const result = forwarder.processBatch(batchCopy);
357350

358351
if (result) {
359-
mpInstance.Logger.verbose(result as string);
352+
mpInstance.Logger.verbose(result);
360353
}
361354
} catch (e) {
362355
mpInstance.Logger.verbose(e as string);
@@ -641,7 +634,7 @@ export default function Forwarders(
641634
// there being a separate process for MP configured kits and
642635
// sideloaded kits, this will need to be refactored.
643636
this.processSideloadedKits = function(
644-
mpConfig: IConfigResponse & { sideloadedKits?: { kitInstance: { register: Function; name: string }; filterDictionary: IKitFilterSettings }[] }
637+
mpConfig: IConfigResponse & { sideloadedKits?: SideloadedKit[] }
645638
): void {
646639
try {
647640
if (Array.isArray(mpConfig.sideloadedKits)) {

src/sdkRuntimeModels.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export interface MParticleWebSDK {
195195
configurePixel(config: IPixelConfiguration): void;
196196
endSession(): void;
197197
init(apiKey: string, config: SDKInitConfig, instanceName?: string): void;
198-
_getActiveForwarders(): MPForwarder[];
198+
_getActiveForwarders(): ConfiguredKit[];
199199
_getIntegrationDelays(): IntegrationDelays;
200200
_setIntegrationDelay(module: number, shouldDelayIntegration: boolean): void;
201201
_setWrapperSDKInfo(name: WrapperSDKTypes, version: string): void;
@@ -390,7 +390,7 @@ export interface SDKHelpersApi {
390390
name: string
391391
): Dictionary<string> | null;
392392
filterUserIdentities?(
393-
userIdentitiesObject: Record<string, string>,
393+
userIdentitiesObject: Dictionary<string>,
394394
filterList: number[]
395395
): ISDKUserIdentity[];
396396
Validators: typeof Validators;

0 commit comments

Comments
 (0)