refactor: moving deriveNamespace back to ElectronIPC

Author: joker23

packages/sdk/electron/__tests__/ElectronClient.ipcMain.test.ts

@@ -8,9 +8,8 @@ import type {
   LDIdentifyOptions,
 } from '@launchdarkly/js-client-sdk-common';
 
-import { deriveNamespace } from '../src/deriveNamespace';
 import { ElectronClient } from '../src/ElectronClient';
-import { getIPCChannelName } from '../src/ElectronIPC';
+import { deriveNamespace, getIPCChannelName } from '../src/ElectronIPC';
 import ElectronCrypto from '../src/platform/ElectronCrypto';
 import ElectronEncoding from '../src/platform/ElectronEncoding';
 import ElectronInfo from '../src/platform/ElectronInfo';

packages/sdk/electron/__tests__/ElectronIPC.test.ts

@@ -1,5 +1,4 @@
-import { deriveNamespace } from '../src/deriveNamespace';
-import { getIPCChannelName } from '../src/ElectronIPC';
+import { deriveNamespace, getIPCChannelName } from '../src/ElectronIPC';
 
 it('derives namespace from credential alone', () => {
   expect(deriveNamespace('mob-abc-123')).toBe('mob-abc-123');

packages/sdk/electron/__tests__/bridge/LDClientBridge.test.ts

@@ -2,7 +2,7 @@ import { ipcRenderer } from 'electron';
 
 import '../../src/bridge';
 import type { LDClientBridge } from '../../src/bridge/LDClientBridge';
-import { deriveNamespace } from '../../src/deriveNamespace';
+import { deriveNamespace } from '../../src/ElectronIPC';
 import type { LDContext } from '../../src/index';
 
 const clientSideId = 'client-side-id';

packages/sdk/electron/__tests__/renderer/ElectronRendererClient.test.ts

@@ -1,7 +1,7 @@
 import type { LDContext } from '@launchdarkly/js-client-sdk-common';
 
 import type { LDClientBridge } from '../../src/bridge/LDClientBridge';
-import { deriveNamespace } from '../../src/deriveNamespace';
+import { deriveNamespace } from '../../src/ElectronIPC';
 import { ElectronRendererClient } from '../../src/renderer/ElectronRendererClient';
 
 const ldClientBridge: LDClientBridge = {

packages/sdk/electron/src/ElectronClient.ts

@@ -25,11 +25,11 @@ import {
   readFlagsFromBootstrap,
 } from '@launchdarkly/js-client-sdk-common';
 
-import { deriveNamespace } from './deriveNamespace';
 import ElectronDataManager from './ElectronDataManager';
 import {
   AllAsyncChannels,
   AllSyncChannels,
+  deriveNamespace,
   getIPCChannelName,
   IpcEventCallback,
   IpcEventSubscription,

packages/sdk/electron/src/ElectronIPC.ts

@@ -1,3 +1,5 @@
+import type { MessagePortMain } from 'electron';
+
 import { LDEmitterEventName } from '@launchdarkly/js-client-sdk-common';
 
 /**
@@ -68,7 +70,7 @@ export type IPCChannel = IPCSyncChannel | IPCAsyncChannel;
  */
 export interface IpcEventSubscription {
   broadcastCallback: (...args: any[]) => void;
-  ports: Map<string, Electron.MessagePortMain>;
+  ports: Map<string, MessagePortMain>;
 }
 
 export interface IpcEventCallback {
@@ -82,3 +84,10 @@ export interface IpcEventCallback {
 export function getIPCChannelName(namespace: string, channel: IPCChannel): string {
   return `ld:${namespace}:${channel}`;
 }
+
+/**
+ * Derives a storage/IPC namespace from a credential and an optional user-provided namespace.
+ */
+export function deriveNamespace(credential: string, customNamespace?: string): string {
+  return customNamespace ? `${customNamespace}_${credential}` : credential;
+}

packages/sdk/electron/src/ElectronOptions.ts

@@ -122,10 +122,6 @@ export interface ElectronOptions extends LDOptionsBase {
   /**
    * An optional namespace to isolate this client's storage and IPC channels
    * from other clients using the same credential in the same process.
-   *
-   * @remarks
-   * Useful when running multiple client instances (e.g., multiple environments)
-   * in the same Electron app. When omitted, isolation is based solely on the credential.
    */
   namespace?: string;
 }

packages/sdk/electron/src/deriveNamespace.ts

@@ -1,5 +1,5 @@
-import { deriveNamespace } from './deriveNamespace';
 import { makeClient } from './ElectronClient';
+import { deriveNamespace } from './ElectronIPC';
 import type { ElectronOptions, LDProxyOptions, LDTLSOptions } from './ElectronOptions';
 import type { LDClient, LDStartOptions } from './LDClient';
 import type { LDContext } from './LDCommon';

packages/sdk/electron/src/index.ts

@@ -13,7 +13,7 @@ import type {
 } from '@launchdarkly/js-client-sdk-common';
 
 import type { LDClientBridge } from '../bridge/LDClientBridge';
-import { deriveNamespace } from '../deriveNamespace';
+import { deriveNamespace } from '../ElectronIPC';
 import type { LDRendererClient } from './LDRendererClient';
 
 export class ElectronRendererClient implements LDRendererClient {