@samanhappy/mcphub 1.1.15 → 1.2.0

package/dist/services/metricsService.js

@@ -2,6 +2,10 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { Counter, Gauge, Histogram, Registry } from 'prom-client';
 export const metricsEnabled = () => process.env.ENABLE_METRICS === 'true';
 export const metricsRegistry = new Registry();
+export const configurationVersionGauge = new Gauge({
+    name: 'mcphub_configuration_version', help: 'Desired and applied shared configuration revision.',
+    labelNames: ['state'], registers: [metricsRegistry],
+});
 const calls = new Counter({
     name: 'mcphub_tool_calls_total',
     help: 'Completed client tool calls, including failures before upstream execution.',

package/dist/services/metricsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsService.js","sourceRoot":"","sources":["../../src/services/metricsService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAY,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,CAAC;AACnF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,QAAQ,EAAE,CAAC;AAC9C,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC;IACxB,IAAI,EAAE,yBAAyB;IAC/B,IAAI,EAAE,4EAA4E;IAClF,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAChC,SAAS,EAAE,CAAC,eAAe,CAAC;CAC7B,CAAC,CAAC;AACH,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC;IAC7B,IAAI,EAAE,mCAAmC;IACzC,IAAI,EAAE,yEAAyE;IAC/E,UAAU,EAAE,CAAC,QAAQ,CAAC;IACtB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC;IACtD,SAAS,EAAE,CAAC,eAAe,CAAC;CAC7B,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC;IACnC,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE,yEAAyE;IAC/E,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,CAAC,eAAe,CAAC;CAC7B,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC;IACpC,IAAI,EAAE,wBAAwB;IAC9B,IAAI,EAAE,+EAA+E;IACrF,SAAS,EAAE,CAAC,eAAe,CAAC;CAC7B,CAAC,CAAC;AACH,MAAM,WAAW,GAAG,IAAI,iBAAiB,EAAsB,CAAC;AAEhE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAQ,EAAE;IACvD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;IACvC,IAAI,OAAO;QAAE,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAK,IAAsB,EAAc,EAAE;IAC7E,IAAI,CAAC,cAAc,EAAE;QAAE,OAAO,IAAI,EAAE,CAAC;IACrC,OAAO,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;YAC5B,MAAM,GAAI,MAAgC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1E,OAAO,MAAM,CAAC;QAChB,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAG,CAAC,MAAM,CAAC;YAC9C,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"metricsService.js","sourceRoot":"","sources":["../../src/services/metricsService.ts"],"names":[],"mappings":"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"}

package/dist/services/oauthClientRegistration.js

@@ -9,6 +9,10 @@
  * Uses the standard openid-client library for OAuth operations.
  */
 import * as client from 'openid-client';
+import { withReplicaLock } from './replicaLock.js';
+import { isReplicaMode } from '../utils/replicaMode.js';
+import { loadServerConfig } from './oauthSettingsStore.js';
+import { expandServerConfig } from './serverConfigEnvironment.js';
 import { getSystemConfigDao, getUserDao } from '../dao/index.js';
 import { resolveInstallBaseUrl } from '../utils/installBaseUrl.js';
 import { resolvePreferredRedirectUris } from '../utils/oauthRedirectUri.js';
@@ -345,6 +349,7 @@ export const exchangeCodeForToken = async (serverName, serverConfig, clientInfo,
         await persistTokens(serverName, {
             accessToken: tokens.access_token,
             refreshToken: tokens.refresh_token ?? undefined,
+            accessTokenExpiresAt: tokens.expires_in === undefined ? null : Date.now() + tokens.expires_in * 1000,
         });
         return {
             accessToken: tokens.access_token,
@@ -360,7 +365,7 @@ export const exchangeCodeForToken = async (serverName, serverConfig, clientInfo,
 /**
  * Refresh access token using refresh token
  */
-export const refreshAccessToken = async (serverName, serverConfig, clientInfo, refreshToken) => {
+const refreshAccessTokenUnlocked = async (serverName, serverConfig, clientInfo, refreshToken) => {
     try {
         logger.log('Refreshing OAuth access token', { serverName });
         // Prepare refresh token parameters
@@ -374,6 +379,7 @@ export const refreshAccessToken = async (serverName, serverConfig, clientInfo, r
         await persistTokens(serverName, {
             accessToken: tokens.access_token,
             refreshToken: tokens.refresh_token ?? undefined,
+            accessTokenExpiresAt: tokens.expires_in === undefined ? null : Date.now() + tokens.expires_in * 1000,
         });
         return {
             accessToken: tokens.access_token,
@@ -386,6 +392,20 @@ export const refreshAccessToken = async (serverName, serverConfig, clientInfo, r
         throw error;
     }
 };
+export const refreshAccessToken = (serverName, serverConfig, clientInfo, refreshToken) => withReplicaLock(JSON.stringify(['oauth', serverName, 'shared']), async () => {
+    if (isReplicaMode()) {
+        const latest = await loadServerConfig(serverName);
+        if (!latest)
+            throw new Error('Server no longer exists');
+        const oauth = (await expandServerConfig(latest)).oauth;
+        if (oauth?.refreshToken !== refreshToken) {
+            if (!oauth?.accessToken)
+                throw new Error('OAuth credentials changed; reconnect');
+            return { accessToken: oauth.accessToken, refreshToken: oauth.refreshToken };
+        }
+    }
+    return refreshAccessTokenUnlocked(serverName, serverConfig, clientInfo, refreshToken);
+});
 /**
  * Generate PKCE code verifier
  */

package/dist/services/oauthClientRegistration.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauthClientRegistration.js","sourceRoot":"","sources":["../../src/services/oauthClientRegistration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauthClientRegistration.js","sourceRoot":"","sources":["../../src/services/oauthClientRegistration.ts"],"names":[],"mappings":"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"}

package/dist/services/oauthServerService.js

@@ -73,7 +73,7 @@ const oauthModel = {
         if (!currentUser)
             throw new OAuth2Server.InvalidGrantError('User no longer exists');
         const sessionVersion = getUserSessionVersion(currentUser);
-        const authCode = saveAuthorizationCode({
+        const authCode = await saveAuthorizationCode({
             redirectUri: code.redirectUri,
             scope: scopeString,
             clientId: client.id,
@@ -99,7 +99,7 @@ const oauthModel = {
      * Get authorization code
      */
     getAuthorizationCode: async (authorizationCode) => {
-        const code = getAuthorizationCode(authorizationCode);
+        const code = await getAuthorizationCode(authorizationCode);
         if (!code || !(await resolveUserSession(code))) {
             return false;
         }
@@ -132,8 +132,7 @@ const oauthModel = {
      * Revoke authorization code
      */
     revokeAuthorizationCode: async (code) => {
-        revokeAuthorizationCode(code.authorizationCode);
-        return true;
+        return await revokeAuthorizationCode(code.authorizationCode);
     },
     /**
      * Save access token and refresh token
@@ -270,11 +269,11 @@ let oauth = null;
 /**
  * Initialize OAuth server
  */
-export const initOAuthServer = async () => {
+export const initOAuthServer = async (configuration) => {
     // Reset to ensure clean state on re-initialization
     oauth = null;
     const systemConfigDao = getSystemConfigDao();
-    const systemConfig = await systemConfigDao.get();
+    const systemConfig = configuration === undefined ? await systemConfigDao.get() : configuration;
     const storedConfig = systemConfig?.oauthServer;
     // Merge stored config with defaults so partial configs still inherit all default values
     const oauthConfig = { ...cloneDefaultOAuthServerConfig(), ...storedConfig };

package/dist/services/oauthServerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauthServerService.js","sourceRoot":"","sources":["../../src/services/oauthServerService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauthServerService.js","sourceRoot":"","sources":["../../src/services/oauthServerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,SAAS,EACT,QAAQ,EACR,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;AAE3C,oCAAoC;AACpC,MAAM,UAAU,GAAyE;IACvF;;;;;;OAMG;IACH,SAAS,EAAE,KAAK,EAAE,QAAgB,EAAE,YAAqB,EAAE,EAAE;QAC3D,IAAI,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAEjD,2EAA2E;QAC3E,uEAAuE;QACvE,0CAA0C;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,GAAG;oBACP,QAAQ,EAAE,UAAU,CAAC,QAAQ;oBAC7B,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,YAAY,EAAE,UAAU,CAAC,YAAY;oBACrC,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,yEAAyE;QACzE,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;gBACrE,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,QAAQ;YACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,EAAE,KAAK,EAC1B,IAAoC,EACpC,MAA2B,EAC3B,IAAuB,EACvB,EAAE;QACF,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,mBAAmB,KAAK,MAAM,EAAE,CAAC;gBAC/D,MAAM,IAAI,YAAY,CAAC,mBAAmB,CACxC,qEAAqE,CACtE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,YAAY,EAAE,WAAW,CAAC;QAC9C,MAAM,QAAQ,GAAG,WAAW,EAAE,yBAAyB,IAAI,GAAG,CAAC;QAE/D,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QAElF,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,YAAY,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;QACpF,MAAM,cAAc,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAC1C;YACE,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc;YACd,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAC9C,EACD,QAAQ,CACT,CAAC;QAEF,OAAO;YACL,iBAAiB,EAAE,QAAQ;YAC3B,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,CAAC;YACjD,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM;YACN,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB;YACD,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAC9C,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,oBAAoB,EAAE,KAAK,EAAE,iBAAyB,EAAE,EAAE;QACxD,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAElE,OAAO;YACL,iBAAiB,EAAE,IAAI,CAAC,IAAI;YAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,QAAQ;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC;YACD,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;SAC9C,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,uBAAuB,EAAE,KAAK,EAAE,IAAoC,EAAE,EAAE;QACtE,OAAO,MAAM,uBAAuB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACH,SAAS,EAAE,KAAK,EACd,KAAyB,EACzB,MAA2B,EAC3B,IAAuB,EACvB,EAAE;QACF,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,YAAY,EAAE,WAAW,CAAC;QAC9C,MAAM,mBAAmB,GAAG,WAAW,EAAE,mBAAmB,IAAI,IAAI,CAAC;QACrE,MAAM,oBAAoB,GAAG,WAAW,EAAE,oBAAoB,IAAI,OAAO,CAAC;QAE1E,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;QAErF,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,YAAY,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,CAAC;QAC9E,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,SAAS,CAChC;YACE,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,EACD,mBAAmB,EACnB,oBAAoB,CACrB,CAAC;QAEF,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE9E,OAAO;YACL,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,oBAAoB,EAAE,UAAU,CAAC,oBAAoB;YACrD,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,qBAAqB,EAAE,UAAU,CAAC,qBAAqB;YACvD,KAAK,EAAE,UAAU;YACjB,MAAM;YACN,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,cAAc,EAAE,KAAK,EAAE,WAAmB,EAAE,EAAE;QAC5C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,OAAO;YACL,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;YAChD,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,QAAQ;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,eAAe,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;QAC9C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;YACpF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,OAAO;YACL,YAAY,EAAE,KAAK,CAAC,YAAa;YACjC,qBAAqB,EAAE,KAAK,CAAC,qBAAsB;YACnD,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,QAAQ;gBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,WAAW,EAAE,KAAK,EAAE,KAAqD,EAAE,EAAE;QAC3E,MAAM,YAAY,GAAG,cAAc,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,WAAW,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,WAAW,EAAE,KAAK,EAAE,KAAyB,EAAE,KAAwB,EAAE,EAAE;QACzE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YAC5C,CAAC,CAAC,KAAK,CAAC,KAAK;YACb,CAAC,CAAE,KAAK,CAAC,KAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEvC,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACH,aAAa,EAAE,KAAK,EAAE,IAAuB,EAAE,MAA2B,EAAE,KAAgB,EAAE,EAAE;QAC9F,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,YAAY,EAAE,WAAW,CAAC;QAC9C,MAAM,aAAa,GAAG,WAAW,EAAE,aAAa,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnE,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;IACtD,CAAC;CACF,CAAC;AAEF,gCAAgC;AAChC,IAAI,KAAK,GAAwB,IAAI,CAAC;AAEtC;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,aAAmC,EAAiB,EAAE;IAC1F,mDAAmD;IACnD,KAAK,GAAG,IAAI,CAAC;IAEb,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;IAC/F,MAAM,YAAY,GAAG,YAAY,EAAE,WAAW,CAAC;IAC/C,wFAAwF;IACxF,MAAM,WAAW,GAAG,EAAE,GAAG,6BAA6B,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAC5E,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,KAAK,IAAI,CAAC;IAEvD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACrD,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,YAAY,CAAC;YACvB,KAAK,EAAE,UAAU;YACjB,mBAAmB,EAAE,WAAW,CAAC,mBAAmB,IAAI,IAAI;YAC5D,oBAAoB,EAAE,WAAW,CAAC,oBAAoB,IAAI,OAAO;YACjE,yBAAyB,EAAE,WAAW,CAAC,yBAAyB,IAAI,GAAG;YACvE,eAAe,EAAE,CAAC,YAAY;YAC9B,8BAA8B,EAAE,KAAK;YACrC,sEAAsE;YACtE,2BAA2B,EAAE,WAAW,CAAC,mBAAmB;gBAC1D,CAAC,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE;gBACnD,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE;SACxD,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;QACxE,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAwB,EAAE;IACtD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAY,EAAE;IAChD,OAAO,KAAK,KAAK,IAAI,CAAC;AACxB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,QAAgB,EAChB,QAAgB,EACmB,EAAE;IACrC,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,cAAc,EAAE,qBAAqB,CAAC,IAAI,CAAC;KAC5C,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAW,EAAE;IAC/C,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACtD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IAChE,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,GAAsB,EAAE,CAAC,UAAU,CAAC;AAEjE;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAmB,EACnB,GAAoB,EACqB,EAAE;IAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEnC,OAAO,MAAM,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,GAAmB,EACnB,GAAoB,EACS,EAAE;IAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEnC,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,GAAmB,EACnB,GAAoB,EACS,EAAE;IAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEnC,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC"}

package/dist/services/oauthSettingsStore.js

@@ -1,5 +1,9 @@
 import { getServerDao } from '../dao/index.js';
 import { logger } from '../utils/logger.js';
+import { IsNull } from 'typeorm';
+import { getAppDataSource } from '../db/connection.js';
+import { Server } from '../db/entities/Server.js';
+import { isReplicaMode } from '../utils/replicaMode.js';
 /**
  * Load the latest server configuration from DAO.
  */
@@ -24,6 +28,7 @@ export const mutateOAuthSettings = async (serverName, mutator) => {
         return undefined;
     }
     const { name: _, ...serverConfig } = server;
+    const expectedOAuth = server.oauth ? structuredClone(server.oauth) : undefined;
     if (!serverConfig.oauth) {
         serverConfig.oauth = {};
     }
@@ -32,6 +37,15 @@ export const mutateOAuthSettings = async (serverName, mutator) => {
         oauth: serverConfig.oauth,
     };
     mutator(context);
+    if (isReplicaMode()) {
+        const result = await getAppDataSource().getRepository(Server).createQueryBuilder()
+            .update().set({ oauth: () => ':nextOAuth' })
+            .where({ name: serverName, oauth: expectedOAuth ?? IsNull() })
+            .setParameter('nextOAuth', JSON.stringify(serverConfig.oauth)).execute();
+        if (result.affected !== 1)
+            throw new Error('OAuth configuration changed; retry with current credentials');
+        return context.serverConfig;
+    }
     const updated = await serverDao.update(serverName, { oauth: serverConfig.oauth }, { runtimeOAuth: true });
     if (!updated) {
         throw new Error(`Failed to persist OAuth settings for server ${serverName}`);
@@ -72,6 +86,12 @@ export const persistClientCredentials = async (serverName, credentials) => {
 export const persistTokens = async (serverName, tokens) => {
     return mutateOAuthSettings(serverName, ({ oauth }) => {
         oauth.accessToken = tokens.accessToken;
+        if (tokens.accessTokenExpiresAt !== undefined) {
+            if (tokens.accessTokenExpiresAt === null)
+                delete oauth.accessTokenExpiresAt;
+            else
+                oauth.accessTokenExpiresAt = tokens.accessTokenExpiresAt;
+        }
         if (tokens.refreshToken !== undefined) {
             if (tokens.refreshToken) {
                 oauth.refreshToken = tokens.refreshToken;
@@ -104,6 +124,7 @@ export const clearOAuthData = async (serverName, scope) => {
     return mutateOAuthSettings(serverName, ({ oauth }) => {
         if (scope === 'tokens' || scope === 'all') {
             delete oauth.accessToken;
+            delete oauth.accessTokenExpiresAt;
             delete oauth.refreshToken;
         }
         if (scope === 'client' || scope === 'all') {

package/dist/services/oauthSettingsStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauthSettingsStore.js","sourceRoot":"","sources":["../../src/services/oauthSettingsStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauthSettingsStore.js","sourceRoot":"","sources":["../../src/services/oauthSettingsStore.ts"],"names":[],"mappings":"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"}

package/dist/services/personalOAuthService.js

@@ -1,4 +1,5 @@
 import { validateAuthorizationRelay } from '../utils/oauthServerMetadata.js';
+import { withReplicaLock } from './replicaLock.js';
 import { expandServerConfig } from './serverConfigEnvironment.js';
 import { getCredentialBindingDao, getServerDao, getUserDao } from '../dao/DaoFactory.js';
 import { credentialBindingEvents, encryptCredentialValues, decryptCredentialValues, } from './credentialBindingService.js';
@@ -7,6 +8,7 @@ import { CredentialBindingError } from '../utils/credentialTemplate.js';
 export const hasPersonalOAuth = (config) => config?.oauth?.identityMode === 'personal';
 export const personalOAuthContexts = new WeakMap();
 const queues = new Map();
+const renewals = new Map();
 const serialize = async (key, action) => {
     const previous = queues.get(key) || Promise.resolve();
     const next = previous.catch(() => undefined).then(action);
@@ -19,7 +21,7 @@ const serialize = async (key, action) => {
             queues.delete(key);
     }
 };
-export const withPersonalOAuthLock = (serverName, username, action) => serialize(JSON.stringify([serverName, username]), action);
+export const withPersonalOAuthLock = (serverName, username, action) => withReplicaLock(JSON.stringify(['oauth', serverName, username]), () => serialize(JSON.stringify([serverName, username]), action));
 export const personalAuthorizationRequired = (name) => new CredentialBindingError(`Personal authorization required for '${name}'. Connect in Dashboard → Servers.`);
 // The declaration, not resolved tokens/client registration, binds a flow to its destination.
 // Only destination-relevant fields participate: transport type, endpoint URL, and the OAuth
@@ -30,7 +32,7 @@ export const personalAuthorizationRequired = (name) => new CredentialBindingErro
 // (accessToken, refreshToken, pendingAuthorization) never belong to a stored declaration.
 // Bindings follow a plain rename; the display name does not change the destination.
 const declarationOAuth = (oauth) => {
-    const { accessToken: _, refreshToken: __, pendingAuthorization: ___, ...declaration } = oauth || {};
+    const { accessToken: _, accessTokenExpiresAt: _expiry, refreshToken: __, pendingAuthorization: ___, ...declaration } = oauth || {};
     return declaration;
 };
 // JSON.stringify is key-order sensitive, and the dashboard save path normalizes the
@@ -211,6 +213,12 @@ export class PersonalOAuthContext {
     async persistTokens(_name, tokens) {
         const saved = await this.mutate(({ oauth }) => {
             oauth.accessToken = tokens.accessToken;
+            if (tokens.accessTokenExpiresAt !== undefined) {
+                if (tokens.accessTokenExpiresAt === null)
+                    delete oauth.accessTokenExpiresAt;
+                else
+                    oauth.accessTokenExpiresAt = tokens.accessTokenExpiresAt;
+            }
             if (tokens.refreshToken !== undefined)
                 oauth.refreshToken = tokens.refreshToken || undefined;
             const metadata = oauth.pendingAuthorization?.discoveryState?.authorizationServerMetadata;
@@ -224,6 +232,35 @@ export class PersonalOAuthContext {
         this.refresh = undefined;
         return saved;
     }
+    async renewTokens(action) {
+        const key = JSON.stringify([this.serverName, this.username, this.revision]);
+        let renewal = renewals.get(key);
+        if (!renewal) {
+            renewal = (async () => {
+                await this.assertCurrent();
+                if ((await getCredentialBindingDao().get(this.serverName, this.username))?.encryptedValues !==
+                    this.revision)
+                    throw new CredentialBindingError('Personal authorization changed; reconnect');
+                await action();
+                return this;
+            })();
+            renewals.set(key, renewal);
+        }
+        try {
+            const renewed = await renewal;
+            await this.assertCurrent();
+            if ((await getCredentialBindingDao().get(this.serverName, this.username))?.encryptedValues !==
+                renewed.revision)
+                throw new CredentialBindingError('Personal authorization changed; reconnect');
+            this.revision = renewed.revision;
+            this.config = renewed.config;
+            personalOAuthContexts.set(this.config, this);
+        }
+        finally {
+            if (renewals.get(key) === renewal)
+                renewals.delete(key);
+        }
+    }
     updatePendingAuthorization(_name, pending) {
         return this.mutate(({ oauth }) => {
             oauth.pendingAuthorization = {
@@ -237,6 +274,7 @@ export class PersonalOAuthContext {
         return this.mutate(({ oauth }) => {
             if (scope === 'all' || scope === 'tokens') {
                 delete oauth.accessToken;
+                delete oauth.accessTokenExpiresAt;
                 delete oauth.refreshToken;
             }
             if (scope === 'all' || scope === 'client') {

package/dist/services/personalOAuthService.js.map

@@ -1 +1 @@
-{"version":3,"file":"personalOAuthService.js","sourceRoot":"","sources":["../../src/services/personalOAuthService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"personalOAuthService.js","sourceRoot":"","sources":["../../src/services/personalOAuthService.ts"],"names":[],"mappings":"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"}

package/dist/services/replicaLock.js

@@ -0,0 +1,30 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { getAppDataSource } from '../db/connection.js';
+import { isReplicaMode } from '../utils/replicaMode.js';
+const heldLocks = new AsyncLocalStorage();
+/** Credential-scoped, reentrant lock; it never retries the action after a database failure. */
+export const withReplicaLock = async (scope, action) => {
+    if (!isReplicaMode() || heldLocks.getStore()?.has(scope))
+        return action();
+    const runner = getAppDataSource().createQueryRunner();
+    const held = new Set(heldLocks.getStore());
+    try {
+        await runner.connect();
+        await runner.startTransaction();
+        await runner.query("SET LOCAL lock_timeout = '10s'");
+        await runner.query('SELECT pg_advisory_xact_lock(209, hashtext($1))', [scope]);
+        held.add(scope);
+        return await heldLocks.run(held, action);
+    }
+    finally {
+        held.delete(scope);
+        try {
+            if (runner.isTransactionActive)
+                await runner.rollbackTransaction();
+        }
+        finally {
+            await runner.release();
+        }
+    }
+};
+//# sourceMappingURL=replicaLock.js.map

package/dist/services/replicaLock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"replicaLock.js","sourceRoot":"","sources":["../../src/services/replicaLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,SAAS,GAAG,IAAI,iBAAiB,EAAe,CAAC;AAEvD,+FAA+F;AAC/F,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAK,KAAa,EAAE,MAAwB,EAAc,EAAE;IAC9F,IAAI,CAAC,aAAa,EAAE,IAAI,SAAS,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,MAAM,EAAE,CAAC;IAC1E,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC,iBAAiB,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAChC,MAAM,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACrD,MAAM,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChB,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,CAAC;YACH,IAAI,MAAM,CAAC,mBAAmB;gBAAE,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACrE,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/services/replicaService.js

@@ -0,0 +1,111 @@
+import os from 'node:os';
+import { getAppDataSource } from '../db/connection.js';
+import { databaseTransaction } from '../db/transactionContext.js';
+import { getServerDao, getSystemConfigDao } from '../dao/DaoFactory.js';
+import { getCachedSystemConfig, setCachedSystemConfig } from '../utils/systemConfigCache.js';
+import { isReplicaMode } from '../utils/replicaMode.js';
+import { logger } from '../utils/logger.js';
+import { initOAuthServer } from './oauthServerService.js';
+let desiredVersion = null;
+let appliedVersion = null;
+let lastError = null;
+let timer;
+let refresh;
+let apply;
+let accepting = false;
+let configurationDirty = false;
+let appliedOAuthConfiguration;
+export const markReplicaConfigurationDirty = () => {
+    configurationDirty = true;
+};
+export const replicaStatus = () => ({
+    nodeId: process.env.MCPHUB_NODE_ID || os.hostname(),
+    desiredVersion,
+    appliedVersion,
+    lastError,
+    accepting,
+    configurationDirty,
+});
+export const getConfigurationVersion = async () => {
+    const rows = await getAppDataSource().query('SELECT version::text FROM mcphub_revision WHERE id = 1');
+    if (!rows.length)
+        throw new Error('Replica schema missing; run db:setup before starting replicas');
+    return rows[0].version;
+};
+export const refreshReplicaConfiguration = () => {
+    if (refresh)
+        return refresh;
+    refresh = (async () => {
+        const runner = getAppDataSource().createQueryRunner();
+        try {
+            await runner.connect();
+            await runner.startTransaction('REPEATABLE READ');
+            const snapshot = await databaseTransaction.run(runner, async () => {
+                const version = await getConfigurationVersion();
+                desiredVersion = version;
+                if (version === appliedVersion && !configurationDirty)
+                    return undefined;
+                configurationDirty = false;
+                const servers = await getServerDao().findAll();
+                const systemConfig = await getSystemConfigDao().get();
+                return { version, servers, systemConfig };
+            });
+            await runner.commitTransaction();
+            await runner.release();
+            if (snapshot) {
+                const previous = getCachedSystemConfig();
+                setCachedSystemConfig(snapshot.systemConfig);
+                try {
+                    await apply(snapshot.servers);
+                    const oauthConfiguration = JSON.stringify(snapshot.systemConfig?.oauthServer);
+                    if (oauthConfiguration !== appliedOAuthConfiguration) {
+                        await initOAuthServer(snapshot.systemConfig);
+                        appliedOAuthConfiguration = oauthConfiguration;
+                    }
+                }
+                catch (error) {
+                    setCachedSystemConfig(previous);
+                    throw error;
+                }
+                appliedVersion = snapshot.version;
+                logger.info('Replica configuration applied', replicaStatus());
+            }
+            lastError = null;
+        }
+        catch (error) {
+            configurationDirty = true;
+            if (runner.isTransactionActive)
+                await runner.rollbackTransaction();
+            lastError = error instanceof Error ? error.message : String(error);
+            logger.error('Replica configuration refresh failed', { ...replicaStatus(), error });
+            throw error;
+        }
+        finally {
+            if (!runner.isReleased)
+                await runner.release();
+        }
+    })().finally(() => {
+        refresh = undefined;
+    });
+    return refresh;
+};
+export const startReplicaSync = async (reconcile) => {
+    if (!isReplicaMode()) {
+        accepting = true;
+        return;
+    }
+    apply = reconcile;
+    await refreshReplicaConfiguration();
+    accepting = true;
+    timer = setInterval(() => {
+        void refreshReplicaConfiguration().catch(() => undefined);
+    }, 5000);
+    timer.unref();
+};
+export const stopReplicaSync = async () => {
+    accepting = false;
+    clearInterval(timer);
+    if (refresh)
+        await refresh.catch(() => undefined);
+};
+//# sourceMappingURL=replicaService.js.map