@app-connect/core 1.7.25 → 1.7.27

package/jest.config.js

@@ -1,57 +1,57 @@
-const path = require('path');
-
-module.exports = {
-  // Test environment
-  testEnvironment: 'node',
-  
-  // Test file patterns
-  testMatch: [
-    '<rootDir>/test/**/*.test.js',
-    '<rootDir>/**/*.test.js'
-  ],
-  
-  // Setup files
-  setupFilesAfterEnv: [
-    '<rootDir>/test/setup.js'
-  ],
-  
-  // Coverage configuration
-  collectCoverage: true,
-  coverageDirectory: '<rootDir>/coverage',
-  coverageReporters: ['text', 'lcov', 'html'],
-  coveragePathIgnorePatterns: [
-    '/node_modules/',
-    '/test/',
-    '/coverage/',
-    'jest.config.js',
-    'setup.js'
-  ],
-  
-  // Module resolution
-  moduleDirectories: ['node_modules', '<rootDir>'],
-  moduleNameMapper: {
-    '^@app-connect/core/(.*)$': '<rootDir>/$1'
-  },
-  
-  // Test timeout
-  testTimeout: 30000,
-  
-  // Reporters
-  reporters: ['default'],
-  
-  // Ignore patterns
-  modulePathIgnorePatterns: [
-    '<rootDir>/node_modules/',
-    '<rootDir>/coverage/',
-    '<rootDir>/test-results/'
-  ],
-  
-  // Clear mocks between tests
-  clearMocks: true,
-  
-  // Restore mocks between tests
-  restoreMocks: true,
-  
-  // Verbose output
-  verbose: true
+const path = require('path');
+
+module.exports = {
+  // Test environment
+  testEnvironment: 'node',
+  
+  // Test file patterns
+  testMatch: [
+    '<rootDir>/test/**/*.test.js',
+    '<rootDir>/**/*.test.js'
+  ],
+  
+  // Setup files
+  setupFilesAfterEnv: [
+    '<rootDir>/test/setup.js'
+  ],
+  
+  // Coverage configuration
+  collectCoverage: true,
+  coverageDirectory: '<rootDir>/coverage',
+  coverageReporters: ['text', 'lcov', 'html'],
+  coveragePathIgnorePatterns: [
+    '/node_modules/',
+    '/test/',
+    '/coverage/',
+    'jest.config.js',
+    'setup.js'
+  ],
+  
+  // Module resolution
+  moduleDirectories: ['node_modules', '<rootDir>'],
+  moduleNameMapper: {
+    '^@app-connect/core/(.*)$': '<rootDir>/$1'
+  },
+  
+  // Test timeout
+  testTimeout: 30000,
+  
+  // Reporters
+  reporters: ['default'],
+  
+  // Ignore patterns
+  modulePathIgnorePatterns: [
+    '<rootDir>/node_modules/',
+    '<rootDir>/coverage/',
+    '<rootDir>/test-results/'
+  ],
+  
+  // Clear mocks between tests
+  clearMocks: true,
+  
+  // Restore mocks between tests
+  restoreMocks: true,
+  
+  // Verbose output
+  verbose: true
 }; 

package/lib/analytics.js

@@ -1,55 +1,55 @@
-const Mixpanel = require('mixpanel');
-const parser = require('ua-parser-js');
-const logger = require('./logger');
-let packageJson = null;
-try {
-    packageJson = require('../package.json');
-}
-catch (e) {
-    logger.warn('Error loading package.json', { stack: e.stack });
-    packageJson = require('../../package.json');
-}
-const appName = 'App Connect';
-const defaultEventAddedVia = 'server';
-const version = packageJson.version;
-let mixpanel = null;
-
-exports.init = function init() {
-    if (!process.env.MIXPANEL_TOKEN) {
-        return;
-    }
-    mixpanel = Mixpanel.init(process.env.MIXPANEL_TOKEN);
-}
-
-exports.track = function track({ eventName, interfaceName, connectorName, accountId, extensionId, success, requestDuration, userAgent, ip, author, eventAddedVia, extras = null }) {
-    if (!mixpanel || !extensionId) {
-        return;
-    }
-    const inUseEventAddedVia = eventAddedVia || defaultEventAddedVia;
-    mixpanel.people.set_once(extensionId, {
-        version,
-        appName,
-        crmPlatform: connectorName
-    });
-    const ua = parser(userAgent);
-    mixpanel.track(eventName, {
-        distinct_id: extensionId,
-        interfaceName,
-        adapterName: connectorName,
-        rcAccountId: accountId,
-        extensionId,
-        success,
-        requestDuration,
-        collectedFrom: 'server',
-        version,
-        appName,
-        eventAddedVia: inUseEventAddedVia,
-        $browser: ua.browser.name,
-        $os: ua.os.name,
-        $device: ua.device.type,
-        ip,
-        author,
-        ...extras
-    });
-    logger.info(`Event: ${eventName}`);
+const Mixpanel = require('mixpanel');
+const parser = require('ua-parser-js');
+const logger = require('./logger');
+let packageJson = null;
+try {
+    packageJson = require('../package.json');
+}
+catch (e) {
+    logger.warn('Error loading package.json', { stack: e.stack });
+    packageJson = require('../../package.json');
+}
+const appName = 'App Connect';
+const defaultEventAddedVia = 'server';
+const version = packageJson.version;
+let mixpanel = null;
+
+exports.init = function init() {
+    if (!process.env.MIXPANEL_TOKEN) {
+        return;
+    }
+    mixpanel = Mixpanel.init(process.env.MIXPANEL_TOKEN);
+}
+
+exports.track = function track({ eventName, interfaceName, connectorName, accountId, extensionId, success, requestDuration, userAgent, ip, author, eventAddedVia, extras = null }) {
+    if (!mixpanel || !extensionId) {
+        return;
+    }
+    const inUseEventAddedVia = eventAddedVia || defaultEventAddedVia;
+    mixpanel.people.set_once(extensionId, {
+        version,
+        appName,
+        crmPlatform: connectorName
+    });
+    const ua = parser(userAgent);
+    mixpanel.track(eventName, {
+        distinct_id: extensionId,
+        interfaceName,
+        adapterName: connectorName,
+        rcAccountId: accountId,
+        extensionId,
+        success,
+        requestDuration,
+        collectedFrom: 'server',
+        version,
+        appName,
+        eventAddedVia: inUseEventAddedVia,
+        $browser: ua.browser.name,
+        $os: ua.os.name,
+        $device: ua.device.type,
+        ip,
+        author,
+        ...extras
+    });
+    logger.info(`Event: ${eventName}`);
 }

package/lib/authSession.js

@@ -1,109 +1,109 @@
-/**
- * Auth Session Helper
- * 
- * Helper functions for managing OAuth auth sessions using CacheModel
- */
-
-const { CacheModel } = require('../models/cacheModel');
-
-const AUTH_SESSION_PREFIX = 'auth-session';
-const PENDING_SESSION_EXPIRY_MINUTES = 5;
-const SETTLED_SESSION_EXPIRY_MINUTES = 15;
-
-function getSessionRecordId(sessionId) {
-    return `${AUTH_SESSION_PREFIX}-${sessionId}`;
-}
-
-function getExpiry(minutes) {
-    return new Date(Date.now() + minutes * 60 * 1000);
-}
-
-function isExpired(record) {
-    return Boolean(record?.expiry && record.expiry <= new Date());
-}
-
-/**
- * Create (or reset) an auth session.
- * If a record already exists for the sessionId (e.g., user retries auth within
- * the same ChatGPT conversation), it is reset to 'pending' so polling works
- * correctly for the new attempt.
- */
-async function createAuthSession(sessionId, data) {
-    const id = getSessionRecordId(sessionId);
-    const expiry = getExpiry(PENDING_SESSION_EXPIRY_MINUTES);
-    const sessionData = {
-        platform: data.platform,
-        hostname: data.hostname || '',
-        createdAt: new Date().toISOString(),
-    };
-
-    const existing = await CacheModel.findByPk(id);
-    if (existing) {
-        await existing.update({ status: 'pending', data: sessionData, expiry });
-    } else {
-        await CacheModel.create({
-            id,
-            cacheKey: AUTH_SESSION_PREFIX,
-            userId: sessionId,
-            status: 'pending',
-            data: sessionData,
-            expiry,
-        });
-    }
-}
-
-/**
- * Get an auth session by ID
- */
-async function getAuthSession(sessionId) {
-    const record = await CacheModel.findByPk(getSessionRecordId(sessionId));
-
-    if (!record) return null;
-
-    if (isExpired(record)) {
-        if (record.status !== 'expired') {
-            await record.update({ status: 'expired' });
-        }
-        return {
-            sessionId: record.userId,
-            status: 'expired',
-            ...record.data
-        };
-    }
-
-    return {
-        sessionId: record.userId,
-        status: record.status,
-        ...record.data
-    };
-}
-
-/**
- * Update an auth session
- */
-async function updateAuthSession(sessionId, data) {
-    const record = await CacheModel.findByPk(getSessionRecordId(sessionId));
-
-    if (!record) return;
-
-    const existingData = record.data || {};
-    const nextStatus = data.status || record.status;
-    await record.update({
-        status: nextStatus,
-        data: {
-            ...existingData,
-            ...data,
-            updatedAt: new Date().toISOString()
-        },
-        expiry: nextStatus === 'pending'
-            ? getExpiry(PENDING_SESSION_EXPIRY_MINUTES)
-            : getExpiry(SETTLED_SESSION_EXPIRY_MINUTES)
-    });
-}
-
-module.exports = {
-    createAuthSession,
-    getAuthSession,
-    updateAuthSession
-};
-
+/**
+ * Auth Session Helper
+ * 
+ * Helper functions for managing OAuth auth sessions using CacheModel
+ */
+
+const { CacheModel } = require('../models/cacheModel');
+
+const AUTH_SESSION_PREFIX = 'auth-session';
+const PENDING_SESSION_EXPIRY_MINUTES = 5;
+const SETTLED_SESSION_EXPIRY_MINUTES = 15;
+
+function getSessionRecordId(sessionId) {
+    return `${AUTH_SESSION_PREFIX}-${sessionId}`;
+}
+
+function getExpiry(minutes) {
+    return new Date(Date.now() + minutes * 60 * 1000);
+}
+
+function isExpired(record) {
+    return Boolean(record?.expiry && record.expiry <= new Date());
+}
+
+/**
+ * Create (or reset) an auth session.
+ * If a record already exists for the sessionId (e.g., user retries auth within
+ * the same ChatGPT conversation), it is reset to 'pending' so polling works
+ * correctly for the new attempt.
+ */
+async function createAuthSession(sessionId, data) {
+    const id = getSessionRecordId(sessionId);
+    const expiry = getExpiry(PENDING_SESSION_EXPIRY_MINUTES);
+    const sessionData = {
+        platform: data.platform,
+        hostname: data.hostname || '',
+        createdAt: new Date().toISOString(),
+    };
+
+    const existing = await CacheModel.findByPk(id);
+    if (existing) {
+        await existing.update({ status: 'pending', data: sessionData, expiry });
+    } else {
+        await CacheModel.create({
+            id,
+            cacheKey: AUTH_SESSION_PREFIX,
+            userId: sessionId,
+            status: 'pending',
+            data: sessionData,
+            expiry,
+        });
+    }
+}
+
+/**
+ * Get an auth session by ID
+ */
+async function getAuthSession(sessionId) {
+    const record = await CacheModel.findByPk(getSessionRecordId(sessionId));
+
+    if (!record) return null;
+
+    if (isExpired(record)) {
+        if (record.status !== 'expired') {
+            await record.update({ status: 'expired' });
+        }
+        return {
+            sessionId: record.userId,
+            status: 'expired',
+            ...record.data
+        };
+    }
+
+    return {
+        sessionId: record.userId,
+        status: record.status,
+        ...record.data
+    };
+}
+
+/**
+ * Update an auth session
+ */
+async function updateAuthSession(sessionId, data) {
+    const record = await CacheModel.findByPk(getSessionRecordId(sessionId));
+
+    if (!record) return;
+
+    const existingData = record.data || {};
+    const nextStatus = data.status || record.status;
+    await record.update({
+        status: nextStatus,
+        data: {
+            ...existingData,
+            ...data,
+            updatedAt: new Date().toISOString()
+        },
+        expiry: nextStatus === 'pending'
+            ? getExpiry(PENDING_SESSION_EXPIRY_MINUTES)
+            : getExpiry(SETTLED_SESSION_EXPIRY_MINUTES)
+    });
+}
+
+module.exports = {
+    createAuthSession,
+    getAuthSession,
+    updateAuthSession
+};
+

package/lib/cacheCleanup.js

@@ -0,0 +1,21 @@
+const { Op } = require('sequelize');
+const { CacheModel } = require('../models/cacheModel');
+const logger = require('./logger');
+
+async function clearExpiredCache({ now = new Date() } = {}) {
+    const deletedCount = await CacheModel.destroy({
+        where: {
+            expiry: {
+                [Op.lte]: now
+            }
+        }
+    });
+
+    logger.info('Expired cache cleanup completed', { deletedCount });
+
+    return deletedCount;
+}
+
+module.exports = {
+    clearExpiredCache
+};