@2112-lab/central-plant 0.3.18 → 0.3.21

package/dist/bundle/index.js

@@ -38938,7 +38938,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.18
+   * @version 0.3.21
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.
@@ -46180,12 +46180,14 @@ function _measureS3Transfer() {
     var fileSize,
       startTime,
       executeTransfer,
+      isExpiredToken,
       Auth,
       endTime,
       duration,
       _args2 = arguments,
       _t,
-      _t2;
+      _t2,
+      _t3;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -46226,8 +46228,12 @@ function _measureS3Transfer() {
         case 3:
           _context2.p = 3;
           _t = _context2.v;
-          if (!(_t.code === 'ExpiredToken' || _t.message && _t.message.includes('ExpiredToken'))) {
-            _context2.n = 8;
+          // Check for ExpiredToken error.
+          // AWS SDK v3 (used by Amplify v5) sets error.name, not error.code.
+          // error.message is 'The provided token has expired.' (no 'ExpiredToken' substring).
+          isExpiredToken = _t.code === 'ExpiredToken' || _t.Code === 'ExpiredToken' || _t.name === 'ExpiredToken' || _t.message && _t.message.toLowerCase().includes('token has expired');
+          if (!isExpiredToken) {
+            _context2.n = 12;
             break;
           }
           console.warn("\u26A0\uFE0F Token expired during ".concat(operation, ". Attempting session refresh and retry..."));
@@ -46240,35 +46246,50 @@ function _measureS3Transfer() {
           throw _t;
         case 4:
           _context2.p = 4;
-          _context2.n = 5;
+          _context2.p = 5;
+          _context2.n = 6;
+          return Auth.currentSession();
+        case 6:
+          console.log("\u2705 User Pool session refreshed for ".concat(operation, "."));
+          _context2.n = 8;
+          break;
+        case 7:
+          _context2.p = 7;
+          _t2 = _context2.v;
+          // If currentSession() fails the refresh token itself is expired —
+          // the user needs to sign in again. Surface that immediately.
+          console.error("\u274C Failed to refresh User Pool session during ".concat(operation, ":"), _t2);
+          throw _t2;
+        case 8:
+          _context2.n = 9;
           return Auth.currentCredentials({
             bypassCache: true
           });
-        case 5:
-          console.log("\u2705 Session refreshed. Retrying ".concat(operation, "..."));
+        case 9:
+          console.log("\u2705 STS credentials refreshed. Retrying ".concat(operation, "..."));
 
           // Reset timer for the retry
           startTime = performance.now();
-          _context2.n = 6;
+          _context2.n = 10;
           return executeTransfer();
-        case 6:
+        case 10:
           return _context2.a(2, _context2.v);
-        case 7:
-          _context2.p = 7;
-          _t2 = _context2.v;
-          console.error("\u274C Retry failed for ".concat(operation, ":"), _t2);
+        case 11:
+          _context2.p = 11;
+          _t3 = _context2.v;
+          console.error("\u274C Retry failed for ".concat(operation, ":"), _t3);
           // If retry fails, throw the Retry Error (likely unrelated or persistent auth issue)
-          throw _t2;
-        case 8:
+          throw _t3;
+        case 12:
           // Standard error handling for non-expired tokens (or if logic above didn't catch it)
           endTime = performance.now();
           duration = ((endTime - startTime) / 1000).toFixed(3);
           console.error("\u274C S3 ".concat(operation, " failed after ").concat(duration, "s:"), _t);
           throw _t;
-        case 9:
+        case 13:
           return _context2.a(2);
       }
-    }, _callee2, null, [[4, 7], [1, 3]]);
+    }, _callee2, null, [[5, 7], [4, 11], [1, 3]]);
   }));
   return _measureS3Transfer.apply(this, arguments);
 }

package/dist/cjs/src/core/centralPlant.js

@@ -35,7 +35,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.18
+   * @version 0.3.21
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.

package/dist/cjs/src/managers/cache/s3Timing.js

@@ -28,12 +28,14 @@ function _measureS3Transfer() {
     var fileSize,
       startTime,
       executeTransfer,
+      isExpiredToken,
       Auth,
       endTime,
       duration,
       _args2 = arguments,
       _t,
-      _t2;
+      _t2,
+      _t3;
     return _rollupPluginBabelHelpers.regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -74,8 +76,12 @@ function _measureS3Transfer() {
         case 3:
           _context2.p = 3;
           _t = _context2.v;
-          if (!(_t.code === 'ExpiredToken' || _t.message && _t.message.includes('ExpiredToken'))) {
-            _context2.n = 8;
+          // Check for ExpiredToken error.
+          // AWS SDK v3 (used by Amplify v5) sets error.name, not error.code.
+          // error.message is 'The provided token has expired.' (no 'ExpiredToken' substring).
+          isExpiredToken = _t.code === 'ExpiredToken' || _t.Code === 'ExpiredToken' || _t.name === 'ExpiredToken' || _t.message && _t.message.toLowerCase().includes('token has expired');
+          if (!isExpiredToken) {
+            _context2.n = 12;
             break;
           }
           console.warn("\u26A0\uFE0F Token expired during ".concat(operation, ". Attempting session refresh and retry..."));
@@ -88,35 +94,50 @@ function _measureS3Transfer() {
           throw _t;
         case 4:
           _context2.p = 4;
-          _context2.n = 5;
+          _context2.p = 5;
+          _context2.n = 6;
+          return Auth.currentSession();
+        case 6:
+          console.log("\u2705 User Pool session refreshed for ".concat(operation, "."));
+          _context2.n = 8;
+          break;
+        case 7:
+          _context2.p = 7;
+          _t2 = _context2.v;
+          // If currentSession() fails the refresh token itself is expired —
+          // the user needs to sign in again. Surface that immediately.
+          console.error("\u274C Failed to refresh User Pool session during ".concat(operation, ":"), _t2);
+          throw _t2;
+        case 8:
+          _context2.n = 9;
           return Auth.currentCredentials({
             bypassCache: true
           });
-        case 5:
-          console.log("\u2705 Session refreshed. Retrying ".concat(operation, "..."));
+        case 9:
+          console.log("\u2705 STS credentials refreshed. Retrying ".concat(operation, "..."));
 
           // Reset timer for the retry
           startTime = performance.now();
-          _context2.n = 6;
+          _context2.n = 10;
           return executeTransfer();
-        case 6:
+        case 10:
           return _context2.a(2, _context2.v);
-        case 7:
-          _context2.p = 7;
-          _t2 = _context2.v;
-          console.error("\u274C Retry failed for ".concat(operation, ":"), _t2);
+        case 11:
+          _context2.p = 11;
+          _t3 = _context2.v;
+          console.error("\u274C Retry failed for ".concat(operation, ":"), _t3);
           // If retry fails, throw the Retry Error (likely unrelated or persistent auth issue)
-          throw _t2;
-        case 8:
+          throw _t3;
+        case 12:
           // Standard error handling for non-expired tokens (or if logic above didn't catch it)
           endTime = performance.now();
           duration = ((endTime - startTime) / 1000).toFixed(3);
           console.error("\u274C S3 ".concat(operation, " failed after ").concat(duration, "s:"), _t);
           throw _t;
-        case 9:
+        case 13:
           return _context2.a(2);
       }
-    }, _callee2, null, [[4, 7], [1, 3]]);
+    }, _callee2, null, [[5, 7], [4, 11], [1, 3]]);
   }));
   return _measureS3Transfer.apply(this, arguments);
 }

package/dist/esm/src/core/centralPlant.js

@@ -31,7 +31,7 @@ var CentralPlant = /*#__PURE__*/function (_BaseDisposable) {
    * Initialize the CentralPlant manager
    * 
    * @constructor
-   * @version 0.3.18
+   * @version 0.3.21
    * @updated 2025-10-22
    * 
    * @description Creates a new CentralPlant instance and initializes internal managers and utilities.

package/dist/esm/src/managers/cache/s3Timing.js

@@ -24,12 +24,14 @@ function _measureS3Transfer() {
     var fileSize,
       startTime,
       executeTransfer,
+      isExpiredToken,
       Auth,
       endTime,
       duration,
       _args2 = arguments,
       _t,
-      _t2;
+      _t2,
+      _t3;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -70,8 +72,12 @@ function _measureS3Transfer() {
         case 3:
           _context2.p = 3;
           _t = _context2.v;
-          if (!(_t.code === 'ExpiredToken' || _t.message && _t.message.includes('ExpiredToken'))) {
-            _context2.n = 8;
+          // Check for ExpiredToken error.
+          // AWS SDK v3 (used by Amplify v5) sets error.name, not error.code.
+          // error.message is 'The provided token has expired.' (no 'ExpiredToken' substring).
+          isExpiredToken = _t.code === 'ExpiredToken' || _t.Code === 'ExpiredToken' || _t.name === 'ExpiredToken' || _t.message && _t.message.toLowerCase().includes('token has expired');
+          if (!isExpiredToken) {
+            _context2.n = 12;
             break;
           }
           console.warn("\u26A0\uFE0F Token expired during ".concat(operation, ". Attempting session refresh and retry..."));
@@ -84,35 +90,50 @@ function _measureS3Transfer() {
           throw _t;
         case 4:
           _context2.p = 4;
-          _context2.n = 5;
+          _context2.p = 5;
+          _context2.n = 6;
+          return Auth.currentSession();
+        case 6:
+          console.log("\u2705 User Pool session refreshed for ".concat(operation, "."));
+          _context2.n = 8;
+          break;
+        case 7:
+          _context2.p = 7;
+          _t2 = _context2.v;
+          // If currentSession() fails the refresh token itself is expired —
+          // the user needs to sign in again. Surface that immediately.
+          console.error("\u274C Failed to refresh User Pool session during ".concat(operation, ":"), _t2);
+          throw _t2;
+        case 8:
+          _context2.n = 9;
           return Auth.currentCredentials({
             bypassCache: true
           });
-        case 5:
-          console.log("\u2705 Session refreshed. Retrying ".concat(operation, "..."));
+        case 9:
+          console.log("\u2705 STS credentials refreshed. Retrying ".concat(operation, "..."));
 
           // Reset timer for the retry
           startTime = performance.now();
-          _context2.n = 6;
+          _context2.n = 10;
           return executeTransfer();
-        case 6:
+        case 10:
           return _context2.a(2, _context2.v);
-        case 7:
-          _context2.p = 7;
-          _t2 = _context2.v;
-          console.error("\u274C Retry failed for ".concat(operation, ":"), _t2);
+        case 11:
+          _context2.p = 11;
+          _t3 = _context2.v;
+          console.error("\u274C Retry failed for ".concat(operation, ":"), _t3);
           // If retry fails, throw the Retry Error (likely unrelated or persistent auth issue)
-          throw _t2;
-        case 8:
+          throw _t3;
+        case 12:
           // Standard error handling for non-expired tokens (or if logic above didn't catch it)
           endTime = performance.now();
           duration = ((endTime - startTime) / 1000).toFixed(3);
           console.error("\u274C S3 ".concat(operation, " failed after ").concat(duration, "s:"), _t);
           throw _t;
-        case 9:
+        case 13:
           return _context2.a(2);
       }
-    }, _callee2, null, [[4, 7], [1, 3]]);
+    }, _callee2, null, [[5, 7], [4, 11], [1, 3]]);
   }));
   return _measureS3Transfer.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2112-lab/central-plant",
-  "version": "0.3.18",
+  "version": "0.3.21",
   "description": "Utility modules for the Central Plant Application",
   "main": "dist/bundle/index.js",
   "module": "dist/esm/src/index.js",