incremental fixes

Author: MrRefactoring

package.json

@@ -116,26 +116,26 @@
     "code:formatting": "pnpm run replace:all && pnpm run prettier && pnpm run lint:fix && pnpm run replace:fixCodeBlockSemicolons"
   },
   "dependencies": {
-    "axios": "^1.10.0",
+    "axios": "^1.11.0",
     "mime": "^4.0.7",
     "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.32.0",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.4",
     "@stylistic/eslint-plugin": "^5.2.2",
     "@types/node": "^20.19.9",
     "@types/sinon": "^17.0.4",
-    "dotenv": "^17.2.0",
-    "eslint": "^9.31.0",
+    "dotenv": "^17.2.1",
+    "eslint": "^9.32.0",
     "globals": "^16.3.0",
-    "jiti": "^2.4.2",
+    "jiti": "^2.5.1",
     "prettier": "^3.6.2",
     "prettier-plugin-jsdoc": "^1.3.3",
-    "rollup": "^4.45.1",
+    "rollup": "^4.45.3",
     "rollup-plugin-esnext-to-nodenext": "^1.0.1",
     "rollup-plugin-node-externals": "^8.0.1",
     "sinon": "^21.0.0",

pnpm-lock.yaml

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Client } from './client';
+import { Client } from './client';
 import type { Config } from '../config';
 import { ConfigSchema } from '../config';
 import { getAuthenticationToken } from '../services/authenticationService';
@@ -10,8 +10,10 @@ const STRICT_GDPR_FLAG = 'x-atlassian-force-account-id';
 const ATLASSIAN_TOKEN_CHECK_FLAG = 'X-Atlassian-Token';
 const ATLASSIAN_TOKEN_CHECK_NOCHECK_VALUE = 'no-check';
 
-export class BaseClient implements Client {
+export class BaseClient extends Client {
   constructor(protected readonly config: Config) {
+    super();
+
     try {
       this.config = ConfigSchema.parse(config);
     } catch (e) {
@@ -73,13 +75,7 @@ export class BaseClient implements Client {
     }, {});
   }
 
-  async sendRequest<T>(request: Request): Promise<T> {
-    const response = await this.sendRequestFullResponse(request);
-
-    return this.handleFetchResponse(response);
-  }
-
-  async sendRequestFullResponse(request: Request): Promise<Response> {
+  async sendRequestWithRawResponse(request: Request): Promise<Response> {
     const url = new URL(request.url, this.config.host);
 
     url.search = this.paramSerializer(request.query ?? {});
@@ -131,33 +127,6 @@ export class BaseClient implements Client {
     throw new Error(errorMessage);
   }
 
-  private async handleFetchResponse<T>(response: Response): Promise<T> {
-    const contentType = response.headers.get('content-type') || '';
-
-    try {
-      if (contentType.includes('application/json')) {
-        return await response.json().catch(async () => {
-          console.log('LLLL', await response.text());
-
-          return null;
-        });
-      } else if (contentType.includes('text/')) {
-        return (await response.text()) as T;
-      } else if (
-        contentType.includes('application/octet-stream') ||
-        contentType.includes('application/x-www-form-urlencoded') ||
-        !contentType
-      ) {
-        return (await response.arrayBuffer()) as T;
-      } else {
-        return response as T;
-      }
-    } catch (error) {
-      // todo
-      throw new Error(`Failed to parse response: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-
   // handleSuccessResponse<T>(response: any): T {
   //   this.config.middlewares?.onResponse?.(response.data);
   //

src/clients/baseClient.ts

@@ -1,5 +1,36 @@
 import type { Request } from '../request';
 
-export interface Client {
-  sendRequest<T>(requestConfig: Request): Promise<T>;
+export abstract class Client {
+  async sendRequest<T>(request: Request): Promise<T> {
+    const response = await this.sendRequestWithRawResponse(request);
+
+    return this.handleFetchResponse(response);
+  }
+
+  abstract sendRequestWithRawResponse(request: Request): Promise<Response>;
+
+  async handleFetchResponse<T>(response: Response): Promise<T> {
+    const contentType = response.headers.get('content-type') || '';
+
+    try {
+      if (contentType.includes('application/json')) {
+        return await response.json().catch(async () => {
+          return undefined;
+        });
+      } else if (contentType.includes('text/')) {
+        return (await response.text()) as T;
+      } else if (
+        contentType.includes('application/octet-stream') ||
+        contentType.includes('application/x-www-form-urlencoded') ||
+        !contentType
+      ) {
+        return (await response.arrayBuffer()) as T;
+      } else {
+        return response as T;
+      }
+    } catch (error) {
+      // todo
+      throw new Error(`Failed to parse response: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
 }

src/clients/client.ts

@@ -28,49 +28,24 @@ export class IssueAttachments {
    *   to view the issue.
    * - If attachments are added in private comments, the comment-level restriction will be applied.
    */
-  async getAttachmentContent<T = Buffer>(
-    parameters: Parameters.GetAttachmentContent | string,
-    callback: Callback<T>,
-  ): Promise<void>;
-  /**
-   * Returns the contents of an attachment. A `Range` header can be set to define a range of bytes within the attachment
-   * to download. See the [HTTP Range header standard](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range)
-   * for details.
-   *
-   * To return a thumbnail of the attachment, use [Get attachment
-   * thumbnail](#api-rest-api-2-attachment-thumbnail-id-get).
-   *
-   * This operation can be accessed anonymously.
-   *
-   * **[Permissions](https://developer.atlassian.com/cloud/jira/platform/rest/v2/intro/#permissions) required:** For the
-   * issue containing the attachment:
-   *
-   * - _Browse projects_ [project permission](https://confluence.atlassian.com/x/yodKLg) for the project that the issue is
-   *   in.
-   * - If [issue-level security](https://confluence.atlassian.com/x/J4lKLg) is configured, issue-level security permission
-   *   to view the issue.
-   * - If attachments are added in private comments, the comment-level restriction will be applied.
-   */
-  async getAttachmentContent<T = Buffer>(
-    parameters: Parameters.GetAttachmentContent | string,
-    callback?: never,
-  ): Promise<T>;
-  async getAttachmentContent<T = Buffer>(
-    parameters: Parameters.GetAttachmentContent | string,
-    callback?: Callback<T>,
-  ): Promise<void | T> {
-    const id = typeof parameters === 'string' ? parameters : parameters.id;
-
+  async getAttachmentContent<T = Models.AttachmentContent>(
+    parameters: Parameters.GetAttachmentContent,
+  ): Promise<T> {
+    // todo add Range header
     const config: Request = {
-      url: `/rest/api/2/attachment/content/${id}`,
+      url: `/rest/api/2/attachment/content/${parameters.id}`,
       method: 'GET',
       query: {
-        redirect: typeof parameters !== 'string' && parameters.redirect,
+        redirect: parameters.redirect,
       },
-      // responseType: 'arraybuffer', // todo
     };
 
-    return this.client.sendRequest(config);
+    const response = await this.client.sendRequestWithRawResponse(config);
+
+    const contentType = response.headers.get('content-type');
+    const content = await response.arrayBuffer();
+
+    return { contentType, content } as T;
   }
 
   /**

src/version2/issueAttachments.ts

@@ -0,0 +1,4 @@
+export interface AttachmentContent {
+  contentType: string | null;
+  content: ArrayBuffer;
+}

src/version2/models/attachmentContent.ts

@@ -1,3 +1,4 @@
+export * from './attachmentContent';
 export * from './actorInput';
 export * from './actorsMap';
 export * from './addAtlassianTeamRequest';