@aws/nx-plugin 0.77.0 → 0.79.0

package/src/utils/files/website/hooks/sigv4/useSigV4.tsx.template

@@ -4,54 +4,102 @@ import { fromCognitoIdentityPool } from '@aws-sdk/credential-provider-cognito-id
 import { useCallback, useRef } from 'react';
 import { useAuth } from 'react-oidc-context';
 import { useRuntimeConfig } from './useRuntimeConfig';
-import { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smithy/types';
+import {
+  AwsCredentialIdentity,
+  AwsCredentialIdentityProvider,
+} from '@smithy/types';
 
 // Credential expiration grace time before considering credentials as expired
 const CREDENTIAL_EXPIRY_OFFSET_MILLIS = 30 * 1000;
 
-export const useSigV4 = () => {
+type AwsSignInput = Parameters<AwsClient['sign']>[0];
+type AwsSignInit = Parameters<AwsClient['sign']>[1];
+
+export interface SigV4Client {
+  /** A SigV4-signing fetch drop-in replacement. */
+  fetch: typeof globalThis.fetch;
+  /** Signs a request. Same parameters as AwsClient.sign(). Returns an unsigned Request when signing is skipped. */
+  sign: AwsClient['sign'];
+}
+
+export const useSigV4 = (): SigV4Client => {
   const { cognitoProps } = useRuntimeConfig();
   const auth = useAuth();
   const user = auth?.user;
 
-  const cachedCredentials = useRef<{ [key: string]: AwsCredentialIdentity }>({});
+  const cachedCredentials = useRef<{ [key: string]: AwsCredentialIdentity }>(
+    {},
+  );
 
-  const withCachedCredentials = useCallback(async (provider: AwsCredentialIdentityProvider, ...cacheKeys: string[]): Promise<AwsCredentialIdentity> => {
-    const key = `sigv4/${cacheKeys.join('/')}`;
-    const cachedCreds = cachedCredentials.current[key];
-    if (cachedCreds && cachedCreds.expiration && cachedCreds.expiration.getTime() > Date.now() + CREDENTIAL_EXPIRY_OFFSET_MILLIS) {
-      return cachedCreds;
+  const skipSigning = !cognitoProps && import.meta.env.MODE === 'serve-local';
+
+  const withCachedCredentials = useCallback(
+    async (
+      provider: AwsCredentialIdentityProvider,
+      ...cacheKeys: string[]
+    ): Promise<AwsCredentialIdentity> => {
+      const key = `sigv4/${cacheKeys.join('/')}`;
+      const cachedCreds = cachedCredentials.current[key];
+      if (
+        cachedCreds &&
+        cachedCreds.expiration &&
+        cachedCreds.expiration.getTime() >
+          Date.now() + CREDENTIAL_EXPIRY_OFFSET_MILLIS
+      ) {
+        return cachedCreds;
+      }
+      const credentials = await provider();
+      cachedCredentials.current[key] = credentials;
+      return credentials;
+    },
+    [],
+  );
+
+  const getAwsClient = useCallback(async (): Promise<AwsClient> => {
+    if (!cognitoProps) {
+      throw new Error('cognitoProps is undefined!');
+    }
+    if (!user?.id_token) {
+      throw new Error('user.id_token is undefined!');
     }
-    const credentials = await provider();
-    cachedCredentials.current[key] = credentials;
-    return credentials;
-  }, []);
 
-  return useCallback(
+    const credentialsFromCognitoIdentityPool = fromCognitoIdentityPool({
+      client: new CognitoIdentityClient({ region: cognitoProps.region }),
+      identityPoolId: cognitoProps.identityPoolId,
+      logins: {
+        [`cognito-idp.${cognitoProps.region}.amazonaws.com/${cognitoProps.userPoolId}`]:
+          user.id_token,
+      },
+    });
+    const credential = await withCachedCredentials(
+      credentialsFromCognitoIdentityPool,
+      cognitoProps.identityPoolId,
+      user.profile.sub,
+    );
+    return new AwsClient(credential);
+  }, [cognitoProps, user?.id_token, user?.profile.sub, withCachedCredentials]);
+
+  const sigv4Fetch: typeof globalThis.fetch = useCallback(
     async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
-      if (!cognitoProps && import.meta.env.MODE === 'serve-local') {
-        // Skip request signing in serve-local mode when cognitoProps are not set
+      if (skipSigning) {
         return fetch(input, init);
       }
-      if (!cognitoProps) {
-        throw new Error('cognitoProps is undefined!');
-      }
-      if (!user?.id_token) {
-        throw new Error('user.id_token is undefined!');
-      }
-
-      const credentialsFromCognitoIdentityPool = fromCognitoIdentityPool({
-        client: new CognitoIdentityClient({ region: cognitoProps.region }),
-        identityPoolId: cognitoProps.identityPoolId,
-        logins: {
-          [`cognito-idp.${cognitoProps.region}.amazonaws.com/${cognitoProps.userPoolId}`]:
-            user.id_token,
-        },
-      });
-      const credential = await withCachedCredentials(credentialsFromCognitoIdentityPool, cognitoProps.identityPoolId, user.profile.sub);
-      const awsClient = new AwsClient(credential);
+      const awsClient = await getAwsClient();
       return awsClient.fetch(input, init);
     },
-    [cognitoProps, user?.id_token, user?.profile.sub, withCachedCredentials]
+    [skipSigning, getAwsClient],
   );
+
+  const sign = useCallback(
+    async (input: AwsSignInput, init?: AwsSignInit): Promise<Request> => {
+      if (skipSigning) {
+        return new Request(input.toString(), init ?? undefined);
+      }
+      const awsClient = await getAwsClient();
+      return awsClient.sign(input, init);
+    },
+    [skipSigning, getAwsClient],
+  );
+
+  return { fetch: sigv4Fetch, sign };
 };

package/src/utils/versions.d.ts

@@ -56,6 +56,8 @@ export declare const TS_VERSIONS: {
     readonly clsx: "2.1.1";
     readonly electrodb: "3.5.3";
     readonly esbuild: "0.27.3";
+    readonly 'event-source-polyfill': "1.0.31";
+    readonly '@types/event-source-polyfill': "1.0.5";
     readonly 'eslint-plugin-prettier': "5.5.5";
     readonly express: "5.2.1";
     readonly 'jsonc-eslint-parser': "2.4.2";
@@ -87,7 +89,7 @@ export type ITsDepVersion = keyof typeof TS_VERSIONS;
  * Add versions to the given dependencies
  */
 export declare const withVersions: (deps: ITsDepVersion[]) => {
-    [k: string]: "3.992.0" | "3.972.3" | "1.0.0-alpha.10" | "2.31.0" | "6.4.5" | "22.1.0" | "9.0.1" | "22.5.1" | "1.27.0" | "0.19.0" | "0.2.2" | "1.160.2" | "1.160.1" | "1.154.7" | "1.158.0" | "3.0.149" | "3.0.1204" | "1.0.50" | "5.90.21" | "5.91.3" | "11.10.0" | "22.19.11" | "8.10.160" | "2.8.19" | "8.18.1" | "5.0.6" | "4.12.0" | "1.0.20" | "2.1106.0" | "2.238.0" | "2.238.0-alpha.0" | "3.12.0" | "10.5.0" | "2.8.6" | "0.7.1" | "2.1.1" | "3.5.3" | "0.27.3" | "5.5.5" | "5.2.1" | "2.4.2" | "4.0.0" | "2.0.0" | "19.3.2" | "3.4.1" | "3.8.1" | "3.3.0" | "19.2.4" | "6.1.3" | "1.0.0-rc.1" | "0.5.21" | "4.1.18" | "4.21.0" | "0.574.0" | "1.4.3" | "3.8.5" | "1.4.0" | "5.1.4" | "4.3.6" | "8.19.0";
+    [k: string]: "3.992.0" | "3.972.3" | "1.0.0-alpha.10" | "2.31.0" | "6.4.5" | "22.1.0" | "9.0.1" | "22.5.1" | "1.27.0" | "0.19.0" | "0.2.2" | "1.160.2" | "1.160.1" | "1.154.7" | "1.158.0" | "3.0.149" | "3.0.1204" | "1.0.50" | "5.90.21" | "5.91.3" | "11.10.0" | "22.19.11" | "8.10.160" | "2.8.19" | "8.18.1" | "5.0.6" | "4.12.0" | "1.0.20" | "2.1106.0" | "2.238.0" | "2.238.0-alpha.0" | "3.12.0" | "10.5.0" | "2.8.6" | "0.7.1" | "2.1.1" | "3.5.3" | "0.27.3" | "1.0.31" | "1.0.5" | "5.5.5" | "5.2.1" | "2.4.2" | "4.0.0" | "2.0.0" | "19.3.2" | "3.4.1" | "3.8.1" | "3.3.0" | "19.2.4" | "6.1.3" | "1.0.0-rc.1" | "0.5.21" | "4.1.18" | "4.21.0" | "0.574.0" | "1.4.3" | "3.8.5" | "1.4.0" | "5.1.4" | "4.3.6" | "8.19.0";
 };
 /**
  * Versions for Python dependencies added by generators

package/src/utils/versions.js

@@ -59,6 +59,8 @@ exports.TS_VERSIONS = {
     clsx: '2.1.1',
     electrodb: '3.5.3',
     esbuild: '0.27.3',
+    'event-source-polyfill': '1.0.31',
+    '@types/event-source-polyfill': '1.0.5',
     'eslint-plugin-prettier': '5.5.5',
     express: '5.2.1',
     'jsonc-eslint-parser': '2.4.2',

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":"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"}