chore: Reduce dependency footprint

Author: davidkna-sap

packages/connectivity/package.json

@@ -44,10 +44,9 @@
     "@sap-cloud-sdk/util": "workspace:^",
     "@sap/xsenv": "^6.2.0",
     "@sap/xssec": "^4.13.0",
-    "async-retry": "^1.3.3",
     "axios": "^1.15.0",
     "jks-js": "^1.1.6",
-    "jsonwebtoken": "^9.0.3",
+    "jwt-decode": "^4.0.0",
     "safe-stable-stringify": "^2.5.0"
   },
   "devDependencies": {

packages/connectivity/src/scp-cf/destination/destination-service.spec.ts

@@ -355,6 +355,7 @@ describe('destination service', () => {
 
   describe('fetchDestinationByToken', () => {
     afterEach(() => {
+      jest.useRealTimers();
       jest.restoreAllMocks();
     });
 
@@ -597,6 +598,9 @@ describe('destination service', () => {
     });
 
     it('does a retry if request fails with 500 error', async () => {
+      jest.useFakeTimers();
+      jest.spyOn(Math, 'random').mockReturnValue(0);
+
       const response = {
         owner: {
           SubaccountId: 'a89ea924-d9c2-4eab-84fb-3ffcaadf5d24',
@@ -610,17 +614,46 @@ describe('destination service', () => {
         .get('/destination-configuration/v1/destinations/HTTP-BASIC')
         .reply(200, response);
 
-      const actual = await fetchDestinationWithTokenRetrieval(
+      const request = fetchDestinationWithTokenRetrieval(
         destinationServiceUri,
         jwt,
         {
           destinationName: 'HTTP-BASIC',
           retry: true
         }
       );
+
+      await jest.advanceTimersByTimeAsync(1000);
+
+      const actual = await request;
       expect(actual).toEqual(parseDestination(response));
     });
 
+    it('stops retrying after the configured number of attempts for 500 errors', async () => {
+      jest.useFakeTimers();
+      jest.spyOn(Math, 'random').mockReturnValue(0);
+
+      const mock = nock(destinationServiceUri)
+        .get('/destination-configuration/v1/destinations/HTTP-BASIC')
+        .times(3)
+        .reply(500);
+
+      const request = fetchDestinationWithTokenRetrieval(
+        destinationServiceUri,
+        jwt,
+        {
+          destinationName: 'HTTP-BASIC',
+          retry: true
+        }
+      );
+
+      await jest.advanceTimersByTimeAsync(1000);
+      await jest.advanceTimersByTimeAsync(2000);
+
+      await expect(request).rejects.toThrow();
+      expect(mock.isDone()).toBe(true);
+    });
+
     it('does no retry if request fails with 401 error', async () => {
       const response = {
         owner: {
@@ -646,6 +679,9 @@ describe('destination service', () => {
     });
 
     it('does a retry if auth token contains errors', async () => {
+      jest.useFakeTimers();
+      jest.spyOn(Math, 'random').mockReturnValue(0);
+
       const responseErrorInToken = {
         owner: {
           SubaccountId: 'a89ea924-d9c2-4eab-84fb-3ffcaadf5d24',
@@ -679,18 +715,25 @@ describe('destination service', () => {
         .get('/destination-configuration/v1/destinations/HTTP-OAUTH')
         .reply(200, responseValidToken);
 
-      const actual = await fetchDestinationWithTokenRetrieval(
+      const request = fetchDestinationWithTokenRetrieval(
         destinationServiceUri,
         jwt,
         {
           destinationName: 'HTTP-OAUTH',
           retry: true
         }
       );
+
+      await jest.advanceTimersByTimeAsync(1000);
+
+      const actual = await request;
       expect(actual).toMatchObject(parseDestination(responseValidToken));
     });
 
     it('does a retry if auth tokens are failing but returns the destination with errors in the end', async () => {
+      jest.useFakeTimers();
+      jest.spyOn(Math, 'random').mockReturnValue(0);
+
       const response = {
         owner: {
           SubaccountId: 'a89ea924-d9c2-4eab-84fb-3ffcaadf5d24',
@@ -713,17 +756,21 @@ describe('destination service', () => {
         .times(3)
         .reply(200, response);
 
-      const actual = await fetchDestinationWithTokenRetrieval(
+      const request = fetchDestinationWithTokenRetrieval(
         destinationServiceUri,
         jwt,
         {
           destinationName: 'HTTP-OAUTH',
           retry: true
         }
       );
-      expect(actual.authTokens![0].error).toEqual('ERROR');
+
+      await jest.advanceTimersByTimeAsync(1000);
+      await jest.advanceTimersByTimeAsync(2000);
+
+      expect((await request).authTokens![0].error).toEqual('ERROR');
       expect(mock.isDone()).toBe(true);
-    }, 10000);
+    });
 
     it('fetches a destination and returns 200 but authTokens are failing', async () => {
       const destinationName = 'FINAL-DESTINATION';

packages/connectivity/src/scp-cf/destination/destination-service.ts

@@ -7,7 +7,6 @@ import {
 import axios from 'axios';
 import { executeWithMiddleware } from '@sap-cloud-sdk/resilience/internal';
 import { resilience } from '@sap-cloud-sdk/resilience';
-import asyncRetry from 'async-retry';
 import { decodeJwt, getTenantId, wrapJwtInHeader } from '../jwt';
 import { urlAndAgent } from '../../http-agent';
 import { buildAuthorizationHeaders } from '../authorization-header';
@@ -303,6 +302,55 @@ function errorMessageFromResponse(
     : '';
 }
 
+/**
+ * @internal
+ * Retries a function with exponential backoff.
+ * @param fn - The function to retry.
+ * @param options - Options for retrying.
+ * @param options.retries - The maximum number of retries. Default is 3.
+ * @param options.onRetry - A callback function that is called before each retry with the error and the current attempt number.
+ * @param options.randomize - Whether to randomize the backoff time by a factor of 1-2. Default is true.
+ * @returns The result of the function.
+ */
+async function withRetry<T>(
+  fn: (bail: (err: Error) => never, attempt: number) => Promise<T>,
+  options: {
+    retries?: number;
+    onRetry?: (err: Error, attempt: number) => void;
+    randomize?: boolean;
+  } = {}
+): Promise<T> {
+  const maxRetries = options.retries ?? 3;
+  const randomize = Number(options.randomize ?? true);
+
+  class BailError extends Error {
+    constructor(readonly cause: Error) {
+      super(cause.message);
+    }
+  }
+
+  for (let attempt = 0; attempt < maxRetries - 1; attempt++) {
+    try {
+      return await fn(err => {
+        throw new BailError(err);
+      }, attempt);
+    } catch (error) {
+      if (error instanceof BailError) {
+        throw error.cause;
+      }
+      options.onRetry?.(error as Error, attempt + 1);
+      // Exponential backoff with optional randomization (factor 1-2x)
+      const scalingFactor = 1 + randomize * Math.random();
+      const backoff = Math.round(scalingFactor * 1000 * 2 ** attempt);
+      await new Promise(resolve => setTimeout(resolve, backoff));
+    }
+  }
+
+  return fn(err => {
+    throw new BailError(err);
+  }, maxRetries - 1);
+}
+
 function retryDestination(
   destinationName: string
 ): Middleware<
@@ -311,20 +359,21 @@ function retryDestination(
   MiddlewareContext<RawAxiosRequestConfig>
 > {
   return options => arg => {
-    let retryCount = 1;
-    return asyncRetry(
-      async bail => {
+    const maxRetries = 3;
+    return withRetry(
+      async (bail, attempt) => {
         try {
           const destination = await options.fn(arg);
-          if (retryCount < 3) {
-            retryCount++;
+          if (attempt < maxRetries - 1) {
             // this will throw if the destination does not contain valid auth headers and a second try is done to get a destination with valid tokens.
             await buildAuthorizationHeaders(parseDestination(destination.data));
           }
           return destination;
         } catch (error) {
-          const status = error?.response?.status;
-          if (status.toString().startsWith('4')) {
+          const status = axios.isAxiosError(error)
+            ? error.response?.status
+            : undefined;
+          if (status?.toString().startsWith('4')) {
             bail(
               new ErrorWithCause(
                 `Request failed with status code ${status}`,
@@ -338,7 +387,7 @@ function retryDestination(
         }
       },
       {
-        retries: 3,
+        retries: maxRetries,
         onRetry: (err: Error) =>
           logger.warn(
             `Failed to retrieve destination ${destinationName} - doing a retry. Original Error ${err.message}`

packages/connectivity/src/scp-cf/jwt/jwt.ts

@@ -1,9 +1,9 @@
 import { createLogger, pickValueIgnoreCase } from '@sap-cloud-sdk/util';
-import { decode } from 'jsonwebtoken';
+import { jwtDecode } from 'jwt-decode';
 import { Cache } from '../cache';
 import { getIssuerSubdomain } from '../subdomain-replacer';
 import type {
-  Jwt,
+  JwtHeader,
   JwtPayload,
   JwtWithPayloadObject
 } from '../jsonwebtoken-type';
@@ -136,7 +136,7 @@ function audiencesFromAud({ aud }: JwtPayload): string[] {
 }
 
 function audiencesFromScope({ scope }: JwtPayload): string[] {
-  return makeArray(scope).reduce(
+  return makeArray(scope).reduce<string[]>(
     (aud, s) => (s.includes('.') ? [...aud, s.split('.')[0]] : aud),
     []
   );
@@ -148,7 +148,20 @@ function audiencesFromScope({ scope }: JwtPayload): string[] {
  * @returns Decoded payload.
  */
 export function decodeJwt(token: string | JwtPayload): JwtPayload {
-  return typeof token === 'string' ? decodeJwtComplete(token).payload : token;
+  if (typeof token !== 'string') {
+    return token;
+  }
+  try {
+    validateJwtFormat(token);
+    return decodeJwtPart<JwtPayload>(token);
+  } catch (error) {
+    throw new Error(
+      'JwtError: The given jwt payload does not encode valid JSON.',
+      {
+        cause: error
+      }
+    );
+  }
 }
 
 /**
@@ -158,13 +171,21 @@ export function decodeJwt(token: string | JwtPayload): JwtPayload {
  * @internal
  */
 export function decodeJwtComplete(token: string): JwtWithPayloadObject {
-  const decodedToken = decode(token, { complete: true, json: true });
-  if (decodedToken !== null && isJwtWithPayloadObject(decodedToken)) {
-    return decodedToken;
+  try {
+    const signature = validateJwtFormat(token);
+    return {
+      header: decodeJwtPart<JwtHeader>(token, { header: true }),
+      payload: decodeJwtPart<JwtPayload>(token),
+      signature
+    };
+  } catch (error) {
+    throw new Error(
+      'JwtError: The given jwt payload does not encode valid JSON.',
+      {
+        cause: error
+      }
+    );
   }
-  throw new Error(
-    'JwtError: The given jwt payload does not encode valid JSON.'
-  );
 }
 
 /**
@@ -274,6 +295,41 @@ export function isUserToken(token: JwtPair | undefined): token is JwtPair {
   return !(keys.length === 1 && keys[0] === 'iss');
 }
 
-function isJwtWithPayloadObject(decoded: Jwt): decoded is JwtWithPayloadObject {
-  return typeof decoded.payload !== 'string';
+
+/**
+ * Validate the format of the given JWT and return the signature part if valid.
+ * @returns The signature part of the JWT if the format is valid.
+ * @throws An error if the JWT format is invalid.
+ * @internal
+ */
+function validateJwtFormat(token: string): string {
+  const [encodedHeader, encodedPayload, signature, ...rest] = token.split('.');
+
+  if (!encodedHeader || !encodedPayload || rest.length > 0) {
+    throw new Error('Invalid JWT format.');
+  }
+
+  return signature;
 }
+
+/**
+ * Decodes part of a JWT (header or payload) and ensures that the decoded value is an object.
+ * @param token - The JWT to decode.
+ * @param options - Options for decoding, e.g. whether to decode the header or payload.
+ * @param options.header - If true, decodes the header; otherwise, decodes the payload.
+ * @returns The decoded JWT part as an object.
+ * @throws An error if the decoded value is not an object.
+ * @internal
+ */
+function decodeJwtPart<T extends object>(
+  token: string,
+  options?: { header?: boolean }
+): T {
+  const decoded = jwtDecode<T>(token, options);
+
+  if (typeof decoded !== 'object' || decoded === null) {
+    throw new Error('Invalid JWT content.');
+  }
+
+  return decoded;
+}

packages/generator-common/package.json

@@ -42,10 +42,8 @@
   "dependencies": {
     "@sap-cloud-sdk/util": "workspace:^",
     "fast-levenshtein": "~3.0.0",
-    "fs-extra": "^11.3.4",
     "glob": "^13.0.6",
     "prettier": "^3.8.1",
-    "voca": "^1.4.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

packages/generator-common/src/sdk-metadata/util.ts

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { readFile } from 'fs-extra';
+import { readFile } from 'node:fs/promises';
 
 /**
  * Get the current SDK version from the package json.

packages/generator-common/src/util.ts

@@ -1,5 +1,4 @@
-import { codeBlock, createLogger } from '@sap-cloud-sdk/util';
-import voca from 'voca';
+import { codeBlock, createLogger, titleFormat } from '@sap-cloud-sdk/util';
 
 /**
  * @returns A copyright header
@@ -80,7 +79,7 @@ function transformUnscopedName(packageName: string) {
  * @internal
  */
 export function directoryToSpeakingModuleName(packageName: string): string {
-  return voca.titleCase(packageName.replace(/[-,_]/g, ' '));
+  return titleFormat(packageName.replace(/[-,_]/g, ' '));
 }
 
 /**