@memberjunction/server 5.25.0 → 5.27.0

package/src/index.ts

@@ -128,6 +128,7 @@ export * from './resolvers/TelemetryResolver.js';
 export * from './resolvers/APIKeyResolver.js';
 export * from './resolvers/MCPResolver.js';
 export * from './resolvers/ActionResolver.js';
+export * from './resolvers/CacheStatsResolver.js';
 export * from './resolvers/EntityCommunicationsResolver.js';
 export * from './resolvers/EntityResolver.js';
 export * from './resolvers/ISAEntityResolver.js';
@@ -451,8 +452,21 @@ export const serve = async (resolverPaths: Array<string>, app: Application = cre
   }
   // Ensure LocalCacheManager is initialized (no-op if already done during engine loading)
   if (!LocalCacheManager.Instance.IsInitialized) {
-    await LocalCacheManager.Instance.Initialize(Metadata.Provider.LocalStorageProvider);
-    console.log('LocalCacheManager initialized');
+    // Build cache config from mj.config.cjs cacheSettings
+    const cs = configInfo.cacheSettings;
+    const cacheConfig = {
+      maxSizeBytes: (cs.maxMemoryMB ?? 150) * 1024 * 1024,
+      maxPercentOfCachePerEntity: cs.maxPercentOfCachePerEntity ?? 50,
+      defaultTTLMs: (cs.defaultTTLSeconds ?? 0) * 1000,
+      evictionSweepIntervalMs: (cs.evictionSweepIntervalSeconds ?? 300) * 1000,
+      verboseLogging: cs.verboseLogging ?? false,
+    };
+    await LocalCacheManager.Instance.Initialize(Metadata.Provider.LocalStorageProvider, cacheConfig);
+    console.log('LocalCacheManager initialized with cache config:', JSON.stringify({
+      maxMemoryMB: cs.maxMemoryMB ?? 150,
+      maxPercentOfCachePerEntity: cs.maxPercentOfCachePerEntity ?? 50,
+      evictionSweepIntervalSeconds: cs.evictionSweepIntervalSeconds ?? 300,
+    }));
   }
 
   // Initialize APIKeyEngine singleton — reads apiKeyGeneration from mj.config.cjs automatically

package/src/resolvers/CacheStatsResolver.ts

@@ -0,0 +1,142 @@
+import { Field, Float, Int, ObjectType, Query, Resolver } from 'type-graphql';
+import { LocalCacheManager, CacheStats, CacheEntryType } from '@memberjunction/core';
+import { RequireSystemUser } from '../directives/index.js';
+
+// ============================================================================
+// GraphQL Object Types
+// ============================================================================
+
+@ObjectType()
+class CacheStatsByTypeGQL {
+    @Field(() => String)
+    Type: CacheEntryType;
+
+    @Field(() => Int)
+    Count: number;
+
+    @Field(() => Int)
+    SizeBytes: number;
+}
+
+@ObjectType()
+class CacheStatsGQL {
+    @Field(() => Int)
+    TotalEntries: number;
+
+    @Field(() => Int)
+    TotalSizeBytes: number;
+
+    @Field(() => [CacheStatsByTypeGQL])
+    ByType: CacheStatsByTypeGQL[];
+
+    @Field(() => Float)
+    OldestEntry: number;
+
+    @Field(() => Float)
+    NewestEntry: number;
+
+    @Field(() => Int)
+    Hits: number;
+
+    @Field(() => Int)
+    Misses: number;
+
+    @Field(() => Float)
+    HitRate: number;
+}
+
+@ObjectType()
+class CacheEntityBreakdownGQL {
+    @Field(() => String)
+    EntityName: string;
+
+    @Field(() => Int)
+    EntryCount: number;
+
+    @Field(() => Int)
+    TotalSizeBytes: number;
+
+    @Field(() => Int)
+    TotalAccessCount: number;
+}
+
+@ObjectType()
+class CacheStatsDetailGQL extends CacheStatsGQL {
+    @Field(() => [CacheEntityBreakdownGQL])
+    EntityBreakdown: CacheEntityBreakdownGQL[];
+}
+
+// ============================================================================
+// Helpers (pure core)
+// ============================================================================
+
+function toGQL(stats: CacheStats): CacheStatsGQL {
+    const gql = new CacheStatsGQL();
+    gql.TotalEntries = stats.totalEntries;
+    gql.TotalSizeBytes = stats.totalSizeBytes;
+    gql.ByType = (['dataset', 'runview', 'runquery'] as const).map(t => {
+        const bt = stats.byType[t];
+        const entry = new CacheStatsByTypeGQL();
+        entry.Type = t;
+        entry.Count = bt.count;
+        entry.SizeBytes = bt.sizeBytes;
+        return entry;
+    });
+    gql.OldestEntry = stats.oldestEntry;
+    gql.NewestEntry = stats.newestEntry;
+    gql.Hits = stats.hits;
+    gql.Misses = stats.misses;
+    gql.HitRate = (stats.hits + stats.misses) > 0
+        ? (stats.hits / (stats.hits + stats.misses)) * 100
+        : 0;
+    return gql;
+}
+
+function buildEntityBreakdown(): CacheEntityBreakdownGQL[] {
+    const entries = LocalCacheManager.Instance.GetAllEntries();
+    const entityMap = new Map<string, { count: number; sizeBytes: number; accessCount: number }>();
+
+    for (const entry of entries) {
+        if (entry.type !== 'runview' || !entry.name) continue;
+        const existing = entityMap.get(entry.name) ?? { count: 0, sizeBytes: 0, accessCount: 0 };
+        existing.count++;
+        existing.sizeBytes += entry.sizeBytes;
+        existing.accessCount += entry.accessCount;
+        entityMap.set(entry.name, existing);
+    }
+
+    return [...entityMap.entries()]
+        .map(([name, data]) => {
+            const gql = new CacheEntityBreakdownGQL();
+            gql.EntityName = name;
+            gql.EntryCount = data.count;
+            gql.TotalSizeBytes = data.sizeBytes;
+            gql.TotalAccessCount = data.accessCount;
+            return gql;
+        })
+        .sort((a, b) => b.EntryCount - a.EntryCount);
+}
+
+// ============================================================================
+// Resolver
+// ============================================================================
+
+@Resolver()
+export class CacheStatsResolver {
+    @RequireSystemUser()
+    @Query(() => CacheStatsGQL)
+    CacheStats(): CacheStatsGQL {
+        const stats = LocalCacheManager.Instance.GetStats();
+        return toGQL(stats);
+    }
+
+    @RequireSystemUser()
+    @Query(() => CacheStatsDetailGQL)
+    CacheStatsDetail(): CacheStatsDetailGQL {
+        const stats = LocalCacheManager.Instance.GetStats();
+        const result = new CacheStatsDetailGQL();
+        Object.assign(result, toGQL(stats));
+        result.EntityBreakdown = buildEntityBreakdown();
+        return result;
+    }
+}

package/src/resolvers/ReportResolver.ts

@@ -2,7 +2,6 @@ import { EntitySaveOptions, IRunReportProvider, Metadata, RunReport } from '@mem
 import { Arg, Ctx, Field, Int, Mutation, ObjectType, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { MJConversationDetailEntity, MJReportEntity } from '@memberjunction/core-entities';
-import { SkipAPIAnalysisCompleteResponse } from '@memberjunction/skip-types';
 import { DataContext } from '@memberjunction/data-context';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { z } from 'zod';
@@ -104,7 +103,7 @@ export class ReportResolverExtended extends ResolverBase {
       const request = new mssql.Request(dataSource);
       const result = await request.query(sql);
       if (!result || !result.recordset || result.recordset.length === 0) throw new Error('Unable to retrieve converation details');
-      const skipData = <SkipAPIAnalysisCompleteResponse>JSON.parse(result.recordset[0].Message);
+      const skipData: { title?: string; reportTitle?: string; userExplanation?: string; messages?: unknown[] } = JSON.parse(result.recordset[0].Message);
 
       const report = await md.GetEntityObject<MJReportEntity>('MJ: Reports', u);
       report.NewRecord();

package/src/__tests__/skip-sdk-organic-keys.test.ts

@@ -1,274 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-/**
- * Tests for the organic-key packing logic in SkipSDK.
- *
- * The packing helpers (`packSingleSkipOrganicKey`, `packSingleSkipOrganicKeyRelatedEntity`,
- * and the organic-key block inside `packSingleSkipEntityInfo`) are private methods on the
- * SkipSDK class and the SDK module pulls in a large dependency graph (mssql, http, MJ
- * config, AI engine, rxjs). To keep these as focused unit tests we mock every transitive
- * dependency aggressively and reach the private methods via bracket notation.
- */
-
-// ---- Mutable state shared with the @memberjunction/core mock ----------------
-
-const mockMetadataEntities: Array<{ ID: string; Name: string; SchemaName: string; BaseView: string }> = [];
-
-// ---- Module mocks (must be defined before importing skip-sdk) ---------------
-
-vi.mock('@memberjunction/core', () => ({
-  LogStatus: vi.fn(),
-  LogError: vi.fn(),
-  Metadata: class {
-    static get Provider() {
-      return { Entities: mockMetadataEntities };
-    }
-  },
-  RunQuery: class {},
-  EntityInfo: class {},
-  EntityFieldInfo: class {},
-  EntityRelationshipInfo: class {},
-  EntityOrganicKeyInfo: class {},
-  EntityOrganicKeyRelatedEntityInfo: class {},
-  UserInfo: class {},
-}));
-
-vi.mock('@memberjunction/global', () => ({
-  CopyScalarsAndArrays: (o: unknown) => o,
-  // The packing helpers compare entity IDs with UUIDsEqual; for the test we
-  // can use simple string equality.
-  UUIDsEqual: (a: string, b: string) => a === b,
-}));
-
-vi.mock('@memberjunction/ai', () => ({
-  GetAIAPIKey: vi.fn(() => 'test-key'),
-}));
-
-vi.mock('@memberjunction/aiengine', () => ({
-  AIEngine: { Instance: { Config: () => Promise.resolve() } },
-}));
-
-vi.mock('@memberjunction/data-context', () => ({
-  DataContext: class {},
-}));
-
-vi.mock('mssql', () => ({
-  default: {},
-  ConnectionPool: class {},
-}));
-
-vi.mock('http', () => ({ request: vi.fn() }));
-vi.mock('https', () => ({ request: vi.fn() }));
-vi.mock('zlib', () => ({ gzip: vi.fn(), createGunzip: vi.fn() }));
-
-vi.mock('rxjs', () => ({
-  BehaviorSubject: class {
-    private value: unknown;
-    constructor(initial: unknown) { this.value = initial; }
-    next(v: unknown) { this.value = v; }
-    pipe() { return this; }
-  },
-}));
-vi.mock('rxjs/operators', () => ({ take: vi.fn() }));
-
-// Skip SDK pulls server config and a couple of resolver internals; stub all of them.
-vi.mock('../config.js', () => ({
-  configInfo: { askSkip: { chatURL: '', apiKey: '', orgID: '', organizationInfo: '' } },
-  baseUrl: '',
-  publicUrl: '',
-  graphqlPort: 4000,
-  graphqlRootPath: '/graphql',
-  apiKey: '',
-}));
-
-vi.mock('../index.js', () => ({
-  getDbType: vi.fn(() => 'mssql'),
-}));
-
-vi.mock('../resolvers/GetDataResolver.js', () => ({
-  registerAccessToken: vi.fn(),
-  GetDataAccessToken: vi.fn(),
-}));
-
-// ---- Imports under test (must come AFTER vi.mock calls) ---------------------
-
-import { SkipSDK } from '../agents/skip-sdk';
-import type { SkipEntityOrganicKeyInfo } from '@memberjunction/skip-types';
-
-// ---- Helpers to fabricate runtime-shaped MJ organic key objects -------------
-
-function makeOrganicKey(overrides: Record<string, unknown> = {}) {
-  const base = {
-    ID: 'ok-1',
-    EntityID: 'ent-source',
-    Name: 'EmailMatch',
-    Description: 'Match members across systems by email address',
-    MatchFieldNames: 'EmailAddress',
-    NormalizationStrategy: 'LowerCaseTrim' as const,
-    CustomNormalizationExpression: null,
-    Sequence: 0,
-    Status: 'Active' as const,
-    RelatedEntities: [] as unknown[],
-  };
-  const merged = { ...base, ...overrides };
-  Object.defineProperty(merged, 'MatchFieldNamesArray', {
-    get() {
-      return this.MatchFieldNames ? this.MatchFieldNames.split(',').map((f: string) => f.trim()) : [];
-    },
-  });
-  return merged;
-}
-
-function makeOrganicKeyRelatedEntity(overrides: Record<string, unknown> = {}) {
-  const base = {
-    ID: 'okre-1',
-    EntityOrganicKeyID: 'ok-1',
-    RelatedEntityID: 'ent-target',
-    RelatedEntityFieldNames: null as string | null,
-    TransitiveObjectName: null as string | null,
-    TransitiveObjectMatchFieldNames: null as string | null,
-    TransitiveObjectOutputFieldName: null as string | null,
-    RelatedEntityJoinFieldName: null as string | null,
-    DisplayName: null as string | null,
-    Sequence: 0,
-  };
-  const merged = { ...base, ...overrides };
-  Object.defineProperty(merged, 'IsDirectMatch', {
-    get() { return this.RelatedEntityFieldNames != null; },
-  });
-  Object.defineProperty(merged, 'IsTransitiveMatch', {
-    get() { return this.TransitiveObjectName != null; },
-  });
-  Object.defineProperty(merged, 'RelatedEntityFieldNamesArray', {
-    get() {
-      return this.RelatedEntityFieldNames ? this.RelatedEntityFieldNames.split(',').map((f: string) => f.trim()) : [];
-    },
-  });
-  Object.defineProperty(merged, 'TransitiveObjectMatchFieldNamesArray', {
-    get() {
-      return this.TransitiveObjectMatchFieldNames ? this.TransitiveObjectMatchFieldNames.split(',').map((f: string) => f.trim()) : [];
-    },
-  });
-  return merged;
-}
-
-// Bracket-notation accessors so the tests can reach private methods without
-// adopting a // @ts-expect-error per call site.
-type SkipSDKPrivate = SkipSDK & {
-  packSingleSkipOrganicKey: (ok: unknown) => SkipEntityOrganicKeyInfo | null;
-  packSingleSkipOrganicKeyRelatedEntity: (re: unknown) => unknown | null;
-};
-
-describe('SkipSDK organic key packing', () => {
-  let sdk: SkipSDKPrivate;
-
-  beforeEach(() => {
-    mockMetadataEntities.length = 0;
-    sdk = new SkipSDK() as SkipSDKPrivate;
-  });
-
-  describe('packSingleSkipOrganicKeyRelatedEntity', () => {
-    it('should pack a direct-match related entity using metadata for schema/baseView', () => {
-      mockMetadataEntities.push({ ID: 'ent-target', Name: 'Members', SchemaName: 'ym', BaseView: 'vwMembers' });
-      const re = makeOrganicKeyRelatedEntity({
-        ID: 'okre-direct',
-        RelatedEntityID: 'ent-target',
-        RelatedEntityFieldNames: 'EmailAddress',
-        DisplayName: 'Members by Email',
-        Sequence: 1,
-      });
-
-      const result = sdk['packSingleSkipOrganicKeyRelatedEntity'](re) as Record<string, unknown> | null;
-      expect(result).not.toBeNull();
-      expect(result!.id).toBe('okre-direct');
-      expect(result!.relatedEntityName).toBe('Members');
-      expect(result!.relatedEntitySchemaName).toBe('ym');
-      expect(result!.relatedEntityBaseView).toBe('vwMembers');
-      expect(result!.isDirectMatch).toBe(true);
-      expect(result!.isTransitiveMatch).toBe(false);
-      expect(result!.relatedEntityFieldNames).toEqual(['EmailAddress']);
-      expect(result!.transitiveObjectName).toBeUndefined();
-    });
-
-    it('should pack a transitive-match related entity through a bridge view', () => {
-      mockMetadataEntities.push({ ID: 'ent-target', Name: 'Members', SchemaName: 'ym', BaseView: 'vwMembers' });
-      const re = makeOrganicKeyRelatedEntity({
-        RelatedEntityID: 'ent-target',
-        TransitiveObjectName: 'ym.vwAcronymToMember',
-        TransitiveObjectMatchFieldNames: 'Acronym',
-        TransitiveObjectOutputFieldName: 'MemberID',
-        RelatedEntityJoinFieldName: 'ID',
-      });
-
-      const result = sdk['packSingleSkipOrganicKeyRelatedEntity'](re) as Record<string, unknown> | null;
-      expect(result).not.toBeNull();
-      expect(result!.isDirectMatch).toBe(false);
-      expect(result!.isTransitiveMatch).toBe(true);
-      expect(result!.relatedEntityFieldNames).toBeUndefined();
-      expect(result!.transitiveObjectName).toBe('ym.vwAcronymToMember');
-      expect(result!.transitiveObjectMatchFieldNames).toEqual(['Acronym']);
-      expect(result!.transitiveObjectOutputFieldName).toBe('MemberID');
-      expect(result!.relatedEntityJoinFieldName).toBe('ID');
-    });
-
-    it('should return null when the related entity is not in metadata', () => {
-      // mockMetadataEntities is empty
-      const re = makeOrganicKeyRelatedEntity({
-        RelatedEntityID: 'ent-missing',
-        RelatedEntityFieldNames: 'EmailAddress',
-      });
-
-      const result = sdk['packSingleSkipOrganicKeyRelatedEntity'](re);
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('packSingleSkipOrganicKey', () => {
-    beforeEach(() => {
-      mockMetadataEntities.push({ ID: 'ent-target', Name: 'Members', SchemaName: 'ym', BaseView: 'vwMembers' });
-    });
-
-    it('should pack a basic organic key with parsed match field names', () => {
-      const ok = makeOrganicKey({
-        ID: 'ok-acronym',
-        Name: 'AcronymMatch',
-        MatchFieldNames: 'MemberOrganization',
-        Sequence: 5,
-        RelatedEntities: [makeOrganicKeyRelatedEntity({ RelatedEntityID: 'ent-target', RelatedEntityFieldNames: 'EmailAddress' })],
-      });
-
-      const result = sdk['packSingleSkipOrganicKey'](ok);
-      expect(result).not.toBeNull();
-      expect(result!.id).toBe('ok-acronym');
-      expect(result!.name).toBe('AcronymMatch');
-      expect(result!.matchFieldNames).toEqual(['MemberOrganization']);
-      expect(result!.normalizationStrategy).toBe('LowerCaseTrim');
-      expect(result!.sequence).toBe(5);
-      expect(result!.relatedEntities).toHaveLength(1);
-    });
-
-    it('should preserve a custom normalization expression', () => {
-      const ok = makeOrganicKey({
-        NormalizationStrategy: 'Custom',
-        CustomNormalizationExpression: 'REPLACE(LOWER({{FieldName}}), \' \', \'\')',
-      });
-
-      const result = sdk['packSingleSkipOrganicKey'](ok);
-      expect(result!.normalizationStrategy).toBe('Custom');
-      expect(result!.customNormalizationExpression).toBe('REPLACE(LOWER({{FieldName}}), \' \', \'\')');
-    });
-
-    it('should drop related entities that cannot be resolved against metadata', () => {
-      const ok = makeOrganicKey({
-        RelatedEntities: [
-          makeOrganicKeyRelatedEntity({ ID: 're-good', RelatedEntityID: 'ent-target', RelatedEntityFieldNames: 'EmailAddress' }),
-          makeOrganicKeyRelatedEntity({ ID: 're-bad', RelatedEntityID: 'ent-missing', RelatedEntityFieldNames: 'EmailAddress' }),
-        ],
-      });
-
-      const result = sdk['packSingleSkipOrganicKey'](ok);
-      expect(result!.relatedEntities).toHaveLength(1);
-      expect(result!.relatedEntities[0].id).toBe('re-good');
-    });
-  });
-});