Merge branch 'main' into rlamb/SDK-197/implement-secure-mode

.github/workflows/react-native-detox.yml

@@ -16,7 +16,6 @@ on:
       - 'packages/shared/common/**'
       - 'packages/shared/sdk-client/**'
       - 'packages/sdk/react-native/**'
-      - 'packages/shared/mocks/**'
 
 jobs:
   detox-android:

package.json

@@ -2,7 +2,6 @@
   "name": "@launchdarkly/js-core",
   "workspaces": [
     "packages/shared/common",
-    "packages/shared/mocks",
     "packages/shared/sdk-client",
     "packages/shared/sdk-server",
     "packages/shared/sdk-server-edge",

packages/sdk/browser/__tests__/BrowserDataManager.test.ts

@@ -74,9 +74,6 @@ describe('given a BrowserDataManager with mocked dependencies', () => {
     };
     config = {
       logger,
-      baseUri: 'string',
-      eventsUri: 'string',
-      streamUri: 'string',
       maxCachedContexts: 5,
       capacity: 100,
       diagnosticRecordingInterval: 1000,
@@ -289,20 +286,27 @@ describe('given a BrowserDataManager with mocked dependencies', () => {
 
   it('should load cached flags and continue to poll to complete identify', async () => {
     const context = Context.fromLDContext({ kind: 'user', key: 'test-user' });
-    const identifyOptions: BrowserIdentifyOptions = {};
-    const identifyResolve = jest.fn();
-    const identifyReject = jest.fn();
 
     flagManager.loadCached.mockResolvedValue(true);
 
-    await dataManager.identify(identifyResolve, identifyReject, context, identifyOptions);
+    let identifyResolve: () => void;
+    let identifyReject: (err: Error) => void;
+    await new Promise<void>((resolve) => {
+      identifyResolve = jest.fn().mockImplementation(() => {
+        resolve();
+      });
+      identifyReject = jest.fn();
+
+      // this is the function under test
+      dataManager.identify(identifyResolve, identifyReject, context, {});
+    });
 
     expect(logger.debug).toHaveBeenCalledWith(
       '[BrowserDataManager] Identify - Flags loaded from cache. Continuing to initialize via a poll.',
     );
 
     expect(flagManager.loadCached).toHaveBeenCalledWith(context);
-    expect(identifyResolve).toHaveBeenCalled();
+    expect(identifyResolve!).toHaveBeenCalled();
     expect(flagManager.init).toHaveBeenCalledWith(
       expect.anything(),
       expect.objectContaining({ flagA: { flag: true, version: undefined } }),
@@ -312,20 +316,25 @@ describe('given a BrowserDataManager with mocked dependencies', () => {
 
   it('should identify from polling when there are no cached flags', async () => {
     const context = Context.fromLDContext({ kind: 'user', key: 'test-user' });
-    const identifyOptions: BrowserIdentifyOptions = {};
-    const identifyResolve = jest.fn();
-    const identifyReject = jest.fn();
 
-    flagManager.loadCached.mockResolvedValue(false);
+    let identifyResolve: () => void;
+    let identifyReject: (err: Error) => void;
+    await new Promise<void>((resolve) => {
+      identifyResolve = jest.fn().mockImplementation(() => {
+        resolve();
+      });
+      identifyReject = jest.fn();
 
-    await dataManager.identify(identifyResolve, identifyReject, context, identifyOptions);
+      // this is the function under test
+      dataManager.identify(identifyResolve, identifyReject, context, {});
+    });
 
     expect(logger.debug).not.toHaveBeenCalledWith(
       'Identify - Flags loaded from cache. Continuing to initialize via a poll.',
     );
 
     expect(flagManager.loadCached).toHaveBeenCalledWith(context);
-    expect(identifyResolve).toHaveBeenCalled();
+    expect(identifyResolve!).toHaveBeenCalled();
     expect(flagManager.init).toHaveBeenCalledWith(
       expect.anything(),
       expect.objectContaining({ flagA: { flag: true, version: undefined } }),

packages/sdk/browser/package.json

@@ -40,7 +40,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@launchdarkly/private-js-mocks": "0.0.1",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.0.2",

packages/sdk/browser/src/BrowserDataManager.ts

@@ -2,7 +2,9 @@ import {
   BaseDataManager,
   Configuration,
   Context,
+  DataSourceErrorKind,
   DataSourcePaths,
+  DataSourceState,
   FlagManager,
   getPollingUri,
   internal,
@@ -91,11 +93,24 @@ export default class BrowserDataManager extends BaseDataManager {
     // TODO: Handle wait for network results in a meaningful way. SDK-707
 
     try {
+      this.dataSourceStatusManager.requestStateUpdate(DataSourceState.Initializing);
       const payload = await requestor.requestPayload();
-      const listeners = this.createStreamListeners(context, identifyResolve);
-      const putListener = listeners.get('put');
-      putListener!.processJson(putListener!.deserializeData(payload));
+      try {
+        const listeners = this.createStreamListeners(context, identifyResolve);
+        const putListener = listeners.get('put');
+        putListener!.processJson(putListener!.deserializeData(payload));
+      } catch (e: any) {
+        this.dataSourceStatusManager.reportError(
+          DataSourceErrorKind.InvalidData,
+          e.message ?? 'Could not parse poll response',
+        );
+      }
     } catch (e: any) {
+      this.dataSourceStatusManager.reportError(
+        DataSourceErrorKind.NetworkError,
+        e.message ?? 'unexpected network error',
+        e.status,
+      );
       identifyReject(e);
     }
 

packages/sdk/cloudflare/jsr.json

@@ -3,15 +3,7 @@
   "version": "2.5.14",
   "exports": "./src/index.ts",
   "publish": {
-    "include": [
-      "LICENSE",
-      "README.md",
-      "package.json",
-      "jsr.json",
-      "src/**/*.ts"
-    ],
-    "exclude": [
-      "src/**/*.test.ts"
-    ]
+    "include": ["LICENSE", "README.md", "package.json", "jsr.json", "src/**/*.ts"],
+    "exclude": ["src/**/*.test.ts"]
   }
 }

packages/sdk/react-native/__tests__/MobileDataManager.test.ts

@@ -63,9 +63,6 @@ describe('given a MobileDataManager with mocked dependencies', () => {
     };
     config = {
       logger,
-      baseUri: 'string',
-      eventsUri: 'string',
-      streamUri: 'string',
       maxCachedContexts: 5,
       capacity: 100,
       diagnosticRecordingInterval: 1000,

packages/sdk/react-native/__tests__/fromExternal/react-native-sse/EventSource.test.ts

@@ -1,15 +1,19 @@
-import { type EventName } from '@launchdarkly/js-client-sdk-common';
-import { createLogger } from '@launchdarkly/private-js-mocks';
+import { type EventName, LDLogger } from '@launchdarkly/js-client-sdk-common';
 
 import EventSource, {
   backoff,
   jitter,
 } from '../../../src/fromExternal/react-native-sse/EventSource';
 
-let logger: ReturnType<typeof createLogger>;
+let logger: LDLogger;
 
 beforeEach(() => {
-  logger = createLogger();
+  logger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
 });
 
 describe('EventSource', () => {

packages/sdk/react-native/package.json

@@ -46,7 +46,6 @@
     "base64-js": "^1.5.1"
   },
   "devDependencies": {
-    "@launchdarkly/private-js-mocks": "0.0.1",
     "@testing-library/react": "^14.1.2",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
     "@types/jest": "^29.5.11",

packages/sdk/server-node/__tests__/LDClientNode.listeners.test.ts

@@ -1,15 +1,18 @@
-import { integrations } from '@launchdarkly/js-server-sdk-common';
-import { createLogger } from '@launchdarkly/private-js-mocks';
+import { integrations, LDLogger } from '@launchdarkly/js-server-sdk-common';
 
 import { Context, LDClient } from '../src';
 import LDClientNode from '../src/LDClientNode';
 
-let logger: ReturnType<typeof createLogger>;
+let logger: LDLogger;
 
 beforeEach(() => {
-  logger = createLogger();
+  logger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
 });
-
 describe('given an LDClient with test data', () => {
   let client: LDClient;
   let td: integrations.TestData;

packages/sdk/server-node/__tests__/LDClientNode.test.ts

@@ -1,12 +1,16 @@
-import { LDContext } from '@launchdarkly/js-server-sdk-common';
-import { createLogger } from '@launchdarkly/private-js-mocks';
+import { LDContext, LDLogger } from '@launchdarkly/js-server-sdk-common';
 
 import { init } from '../src';
 
-let logger: ReturnType<typeof createLogger>;
+let logger: LDLogger;
 
 beforeEach(() => {
-  logger = createLogger();
+  logger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
 });
 
 it('fires ready event in offline mode', (done) => {

packages/sdk/server-node/__tests__/LDClientNode.tls.test.ts

@@ -6,15 +6,18 @@ import {
   TestHttpServer,
 } from 'launchdarkly-js-test-helpers';
 
-import { createLogger } from '@launchdarkly/private-js-mocks';
-
-import { LDClient } from '../src';
+import { LDClient, LDLogger } from '../src';
 import LDClientNode from '../src/LDClientNode';
 
-let logger: ReturnType<typeof createLogger>;
+let logger: LDLogger;
 
 beforeEach(() => {
-  logger = createLogger();
+  logger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
 });
 
 describe('When using a TLS connection', () => {

packages/sdk/server-node/package.json

@@ -50,7 +50,6 @@
     "launchdarkly-eventsource": "2.0.3"
   },
   "devDependencies": {
-    "@launchdarkly/private-js-mocks": "0.0.1",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
     "@types/jest": "^29.4.0",
     "@typescript-eslint/eslint-plugin": "^6.20.0",

packages/shared/mocks/src/contextDeduplicator.ts → packages/shared/common/__tests__/contextDeduplicator.ts

@@ -1,4 +1,5 @@
-import type { Context, subsystem } from '@common';
+import { subsystem } from '../src/api';
+import Context from '../src/Context';
 
 export default class ContextDeduplicator implements subsystem.LDContextDeduplicator {
   flushInterval?: number | undefined = 0.1;

packages/shared/mocks/src/platform.ts → packages/shared/common/__tests__/createBasicPlatform.ts

@@ -1,6 +1,5 @@
-import type { PlatformData, SdkData } from '@common';
-
-import { setupCrypto } from './crypto';
+import { PlatformData, SdkData } from '../src/api';
+import { setupCrypto } from './setupCrypto';
 
 const setupInfo = () => ({
   platformData: jest.fn(

packages/shared/common/src/internal/diagnostics/DiagnosticsManager.test.ts → packages/shared/common/__tests__/internal/diagnostics/DiagnosticsManager.test.ts

@@ -1,6 +1,5 @@
-import { createBasicPlatform } from '@launchdarkly/private-js-mocks';
-
-import DiagnosticsManager from './DiagnosticsManager';
+import DiagnosticsManager from '../../../src/internal/diagnostics/DiagnosticsManager';
+import { createBasicPlatform } from '../../createBasicPlatform';
 
 describe('given a diagnostics manager', () => {
   const dateNowString = '2023-08-10';

packages/shared/common/__tests__/internal/events/EventProcessor.test.ts

@@ -1,10 +1,5 @@
-import {
-  ContextDeduplicator,
-  createBasicPlatform,
-  createLogger,
-} from '@launchdarkly/private-js-mocks';
-
 import { LDContextCommon, LDMultiKindContext } from '../../../src/api/context';
+import { LDLogger } from '../../../src/api/logging/LDLogger';
 import { LDContextDeduplicator, LDDeliveryStatus, LDEventType } from '../../../src/api/subsystem';
 import Context from '../../../src/Context';
 import { EventProcessor, InputIdentifyEvent } from '../../../src/internal';
@@ -13,13 +8,20 @@ import shouldSample from '../../../src/internal/events/sampling';
 import BasicLogger from '../../../src/logging/BasicLogger';
 import format from '../../../src/logging/format';
 import ClientContext from '../../../src/options/ClientContext';
+import ContextDeduplicator from '../../contextDeduplicator';
+import { createBasicPlatform } from '../../createBasicPlatform';
 
 let mockPlatform: ReturnType<typeof createBasicPlatform>;
 let clientContext: ClientContext;
-let logger: ReturnType<typeof createLogger>;
+let logger: LDLogger;
 
 beforeEach(() => {
-  logger = createLogger();
+  logger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
   mockPlatform = createBasicPlatform();
   clientContext = {
     basicConfiguration: {