@forge/events 0.0.0-experimental-416047f → 0.0.0-experimental-9b81865

package/out/invocationErrorCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invocationErrorCode.d.ts","sourceRoot":"","sources":["../src/invocationErrorCode.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,sBAAsB,IAAA;IACtB,iBAAiB,IAAA;IACjB,+BAA+B,IAAA;IAC/B,8BAA8B,IAAA;IAC9B,8BAA8B,IAAA;IAC9B,sBAAsB,IAAA;CACvB"}
+{"version":3,"file":"invocationErrorCode.d.ts","sourceRoot":"","sources":["../src/invocationErrorCode.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,sBAAsB,2BAA2B;IACjD,iBAAiB,sBAAsB;IACvC,+BAA+B,oCAAoC;IACnE,8BAA8B,mCAAmC;IACjE,8BAA8B,mCAAmC;IACjE,sBAAsB,2BAA2B;CAClD"}

package/out/invocationErrorCode.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvocationErrorCode = void 0;
 var InvocationErrorCode;
 (function (InvocationErrorCode) {
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_OUT_OF_MEMORY"] = 0] = "FUNCTION_OUT_OF_MEMORY";
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_TIME_OUT"] = 1] = "FUNCTION_TIME_OUT";
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_PLATFORM_UNKNOWN_ERROR"] = 2] = "FUNCTION_PLATFORM_UNKNOWN_ERROR";
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_PLATFORM_RATE_LIMITED"] = 3] = "FUNCTION_PLATFORM_RATE_LIMITED";
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_UPSTREAM_RATE_LIMITED"] = 4] = "FUNCTION_UPSTREAM_RATE_LIMITED";
-    InvocationErrorCode[InvocationErrorCode["FUNCTION_RETRY_REQUEST"] = 5] = "FUNCTION_RETRY_REQUEST";
+    InvocationErrorCode["FUNCTION_OUT_OF_MEMORY"] = "FUNCTION_OUT_OF_MEMORY";
+    InvocationErrorCode["FUNCTION_TIME_OUT"] = "FUNCTION_TIME_OUT";
+    InvocationErrorCode["FUNCTION_PLATFORM_UNKNOWN_ERROR"] = "FUNCTION_PLATFORM_UNKNOWN_ERROR";
+    InvocationErrorCode["FUNCTION_PLATFORM_RATE_LIMITED"] = "FUNCTION_PLATFORM_RATE_LIMITED";
+    InvocationErrorCode["FUNCTION_UPSTREAM_RATE_LIMITED"] = "FUNCTION_UPSTREAM_RATE_LIMITED";
+    InvocationErrorCode["FUNCTION_RETRY_REQUEST"] = "FUNCTION_RETRY_REQUEST";
 })(InvocationErrorCode = exports.InvocationErrorCode || (exports.InvocationErrorCode = {}));

package/out/jobProgress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jobProgress.d.ts","sourceRoot":"","sources":["../src/jobProgress.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAoB,WAAW,EAAmB,MAAM,SAAS,CAAC;AAEtF,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,EAAE,CAAS;gBAEP,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,WAAW;IAKzC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC;IAehC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;CAcrC"}
+{"version":3,"file":"jobProgress.d.ts","sourceRoot":"","sources":["../src/jobProgress.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAoB,WAAW,EAAmB,MAAM,SAAS,CAAC;AAGtF,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,EAAE,CAAS;gBAEP,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,WAAW;IAKzC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC;IAehC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;CAcrC"}

package/out/jobProgress.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobProgress = void 0;
 const queries_1 = require("./queries");
 const validators_1 = require("./validators");
+const api_1 = require("@forge/api");
 class JobProgress {
     constructor(id, apiClient) {
         this.id = id;
-        this.apiClient = apiClient || global.api.asApp().__requestAtlassian;
+        this.apiClient = apiClient || (0, api_1.createRequestStargateAsApp)();
     }
     async getStats() {
         const [queueName, jobId] = this.id.split('#');
@@ -15,9 +16,9 @@ class JobProgress {
             jobId: jobId,
             time: new Date().toISOString()
         };
-        validators_1.validateGetStatsPayload(getStatsRequest);
-        const response = await queries_1.post(queries_1.GET_STATS_PATH, getStatsRequest, this.apiClient);
-        await validators_1.validateGetStatsAPIResponse(response, getStatsRequest);
+        (0, validators_1.validateGetStatsPayload)(getStatsRequest);
+        const response = await (0, queries_1.post)(queries_1.GET_STATS_PATH, getStatsRequest, this.apiClient);
+        await (0, validators_1.validateGetStatsAPIResponse)(response, getStatsRequest);
         return response;
     }
     async cancel() {
@@ -27,9 +28,9 @@ class JobProgress {
             jobId: jobId,
             time: new Date().toISOString()
         };
-        validators_1.validateCancelJobRequest(cancelJobRequest);
-        const response = await queries_1.post(queries_1.CANCEL_JOB_PATH, cancelJobRequest, this.apiClient);
-        await validators_1.validateCancelJobAPIResponse(response, cancelJobRequest);
+        (0, validators_1.validateCancelJobRequest)(cancelJobRequest);
+        const response = await (0, queries_1.post)(queries_1.CANCEL_JOB_PATH, cancelJobRequest, this.apiClient);
+        await (0, validators_1.validateCancelJobAPIResponse)(response, cancelJobRequest);
         return response;
     }
 }

package/out/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,SAAS,0EAA0E,CAAC;AACjG,eAAO,MAAM,cAAc,wEAAwE,CAAC;AACpG,eAAO,MAAM,eAAe,yEAAyE,CAAC;AAEtG,eAAO,MAAM,IAAI,aAAoB,MAAM,QAAQ,UAAU,aAAa,WAAW,KAAG,OAAO,CAAC,WAAW,CAU1G,CAAC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,SAAS,0EAA0E,CAAC;AACjG,eAAO,MAAM,cAAc,wEAAwE,CAAC;AACpG,eAAO,MAAM,eAAe,yEAAyE,CAAC;AAEtG,eAAO,MAAM,IAAI,aAAoB,MAAM,QAAQ,UAAU,aAAa,WAAW,KAAG,QAAQ,WAAW,CAU1G,CAAC"}

package/out/queries.js

@@ -4,7 +4,7 @@ exports.post = exports.CANCEL_JOB_PATH = exports.GET_STATS_PATH = exports.PUSH_P
 exports.PUSH_PATH = '/webhook/queue/publish/{cloudId}/{environmentId}/{appId}/{appVersion}';
 exports.GET_STATS_PATH = '/webhook/queue/stats/{cloudId}/{environmentId}/{appId}/{appVersion}';
 exports.CANCEL_JOB_PATH = '/webhook/queue/cancel/{cloudId}/{environmentId}/{appId}/{appVersion}';
-exports.post = async (endpoint, body, apiClient) => {
+const post = async (endpoint, body, apiClient) => {
     const request = {
         method: 'POST',
         body: JSON.stringify(body),
@@ -14,3 +14,4 @@ exports.post = async (endpoint, body, apiClient) => {
     };
     return await apiClient(endpoint, request);
 };
+exports.post = post;

package/out/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,SAAS,CAAC;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,KAAK;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW;IAMvD,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,EAAE,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BvF,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;CAGnC"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,SAAS,CAAC;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,qBAAa,KAAK;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,WAAW;IAMvD,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,EAAE,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BvF,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;CAGnC"}

package/out/queue.js

@@ -6,16 +6,17 @@ const queries_1 = require("./queries");
 const validators_1 = require("./validators");
 const v4_1 = tslib_1.__importDefault(require("uuid/v4"));
 const jobProgress_1 = require("./jobProgress");
+const api_1 = require("@forge/api");
 class Queue {
     constructor(queueParams, apiClient) {
-        validators_1.validateQueueKey(queueParams.key);
+        (0, validators_1.validateQueueKey)(queueParams.key);
         this.queueParams = queueParams;
-        this.apiClient = apiClient || global.api.asApp().__requestAtlassian;
+        this.apiClient = apiClient || (0, api_1.createRequestStargateAsApp)();
     }
     async push(payloads, pushSettings) {
-        validators_1.validatePushPayloads(payloads);
+        (0, validators_1.validatePushPayloads)(payloads);
         const queueName = this.queueParams.key;
-        const jobId = v4_1.default();
+        const jobId = (0, v4_1.default)();
         const pushRequest = {
             queueName: queueName,
             jobId: jobId,
@@ -25,13 +26,13 @@ class Queue {
             time: new Date().toISOString()
         };
         if (pushSettings) {
-            validators_1.validatePushSettings(pushSettings);
+            (0, validators_1.validatePushSettings)(pushSettings);
             if (pushSettings.delayInSeconds) {
                 pushRequest.delayInSeconds = pushSettings.delayInSeconds;
             }
         }
-        const response = await queries_1.post(queries_1.PUSH_PATH, pushRequest, this.apiClient);
-        await validators_1.validatePushAPIResponse(response, pushRequest);
+        const response = await (0, queries_1.post)(queries_1.PUSH_PATH, pushRequest, this.apiClient);
+        await (0, validators_1.validatePushAPIResponse)(response, pushRequest);
         return `${queueName}#${jobId}`;
     }
     getJob(jobId) {

package/out/retryOptions.d.ts

@@ -1,9 +1,12 @@
 import { InvocationErrorCode } from './invocationErrorCode';
-export declare class RetryOptions {
-    static readonly MIN_RETRY_AFTER = 1;
-    private _retryAfter;
+export declare const MIN_RETRY_AFTER = 1;
+export declare const DEFAULT_RETRY_OPTIONS: {
+    retryAfter: number;
     retryReason: InvocationErrorCode;
-    set retryAfter(valueInSeconds: number);
-    get retryAfter(): number;
+};
+export interface RetryOptions {
+    retryAfter: number;
+    retryReason: InvocationErrorCode;
+    retryData?: any;
 }
 //# sourceMappingURL=retryOptions.d.ts.map

package/out/retryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retryOptions.d.ts","sourceRoot":"","sources":["../src/retryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,YAAY;IACvB,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IAEpC,OAAO,CAAC,WAAW,CAAgC;IAE5C,WAAW,EAAE,mBAAmB,CAA8C;IAMrF,IAAI,UAAU,CAAC,cAAc,EAAE,MAAM,EAIpC;IAKD,IAAI,UAAU,IAAI,MAAM,CAEvB;CACF"}
+{"version":3,"file":"retryOptions.d.ts","sourceRoot":"","sources":["../src/retryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,eAAe,IAAI,CAAC;AAEjC,eAAO,MAAM,qBAAqB;;;CAGjC,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,mBAAmB,CAAC;IACjC,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB"}

package/out/retryOptions.js

@@ -1,20 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RetryOptions = void 0;
+exports.DEFAULT_RETRY_OPTIONS = exports.MIN_RETRY_AFTER = void 0;
 const invocationErrorCode_1 = require("./invocationErrorCode");
-class RetryOptions {
-    constructor() {
-        this._retryAfter = RetryOptions.MIN_RETRY_AFTER;
-        this.retryReason = invocationErrorCode_1.InvocationErrorCode.FUNCTION_RETRY_REQUEST;
-    }
-    set retryAfter(valueInSeconds) {
-        if (valueInSeconds >= RetryOptions.MIN_RETRY_AFTER) {
-            this._retryAfter = valueInSeconds;
-        }
-    }
-    get retryAfter() {
-        return this._retryAfter;
-    }
-}
-exports.RetryOptions = RetryOptions;
-RetryOptions.MIN_RETRY_AFTER = 1;
+exports.MIN_RETRY_AFTER = 1;
+exports.DEFAULT_RETRY_OPTIONS = {
+    retryAfter: exports.MIN_RETRY_AFTER,
+    retryReason: invocationErrorCode_1.InvocationErrorCode.FUNCTION_RETRY_REQUEST
+};

package/out/validators.js

@@ -6,17 +6,19 @@ const text_1 = require("./text");
 const VALID_QUEUE_NAME_PATTERN = /^[a-zA-Z0-9-_]+$/;
 const MAXIMUM_EVENTS = 50;
 const MAXIMUM_PAYLOAD_SIZE_KB = 200;
-exports.validateQueueKey = (queueName) => {
+const validateQueueKey = (queueName) => {
     if (!queueName || !VALID_QUEUE_NAME_PATTERN.test(queueName)) {
         throw new errors_1.InvalidQueueNameError(text_1.Text.error.invalidQueueName);
     }
 };
-exports.validatePushSettings = (settings) => {
+exports.validateQueueKey = validateQueueKey;
+const validatePushSettings = (settings) => {
     if ((settings.delayInSeconds && settings.delayInSeconds > 900) || settings.delayInSeconds < 0) {
         throw new errors_1.InvalidPushSettingsError(text_1.Text.error.invalidDelayInSecondsSetting);
     }
 };
-exports.validatePushPayloads = (payloads) => {
+exports.validatePushSettings = validatePushSettings;
+const validatePushPayloads = (payloads) => {
     if (!payloads || (Array.isArray(payloads) && payloads.length === 0)) {
         throw new errors_1.NoEventsToPushError(text_1.Text.error.noEventsPushed);
     }
@@ -28,19 +30,22 @@ exports.validatePushPayloads = (payloads) => {
         throw new errors_1.PayloadTooBigError(text_1.Text.error.maxPayloadAllowed(MAXIMUM_PAYLOAD_SIZE_KB));
     }
 };
-exports.validateGetStatsPayload = (getStatsRequest) => {
+exports.validatePushPayloads = validatePushPayloads;
+const validateGetStatsPayload = (getStatsRequest) => {
     if (!getStatsRequest.jobId) {
         throw new errors_1.JobDoesNotExistError(text_1.Text.error.jobIdEmpty);
     }
-    exports.validateQueueKey(getStatsRequest.queueName);
+    (0, exports.validateQueueKey)(getStatsRequest.queueName);
 };
-exports.validateCancelJobRequest = (cancelJobRequest) => {
+exports.validateGetStatsPayload = validateGetStatsPayload;
+const validateCancelJobRequest = (cancelJobRequest) => {
     if (!cancelJobRequest.jobId) {
         throw new errors_1.JobDoesNotExistError(text_1.Text.error.jobIdEmpty);
     }
-    exports.validateQueueKey(cancelJobRequest.queueName);
+    (0, exports.validateQueueKey)(cancelJobRequest.queueName);
 };
-exports.validateAPIResponse = async (response, expectedSuccessStatus) => {
+exports.validateCancelJobRequest = validateCancelJobRequest;
+const validateAPIResponse = async (response, expectedSuccessStatus) => {
     if (response.status === 429) {
         throw new errors_1.RateLimitError(text_1.Text.error.rateLimitError);
     }
@@ -61,7 +66,8 @@ exports.validateAPIResponse = async (response, expectedSuccessStatus) => {
         throw internalServerError;
     }
 };
-exports.validatePushAPIResponse = async (response, requestBody) => {
+exports.validateAPIResponse = validateAPIResponse;
+const validatePushAPIResponse = async (response, requestBody) => {
     if (response.status === 413) {
         const responseBody = await response.json();
         throw new errors_1.PayloadTooBigError(responseBody.errorMessage);
@@ -87,17 +93,20 @@ exports.validatePushAPIResponse = async (response, requestBody) => {
         }
         throw partialSuccessError;
     }
-    await exports.validateAPIResponse(response, 201);
+    await (0, exports.validateAPIResponse)(response, 201);
 };
-exports.validateGetStatsAPIResponse = async (response, getStatsRequest) => {
+exports.validatePushAPIResponse = validatePushAPIResponse;
+const validateGetStatsAPIResponse = async (response, getStatsRequest) => {
     if (response.status === 404) {
         throw new errors_1.JobDoesNotExistError(text_1.Text.error.jobDoesNotExit(getStatsRequest.jobId, getStatsRequest.queueName));
     }
-    await exports.validateAPIResponse(response, 200);
+    await (0, exports.validateAPIResponse)(response, 200);
 };
-exports.validateCancelJobAPIResponse = async (response, cancelJobRequest) => {
+exports.validateGetStatsAPIResponse = validateGetStatsAPIResponse;
+const validateCancelJobAPIResponse = async (response, cancelJobRequest) => {
     if (response.status === 404) {
         throw new errors_1.JobDoesNotExistError(text_1.Text.error.jobDoesNotExit(cancelJobRequest.jobId, cancelJobRequest.queueName));
     }
-    await exports.validateAPIResponse(response, 204);
+    await (0, exports.validateAPIResponse)(response, 204);
 };
+exports.validateCancelJobAPIResponse = validateCancelJobAPIResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/events",
-  "version": "0.0.0-experimental-416047f",
+  "version": "0.0.0-experimental-9b81865",
   "description": "Forge Async Event methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,7 +16,7 @@
     "@types/uuid": "^3.4.7"
   },
   "dependencies": {
-    "@forge/api": "^2.6.1",
+    "@forge/api": "^0.0.0-experimental-9b81865",
     "uuid": "^3.4.0"
   }
 }

package/src/__test__/invocationError.test.ts

@@ -1,23 +1,40 @@
-import { RetryOptions } from '../retryOptions';
 import { InvocationError } from '../invocationError';
 import { InvocationErrorCode } from '../invocationErrorCode';
+import { DEFAULT_RETRY_OPTIONS, MIN_RETRY_AFTER, RetryOptions } from '../retryOptions';
 
 describe('InvocationError tests', () => {
-  const defaultRetryOption = new RetryOptions();
   let target = new InvocationError();
 
   it('Populate invocationError with default retryOptions and expect default retry option', async () => {
-    expect(target.retryOptions.retryAfter).toEqual(defaultRetryOption.retryAfter);
+    expect(target.retryOptions.retryAfter).toEqual(DEFAULT_RETRY_OPTIONS.retryAfter);
     expect(target.retryOptions.retryReason).toEqual(InvocationErrorCode.FUNCTION_RETRY_REQUEST);
     expect((target as any).hasOwnProperty('_retry')).toBe(true);
   });
 
   it('Populate InvocationError with custom RetryOptions and expect the custom value to set.', () => {
-    defaultRetryOption.retryAfter = 10;
-    defaultRetryOption.retryReason = InvocationErrorCode.FUNCTION_OUT_OF_MEMORY;
-    target = new InvocationError(defaultRetryOption);
+    const retryOptions: RetryOptions = {
+      retryAfter: 10,
+      retryReason: InvocationErrorCode.FUNCTION_OUT_OF_MEMORY,
+      retryData: {
+        eventsToSplit: 5
+      }
+    };
+    target = new InvocationError(retryOptions);
 
-    expect(target.retryOptions).toEqual(defaultRetryOption);
+    expect(target.retryOptions).toEqual(retryOptions);
+    expect((target as any).hasOwnProperty('_retry')).toBe(true);
+  });
+
+  it('Use MIN_RETRY_AFTER when retryAfter <= 0', () => {
+    const retryOptions: RetryOptions = {
+      retryAfter: 0,
+      retryReason: InvocationErrorCode.FUNCTION_OUT_OF_MEMORY,
+      retryData: 'some string data'
+    };
+    target = new InvocationError(retryOptions);
+
+    expect(target.retryOptions.retryAfter).toEqual(MIN_RETRY_AFTER);
+    expect(target.retryOptions.retryData).toEqual('some string data');
     expect((target as any).hasOwnProperty('_retry')).toBe(true);
   });
 });

package/src/__test__/jobProgress.test.ts

@@ -1,13 +1,18 @@
-import { getApiClientMock, verifyApiClientCalledWith } from './utils';
+import { getMockFetchMethod, verifyApiClientCalledWith } from './utils';
 import { InternalServerError, InvalidQueueNameError, JobDoesNotExistError, RateLimitError } from '../errors';
 import { JobProgress } from '../jobProgress';
+import { createRequestStargateAsApp } from '@forge/api';
 
-const getJobProgress = (apiClientMock: any, jobId: string) => new JobProgress(jobId, apiClientMock);
+jest.mock('@forge/api', () => ({
+  createRequestStargateAsApp: jest.fn().mockReturnValue(getMockFetchMethod('done', 200))
+}));
+
+const getJobProgress = (jobId: string, apiClientMock?: any) => new JobProgress(jobId, apiClientMock);
 
 describe('JobProgress methods', () => {
   describe('getStats', () => {
     it('should call the queue/stats endpoint', async () => {
-      const apiClientMock = getApiClientMock(
+      const apiClientMock = getMockFetchMethod(
         {
           success: 100,
           inProgress: 50,
@@ -15,7 +20,7 @@ describe('JobProgress methods', () => {
         },
         200
       );
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       const response = await jobProgress.getStats();
       const { success, inProgress, failed } = await response.json();
       verifyApiClientCalledWith(apiClientMock, '/webhook/queue/stats/{cloudId}/{environmentId}/{appId}/{appVersion}', {
@@ -28,14 +33,14 @@ describe('JobProgress methods', () => {
     });
 
     it('should throw JobDoesNotExistError', async () => {
-      const apiClientMock = getApiClientMock(
+      const apiClientMock = getMockFetchMethod(
         {
           message: 'Job Not Found',
           code: 404
         },
         404
       );
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       await expect(jobProgress.getStats()).rejects.toThrow(
         new JobDoesNotExistError(`The job test-job-id was not found for the queue test-queue-name.`)
       );
@@ -46,8 +51,8 @@ describe('JobProgress methods', () => {
     });
 
     it('should throw RateLimitError', async () => {
-      const apiClientMock = getApiClientMock({}, 429);
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const apiClientMock = getMockFetchMethod({}, 429);
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       await expect(jobProgress.getStats()).rejects.toThrow(new RateLimitError(`Too many requests.`));
       verifyApiClientCalledWith(apiClientMock, '/webhook/queue/stats/{cloudId}/{environmentId}/{appId}/{appVersion}', {
         queueName: 'test-queue-name',
@@ -56,7 +61,7 @@ describe('JobProgress methods', () => {
     });
 
     it('should throw InternalServerError', async () => {
-      const apiClientMock = getApiClientMock(
+      const apiClientMock = getMockFetchMethod(
         {
           message: 'Service is not available',
           code: 513,
@@ -64,7 +69,7 @@ describe('JobProgress methods', () => {
         },
         513
       );
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       await expect(jobProgress.getStats()).rejects.toThrow(
         new InternalServerError(`513 Status Text: Service is not available`, 513)
       );
@@ -77,8 +82,8 @@ describe('JobProgress methods', () => {
 
   describe('cancel', () => {
     it('should call the queue/cancel endpoint', async () => {
-      const apiClientMock = getApiClientMock({}, 204);
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const apiClientMock = getMockFetchMethod({}, 204);
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       const response = await jobProgress.cancel();
       verifyApiClientCalledWith(apiClientMock, '/webhook/queue/cancel/{cloudId}/{environmentId}/{appId}/{appVersion}', {
         queueName: 'test-queue-name',
@@ -88,14 +93,14 @@ describe('JobProgress methods', () => {
     });
 
     it('should throw JobDoesNotExistError', async () => {
-      const apiClientMock = getApiClientMock(
+      const apiClientMock = getMockFetchMethod(
         {
           message: 'Job Not Found',
           code: 404
         },
         404
       );
-      const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+      const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
       await expect(jobProgress.cancel()).rejects.toThrow(
         new JobDoesNotExistError(`The job test-job-id was not found for the queue test-queue-name.`)
       );
@@ -107,13 +112,13 @@ describe('JobProgress methods', () => {
   });
 
   it('should throw InternalServerError when WHP returns 422 response', async () => {
-    const apiClientMock = getApiClientMock(
+    const apiClientMock = getMockFetchMethod(
       {
         errors: ['jobId must not be null', 'queueName must not be null']
       },
       422
     );
-    const jobProgress = getJobProgress(apiClientMock, 'test-queue-name#test-job-id');
+    const jobProgress = getJobProgress('test-queue-name#test-job-id', apiClientMock);
     await expect(jobProgress.getStats()).rejects.toThrow(
       new InternalServerError(`422 Status Text: jobId must not be null, queueName must not be null`)
     );
@@ -125,7 +130,7 @@ describe('JobProgress methods', () => {
   });
 
   it('should throw errors when queueName or jobId is empty', async () => {
-    const apiClientMock = getApiClientMock(
+    const apiClientMock = getMockFetchMethod(
       {
         success: 100,
         inProgress: 50,
@@ -133,17 +138,23 @@ describe('JobProgress methods', () => {
       },
       200
     );
-    const jobProgress1 = getJobProgress(apiClientMock, 'test-queue-name#');
+    const jobProgress1 = getJobProgress('test-queue-name#', apiClientMock);
     await expect(jobProgress1.getStats()).rejects.toThrow(new JobDoesNotExistError(`jobId cannot be empty.`));
 
-    const jobProgress2 = getJobProgress(apiClientMock, '#test-job-id');
+    const jobProgress2 = getJobProgress('#test-job-id', apiClientMock);
     await expect(jobProgress2.getStats()).rejects.toThrow(
       new InvalidQueueNameError('Queue names can only contain alphanumeric characters, dashes and underscores.')
     );
 
-    const jobProgress3 = getJobProgress(apiClientMock, '');
+    const jobProgress3 = getJobProgress('', apiClientMock);
     await expect(jobProgress3.getStats()).rejects.toThrow(new JobDoesNotExistError(`jobId cannot be empty.`));
 
     expect(apiClientMock).toHaveBeenCalledTimes(0);
   });
+
+  it('requests stargate if no api client is provided', async () => {
+    const jobProgress = getJobProgress('test-queue-name#job-id');
+    await jobProgress.getStats();
+    expect(createRequestStargateAsApp()).toBeCalledTimes(1);
+  });
 });