@mavogel/awscdk-rootmail 0.0.323 → 0.0.324

package/node_modules/nodemailer/lib/xoauth2/index.js

@@ -72,6 +72,9 @@ class XOAuth2 extends Stream {
             let timeout = Math.max(Number(this.options.timeout) || 0, 0);
             this.expires = (timeout && Date.now() + timeout * 1000) || 0;
         }
+
+        this.renewing = false; // Track if renewal is in progress
+        this.renewalQueue = []; // Queue for pending requests during renewal
     }
 
     /**
@@ -82,14 +85,61 @@ class XOAuth2 extends Stream {
      */
     getToken(renew, callback) {
         if (!renew && this.accessToken && (!this.expires || this.expires > Date.now())) {
+            this.logger.debug(
+                {
+                    tnx: 'OAUTH2',
+                    user: this.options.user,
+                    action: 'reuse'
+                },
+                'Reusing existing access token for %s',
+                this.options.user
+            );
             return callback(null, this.accessToken);
         }
 
-        let generateCallback = (...args) => {
-            if (args[0]) {
+        // check if it is possible to renew, if not, return the current token or error
+        if (!this.provisionCallback && !this.options.refreshToken && !this.options.serviceClient) {
+            if (this.accessToken) {
+                this.logger.debug(
+                    {
+                        tnx: 'OAUTH2',
+                        user: this.options.user,
+                        action: 'reuse'
+                    },
+                    'Reusing existing access token (no refresh capability) for %s',
+                    this.options.user
+                );
+                return callback(null, this.accessToken);
+            }
+            this.logger.error(
+                {
+                    tnx: 'OAUTH2',
+                    user: this.options.user,
+                    action: 'renew'
+                },
+                'Cannot renew access token for %s: No refresh mechanism available',
+                this.options.user
+            );
+            return callback(new Error("Can't create new access token for user"));
+        }
+
+        // If renewal already in progress, queue this request instead of starting another
+        if (this.renewing) {
+            return this.renewalQueue.push({ renew, callback });
+        }
+
+        this.renewing = true;
+
+        // Handles token renewal completion - processes queued requests and cleans up
+        const generateCallback = (err, accessToken) => {
+            this.renewalQueue.forEach(item => item.callback(err, accessToken));
+            this.renewalQueue = [];
+            this.renewing = false;
+
+            if (err) {
                 this.logger.error(
                     {
-                        err: args[0],
+                        err,
                         tnx: 'OAUTH2',
                         user: this.options.user,
                         action: 'renew'
@@ -108,7 +158,8 @@ class XOAuth2 extends Stream {
                     this.options.user
                 );
             }
-            callback(...args);
+            // Complete original request
+            callback(err, accessToken);
         };
 
         if (this.provisionCallback) {
@@ -166,8 +217,8 @@ class XOAuth2 extends Stream {
             let token;
             try {
                 token = this.jwtSignRS256(tokenData);
-            } catch (err) {
-                return callback(new Error('Can\x27t generate token. Check your auth options'));
+            } catch (_err) {
+                return callback(new Error("Can't generate token. Check your auth options"));
             }
 
             urlOptions = {
@@ -181,7 +232,7 @@ class XOAuth2 extends Stream {
             };
         } else {
             if (!this.options.refreshToken) {
-                return callback(new Error('Can\x27t create new access token for user'));
+                return callback(new Error("Can't create new access token for user"));
             }
 
             // web app - https://developers.google.com/identity/protocols/OAuth2WebServer

package/node_modules/nodemailer/package.json

@@ -1,12 +1,15 @@
 {
     "name": "nodemailer",
-    "version": "7.0.4",
+    "version": "7.0.9",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
         "test": "node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js",
         "test:coverage": "c8 node --test --test-concurrency=1 test/**/*.test.js test/**/*-test.js",
+        "format": "prettier --write \"**/*.{js,json,md}\"",
+        "format:check": "prettier --check \"**/*.{js,json,md}\"",
         "lint": "eslint .",
+        "lint:fix": "eslint . --fix",
         "update": "rm -rf node_modules/ package-lock.json && ncu -u && npm install"
     },
     "repository": {
@@ -23,16 +26,17 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-sesv2": "3.839.0",
+        "@aws-sdk/client-sesv2": "3.901.0",
         "bunyan": "1.8.15",
         "c8": "10.1.3",
-        "eslint": "8.57.0",
-        "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "9.1.0",
+        "eslint": "^9.37.0",
+        "eslint-config-prettier": "^10.1.8",
+        "globals": "^16.4.0",
         "libbase64": "1.3.0",
         "libmime": "5.3.7",
         "libqp": "2.1.1",
         "nodemailer-ntlm-auth": "1.0.4",
+        "prettier": "^3.6.2",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
         "smtp-server": "3.14.0"

package/node_modules/tlds/index.json

@@ -945,7 +945,6 @@
   "realty",
   "recipes",
   "red",
-  "redstone",
   "redumbrella",
   "rehab",
   "reise",

package/node_modules/tlds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tlds",
-  "version": "1.259.0",
+  "version": "1.260.0",
   "description": "A list of TLDs.",
   "repository": "https://github.com/stephenmathieson/node-tlds.git",
   "author": "Stephen Mathieson",

package/package.json

@@ -120,7 +120,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.323",
+  "version": "0.0.324",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [