fix after rebasing

Author: KSDaemon

packages/cubejs-client-core/package.json

@@ -38,7 +38,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@cubejs-backend/linter": "1.3.13",
+    "@cubejs-backend/linter": "1.3.15",
     "@types/jest": "^29",
     "@types/moment-range": "^4.0.0",
     "@types/ramda": "^0.27.34",

packages/cubejs-client-core/src/HttpTransport.ts

@@ -24,6 +24,10 @@ export type TransportOptions = {
    * Fetch timeout in milliseconds. Would be passed as AbortSignal.timeout()
    */
   fetchTimeout?: number;
+  /**
+   * AbortSignal to cancel requests
+   */
+  signal?: AbortSignal;
 };
 
 export interface ITransportResponse<R> {
@@ -52,8 +56,8 @@ export class HttpTransport implements ITransport<Response> {
   protected credentials: TransportOptions['credentials'];
 
   protected fetchTimeout: number | undefined;
-  
-  private signal: any;
+
+  private readonly signal: AbortSignal | undefined;
 
   public constructor({ authorization, apiUrl, method, headers = {}, credentials, fetchTimeout, signal }: Omit<TransportOptions, 'headers'> & { headers?: TransportOptions['headers'] }) {
     this.authorization = authorization;

packages/cubejs-client-core/src/index.ts

@@ -45,6 +45,10 @@ export type LoadMethodOptions = {
    * Function that receives `ProgressResult` on each `Continue wait` message.
    */
   progressCallback?(result: ProgressResult): void;
+  /**
+   * AbortSignal to cancel requests
+   */
+  signal?: AbortSignal;
 };
 
 export type DeeplyReadonly<T> = {
@@ -139,6 +143,14 @@ export type CubeApiOptions = {
    * How many network errors would be retried before returning to users. Default to 0.
    */
   networkErrorRetries?: number;
+  /**
+   * AbortSignal to cancel requests
+   */
+  signal?: AbortSignal;
+  /**
+   * Fetch timeout in milliseconds. Would be passed as AbortSignal.timeout()
+   */
+  fetchTimeout?: number;
 };
 
 /**
@@ -528,7 +540,7 @@ class CubeApi {
       () => this.request('load', {
         query,
         queryType: 'multi',
-        signal: options.signal
+        signal: options?.signal
       }),
       (response: any) => this.loadResponseInternal(response, options),
       options,
@@ -594,7 +606,7 @@ class CubeApi {
       () => this.request('subscribe', {
         query,
         queryType: 'multi',
-        signal: options.signal
+        signal: options?.signal
       }),
       (response: any) => this.loadResponseInternal(response, options),
       { ...options, subscribe: true },

packages/cubejs-client-core/test/HttpTransport.test.ts

@@ -120,13 +120,16 @@ describe('HttpTransport', () => {
   // Signal tests from src/tests/HttpTransport.test.js
   describe('Signal functionality', () => {
     beforeEach(() => {
-      fetch.mockClear();
       // Default mock implementation for signal tests
-      fetch.mockImplementation(() => Promise.resolve({
+      mockedFetch.mockImplementation(() => Promise.resolve({
         json: () => Promise.resolve({ data: 'test data' }),
         ok: true,
         status: 200
-      }));
+      }) as any);
+    });
+
+    afterEach(() => {
+      mockedFetch.mockClear();
     });
 
     test('should pass the signal to fetch when provided in constructor', async () => {
@@ -148,8 +151,8 @@ describe('HttpTransport', () => {
       await Promise.resolve();
 
       // Ensure fetch was called with the signal
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch.mock.calls[0][1].signal).toBe(signal);
+      expect(mockedFetch).toHaveBeenCalledTimes(1);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).toBe(signal);
 
       await promise;
     });
@@ -175,8 +178,8 @@ describe('HttpTransport', () => {
       await Promise.resolve();
 
       // Ensure fetch was called with the signal
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch.mock.calls[0][1].signal).toBe(signal);
+      expect(mockedFetch).toHaveBeenCalledTimes(1);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).toBe(signal);
 
       await promise;
     });
@@ -203,9 +206,9 @@ describe('HttpTransport', () => {
       await Promise.resolve();
 
       // Ensure fetch was called with the request signal, not the constructor signal
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch.mock.calls[0][1].signal).toBe(controller2.signal);
-      expect(fetch.mock.calls[0][1].signal).not.toBe(controller1.signal);
+      expect(mockedFetch).toHaveBeenCalledTimes(1);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).toBe(controller2.signal);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).not.toBe(controller1.signal);
 
       await promise;
     });
@@ -233,8 +236,8 @@ describe('HttpTransport', () => {
       await Promise.resolve();
 
       // Ensure fetch was called with the timeout signal
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch.mock.calls[0][1].signal).toBe(mockTimeoutSignal);
+      expect(mockedFetch).toHaveBeenCalledTimes(1);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).toBe(mockTimeoutSignal);
       expect(AbortSignal.timeout).toHaveBeenCalledWith(5000);
 
       // Restore original implementation
@@ -246,12 +249,12 @@ describe('HttpTransport', () => {
     test('should handle request abortion', async () => {
       // Create a mock Promise and resolver function to control Promise completion
       let resolveFetch;
-      const fetchPromise = new Promise(resolve => {
+      const fetchPromise = new Promise<Response>(resolve => {
         resolveFetch = resolve;
       });
 
       // Mock fetch to return our controlled Promise
-      fetch.mockImplementationOnce(() => fetchPromise);
+      mockedFetch.mockImplementationOnce(() => fetchPromise);
 
       const controller = new AbortController();
       const { signal } = controller;
@@ -273,14 +276,14 @@ describe('HttpTransport', () => {
       await Promise.resolve();
 
       // Ensure fetch was called with the signal
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch.mock.calls[0][1].signal).toBe(signal);
+      expect(mockedFetch).toHaveBeenCalledTimes(1);
+      expect(mockedFetch.mock.calls[0]?.[1]?.signal).toBe(signal);
 
       // Abort the request
       controller.abort();
 
       // Resolve the fetch Promise, simulating request completion
-      resolveFetch({
+      resolveFetch!({
         json: () => Promise.resolve({ data: 'aborted data' }),
         ok: true,
         status: 200