@atlassian-dc-mcp/jira 0.17.0 → 0.18.0

package/src/config.ts

@@ -12,7 +12,8 @@ export const JIRA_PRODUCT: ProductDefinition = {
     token: 'JIRA_API_TOKEN',
     defaultPageSize: 'JIRA_DEFAULT_PAGE_SIZE',
   },
-  defaultApiBasePath: '/rest/api/2',
+  defaultApiBasePath: '/rest',
+  apiBasePathStrippableSuffixes: ['/api/2'],
 };
 
 export function getJiraRuntimeConfig() {

package/src/jira-client/core/request.ts

@@ -9,6 +9,9 @@ import { CancelablePromise } from './CancelablePromise.js';
 import type { OnCancel } from './CancelablePromise.js';
 import type { OpenAPIConfig } from './OpenAPI.js';
 
+const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
+const REQUEST_TIMEOUT_MS_ENV_VAR = 'ATLASSIAN_DC_MCP_REQUEST_TIMEOUT_MS';
+
 export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
     return value !== undefined && value !== null;
 };
@@ -129,6 +132,15 @@ export const getFormData = (options: ApiRequestOptions): FormData | undefined =>
 
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 
+const getRequestTimeoutMs = (): number => {
+    const raw = process.env[REQUEST_TIMEOUT_MS_ENV_VAR];
+    if (!raw) {
+        return DEFAULT_REQUEST_TIMEOUT_MS;
+    }
+    const parsed = Number.parseInt(raw.trim(), 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_REQUEST_TIMEOUT_MS;
+};
+
 export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
     if (typeof resolver === 'function') {
         return (resolver as Resolver<T>)(options);
@@ -202,6 +214,7 @@ export const sendRequest = async (
     onCancel: OnCancel
 ): Promise<Response> => {
     const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), getRequestTimeoutMs());
 
     const request: RequestInit = {
         headers,
@@ -214,9 +227,16 @@ export const sendRequest = async (
         request.credentials = config.CREDENTIALS;
     }
 
-    onCancel(() => controller.abort());
+    onCancel(() => {
+        clearTimeout(timeout);
+        controller.abort();
+    });
 
-    return await fetch(url, request);
+    try {
+        return await fetch(url, request);
+    } finally {
+        clearTimeout(timeout);
+    }
 };
 
 export const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {

package/src/jira-service.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { handleApiOperation } from '@atlassian-dc-mcp/common';
-import { IssueService, OpenAPI, SearchService } from './jira-client/index.js';
+import { handleApiOperation, resolveOpenApiBase } from '@atlassian-dc-mcp/common';
+import { IssueService, MyselfService, OpenAPI, SearchService } from './jira-client/index.js';
 import type { StringList } from './jira-client/models/StringList.js';
-import { getDefaultPageSize, getMissingConfig } from './config.js';
+import { getDefaultPageSize, getMissingConfig, JIRA_PRODUCT } from './config.js';
 
 const DEFAULT_SEARCH_FIELDS = ['summary', 'description', 'status', 'assignee', 'reporter', 'priority', 'issuetype', 'labels', 'updated'];
 const DEFAULT_ISSUE_FIELDS = [...DEFAULT_SEARCH_FIELDS, 'parent', 'subtasks'];
@@ -28,17 +28,15 @@ export class JiraService {
   constructor(
     host: string | undefined,
     token: string | (() => string | undefined),
-    fullBaseUrl?: string,
+    apiBasePath?: string,
     getPageSize: () => number = getDefaultPageSize,
   ) {
-    if (fullBaseUrl) {
-      OpenAPI.BASE = fullBaseUrl;
-    } else if (host) {
-      OpenAPI.BASE = `https://${host}/rest`;
-    } else {
-      throw new Error('Either host or fullBaseUrl must be provided');
-    }
-
+    OpenAPI.BASE = resolveOpenApiBase({
+      host,
+      apiBasePath,
+      defaultBasePath: JIRA_PRODUCT.defaultApiBasePath ?? '/rest',
+      strippableSuffixes: JIRA_PRODUCT.apiBasePathStrippableSuffixes,
+    });
     OpenAPI.TOKEN = resolveToken(token, 'Missing required environment variable: JIRA_API_TOKEN');
     OpenAPI.VERSION = '2';
     this.getPageSize = getPageSize;
@@ -147,6 +145,10 @@ export class JiraService {
     }, 'Error transitioning issue');
   }
 
+  async validateSetup(): Promise<void> {
+    await MyselfService.getUser();
+  }
+
   static validateConfig(): string[] {
     return getMissingConfig();
   }

package/src/setup.ts

@@ -1,4 +1,15 @@
-import { runSetup } from '@atlassian-dc-mcp/common';
+import { describeValidationError, runSetup } from '@atlassian-dc-mcp/common';
 import { JIRA_PRODUCT } from './config.js';
+import { JiraService } from './jira-service.js';
 
-await runSetup(JIRA_PRODUCT);
+await runSetup(JIRA_PRODUCT, {
+  validateCredentials: async ({ host, apiBasePath, token }) => {
+    const service = new JiraService(host || undefined, token, apiBasePath || undefined);
+    try {
+      await service.validateSetup();
+      return { ok: true };
+    } catch (error) {
+      return { ok: false, message: describeValidationError(error) };
+    }
+  },
+});