Merge branch 'launchdarkly:main' into main

professorice · web-flow · commit 602ff36182cd · 2025-09-16T12:30:45.000-04:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -5,7 +5,7 @@
   "packages/sdk/cloudflare": "2.7.10",
   "packages/sdk/fastly": "0.2.1",
   "packages/shared/sdk-server-edge": "2.6.9",
-  "packages/sdk/vercel": "1.3.33",
+  "packages/sdk/vercel": "1.3.34",
   "packages/sdk/akamai-base": "3.0.10",
   "packages/sdk/akamai-edgekv": "1.4.12",
   "packages/shared/akamai-edgeworker-sdk": "2.0.10",
@@ -15,7 +15,7 @@
   "packages/sdk/react-native": "10.10.5",
   "packages/telemetry/node-server-sdk-otel": "1.3.2",
   "packages/sdk/browser": "0.8.1",
-  "packages/sdk/server-ai": "0.11.3",
+  "packages/sdk/server-ai": "0.11.4",
   "packages/telemetry/browser-telemetry": "1.0.11",
   "packages/tooling/jest": "0.1.10",
   "packages/sdk/combined-browser": "0.0.0"
diff --git a/packages/sdk/server-ai/CHANGELOG.md b/packages/sdk/server-ai/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.11.4](https://github.com/launchdarkly/js-core/compare/server-sdk-ai-v0.11.3...server-sdk-ai-v0.11.4) (2025-09-15)
+
+
+### Bug Fixes
+
+* Support Vercel v5 AI SDK token usage ([#926](https://github.com/launchdarkly/js-core/issues/926)) ([0d059a4](https://github.com/launchdarkly/js-core/commit/0d059a43050eaaaba84262d5e16cf875ccb409ea))
+
 ## [0.11.3](https://github.com/launchdarkly/js-core/compare/server-sdk-ai-v0.11.2...server-sdk-ai-v0.11.3) (2025-08-29)
 
 
diff --git a/packages/sdk/server-ai/examples/bedrock/package.json b/packages/sdk/server-ai/examples/bedrock/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "^3.679.0",
     "@launchdarkly/node-server-sdk": "^9.7.1",
-    "@launchdarkly/server-sdk-ai": "0.11.3"
+    "@launchdarkly/server-sdk-ai": "0.11.4"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
diff --git a/packages/sdk/server-ai/examples/openai/package.json b/packages/sdk/server-ai/examples/openai/package.json
@@ -22,7 +22,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@launchdarkly/node-server-sdk": "^9.7.1",
-    "@launchdarkly/server-sdk-ai": "0.11.3",
+    "@launchdarkly/server-sdk-ai": "0.11.4",
     "openai": "^4.58.1"
   },
   "devDependencies": {
diff --git a/packages/sdk/server-ai/package.json b/packages/sdk/server-ai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchdarkly/server-sdk-ai",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "LaunchDarkly AI SDK for Server-Side JavaScript",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/server-ai",
   "repository": {
diff --git a/packages/sdk/server-ai/src/LDAIConfigMapper.ts b/packages/sdk/server-ai/src/LDAIConfigMapper.ts
@@ -52,6 +52,7 @@ export class LDAIConfigMapper {
       model,
       messages,
       maxTokens: this._findParameter('max_tokens', 'maxTokens'),
+      maxOutputTokens: this._findParameter('max_tokens', 'maxTokens'),
       temperature: this._findParameter('temperature'),
       topP: this._findParameter('top_p', 'topP'),
       topK: this._findParameter('top_k', 'topK'),
diff --git a/packages/sdk/server-ai/src/LDAIConfigTrackerImpl.ts b/packages/sdk/server-ai/src/LDAIConfigTrackerImpl.ts
@@ -138,7 +138,9 @@ export class LDAIConfigTrackerImpl implements LDAIConfigTracker {
     TRes extends {
       usage?: {
         totalTokens?: number;
+        inputTokens?: number;
         promptTokens?: number;
+        outputTokens?: number;
         completionTokens?: number;
       };
     },
@@ -161,7 +163,9 @@ export class LDAIConfigTrackerImpl implements LDAIConfigTracker {
       finishReason?: Promise<string>;
       usage?: Promise<{
         totalTokens?: number;
+        inputTokens?: number;
         promptTokens?: number;
+        outputTokens?: number;
         completionTokens?: number;
       }>;
     },
diff --git a/packages/sdk/server-ai/src/api/config/LDAIConfigTracker.ts b/packages/sdk/server-ai/src/api/config/LDAIConfigTracker.ts
@@ -149,7 +149,9 @@ export interface LDAIConfigTracker {
     TRes extends {
       usage?: {
         totalTokens?: number;
+        inputTokens?: number;
         promptTokens?: number;
+        outputTokens?: number;
         completionTokens?: number;
       };
     },
@@ -174,7 +176,9 @@ export interface LDAIConfigTracker {
       finishReason?: Promise<string>;
       usage?: Promise<{
         totalTokens?: number;
+        inputTokens?: number;
         promptTokens?: number;
+        outputTokens?: number;
         completionTokens?: number;
       }>;
     },
diff --git a/packages/sdk/server-ai/src/api/config/VercelAISDK.ts b/packages/sdk/server-ai/src/api/config/VercelAISDK.ts
@@ -10,6 +10,7 @@ export interface VercelAISDKConfig<TMod> {
   model: TMod;
   messages?: LDMessage[] | undefined;
   maxTokens?: number | undefined;
+  maxOutputTokens?: number | undefined;
   temperature?: number | undefined;
   topP?: number | undefined;
   topK?: number | undefined;
diff --git a/packages/sdk/server-ai/src/api/metrics/VercelAISDKTokenUsage.ts b/packages/sdk/server-ai/src/api/metrics/VercelAISDKTokenUsage.ts
@@ -2,12 +2,14 @@ import { LDTokenUsage } from './LDTokenUsage';
 
 export function createVercelAISDKTokenUsage(data: {
   totalTokens?: number;
+  inputTokens?: number;
   promptTokens?: number;
+  outputTokens?: number;
   completionTokens?: number;
 }): LDTokenUsage {
   return {
     total: data.totalTokens ?? 0,
-    input: data.promptTokens ?? 0,
-    output: data.completionTokens ?? 0,
+    input: data.inputTokens ?? data.promptTokens ?? 0,
+    output: data.outputTokens ?? data.completionTokens ?? 0,
   };
 }
diff --git a/packages/sdk/vercel/CHANGELOG.md b/packages/sdk/vercel/CHANGELOG.md
@@ -20,6 +20,13 @@ All notable changes to the LaunchDarkly SDK for Vercel Edge Config will be docum
   * dependencies
     * @launchdarkly/js-server-sdk-common-edge bumped from 2.2.1 to 2.2.2
 
+## [1.3.34](https://github.com/launchdarkly/js-core/compare/vercel-server-sdk-v1.3.33...vercel-server-sdk-v1.3.34) (2025-09-10)
+
+
+### Bug Fixes
+
+* improving payload processing overhead when payload does not change ([#918](https://github.com/launchdarkly/js-core/issues/918)) ([be2ee75](https://github.com/launchdarkly/js-core/commit/be2ee75c1b23d484bddbe1bc4f6662872fb1d3fb))
+
 ## [1.3.33](https://github.com/launchdarkly/js-core/compare/vercel-server-sdk-v1.3.32...vercel-server-sdk-v1.3.33) (2025-08-29)
 
 
diff --git a/packages/sdk/vercel/__tests__/api/EdgeFeatureStore.test.ts b/packages/sdk/vercel/__tests__/api/EdgeFeatureStore.test.ts
@@ -0,0 +1,182 @@
+import { AsyncStoreFacade, LDFeatureStore } from '@launchdarkly/js-server-sdk-common-edge';
+import * as edgeExports from '@launchdarkly/js-server-sdk-common-edge';
+
+import { EdgeFeatureStore } from '../../src/api/EdgeFeatureStore';
+import mockEdgeProvider from '../utils/mockEdgeProvider';
+import * as testData from './testData.json';
+
+describe('EdgeFeatureStore', () => {
+  const sdkKey = 'sdkKey';
+  const kvKey = `LD-Env-${sdkKey}`;
+  const mockLogger = {
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+  };
+  const mockGet = mockEdgeProvider.get as jest.Mock;
+  let featureStore: LDFeatureStore;
+  let asyncFeatureStore: AsyncStoreFacade;
+
+  beforeEach(() => {
+    featureStore = new EdgeFeatureStore(mockEdgeProvider, sdkKey, 'MockEdgeProvider', mockLogger);
+    asyncFeatureStore = new AsyncStoreFacade(featureStore);
+    mockGet.mockImplementation(() => Promise.resolve(testData));
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('get', () => {
+    test('get flag', async () => {
+      const flag = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag1');
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(flag).toMatchObject(testData.flags.testFlag1);
+    });
+
+    test('invalid flag key', async () => {
+      const flag = await asyncFeatureStore.get({ namespace: 'features' }, 'invalid');
+
+      expect(flag).toBeUndefined();
+    });
+
+    test('get segment', async () => {
+      const segment = await asyncFeatureStore.get({ namespace: 'segments' }, 'testSegment1');
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(segment).toMatchObject(testData.segments.testSegment1);
+    });
+
+    test('invalid segment key', async () => {
+      const segment = await asyncFeatureStore.get({ namespace: 'segments' }, 'invalid');
+
+      expect(segment).toBeUndefined();
+    });
+
+    test('invalid kv key', async () => {
+      mockGet.mockImplementation(() => Promise.resolve(null));
+      const flag = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag1');
+
+      expect(flag).toBeNull();
+    });
+
+    test('get multiple flags with same payload', async () => {
+      const reviveSpy = jest.spyOn(edgeExports, 'reviveFullPayload');
+
+      const flag1 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag1');
+      const flag2 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag2');
+      const flag3 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag3');
+
+      expect(mockGet).toHaveBeenCalledTimes(3);
+      expect(reviveSpy).toHaveBeenCalledTimes(1);
+      expect(flag1).toMatchObject(testData.flags.testFlag1);
+      expect(flag2).toMatchObject(testData.flags.testFlag2);
+      expect(flag3).toMatchObject(testData.flags.testFlag3);
+
+      reviveSpy.mockRestore();
+    });
+
+    test('get multiple flags with changing payload', async () => {
+      const changedFlag2 = {
+        ...testData.flags.testFlag2,
+        version: testData.flags.testFlag2.version + 1,
+      };
+      const changedFlag3 = {
+        ...testData.flags.testFlag3,
+        version: testData.flags.testFlag3.version + 1,
+      };
+
+      mockGet.mockImplementationOnce(() => Promise.resolve(testData));
+      mockGet.mockImplementationOnce(() =>
+        // New payload object reference
+        Promise.resolve({
+          ...testData,
+          flags: { ...testData.flags, testFlag2: { ...changedFlag2 } },
+        }),
+      );
+      mockGet.mockImplementationOnce(() =>
+        // New payload object reference
+        Promise.resolve({
+          ...testData,
+          flags: { ...testData.flags, testFlag3: { ...changedFlag3 } },
+        }),
+      );
+      const reviveSpy = jest.spyOn(edgeExports, 'reviveFullPayload');
+
+      const flag1 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag1');
+      const flag2 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag2');
+      const flag3 = await asyncFeatureStore.get({ namespace: 'features' }, 'testFlag3');
+
+      expect(mockGet).toHaveBeenCalledTimes(3);
+      expect(reviveSpy).toHaveBeenCalledTimes(3);
+      expect(flag1).toMatchObject(testData.flags.testFlag1);
+      expect(flag2).toMatchObject(changedFlag2);
+      expect(flag3).toMatchObject(changedFlag3);
+
+      reviveSpy.mockRestore();
+    });
+  });
+
+  describe('all', () => {
+    test('all flags', async () => {
+      const flags = await asyncFeatureStore.all({ namespace: 'features' });
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(flags).toMatchObject(testData.flags);
+    });
+
+    test('all segments', async () => {
+      const segment = await asyncFeatureStore.all({ namespace: 'segments' });
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(segment).toMatchObject(testData.segments);
+    });
+
+    test('invalid DataKind', async () => {
+      const flag = await asyncFeatureStore.all({ namespace: 'InvalidDataKind' });
+
+      expect(flag).toEqual({});
+    });
+
+    test('invalid kv key', async () => {
+      mockGet.mockImplementation(() => Promise.resolve(null));
+      const segment = await asyncFeatureStore.all({ namespace: 'segments' });
+
+      expect(segment).toEqual({});
+    });
+  });
+
+  describe('initialized', () => {
+    test('is initialized', async () => {
+      const isInitialized = await asyncFeatureStore.initialized();
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(isInitialized).toBeTruthy();
+    });
+
+    test('not initialized', async () => {
+      mockGet.mockImplementation(() => Promise.resolve(null));
+      const isInitialized = await asyncFeatureStore.initialized();
+
+      expect(mockGet).toHaveBeenCalledWith(kvKey);
+      expect(isInitialized).toBeFalsy();
+    });
+  });
+
+  describe('init & getDescription', () => {
+    test('init', (done) => {
+      const cb = jest.fn(() => {
+        done();
+      });
+      featureStore.init(testData, cb);
+    });
+
+    test('getDescription', async () => {
+      const description = featureStore.getDescription?.();
+
+      expect(description).toEqual('MockEdgeProvider');
+    });
+  });
+});
diff --git a/packages/sdk/vercel/__tests__/api/testData.json b/packages/sdk/vercel/__tests__/api/testData.json
diff --git a/packages/sdk/vercel/__tests__/utils/mockEdgeProvider.ts b/packages/sdk/vercel/__tests__/utils/mockEdgeProvider.ts
diff --git a/packages/sdk/vercel/package.json b/packages/sdk/vercel/package.json
diff --git a/packages/sdk/vercel/src/api/EdgeFeatureStore.ts b/packages/sdk/vercel/src/api/EdgeFeatureStore.ts
diff --git a/packages/sdk/vercel/src/api/index.ts b/packages/sdk/vercel/src/api/index.ts
diff --git a/packages/sdk/vercel/src/index.ts b/packages/sdk/vercel/src/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@launchdarkly/server-sdk-ai",`
`3`		`- "version": "0.11.3",`
	`3`	`+ "version": "0.11.4",`
`4`	`4`	`"description": "LaunchDarkly AI SDK for Server-Side JavaScript",`
`5`	`5`	`"homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/sdk/server-ai",`
`6`	`6`	`"repository": {`