@samanhappy/mcphub 1.0.34 → 1.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/controllers/oauthCallbackController.js +83 -54
- package/dist/controllers/oauthCallbackController.js.map +1 -1
- package/dist/controllers/serverController.js +46 -37
- package/dist/controllers/serverController.js.map +1 -1
- package/dist/dao/ServerDao.js +10 -0
- package/dist/dao/ServerDao.js.map +1 -1
- package/dist/dao/ServerDaoDbImpl.js +43 -3
- package/dist/dao/ServerDaoDbImpl.js.map +1 -1
- package/dist/dao/SystemConfigDao.js +38 -1
- package/dist/dao/SystemConfigDao.js.map +1 -1
- package/dist/dao/SystemConfigDaoDbImpl.js +6 -1
- package/dist/dao/SystemConfigDaoDbImpl.js.map +1 -1
- package/dist/services/vectorSearchService.js +52 -12
- package/dist/services/vectorSearchService.js.map +1 -1
- package/dist/utils/migration.js +13 -1
- package/dist/utils/migration.js.map +1 -1
- package/dist/utils/openApiRequestBody.js +14 -2
- package/dist/utils/openApiRequestBody.js.map +1 -1
- package/dist/utils/serverConfigPersistence.js +77 -9
- package/dist/utils/serverConfigPersistence.js.map +1 -1
- package/dist/utils/smartRouting.js +10 -4
- package/dist/utils/smartRouting.js.map +1 -1
- package/frontend/dist/assets/{ActivityPage-BYoyi-IG.js → ActivityPage-B4OBJUBq.js} +2 -2
- package/frontend/dist/assets/{ActivityPage-BYoyi-IG.js.map → ActivityPage-B4OBJUBq.js.map} +1 -1
- package/frontend/dist/assets/{Dashboard-BOHkLPxE.js → Dashboard-czP-DGHn.js} +2 -2
- package/frontend/dist/assets/{Dashboard-BOHkLPxE.js.map → Dashboard-czP-DGHn.js.map} +1 -1
- package/frontend/dist/assets/{EndpointCopy-DDVLhiUy.js → EndpointCopy-CDwtdCHE.js} +2 -2
- package/frontend/dist/assets/{EndpointCopy-DDVLhiUy.js.map → EndpointCopy-CDwtdCHE.js.map} +1 -1
- package/frontend/dist/assets/{GroupsPage-B3bHSWmT.js → GroupsPage-BgUHjkGb.js} +2 -2
- package/frontend/dist/assets/{GroupsPage-B3bHSWmT.js.map → GroupsPage-BgUHjkGb.js.map} +1 -1
- package/frontend/dist/assets/{LoginPage-CfAnFIbQ.js → LoginPage-BBzViqLx.js} +2 -2
- package/frontend/dist/assets/{LoginPage-CfAnFIbQ.js.map → LoginPage-BBzViqLx.js.map} +1 -1
- package/frontend/dist/assets/{LogsPage-DT2VotXH.js → LogsPage-CqbaqFiQ.js} +2 -2
- package/frontend/dist/assets/{LogsPage-DT2VotXH.js.map → LogsPage-CqbaqFiQ.js.map} +1 -1
- package/frontend/dist/assets/{MarketPage-Cn0J7UNX.js → MarketPage-DinCKwrj.js} +2 -2
- package/frontend/dist/assets/{MarketPage-Cn0J7UNX.js.map → MarketPage-DinCKwrj.js.map} +1 -1
- package/frontend/dist/assets/{OAuthConsentPage-DnKLaKDH.js → OAuthConsentPage-BuPcJ2zS.js} +2 -2
- package/frontend/dist/assets/{OAuthConsentPage-DnKLaKDH.js.map → OAuthConsentPage-BuPcJ2zS.js.map} +1 -1
- package/frontend/dist/assets/{PromptsPage-Ccg3fJWt.js → PromptsPage-CJ-wYRAL.js} +2 -2
- package/frontend/dist/assets/{PromptsPage-Ccg3fJWt.js.map → PromptsPage-CJ-wYRAL.js.map} +1 -1
- package/frontend/dist/assets/{ResourcesPage-V45CxfvA.js → ResourcesPage-DRV8gnZV.js} +2 -2
- package/frontend/dist/assets/{ResourcesPage-V45CxfvA.js.map → ResourcesPage-DRV8gnZV.js.map} +1 -1
- package/frontend/dist/assets/{ServersPage-DA_nkhLB.js → ServersPage-CbtcAcVH.js} +4 -4
- package/frontend/dist/assets/{ServersPage-DA_nkhLB.js.map → ServersPage-CbtcAcVH.js.map} +1 -1
- package/frontend/dist/assets/SettingsPage-Czv4OhtK.js +12 -0
- package/frontend/dist/assets/SettingsPage-Czv4OhtK.js.map +1 -0
- package/frontend/dist/assets/{StatusDot-DcjrhMNI.js → StatusDot-CwpmIlJi.js} +2 -2
- package/frontend/dist/assets/{StatusDot-DcjrhMNI.js.map → StatusDot-CwpmIlJi.js.map} +1 -1
- package/frontend/dist/assets/{ToggleGroup-BSLtGF--.js → ToggleGroup-1qFTkDqh.js} +2 -2
- package/frontend/dist/assets/{ToggleGroup-BSLtGF--.js.map → ToggleGroup-1qFTkDqh.js.map} +1 -1
- package/frontend/dist/assets/{UsersPage-DKdCe4GT.js → UsersPage-CAMXgywh.js} +2 -2
- package/frontend/dist/assets/{UsersPage-DKdCe4GT.js.map → UsersPage-CAMXgywh.js.map} +1 -1
- package/frontend/dist/assets/index-Cb6IBpZR.js +3 -0
- package/frontend/dist/assets/index-Cb6IBpZR.js.map +1 -0
- package/frontend/dist/assets/{resourceService-DIUK5vbC.js → resourceService-BTVgor9F.js} +2 -2
- package/frontend/dist/assets/{resourceService-DIUK5vbC.js.map → resourceService-BTVgor9F.js.map} +1 -1
- package/frontend/dist/assets/{useCostData-CSeCIQmM.js → useCostData-CDVGUx_e.js} +2 -2
- package/frontend/dist/assets/{useCostData-CSeCIQmM.js.map → useCostData-CDVGUx_e.js.map} +1 -1
- package/frontend/dist/assets/useSettingsData-92nglN_X.js +2 -0
- package/frontend/dist/assets/{useSettingsData-CvAOhPaX.js.map → useSettingsData-92nglN_X.js.map} +1 -1
- package/frontend/dist/assets/{variableDetection-BeF9gp9K.js → variableDetection-BlOwsGsz.js} +2 -2
- package/frontend/dist/assets/{variableDetection-BeF9gp9K.js.map → variableDetection-BlOwsGsz.js.map} +1 -1
- package/frontend/dist/index.html +1 -1
- package/package.json +1 -1
- package/frontend/dist/assets/SettingsPage-BJjO5cte.js +0 -12
- package/frontend/dist/assets/SettingsPage-BJjO5cte.js.map +0 -1
- package/frontend/dist/assets/index-DjExFs33.js +0 -3
- package/frontend/dist/assets/index-DjExFs33.js.map +0 -1
- package/frontend/dist/assets/useSettingsData-CvAOhPaX.js +0 -2
|
@@ -282,70 +282,99 @@ export const handleOAuthCallback = async (req, res) => {
|
|
|
282
282
|
});
|
|
283
283
|
const refreshedTransport = await createTransportFromConfig(serverInfo.name, effectiveConfig);
|
|
284
284
|
serverInfo.transport = refreshedTransport;
|
|
285
|
-
//
|
|
286
|
-
serverInfo.status = '
|
|
285
|
+
// OAuth tokens are available, but the new transport is not connected yet.
|
|
286
|
+
serverInfo.status = 'connecting';
|
|
287
287
|
if (serverInfo.oauth) {
|
|
288
288
|
serverInfo.oauth.authorizationUrl = undefined;
|
|
289
289
|
serverInfo.oauth.state = undefined;
|
|
290
290
|
}
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
291
|
+
if (!serverInfo.client || !serverInfo.transport) {
|
|
292
|
+
const missingRuntimeError = new Error(`Cannot reconnect ${serverInfo.name} after OAuth callback because client or transport is missing`);
|
|
293
|
+
serverInfo.status = 'disconnected';
|
|
294
|
+
serverInfo.error = missingRuntimeError.message;
|
|
295
|
+
throw missingRuntimeError;
|
|
296
|
+
}
|
|
297
|
+
logger.log('Connecting client with refreshed transport', {
|
|
298
|
+
serverName: serverInfo.name,
|
|
299
|
+
});
|
|
300
|
+
const reconnectClient = serverInfo.client;
|
|
301
|
+
const reconnectTransport = serverInfo.transport;
|
|
302
|
+
try {
|
|
303
|
+
await connectClientWithDiagnostics(reconnectClient, reconnectTransport, serverInfo.options);
|
|
304
|
+
}
|
|
305
|
+
catch (connectError) {
|
|
306
|
+
serverInfo.status = 'disconnected';
|
|
307
|
+
serverInfo.error = `Failed to connect after OAuth callback: ${connectError instanceof Error ? connectError.message : String(connectError)}`;
|
|
308
|
+
logger.error('Error connecting client after OAuth callback', {
|
|
309
|
+
serverName: serverInfo.name,
|
|
310
|
+
error: connectError,
|
|
311
|
+
});
|
|
312
|
+
if (connectError instanceof Error) {
|
|
313
|
+
logger.error('Connect error details after OAuth callback', {
|
|
314
|
+
serverName: serverInfo.name,
|
|
315
|
+
message: connectError.message,
|
|
316
|
+
stack: connectError.stack,
|
|
317
|
+
});
|
|
318
|
+
}
|
|
319
|
+
try {
|
|
320
|
+
await reconnectClient.close();
|
|
321
|
+
}
|
|
322
|
+
catch (clientCloseError) {
|
|
323
|
+
logger.warn('Failed to close client after OAuth reconnect failure', {
|
|
324
|
+
serverName: serverInfo.name,
|
|
325
|
+
error: clientCloseError,
|
|
326
|
+
});
|
|
327
|
+
}
|
|
328
|
+
try {
|
|
329
|
+
await reconnectTransport.close();
|
|
330
|
+
}
|
|
331
|
+
catch (transportCloseError) {
|
|
332
|
+
logger.warn('Failed to close transport after OAuth reconnect failure', {
|
|
297
333
|
serverName: serverInfo.name,
|
|
334
|
+
error: transportCloseError,
|
|
298
335
|
});
|
|
299
|
-
try {
|
|
300
|
-
await connectClientWithDiagnostics(serverInfo.client, serverInfo.transport, serverInfo.options);
|
|
301
|
-
logger.log('Client connected successfully after OAuth callback', {
|
|
302
|
-
serverName: serverInfo.name,
|
|
303
|
-
});
|
|
304
|
-
// List tools after successful connection
|
|
305
|
-
const capabilities = serverInfo.client.getServerCapabilities();
|
|
306
|
-
logger.log('Server capabilities after OAuth callback', {
|
|
307
|
-
serverName: serverInfo.name,
|
|
308
|
-
capabilities,
|
|
309
|
-
});
|
|
310
|
-
if (capabilities?.tools) {
|
|
311
|
-
logger.log('Listing tools after OAuth callback', {
|
|
312
|
-
serverName: serverInfo.name,
|
|
313
|
-
});
|
|
314
|
-
const toolsResult = await serverInfo.client.listTools({}, serverInfo.options);
|
|
315
|
-
updateServerToolsCache(serverInfo, toolsResult.tools);
|
|
316
|
-
logger.log('Listed tools after OAuth callback', {
|
|
317
|
-
serverName: serverInfo.name,
|
|
318
|
-
toolCount: serverInfo.tools.length,
|
|
319
|
-
});
|
|
320
|
-
}
|
|
321
|
-
else {
|
|
322
|
-
logger.log('Server does not support tools capability after OAuth callback', {
|
|
323
|
-
serverName: serverInfo.name,
|
|
324
|
-
});
|
|
325
|
-
}
|
|
326
|
-
}
|
|
327
|
-
catch (connectError) {
|
|
328
|
-
logger.error('Error connecting client after OAuth callback', {
|
|
329
|
-
serverName: serverInfo.name,
|
|
330
|
-
error: connectError,
|
|
331
|
-
});
|
|
332
|
-
if (connectError instanceof Error) {
|
|
333
|
-
logger.error('Connect error details after OAuth callback', {
|
|
334
|
-
serverName: serverInfo.name,
|
|
335
|
-
message: connectError.message,
|
|
336
|
-
stack: connectError.stack,
|
|
337
|
-
});
|
|
338
|
-
}
|
|
339
|
-
// Even if connection fails, mark OAuth as complete
|
|
340
|
-
// The user can try reconnecting from the dashboard
|
|
341
|
-
}
|
|
342
336
|
}
|
|
343
|
-
|
|
344
|
-
|
|
337
|
+
if (serverInfo.client === reconnectClient) {
|
|
338
|
+
serverInfo.client = undefined;
|
|
339
|
+
}
|
|
340
|
+
if (serverInfo.transport === reconnectTransport) {
|
|
341
|
+
serverInfo.transport = undefined;
|
|
342
|
+
}
|
|
343
|
+
throw connectError;
|
|
344
|
+
}
|
|
345
|
+
serverInfo.status = 'connected';
|
|
346
|
+
serverInfo.error = null;
|
|
347
|
+
logger.log('Client connected successfully after OAuth callback', {
|
|
348
|
+
serverName: serverInfo.name,
|
|
349
|
+
});
|
|
350
|
+
// List tools after successful connection. A cache refresh failure does not
|
|
351
|
+
// invalidate the connection established by the MCP handshake.
|
|
352
|
+
const capabilities = serverInfo.client.getServerCapabilities();
|
|
353
|
+
logger.log('Server capabilities after OAuth callback', {
|
|
354
|
+
serverName: serverInfo.name,
|
|
355
|
+
capabilities,
|
|
356
|
+
});
|
|
357
|
+
if (capabilities?.tools) {
|
|
358
|
+
logger.log('Listing tools after OAuth callback', {
|
|
359
|
+
serverName: serverInfo.name,
|
|
360
|
+
});
|
|
361
|
+
try {
|
|
362
|
+
const toolsResult = await serverInfo.client.listTools({}, serverInfo.options);
|
|
363
|
+
updateServerToolsCache(serverInfo, toolsResult.tools);
|
|
364
|
+
logger.log('Listed tools after OAuth callback', {
|
|
365
|
+
serverName: serverInfo.name,
|
|
366
|
+
toolCount: serverInfo.tools.length,
|
|
367
|
+
});
|
|
368
|
+
}
|
|
369
|
+
catch (listToolsError) {
|
|
370
|
+
logger.error('Failed to list tools after OAuth callback', {
|
|
371
|
+
serverName: serverInfo.name,
|
|
372
|
+
error: listToolsError,
|
|
373
|
+
});
|
|
345
374
|
}
|
|
346
375
|
}
|
|
347
376
|
else {
|
|
348
|
-
logger.log('
|
|
377
|
+
logger.log('Server does not support tools capability after OAuth callback', {
|
|
349
378
|
serverName: serverInfo.name,
|
|
350
379
|
});
|
|
351
380
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthCallbackController.js","sourceRoot":"","sources":["../../src/controllers/oauthCallbackController.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,4BAA4B,EAC5B,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3C,KAAK;KACF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;KACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;KACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;KACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;KACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,oBAAoB,GAAG,CAC3B,CAA0B,EAC1B,IAAyB,EACzB,KAAa,EACb,OAAe,EACf,OAA4C,EAC5C,YAAqB,KAAK,EAClB,EAAE;IACV,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC;IACrC,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAEnC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACpC,yEAAyE;IACzE,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACjE,MAAM,gBAAgB,GAAG,UAAU,CACjC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,2BAA2B,CAAC,CACtE,CAAC;IACF,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAExE,OAAO;;;;;;iBAMQ,SAAS;;;;;;wJAM8H,aAAa,YAAY,WAAW;;;;;;;;;;;;qCAYvJ,YAAY;;;;;;;UAOvC,SAAS,CAAC,CAAC,CAAC,+DAA+D,CAAC,CAAC,CAAC,EAAE;;;;mCAIvD,IAAI,UAAU,SAAS;YAE9C,OAAO;QACL,CAAC,CAAC,OAAO;aACJ,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,qBAAqB,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CACpJ;aACA,IAAI,CAAC,EAAE,CAAC;QACb,CAAC,CAAC,EACN;YACE,OAAO,CAAC,CAAC,CAAC,sBAAsB,WAAW,MAAM,CAAC,CAAC,CAAC,EAAE;YACtD,SAAS,CAAC,CAAC,CAAC,wBAAwB,eAAe,MAAM,CAAC,CAAC,CAAC,EAAE;+DACX,gBAAgB;;;;GAI5E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAsB,EAAE;IACjE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;QACtB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,UAAkB,EAAsB,EAAE;IAC5E,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,MAAM,CAAC;QACxB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kEAAkE;IACpE,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACvE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC5D,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAE9C,iEAAiE;QACjE,MAAM,CAAC,GAAI,GAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEnD,iCAAiC;QACjC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;gBACzC,KAAK;gBACL,gBAAgB,EAAE,iBAAiB,IAAI,EAAE;aAC1C,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACzB,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,mCAAmC,CAAC,EAAE,EAAE,EAAE;gBAC3E,EAAE,KAAK,EAAE,CAAC,CAAC,wCAAwC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC5E,GAAG,CAAC,iBAAiB;oBACnB,CAAC,CAAC;wBACE;4BACE,KAAK,EAAE,CAAC,CAAC,0CAA0C,CAAC;4BACpD,KAAK,EAAE,MAAM,CAAC,iBAAiB,CAAC;yBACjC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CACH,CAAC;QACJ,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACvD,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,CAAC,CAAC,qCAAqC,CAAC,CACzC,CACF,CAAC;QACN,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC1D,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,CAAC,CAAC,oCAAoC,CAAC,CACxC,CACF,CAAC;QACN,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAE5E,iCAAiC;QACjC,IAAI,UAAkC,CAAC;QAEvC,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,iBAAqC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,iBAAiB,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,qDAAqD,EAAE;oBAChE,iBAAiB;iBAClB,CAAC,CAAC;gBACH,UAAU,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACjD,KAAK,EAAE,UAAU;gBACjB,iBAAiB;aAClB,CAAC,CAAC;YACH,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,GAAG,CAAC,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC,qCAAqC,CAAC,EAAE,CAC3F,CACF,CAAC;QACN,CAAC;QAED,6DAA6D;QAC7D,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACrE,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE;gBAC3C,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,2DAA2D;gBAC3D,aAAa,EAAE,YAAY;gBAC3B,aAAa,EAAE,YAAY;aAC5B,CAAC,CAAC;YACH,oGAAoG;QACtG,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,sCAAsC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpF,sEAAsE;QACtE,sEAAsE;QACtE,uEAAuE;QACvE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,wBAAwB,CAAC;YACzC,GAAG,EAAE,QAAQ;YACb,gBAAgB,EACd,UAAU,CAAC,KAAK,EAAE,gBAAgB;gBAClC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,gBAAgB;YAClE,gBAAgB,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM;SACxE,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE;gBACnD,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,mCAAmC,CAAC,EACtC,SAAS,CAAC,MAAM,CACjB,CACF,CAAC;QACN,CAAC;QACD,IAAI,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,uEAAuE,EAAE;gBACnF,UAAU,EAAE,UAAU,CAAC,IAAI;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,mFAAmF;QACnF,qEAAqE;QACrE,IAAI,UAAU,CAAC,SAAS,IAAI,YAAY,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACjE,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,yCAAyC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvF,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAgB,CAAC;gBACrD,MAAM,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAE7C,MAAM,CAAC,GAAG,CAAC,sDAAsD,EAAE;oBACjE,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBAEH,wFAAwF;gBACxF,oFAAoF;gBACpF,qFAAqF;gBACrF,uFAAuF;gBACvF,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,WAAW;oBACjC,CAAC,CAAE,cAAc,CAAC,WAAkB,CAAwB;oBAC5D,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;gBAEtB,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CACb,oCAAoC,UAAU,CAAC,IAAI,uBAAuB,CAC3E,CAAC;gBACJ,CAAC;gBAED,iDAAiD;gBACjD,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC;gBAEpC,sEAAsE;gBACtE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;oBACpD,UAAU,CAAC,OAAO,GAAG;wBACnB,OAAO,EAAE,aAAa,CAAC,OAAO,IAAI,KAAK;wBACvC,sBAAsB,EAAE,aAAa,CAAC,sBAAsB,IAAI,IAAI;wBACpE,eAAe,EAAE,aAAa,CAAC,eAAe;qBAC/C,CAAC;gBACJ,CAAC;gBAED,sFAAsF;gBACtF,IAAI,CAAC;oBACH,IAAI,UAAU,CAAC,SAAS,IAAI,OAAO,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;wBAC5D,MAAO,UAAU,CAAC,SAAiB,CAAC,KAAK,EAAE,CAAC;oBAC9C,CAAC;gBACH,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE;wBACvE,UAAU,EAAE,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,UAAU;qBAClB,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,iDAAiD,EAAE;oBAC5D,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBACH,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CACxD,UAAU,CAAC,IAAI,EACf,eAAe,CAChB,CAAC;gBACF,UAAU,CAAC,SAAS,GAAG,kBAAkB,CAAC;gBAE1C,qDAAqD;gBACrD,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;gBAChC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;oBACrB,UAAU,CAAC,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC;oBAC9C,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;gBACrC,CAAC;gBAED,wCAAwC;gBACxC,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;gBAEzF,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,0CAA0C;oBAC1C,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;wBAC9C,MAAM,CAAC,GAAG,CAAC,4CAA4C,EAAE;4BACvD,UAAU,EAAE,UAAU,CAAC,IAAI;yBAC5B,CAAC,CAAC;wBACH,IAAI,CAAC;4BACH,MAAM,4BAA4B,CAChC,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,EACpB,UAAU,CAAC,OAAO,CACnB,CAAC;4BACF,MAAM,CAAC,GAAG,CAAC,oDAAoD,EAAE;gCAC/D,UAAU,EAAE,UAAU,CAAC,IAAI;6BAC5B,CAAC,CAAC;4BAEH,yCAAyC;4BACzC,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;4BAC/D,MAAM,CAAC,GAAG,CAAC,0CAA0C,EAAE;gCACrD,UAAU,EAAE,UAAU,CAAC,IAAI;gCAC3B,YAAY;6BACb,CAAC,CAAC;4BAEH,IAAI,YAAY,EAAE,KAAK,EAAE,CAAC;gCACxB,MAAM,CAAC,GAAG,CAAC,oCAAoC,EAAE;oCAC/C,UAAU,EAAE,UAAU,CAAC,IAAI;iCAC5B,CAAC,CAAC;gCACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;gCAC9E,sBAAsB,CAAC,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;gCACtD,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE;oCAC9C,UAAU,EAAE,UAAU,CAAC,IAAI;oCAC3B,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM;iCACnC,CAAC,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACN,MAAM,CAAC,GAAG,CAAC,+DAA+D,EAAE;oCAC1E,UAAU,EAAE,UAAU,CAAC,IAAI;iCAC5B,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;wBAAC,OAAO,YAAY,EAAE,CAAC;4BACtB,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE;gCAC3D,UAAU,EAAE,UAAU,CAAC,IAAI;gCAC3B,KAAK,EAAE,YAAY;6BACpB,CAAC,CAAC;4BACH,IAAI,YAAY,YAAY,KAAK,EAAE,CAAC;gCAClC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;oCACzD,UAAU,EAAE,UAAU,CAAC,IAAI;oCAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;oCAC7B,KAAK,EAAE,YAAY,CAAC,KAAK;iCAC1B,CAAC,CAAC;4BACL,CAAC;4BACD,mDAAmD;4BACnD,mDAAmD;wBACrD,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,GAAG,CACR,mFAAmF,EACnF,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAChC,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,+CAA+C,EAAE;wBAC1D,UAAU,EAAE,UAAU,CAAC,IAAI;qBAC5B,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,8CAA8C,EAAE;oBACzD,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBAEH,sBAAsB;gBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACzB,oBAAoB,CAClB,CAAC,EACD,SAAS,EACT,CAAC,CAAC,uCAAuC,CAAC,EAC1C,CAAC,CAAC,8BAA8B,CAAC,EACjC;oBACE,EAAE,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,EAAE;oBAC5D,EAAE,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,yBAAyB,CAAC,EAAE;iBAC1E,EACD,IAAI,CACL,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE;oBACvD,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,KAAK;iBACN,CAAC,CAAC;gBACH,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE;oBAC3C,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,SAAS,EAAE,OAAO,KAAK;oBACvB,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI;oBACnC,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBACpE,UAAU,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB;iBACpE,CAAC,CAAC;gBAEH,OAAO,GAAG;qBACP,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,+BAA+B,CAAC,EAClC,GAAG,CAAC,CAAC,sCAAsC,CAAC,KAAK,CAAC,CAAC,gCAAgC,CAAC,EAAE,EACtF,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAC/E,CACF,CAAC;YACN,CAAC;QACH,CAAC;aAAM,CAAC;YACN,iEAAiE;YACjE,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YACvF,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,kCAAkC,CAAC,EACrC,CAAC,CAAC,yCAAyC,CAAC,CAC7C,CACF,CAAC;QACN,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpE,iEAAiE;QACjE,MAAM,CAAC,GAAI,GAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,GAAG;aACP,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,6BAA6B,CAAC,EAChC,CAAC,CAAC,oCAAoC,CAAC,CACxC,CACF,CAAC;IACN,CAAC;AACH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"oauthCallbackController.js","sourceRoot":"","sources":["../../src/controllers/oauthCallbackController.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,4BAA4B,EAC5B,yBAAyB,EACzB,sBAAsB,GACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3C,KAAK;KACF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;KACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;KACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;KACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;KACvB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,oBAAoB,GAAG,CAC3B,CAA0B,EAC1B,IAAyB,EACzB,KAAa,EACb,OAAe,EACf,OAA4C,EAC5C,YAAqB,KAAK,EAClB,EAAE;IACV,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC;IACrC,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAEnC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACpC,yEAAyE;IACzE,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACjE,MAAM,gBAAgB,GAAG,UAAU,CACjC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,2BAA2B,CAAC,CACtE,CAAC;IACF,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAExE,OAAO;;;;;;iBAMQ,SAAS;;;;;;wJAM8H,aAAa,YAAY,WAAW;;;;;;;;;;;;qCAYvJ,YAAY;;;;;;;UAOvC,SAAS,CAAC,CAAC,CAAC,+DAA+D,CAAC,CAAC,CAAC,EAAE;;;;mCAIvD,IAAI,UAAU,SAAS;YAE9C,OAAO;QACL,CAAC,CAAC,OAAO;aACJ,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,qBAAqB,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CACpJ;aACA,IAAI,CAAC,EAAE,CAAC;QACb,CAAC,CAAC,EACN;YACE,OAAO,CAAC,CAAC,CAAC,sBAAsB,WAAW,MAAM,CAAC,CAAC,CAAC,EAAE;YACtD,SAAS,CAAC,CAAC,CAAC,wBAAwB,eAAe,MAAM,CAAC,CAAC,CAAC,EAAE;+DACX,gBAAgB;;;;GAI5E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAsB,EAAE;IACjE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;QACtB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,UAAkB,EAAsB,EAAE;IAC5E,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,MAAM,CAAC;QACxB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kEAAkE;IACpE,CAAC;IAED,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACvE,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC5D,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAE9C,iEAAiE;QACjE,MAAM,CAAC,GAAI,GAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEnD,iCAAiC;QACjC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;gBACzC,KAAK;gBACL,gBAAgB,EAAE,iBAAiB,IAAI,EAAE;aAC1C,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACzB,oBAAoB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,mCAAmC,CAAC,EAAE,EAAE,EAAE;gBAC3E,EAAE,KAAK,EAAE,CAAC,CAAC,wCAAwC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC5E,GAAG,CAAC,iBAAiB;oBACnB,CAAC,CAAC;wBACE;4BACE,KAAK,EAAE,CAAC,CAAC,0CAA0C,CAAC;4BACpD,KAAK,EAAE,MAAM,CAAC,iBAAiB,CAAC;yBACjC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CACH,CAAC;QACJ,CAAC;QAED,+BAA+B;QAC/B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACvD,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,CAAC,CAAC,qCAAqC,CAAC,CACzC,CACF,CAAC;QACN,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC1D,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,CAAC,CAAC,oCAAoC,CAAC,CACxC,CACF,CAAC;QACN,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QAE5E,iCAAiC;QACjC,IAAI,UAAkC,CAAC;QAEvC,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,iBAAqC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,iBAAiB,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,qDAAqD,EAAE;oBAChE,iBAAiB;iBAClB,CAAC,CAAC;gBACH,UAAU,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACjD,KAAK,EAAE,UAAU;gBACjB,iBAAiB;aAClB,CAAC,CAAC;YACH,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,8BAA8B,CAAC,EACjC,GAAG,CAAC,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC,qCAAqC,CAAC,EAAE,CAC3F,CACF,CAAC;QACN,CAAC;QAED,6DAA6D;QAC7D,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACrE,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE;gBAC3C,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,2DAA2D;gBAC3D,aAAa,EAAE,YAAY;gBAC3B,aAAa,EAAE,YAAY;aAC5B,CAAC,CAAC;YACH,oGAAoG;QACtG,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,sCAAsC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpF,sEAAsE;QACtE,sEAAsE;QACtE,uEAAuE;QACvE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,wBAAwB,CAAC;YACzC,GAAG,EAAE,QAAQ;YACb,gBAAgB,EACd,UAAU,CAAC,KAAK,EAAE,gBAAgB;gBAClC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,gBAAgB;YAClE,gBAAgB,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM;SACxE,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE;gBACnD,UAAU,EAAE,UAAU,CAAC,IAAI;gBAC3B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,CAAC,CAAC;YACH,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,mCAAmC,CAAC,EACtC,SAAS,CAAC,MAAM,CACjB,CACF,CAAC;QACN,CAAC;QACD,IAAI,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,uEAAuE,EAAE;gBACnF,UAAU,EAAE,UAAU,CAAC,IAAI;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,mFAAmF;QACnF,qEAAqE;QACrE,IAAI,UAAU,CAAC,SAAS,IAAI,YAAY,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACjE,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,yCAAyC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvF,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAgB,CAAC;gBACrD,MAAM,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAE7C,MAAM,CAAC,GAAG,CAAC,sDAAsD,EAAE;oBACjE,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBAEH,wFAAwF;gBACxF,oFAAoF;gBACpF,qFAAqF;gBACrF,uFAAuF;gBACvF,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,WAAW;oBACjC,CAAC,CAAE,cAAc,CAAC,WAAkB,CAAwB;oBAC5D,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;gBAEtB,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CACb,oCAAoC,UAAU,CAAC,IAAI,uBAAuB,CAC3E,CAAC;gBACJ,CAAC;gBAED,iDAAiD;gBACjD,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC;gBAEpC,sEAAsE;gBACtE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;oBACpD,UAAU,CAAC,OAAO,GAAG;wBACnB,OAAO,EAAE,aAAa,CAAC,OAAO,IAAI,KAAK;wBACvC,sBAAsB,EAAE,aAAa,CAAC,sBAAsB,IAAI,IAAI;wBACpE,eAAe,EAAE,aAAa,CAAC,eAAe;qBAC/C,CAAC;gBACJ,CAAC;gBAED,sFAAsF;gBACtF,IAAI,CAAC;oBACH,IAAI,UAAU,CAAC,SAAS,IAAI,OAAO,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;wBAC5D,MAAO,UAAU,CAAC,SAAiB,CAAC,KAAK,EAAE,CAAC;oBAC9C,CAAC;gBACH,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,MAAM,CAAC,IAAI,CAAC,2DAA2D,EAAE;wBACvE,UAAU,EAAE,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,UAAU;qBAClB,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,iDAAiD,EAAE;oBAC5D,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBACH,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CACxD,UAAU,CAAC,IAAI,EACf,eAAe,CAChB,CAAC;gBACF,UAAU,CAAC,SAAS,GAAG,kBAAkB,CAAC;gBAE1C,0EAA0E;gBAC1E,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC;gBACjC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;oBACrB,UAAU,CAAC,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC;oBAC9C,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;gBACrC,CAAC;gBAED,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;oBAChD,MAAM,mBAAmB,GAAG,IAAI,KAAK,CACnC,oBAAoB,UAAU,CAAC,IAAI,8DAA8D,CAClG,CAAC;oBACF,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC;oBACnC,UAAU,CAAC,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC;oBAC/C,MAAM,mBAAmB,CAAC;gBAC5B,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,4CAA4C,EAAE;oBACvD,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC1C,MAAM,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC;gBAChD,IAAI,CAAC;oBACH,MAAM,4BAA4B,CAChC,eAAe,EACf,kBAAkB,EAClB,UAAU,CAAC,OAAO,CACnB,CAAC;gBACJ,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC;oBACnC,UAAU,CAAC,KAAK,GAAG,2CACjB,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAC5E,EAAE,CAAC;oBACH,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE;wBAC3D,UAAU,EAAE,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;oBACH,IAAI,YAAY,YAAY,KAAK,EAAE,CAAC;wBAClC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;4BACzD,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;4BAC7B,KAAK,EAAE,YAAY,CAAC,KAAK;yBAC1B,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,CAAC;wBACH,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;oBAChC,CAAC;oBAAC,OAAO,gBAAgB,EAAE,CAAC;wBAC1B,MAAM,CAAC,IAAI,CAAC,sDAAsD,EAAE;4BAClE,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,KAAK,EAAE,gBAAgB;yBACxB,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,CAAC;wBACH,MAAM,kBAAkB,CAAC,KAAK,EAAE,CAAC;oBACnC,CAAC;oBAAC,OAAO,mBAAmB,EAAE,CAAC;wBAC7B,MAAM,CAAC,IAAI,CAAC,yDAAyD,EAAE;4BACrE,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,KAAK,EAAE,mBAAmB;yBAC3B,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,UAAU,CAAC,MAAM,KAAK,eAAe,EAAE,CAAC;wBAC1C,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;oBAChC,CAAC;oBACD,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,EAAE,CAAC;wBAChD,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;oBACnC,CAAC;oBAED,MAAM,YAAY,CAAC;gBACrB,CAAC;gBAED,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;gBAChC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAC,oDAAoD,EAAE;oBAC/D,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBAEH,2EAA2E;gBAC3E,8DAA8D;gBAC9D,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;gBAC/D,MAAM,CAAC,GAAG,CAAC,0CAA0C,EAAE;oBACrD,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,YAAY;iBACb,CAAC,CAAC;gBAEH,IAAI,YAAY,EAAE,KAAK,EAAE,CAAC;oBACxB,MAAM,CAAC,GAAG,CAAC,oCAAoC,EAAE;wBAC/C,UAAU,EAAE,UAAU,CAAC,IAAI;qBAC5B,CAAC,CAAC;oBACH,IAAI,CAAC;wBACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;wBAC9E,sBAAsB,CAAC,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;wBACtD,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE;4BAC9C,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM;yBACnC,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,cAAc,EAAE,CAAC;wBACxB,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE;4BACxD,UAAU,EAAE,UAAU,CAAC,IAAI;4BAC3B,KAAK,EAAE,cAAc;yBACtB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,+DAA+D,EAAE;wBAC1E,UAAU,EAAE,UAAU,CAAC,IAAI;qBAC5B,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,GAAG,CAAC,8CAA8C,EAAE;oBACzD,UAAU,EAAE,UAAU,CAAC,IAAI;iBAC5B,CAAC,CAAC;gBAEH,sBAAsB;gBACtB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACzB,oBAAoB,CAClB,CAAC,EACD,SAAS,EACT,CAAC,CAAC,uCAAuC,CAAC,EAC1C,CAAC,CAAC,8BAA8B,CAAC,EACjC;oBACE,EAAE,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,IAAI,EAAE;oBAC5D,EAAE,KAAK,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,yBAAyB,CAAC,EAAE;iBAC1E,EACD,IAAI,CACL,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE;oBACvD,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,KAAK;iBACN,CAAC,CAAC;gBACH,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE;oBAC3C,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,SAAS,EAAE,OAAO,KAAK;oBACvB,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI;oBACnC,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBACpE,UAAU,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB;iBACpE,CAAC,CAAC;gBAEH,OAAO,GAAG;qBACP,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,+BAA+B,CAAC,EAClC,GAAG,CAAC,CAAC,sCAAsC,CAAC,KAAK,CAAC,CAAC,gCAAgC,CAAC,EAAE,EACtF,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAC/E,CACF,CAAC;YACN,CAAC;QACH,CAAC;aAAM,CAAC;YACN,iEAAiE;YACjE,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YACvF,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,kCAAkC,CAAC,EACrC,CAAC,CAAC,yCAAyC,CAAC,CAC7C,CACF,CAAC;QACN,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpE,iEAAiE;QACjE,MAAM,CAAC,GAAI,GAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAEnD,OAAO,GAAG;aACP,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CACH,oBAAoB,CAClB,CAAC,EACD,OAAO,EACP,CAAC,CAAC,6BAA6B,CAAC,EAChC,CAAC,CAAC,oCAAoC,CAAC,CACxC,CACF,CAAC;IACN,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { removeServerToolEmbeddings, syncAllServerToolsEmbeddings, } from '../se
|
|
|
5
5
|
import { createSafeJSON } from '../utils/serialization.js';
|
|
6
6
|
import { cloneDefaultOAuthServerConfig } from '../constants/oauthServerDefaults.js';
|
|
7
7
|
import { getBearerKeyDao, getGroupDao, getOAuthClientDao, getOAuthTokenDao, getServerDao, getSystemConfigDao, getUserConfigDao, getUserDao, } from '../dao/DaoFactory.js';
|
|
8
|
+
import { migrateLegacySmartRoutingConfig } from '../dao/SystemConfigDao.js';
|
|
8
9
|
import { UserContextService } from '../services/userContextService.js';
|
|
9
10
|
import { authorizationService } from '../services/authorizationService.js';
|
|
10
11
|
import { presentServerForPrincipal, presentServerInfoForPrincipal, } from '../services/serverConfigPresenter.js';
|
|
@@ -265,9 +266,9 @@ export const getAllSettings = async (req, res) => {
|
|
|
265
266
|
systemConfig.smartRouting = {
|
|
266
267
|
enabled: false,
|
|
267
268
|
dbUrl: dbUrlEnv ? '${DB_URL}' : '',
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
269
|
+
llmProviderBaseUrl: '',
|
|
270
|
+
llmProviderApiKey: '',
|
|
271
|
+
embeddingModel: '',
|
|
271
272
|
};
|
|
272
273
|
}
|
|
273
274
|
else if (!systemConfig.smartRouting.dbUrl) {
|
|
@@ -1283,7 +1284,8 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1283
1284
|
return;
|
|
1284
1285
|
}
|
|
1285
1286
|
try {
|
|
1286
|
-
const { routing, install, smartRouting, toolResultCompression, mcpRouter, nameSeparator, enableSessionRebuild, oauthServer, auth, activityLog, } = req.body;
|
|
1287
|
+
const { routing, install, smartRouting: requestSmartRouting, toolResultCompression, mcpRouter, nameSeparator, enableSessionRebuild, oauthServer, auth, activityLog, } = req.body;
|
|
1288
|
+
const { smartRouting } = migrateLegacySmartRoutingConfig(requestSmartRouting);
|
|
1287
1289
|
const hasRoutingUpdate = routing &&
|
|
1288
1290
|
(typeof routing.enableGlobalRoute === 'boolean' ||
|
|
1289
1291
|
typeof routing.enableGroupNameRoute === 'boolean' ||
|
|
@@ -1305,9 +1307,10 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1305
1307
|
typeof smartRouting.embeddingEncodingFormat === 'string' ||
|
|
1306
1308
|
typeof smartRouting.embeddingDimensions === 'number' ||
|
|
1307
1309
|
smartRouting.embeddingDimensions === null ||
|
|
1308
|
-
typeof smartRouting.
|
|
1309
|
-
typeof smartRouting.
|
|
1310
|
-
typeof smartRouting.
|
|
1310
|
+
typeof smartRouting.embeddingDimensionsApiPassthrough === 'boolean' ||
|
|
1311
|
+
typeof smartRouting.llmProviderBaseUrl === 'string' ||
|
|
1312
|
+
typeof smartRouting.llmProviderApiKey === 'string' ||
|
|
1313
|
+
typeof smartRouting.embeddingModel === 'string' ||
|
|
1311
1314
|
typeof smartRouting.azureOpenaiEndpoint === 'string' ||
|
|
1312
1315
|
typeof smartRouting.azureOpenaiApiKey === 'string' ||
|
|
1313
1316
|
typeof smartRouting.azureOpenaiApiVersion === 'string' ||
|
|
@@ -1397,9 +1400,9 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1397
1400
|
basePacingDelayMs: undefined,
|
|
1398
1401
|
embeddingProvider: 'openai',
|
|
1399
1402
|
embeddingDimensions: undefined,
|
|
1400
|
-
|
|
1401
|
-
|
|
1402
|
-
|
|
1403
|
+
llmProviderBaseUrl: '',
|
|
1404
|
+
llmProviderApiKey: '',
|
|
1405
|
+
embeddingModel: '',
|
|
1403
1406
|
azureOpenaiEndpoint: '',
|
|
1404
1407
|
azureOpenaiApiKey: '',
|
|
1405
1408
|
azureOpenaiApiVersion: '',
|
|
@@ -1448,9 +1451,9 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1448
1451
|
basePacingDelayMs: undefined,
|
|
1449
1452
|
embeddingProvider: 'openai',
|
|
1450
1453
|
embeddingDimensions: undefined,
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
+
llmProviderBaseUrl: '',
|
|
1455
|
+
llmProviderApiKey: '',
|
|
1456
|
+
embeddingModel: '',
|
|
1454
1457
|
azureOpenaiEndpoint: '',
|
|
1455
1458
|
azureOpenaiApiKey: '',
|
|
1456
1459
|
azureOpenaiApiVersion: '',
|
|
@@ -1556,6 +1559,10 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1556
1559
|
else if (smartRouting.embeddingDimensions === null) {
|
|
1557
1560
|
systemConfig.smartRouting.embeddingDimensions = undefined;
|
|
1558
1561
|
}
|
|
1562
|
+
if (typeof smartRouting.embeddingDimensionsApiPassthrough === 'boolean') {
|
|
1563
|
+
systemConfig.smartRouting.embeddingDimensionsApiPassthrough =
|
|
1564
|
+
smartRouting.embeddingDimensionsApiPassthrough;
|
|
1565
|
+
}
|
|
1559
1566
|
if (typeof smartRouting.enabled === 'boolean') {
|
|
1560
1567
|
// If enabling Smart Routing, validate required fields
|
|
1561
1568
|
if (smartRouting.enabled) {
|
|
@@ -1586,19 +1593,19 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1586
1593
|
}
|
|
1587
1594
|
}
|
|
1588
1595
|
else {
|
|
1589
|
-
// Get current
|
|
1590
|
-
const
|
|
1591
|
-
? smartRouting.
|
|
1592
|
-
: (systemConfig.smartRouting.
|
|
1593
|
-
const
|
|
1594
|
-
? smartRouting.
|
|
1595
|
-
: (systemConfig.smartRouting.
|
|
1596
|
-
const
|
|
1597
|
-
? smartRouting.
|
|
1598
|
-
: (systemConfig.smartRouting.
|
|
1599
|
-
if (!
|
|
1596
|
+
// Get current LLM provider config values, preferring new values from request
|
|
1597
|
+
const currentLlmProviderApiKey = typeof smartRouting.llmProviderApiKey === 'string'
|
|
1598
|
+
? smartRouting.llmProviderApiKey.trim()
|
|
1599
|
+
: (systemConfig.smartRouting.llmProviderApiKey || '').trim();
|
|
1600
|
+
const currentLlmProviderBaseUrl = typeof smartRouting.llmProviderBaseUrl === 'string'
|
|
1601
|
+
? smartRouting.llmProviderBaseUrl.trim()
|
|
1602
|
+
: (systemConfig.smartRouting.llmProviderBaseUrl || '').trim();
|
|
1603
|
+
const currentEmbeddingModel = typeof smartRouting.embeddingModel === 'string'
|
|
1604
|
+
? smartRouting.embeddingModel.trim()
|
|
1605
|
+
: (systemConfig.smartRouting.embeddingModel || '').trim();
|
|
1606
|
+
if (!currentLlmProviderApiKey || !currentLlmProviderBaseUrl || !currentEmbeddingModel) {
|
|
1600
1607
|
res.status(400).json({
|
|
1601
|
-
message: 'Smart routing cannot be enabled without
|
|
1608
|
+
message: 'Smart routing cannot be enabled without LLM provider configuration. Please provide API key, API base URL, and embedding model.',
|
|
1602
1609
|
});
|
|
1603
1610
|
return;
|
|
1604
1611
|
}
|
|
@@ -1617,15 +1624,15 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1617
1624
|
else if (smartRouting.basePacingDelayMs === null) {
|
|
1618
1625
|
systemConfig.smartRouting.basePacingDelayMs = undefined;
|
|
1619
1626
|
}
|
|
1620
|
-
if (typeof smartRouting.
|
|
1621
|
-
systemConfig.smartRouting.
|
|
1627
|
+
if (typeof smartRouting.llmProviderBaseUrl === 'string') {
|
|
1628
|
+
systemConfig.smartRouting.llmProviderBaseUrl = smartRouting.llmProviderBaseUrl?.trim();
|
|
1622
1629
|
}
|
|
1623
|
-
if (typeof smartRouting.
|
|
1624
|
-
systemConfig.smartRouting.
|
|
1630
|
+
if (typeof smartRouting.llmProviderApiKey === 'string') {
|
|
1631
|
+
systemConfig.smartRouting.llmProviderApiKey = smartRouting.llmProviderApiKey?.trim();
|
|
1625
1632
|
}
|
|
1626
|
-
if (typeof smartRouting.
|
|
1627
|
-
systemConfig.smartRouting.
|
|
1628
|
-
smartRouting.
|
|
1633
|
+
if (typeof smartRouting.embeddingModel === 'string') {
|
|
1634
|
+
systemConfig.smartRouting.embeddingModel =
|
|
1635
|
+
smartRouting.embeddingModel?.trim();
|
|
1629
1636
|
}
|
|
1630
1637
|
if (typeof smartRouting.azureOpenaiEndpoint === 'string') {
|
|
1631
1638
|
systemConfig.smartRouting.azureOpenaiEndpoint = smartRouting.azureOpenaiEndpoint?.trim();
|
|
@@ -1661,11 +1668,13 @@ export const updateSystemConfig = async (req, res) => {
|
|
|
1661
1668
|
systemConfig.smartRouting.embeddingEncodingFormat ||
|
|
1662
1669
|
previousSmartRoutingConfig.embeddingDimensions !==
|
|
1663
1670
|
systemConfig.smartRouting.embeddingDimensions ||
|
|
1664
|
-
previousSmartRoutingConfig.
|
|
1665
|
-
systemConfig.smartRouting.
|
|
1666
|
-
previousSmartRoutingConfig.
|
|
1667
|
-
|
|
1668
|
-
|
|
1671
|
+
previousSmartRoutingConfig.embeddingDimensionsApiPassthrough !==
|
|
1672
|
+
systemConfig.smartRouting.embeddingDimensionsApiPassthrough ||
|
|
1673
|
+
previousSmartRoutingConfig.llmProviderBaseUrl !==
|
|
1674
|
+
systemConfig.smartRouting.llmProviderBaseUrl ||
|
|
1675
|
+
previousSmartRoutingConfig.llmProviderApiKey !== systemConfig.smartRouting.llmProviderApiKey ||
|
|
1676
|
+
previousSmartRoutingConfig.embeddingModel !==
|
|
1677
|
+
systemConfig.smartRouting.embeddingModel ||
|
|
1669
1678
|
previousSmartRoutingConfig.azureOpenaiEndpoint !==
|
|
1670
1679
|
systemConfig.smartRouting.azureOpenaiEndpoint ||
|
|
1671
1680
|
previousSmartRoutingConfig.azureOpenaiApiKey !==
|