@cdklabs/cdk-construct-connect-datalake 0.0.20 → 0.0.22

package/node_modules/@aws-sdk/credential-provider-login/dist-cjs/index.js

@@ -1,5 +1,5 @@
 const { setCredentialFeature } = require("@aws-sdk/core/client");
-const { CredentialsProviderError, readFile, parseKnownFiles, getProfileName } = require("@smithy/core/config");
+const { CredentialsProviderError, parseKnownFiles, getProfileName } = require("@smithy/core/config");
 const { HttpRequest } = require("@smithy/core/protocols");
 const { createHash, createPrivateKey, createPublicKey, sign } = require("node:crypto");
 const { promises } = require("node:fs");
@@ -28,13 +28,7 @@ class LoginCredentialsFetcher {
         if (timeUntilExpiry <= LoginCredentialsFetcher.REFRESH_THRESHOLD) {
             return this.refresh(token);
         }
-        return {
-            accessKeyId: accessToken.accessKeyId,
-            secretAccessKey: accessToken.secretAccessKey,
-            sessionToken: accessToken.sessionToken,
-            accountId: accessToken.accountId,
-            expiration: new Date(accessToken.expiresAt),
-        };
+        return this.toCredentials(token.accessToken);
     }
     get logger() {
         return this.init?.logger;
@@ -42,7 +36,25 @@ class LoginCredentialsFetcher {
     get loginSession() {
         return this.profileData.login_session;
     }
+    toCredentials(token) {
+        return {
+            accessKeyId: token.accessKeyId,
+            secretAccessKey: token.secretAccessKey,
+            sessionToken: token.sessionToken,
+            accountId: token.accountId,
+            expiration: new Date(token.expiresAt),
+        };
+    }
     async refresh(token) {
+        const diskToken = await this.loadToken().catch(() => token);
+        const now = Date.now();
+        const diskExpiry = new Date(diskToken.accessToken.expiresAt).getTime();
+        const tokenExpiry = new Date(token.accessToken.expiresAt).getTime();
+        const freshToken = diskExpiry <= now && tokenExpiry > now ? token : diskToken;
+        const freshExpiry = new Date(freshToken.accessToken.expiresAt).getTime();
+        if (freshExpiry - Date.now() > LoginCredentialsFetcher.REFRESH_THRESHOLD) {
+            return this.toCredentials(freshToken.accessToken);
+        }
         const { SigninClient, CreateOAuth2TokenCommand } = require('@aws-sdk/nested-clients/signin');
         const { logger, userAgentAppId } = this.callerClientConfig ?? {};
         const isH2 = (requestHandler) => {
@@ -66,8 +78,8 @@ class LoginCredentialsFetcher {
         this.createDPoPInterceptor(client.middlewareStack);
         const commandInput = {
             tokenInput: {
-                clientId: token.clientId,
-                refreshToken: token.refreshToken,
+                clientId: freshToken.clientId,
+                refreshToken: freshToken.refreshToken,
                 grantType: "refresh_token",
             },
         };
@@ -84,9 +96,9 @@ class LoginCredentialsFetcher {
             const expiresInMs = (expiresIn ?? 900) * 1000;
             const expiration = new Date(Date.now() + expiresInMs);
             const updatedToken = {
-                ...token,
+                ...freshToken,
                 accessToken: {
-                    ...token.accessToken,
+                    ...freshToken.accessToken,
                     accessKeyId,
                     secretAccessKey,
                     sessionToken,
@@ -95,14 +107,7 @@ class LoginCredentialsFetcher {
                 refreshToken,
             };
             await this.saveToken(updatedToken);
-            const newAccessToken = updatedToken.accessToken;
-            return {
-                accessKeyId: newAccessToken.accessKeyId,
-                secretAccessKey: newAccessToken.secretAccessKey,
-                sessionToken: newAccessToken.sessionToken,
-                accountId: newAccessToken.accountId,
-                expiration,
-            };
+            return this.toCredentials(updatedToken.accessToken);
         }
         catch (error) {
             if (error.name === "AccessDeniedException") {
@@ -123,7 +128,15 @@ class LoginCredentialsFetcher {
                     default:
                         message = `Failed to refresh token: ${String(error)}. Please re-authenticate using \`aws login\``;
                 }
-                throw new CredentialsProviderError(message, { logger: this.logger, tryNextLink: false });
+                throw new CredentialsProviderError(message, {
+                    logger: this.logger,
+                    tryNextLink: false,
+                });
+            }
+            const tokenExpiry = new Date(freshToken.accessToken.expiresAt).getTime();
+            if (tokenExpiry > Date.now()) {
+                this.logger?.warn?.(`Failed to refresh token: ${String(error)}. Using existing token until expiry.`);
+                return this.toCredentials(freshToken.accessToken);
             }
             throw new CredentialsProviderError(`Failed to refresh token: ${String(error)}. Please re-authenticate using aws login`, { logger: this.logger });
         }
@@ -131,13 +144,7 @@ class LoginCredentialsFetcher {
     async loadToken() {
         const tokenFilePath = this.getTokenFilePath();
         try {
-            let tokenData;
-            try {
-                tokenData = await readFile(tokenFilePath, { ignoreCache: this.init?.ignoreCache });
-            }
-            catch {
-                tokenData = await promises.readFile(tokenFilePath, "utf8");
-            }
+            const tokenData = await promises.readFile(tokenFilePath, "utf8");
             const token = JSON.parse(tokenData);
             const missingFields = ["accessToken", "clientId", "refreshToken", "dpopKey"].filter((k) => !token[k]);
             if (!token.accessToken?.accountId) {

package/node_modules/@aws-sdk/credential-provider-login/dist-es/LoginCredentialsFetcher.js

@@ -1,4 +1,4 @@
-import { CredentialsProviderError, readFile } from "@smithy/core/config";
+import { CredentialsProviderError } from "@smithy/core/config";
 import { HttpRequest } from "@smithy/core/protocols";
 import { createHash, createPrivateKey, createPublicKey, sign } from "node:crypto";
 import { promises as fs } from "node:fs";
@@ -26,13 +26,7 @@ export class LoginCredentialsFetcher {
         if (timeUntilExpiry <= LoginCredentialsFetcher.REFRESH_THRESHOLD) {
             return this.refresh(token);
         }
-        return {
-            accessKeyId: accessToken.accessKeyId,
-            secretAccessKey: accessToken.secretAccessKey,
-            sessionToken: accessToken.sessionToken,
-            accountId: accessToken.accountId,
-            expiration: new Date(accessToken.expiresAt),
-        };
+        return this.toCredentials(token.accessToken);
     }
     get logger() {
         return this.init?.logger;
@@ -40,7 +34,25 @@ export class LoginCredentialsFetcher {
     get loginSession() {
         return this.profileData.login_session;
     }
+    toCredentials(token) {
+        return {
+            accessKeyId: token.accessKeyId,
+            secretAccessKey: token.secretAccessKey,
+            sessionToken: token.sessionToken,
+            accountId: token.accountId,
+            expiration: new Date(token.expiresAt),
+        };
+    }
     async refresh(token) {
+        const diskToken = await this.loadToken().catch(() => token);
+        const now = Date.now();
+        const diskExpiry = new Date(diskToken.accessToken.expiresAt).getTime();
+        const tokenExpiry = new Date(token.accessToken.expiresAt).getTime();
+        const freshToken = diskExpiry <= now && tokenExpiry > now ? token : diskToken;
+        const freshExpiry = new Date(freshToken.accessToken.expiresAt).getTime();
+        if (freshExpiry - Date.now() > LoginCredentialsFetcher.REFRESH_THRESHOLD) {
+            return this.toCredentials(freshToken.accessToken);
+        }
         const { SigninClient, CreateOAuth2TokenCommand } = await import("@aws-sdk/nested-clients/signin");
         const { logger, userAgentAppId } = this.callerClientConfig ?? {};
         const isH2 = (requestHandler) => {
@@ -64,8 +76,8 @@ export class LoginCredentialsFetcher {
         this.createDPoPInterceptor(client.middlewareStack);
         const commandInput = {
             tokenInput: {
-                clientId: token.clientId,
-                refreshToken: token.refreshToken,
+                clientId: freshToken.clientId,
+                refreshToken: freshToken.refreshToken,
                 grantType: "refresh_token",
             },
         };
@@ -82,9 +94,9 @@ export class LoginCredentialsFetcher {
             const expiresInMs = (expiresIn ?? 900) * 1000;
             const expiration = new Date(Date.now() + expiresInMs);
             const updatedToken = {
-                ...token,
+                ...freshToken,
                 accessToken: {
-                    ...token.accessToken,
+                    ...freshToken.accessToken,
                     accessKeyId,
                     secretAccessKey,
                     sessionToken,
@@ -93,14 +105,7 @@ export class LoginCredentialsFetcher {
                 refreshToken,
             };
             await this.saveToken(updatedToken);
-            const newAccessToken = updatedToken.accessToken;
-            return {
-                accessKeyId: newAccessToken.accessKeyId,
-                secretAccessKey: newAccessToken.secretAccessKey,
-                sessionToken: newAccessToken.sessionToken,
-                accountId: newAccessToken.accountId,
-                expiration,
-            };
+            return this.toCredentials(updatedToken.accessToken);
         }
         catch (error) {
             if (error.name === "AccessDeniedException") {
@@ -121,7 +126,15 @@ export class LoginCredentialsFetcher {
                     default:
                         message = `Failed to refresh token: ${String(error)}. Please re-authenticate using \`aws login\``;
                 }
-                throw new CredentialsProviderError(message, { logger: this.logger, tryNextLink: false });
+                throw new CredentialsProviderError(message, {
+                    logger: this.logger,
+                    tryNextLink: false,
+                });
+            }
+            const tokenExpiry = new Date(freshToken.accessToken.expiresAt).getTime();
+            if (tokenExpiry > Date.now()) {
+                this.logger?.warn?.(`Failed to refresh token: ${String(error)}. Using existing token until expiry.`);
+                return this.toCredentials(freshToken.accessToken);
             }
             throw new CredentialsProviderError(`Failed to refresh token: ${String(error)}. Please re-authenticate using aws login`, { logger: this.logger });
         }
@@ -129,13 +142,7 @@ export class LoginCredentialsFetcher {
     async loadToken() {
         const tokenFilePath = this.getTokenFilePath();
         try {
-            let tokenData;
-            try {
-                tokenData = await readFile(tokenFilePath, { ignoreCache: this.init?.ignoreCache });
-            }
-            catch {
-                tokenData = await fs.readFile(tokenFilePath, "utf8");
-            }
+            const tokenData = await fs.readFile(tokenFilePath, "utf8");
             const token = JSON.parse(tokenData);
             const missingFields = ["accessToken", "clientId", "refreshToken", "dpopKey"].filter((k) => !token[k]);
             if (!token.accessToken?.accountId) {

package/node_modules/@aws-sdk/credential-provider-login/dist-types/LoginCredentialsFetcher.d.ts

@@ -17,6 +17,7 @@ export declare class LoginCredentialsFetcher {
     loadCredentials(): Promise<AwsCredentialIdentity>;
     private get logger();
     private get loginSession();
+    private toCredentials;
     private refresh;
     private loadToken;
     private saveToken;

package/node_modules/@aws-sdk/credential-provider-login/dist-types/ts3.4/LoginCredentialsFetcher.d.ts

@@ -14,6 +14,7 @@ export declare class LoginCredentialsFetcher {
   loadCredentials(): Promise<AwsCredentialIdentity>;
   private readonly logger: any;
   private readonly loginSession: any;
+  private toCredentials;
   private refresh;
   private loadToken;
   private saveToken;

package/node_modules/@aws-sdk/credential-provider-login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-login",
-  "version": "3.972.68",
+  "version": "3.972.74",
   "description": "AWS credential provider that sources credentials from aws login cached tokens",
   "keywords": [
     "aws",
@@ -45,10 +45,10 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
-    "@aws-sdk/nested-clients": "^3.997.35",
+    "@aws-sdk/core": "^3.977.6",
+    "@aws-sdk/nested-clients": "^3.997.41",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
+    "@smithy/core": "^3.31.1",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/credential-provider-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-node",
-  "version": "3.972.72",
+  "version": "3.972.78",
   "description": "AWS credential provider that sources credentials from a Node.JS environment. ",
   "keywords": [
     "aws",
@@ -45,15 +45,15 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/credential-provider-env": "^3.972.61",
-    "@aws-sdk/credential-provider-http": "^3.972.63",
-    "@aws-sdk/credential-provider-ini": "^3.973.6",
-    "@aws-sdk/credential-provider-process": "^3.972.61",
-    "@aws-sdk/credential-provider-sso": "^3.973.5",
-    "@aws-sdk/credential-provider-web-identity": "^3.972.67",
+    "@aws-sdk/credential-provider-env": "^3.972.67",
+    "@aws-sdk/credential-provider-http": "^3.972.69",
+    "@aws-sdk/credential-provider-ini": "^3.973.12",
+    "@aws-sdk/credential-provider-process": "^3.972.67",
+    "@aws-sdk/credential-provider-sso": "^3.973.11",
+    "@aws-sdk/credential-provider-web-identity": "^3.972.73",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
-    "@smithy/credential-provider-imds": "^4.4.13",
+    "@smithy/core": "^3.31.1",
+    "@smithy/credential-provider-imds": "^4.4.16",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/credential-provider-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-process",
-  "version": "3.972.61",
+  "version": "3.972.67",
   "description": "AWS credential provider that sources credential_process from ~/.aws/credentials and ~/.aws/config",
   "keywords": [
     "aws",
@@ -43,9 +43,9 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
+    "@aws-sdk/core": "^3.977.6",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
+    "@smithy/core": "^3.31.1",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/credential-provider-sso/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-sso",
-  "version": "3.973.5",
+  "version": "3.973.11",
   "description": "AWS credential provider that exchanges a resolved SSO login token file for temporary AWS credentials",
   "keywords": [
     "aws",
@@ -45,11 +45,11 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
-    "@aws-sdk/nested-clients": "^3.997.35",
-    "@aws-sdk/token-providers": "3.1095.0",
+    "@aws-sdk/core": "^3.977.6",
+    "@aws-sdk/nested-clients": "^3.997.41",
+    "@aws-sdk/token-providers": "3.1103.0",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
+    "@smithy/core": "^3.31.1",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/credential-provider-web-identity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/credential-provider-web-identity",
-  "version": "3.972.67",
+  "version": "3.972.73",
   "description": "AWS credential provider that calls STS assumeRole for temporary AWS credentials",
   "keywords": [
     "aws",
@@ -50,10 +50,10 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
-    "@aws-sdk/nested-clients": "^3.997.35",
+    "@aws-sdk/core": "^3.977.6",
+    "@aws-sdk/nested-clients": "^3.997.41",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
+    "@smithy/core": "^3.31.1",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js

@@ -83,7 +83,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.34";
+var version = "3.997.40";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js

@@ -78,7 +78,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.34";
+var version = "3.997.40";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js

@@ -78,7 +78,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.34";
+var version = "3.997.40";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js

@@ -78,7 +78,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.34";
+var version = "3.997.40";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js

@@ -258,7 +258,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.34";
+var version = "3.997.40";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/nested-clients/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/nested-clients",
-  "version": "3.997.35",
+  "version": "3.997.41",
   "description": "Nested clients for AWS SDK packages.",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/nested-clients",
   "license": "Apache-2.0",
@@ -100,12 +100,12 @@
     "test:watch": "yarn g:vitest watch"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
-    "@aws-sdk/signature-v4-multi-region": "^3.996.42",
+    "@aws-sdk/core": "^3.977.6",
+    "@aws-sdk/signature-v4-multi-region": "^3.996.43",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
-    "@smithy/fetch-http-handler": "^5.6.10",
-    "@smithy/node-http-handler": "^4.9.10",
+    "@smithy/core": "^3.31.1",
+    "@smithy/fetch-http-handler": "^5.6.13",
+    "@smithy/node-http-handler": "^4.9.13",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/signature-v4-multi-region/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/signature-v4-multi-region",
-  "version": "3.996.42",
+  "version": "3.996.43",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages/signature-v4-multi-region",
   "license": "Apache-2.0",
   "author": {
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/signature-v4": "^5.6.9",
+    "@smithy/signature-v4": "^5.6.12",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },

package/node_modules/@aws-sdk/token-providers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/token-providers",
-  "version": "3.1095.0",
+  "version": "3.1103.0",
   "description": "A collection of token providers",
   "keywords": [
     "aws",
@@ -48,10 +48,10 @@
     "test:integration:watch": "yarn g:vitest watch -c vitest.config.integ.mts"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.0",
-    "@aws-sdk/nested-clients": "^3.997.35",
+    "@aws-sdk/core": "^3.977.6",
+    "@aws-sdk/nested-clients": "^3.997.41",
     "@aws-sdk/types": "^3.974.2",
-    "@smithy/core": "^3.29.8",
+    "@smithy/core": "^3.31.1",
     "@smithy/types": "^4.16.1",
     "tslib": "^2.6.2"
   },