@qodalis/cli-core 2.0.0 → 2.1.0

package/public-api.mjs

@@ -2597,7 +2597,7 @@ function satisfiesVersionRange(installed, range) {
 }
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0";
+var LIBRARY_VERSION = "2.1.0";
 var API_VERSION = 2;
 
 // src/lib/utils/server-version-negotiator.ts
@@ -2659,13 +2659,61 @@ function buildAuthenticatedWebSocketUrl(wsUrl, headers) {
   ).join("&");
   return `${wsUrl}${separator}${params}`;
 }
-async function resolveServerWebSocketUrl(services, serverName, wsUrl, configHeaders) {
+var CLI_WS_TICKET_PATH = "/api/v1/qcli/sessions/ws-ticket";
+var warnedServers = /* @__PURE__ */ new Set();
+async function buildServerWebSocketUrl(wsUrl, headers, options) {
+  const resolved = resolveHeaders(headers);
+  if (Object.keys(resolved).length === 0) {
+    return wsUrl;
+  }
+  if (options?.unsafeHeadersInWebSocketUrl) {
+    return buildAuthenticatedWebSocketUrl(wsUrl, resolved);
+  }
+  const httpBase = toHttpBaseUrl(wsUrl);
+  const ticket = await fetchWebSocketTicket(httpBase, resolved);
+  if (ticket) {
+    return appendQueryParams(wsUrl, { ticket });
+  }
+  if (!warnedServers.has(httpBase)) {
+    warnedServers.add(httpBase);
+    console.warn(
+      `[qodalis-cli] ${httpBase} issued no WebSocket ticket (${CLI_WS_TICKET_PATH}), so its sockets connect without credentials. Configured headers are never copied into WebSocket URLs; enable the users plugin on the server, or set \`unsafeHeadersInWebSocketUrl: true\` on the server config to keep the old behaviour.`
+    );
+  }
+  return wsUrl;
+}
+async function resolveServerWebSocketUrl(services, serverName, wsUrl, configHeaders, options) {
   const authService = services?.get(ICliServerAuthService_TOKEN);
   const params = await authService?.getWebSocketParams?.(serverName);
   if (params) {
     return appendQueryParams(wsUrl, params);
   }
-  return buildAuthenticatedWebSocketUrl(wsUrl, () => resolveServerHeaders(services, serverName, configHeaders));
+  return buildServerWebSocketUrl(
+    wsUrl,
+    () => resolveServerHeaders(services, serverName, configHeaders),
+    options
+  );
+}
+function toHttpBaseUrl(wsUrl) {
+  const url = new URL(wsUrl);
+  const wsSegment = url.pathname.indexOf("/ws/");
+  const basePath = wsSegment >= 0 ? url.pathname.slice(0, wsSegment) : "";
+  const protocol = url.protocol === "wss:" || url.protocol === "https:" ? "https:" : "http:";
+  return `${protocol}//${url.host}${basePath}`;
+}
+async function fetchWebSocketTicket(httpBase, headers) {
+  try {
+    const response = await fetch(`${httpBase}${CLI_WS_TICKET_PATH}`, {
+      method: "POST",
+      headers: { ...headers, "Content-Type": "application/json" },
+      body: "{}"
+    });
+    if (!response.ok) return void 0;
+    const body = await response.json();
+    return typeof body?.ticket === "string" && body.ticket ? body.ticket : void 0;
+  } catch {
+    return void 0;
+  }
 }
 function appendQueryParams(url, params) {
   const entries = Object.entries(params);
@@ -4205,6 +4253,6 @@ var BrowserFileTransferService = class {
   }
 };
 
-export { API_VERSION, BrowserFileTransferService, CANCELLATION_ERROR_MESSAGE, CLI_CONFIGURE_STORE_NAME, CancellablePromise, CliAccessDeniedError, CliBackgroundColor, CliForegroundColor, CliHttpError, CliIcon, CliKeyData, CliLogLevel, CliModuleRegistry, CliServerPermissions, CliUsersPermissions, DEFAULT_DIR_PERMISSIONS, DEFAULT_FILE_PERMISSIONS, DefaultLibraryAuthor, DefaultThemeInfos, DefaultThemes, ICliAuditService_TOKEN, ICliAuthService_TOKEN, ICliAuthorizationService_TOKEN, ICliCommandGuard_TOKEN, ICliCompletionProvider_TOKEN, ICliDragDropService_TOKEN, ICliEventBus_TOKEN, ICliFilePickerProvider_TOKEN, ICliFileTransferService_TOKEN, ICliGroupsStoreService_TOKEN, ICliHttpClient_TOKEN, ICliKeyValueStore_TOKEN, ICliPermissionRegistry_TOKEN, ICliPermissionService_TOKEN, ICliServerAuthService_TOKEN, ICliServerAuthTokenProvider_TOKEN, ICliServerManager_TOKEN, ICliSessionsService_TOKEN, ICliTranslationService_TOKEN, ICliUserEventService_TOKEN, ICliUserSessionService_TOKEN, ICliUsersStoreService_TOKEN, LIBRARY_VERSION, ObjectDescriber, ServerVersionNegotiator, appendQueryParams, bootCliModule, buildAuthenticatedWebSocketUrl, clearTerminalLine, cliAccessMetadataGuards, cliAuthorize, cliCanAccess, cliDefaultServer, cliEvaluateAccess, cliHasPermission, cliMergePermissions, cliMissingPermissions, cliPermissionMatches, cliRequireAuthGuard, cliRequiredGroupsGuard, cliRequiredPermissionsGuard, colorFirstWord, colorizeJson, compareVersions, constants, createCliToken, createWorkerService, delay, derivePanelThemeStyles, enums, formatJson, getConfigValue, getParameterValue, getPluginConfigValue, getRightOfWord, highlightTextWithBg, initializeBrowserEnvironment, isCliAccessDeniedError, joinShellWords, loadPanelPosition, nextPanelPosition, quoteShellWord, resolveConfigurationCategories, resolveHeaders, resolveServerHeaders, resolveServerWebSocketUrl, satisfiesMinVersion, satisfiesVersionRange, savePanelPosition, splitShellWords, stripAnsi, toQueryString, truncateToWidth, unquoteRawArgument, utils, visibleLength, writeExamples, writeHint, writeUsage, writeWrapped };
+export { API_VERSION, BrowserFileTransferService, CANCELLATION_ERROR_MESSAGE, CLI_CONFIGURE_STORE_NAME, CLI_WS_TICKET_PATH, CancellablePromise, CliAccessDeniedError, CliBackgroundColor, CliForegroundColor, CliHttpError, CliIcon, CliKeyData, CliLogLevel, CliModuleRegistry, CliServerPermissions, CliUsersPermissions, DEFAULT_DIR_PERMISSIONS, DEFAULT_FILE_PERMISSIONS, DefaultLibraryAuthor, DefaultThemeInfos, DefaultThemes, ICliAuditService_TOKEN, ICliAuthService_TOKEN, ICliAuthorizationService_TOKEN, ICliCommandGuard_TOKEN, ICliCompletionProvider_TOKEN, ICliDragDropService_TOKEN, ICliEventBus_TOKEN, ICliFilePickerProvider_TOKEN, ICliFileTransferService_TOKEN, ICliGroupsStoreService_TOKEN, ICliHttpClient_TOKEN, ICliKeyValueStore_TOKEN, ICliPermissionRegistry_TOKEN, ICliPermissionService_TOKEN, ICliServerAuthService_TOKEN, ICliServerAuthTokenProvider_TOKEN, ICliServerManager_TOKEN, ICliSessionsService_TOKEN, ICliTranslationService_TOKEN, ICliUserEventService_TOKEN, ICliUserSessionService_TOKEN, ICliUsersStoreService_TOKEN, LIBRARY_VERSION, ObjectDescriber, ServerVersionNegotiator, appendQueryParams, bootCliModule, buildAuthenticatedWebSocketUrl, buildServerWebSocketUrl, clearTerminalLine, cliAccessMetadataGuards, cliAuthorize, cliCanAccess, cliDefaultServer, cliEvaluateAccess, cliHasPermission, cliMergePermissions, cliMissingPermissions, cliPermissionMatches, cliRequireAuthGuard, cliRequiredGroupsGuard, cliRequiredPermissionsGuard, colorFirstWord, colorizeJson, compareVersions, constants, createCliToken, createWorkerService, delay, derivePanelThemeStyles, enums, formatJson, getConfigValue, getParameterValue, getPluginConfigValue, getRightOfWord, highlightTextWithBg, initializeBrowserEnvironment, isCliAccessDeniedError, joinShellWords, loadPanelPosition, nextPanelPosition, quoteShellWord, resolveConfigurationCategories, resolveHeaders, resolveServerHeaders, resolveServerWebSocketUrl, satisfiesMinVersion, satisfiesVersionRange, savePanelPosition, splitShellWords, stripAnsi, toQueryString, truncateToWidth, unquoteRawArgument, utils, visibleLength, writeExamples, writeHint, writeUsage, writeWrapped };
 //# sourceMappingURL=public-api.mjs.map
 //# sourceMappingURL=public-api.mjs.map