@dereekb/zoom 13.10.9 → 13.11.1

package/nestjs/index.cjs.js

@@ -3,19 +3,17 @@
 var common = require('@nestjs/common');
 var zoom = require('@dereekb/zoom');
 var util = require('@dereekb/util');
-var node_path = require('node:path');
-var node_fs = require('node:fs');
-var config = require('@nestjs/config');
 var nestjs = require('@dereekb/nestjs');
+var config = require('@nestjs/config');
 var node_crypto = require('node:crypto');
 
-function _type_of(obj) {
+function _type_of$1(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 function __decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if ((typeof Reflect === "undefined" ? "undefined" : _type_of(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    if ((typeof Reflect === "undefined" ? "undefined" : _type_of$1(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
@@ -177,6 +175,14 @@ function _define_property$7(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    "@swc/helpers - instanceof";
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _iterable_to_array$2(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -225,12 +231,35 @@ function _object_spread$3(target) {
     }
     return target;
 }
+function ownKeys$2(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props$2(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys$2(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array$2(arr, i) || _non_iterable_rest();
 }
 function _to_consumable_array$2(arr) {
     return _array_without_holes$2(arr) || _iterable_to_array$2(arr) || _unsupported_iterable_to_array$2(arr) || _non_iterable_spread$2();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array$2(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array$2(o, minLen);
@@ -346,6 +375,56 @@ function _ts_generator$2(thisArg, body) {
 exports.ZoomOAuthAccessTokenCacheService = __decorate([
     common.Injectable()
 ], exports.ZoomOAuthAccessTokenCacheService);
+// MARK: Merge
+function buildZoomReadAdapter(cache) {
+    return {
+        load: function load() {
+            return _async_to_generator$2(function() {
+                var value;
+                return _ts_generator$2(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                cache.loadCachedToken().catch(function() {
+                                    return undefined;
+                                })
+                            ];
+                        case 1:
+                            value = _state.sent();
+                            return [
+                                2,
+                                value != null && !util.isExpired(value) ? value : undefined
+                            ];
+                    }
+                });
+            })();
+        },
+        update: function update(token) {
+            return cache.updateCachedToken(token);
+        },
+        clear: function clear() {
+            return _async_to_generator$2(function() {
+                return _ts_generator$2(this, function(_state) {
+                    return [
+                        2
+                    ];
+                });
+            // ZoomAccessTokenCache does not expose a clear method.
+            })();
+        }
+    };
+}
+function updateZoomCacheCapturingError(cache, accessToken) {
+    return cache.updateCachedToken(accessToken).then(function() {
+        return null;
+    }).catch(function(e) {
+        return [
+            cache,
+            e
+        ];
+    });
+}
 /**
  * Default error logging function for merged cache service update failures.
  *
@@ -364,6 +443,11 @@ exports.ZoomOAuthAccessTokenCacheService = __decorate([
  *
  * When updating a cached token, it will update the token across all services.
  *
+ * Read fall-through is delegated to {@link mergeAsyncValueCaches} after wrapping each
+ * underlying cache with an {@link isExpired}-aware filter, so an expired cached token
+ * never short-circuits the lookup. Updates run across all services in parallel via
+ * `Promise.allSettled`, mirroring the previous behavior, with optional error logging.
+ *
  * @param inputServicesToMerge Must include at least one service. Empty arrays will throw an error.
  * @param logError Optional error logging configuration. Pass a function, true for default logging, or false to disable.
  * @returns A merged ZoomOAuthAccessTokenCacheService
@@ -373,60 +457,45 @@ exports.ZoomOAuthAccessTokenCacheService = __decorate([
     if (allServices.length === 0) {
         throw new Error('mergeZoomOAuthAccessTokenCacheServices() input cannot be empty.');
     }
-    var loadZoomAccessTokenCache = function loadZoomAccessTokenCache(accessCachesForServices) {
-        var loadCachedTokenFromFirstService = util.tryWithPromiseFactoriesFunction({
-            promiseFactories: accessCachesForServices.map(function(x) {
-                return function() {
-                    return x.loadCachedToken().catch(function() {
-                        return null;
-                    }).then(function(x) {
-                        var result = undefined;
-                        if (x && !util.isPast(x.expiresAt)) {
-                            result = x; // only return from cache if it is not expired
-                        }
-                        return result;
-                    });
-                };
-            }),
-            successOnMaybe: false,
-            throwErrors: false
-        });
-        var cacheForService = {
+    function mergeCachesForService(accessCachesForServices) {
+        // Per-cache adapters with expiry filtering so reads fall through to the next tier when a cache holds an expired token.
+        var readAdapters = accessCachesForServices.map(buildZoomReadAdapter);
+        var merged = util.mergeAsyncValueCaches(readAdapters);
+        return {
             loadCachedToken: function loadCachedToken() {
-                return loadCachedTokenFromFirstService();
+                return merged.load();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
+                    var settled, failedUpdates;
                     return _ts_generator$2(this, function(_state) {
-                        return [
-                            2,
-                            Promise.allSettled(accessCachesForServices.map(function(x) {
-                                return x.updateCachedToken(accessToken).then(function() {
-                                    return null;
-                                }).catch(function(e) {
-                                    return [
-                                        x,
-                                        e
-                                    ];
-                                });
-                            })).then(function(x) {
-                                // only find the failures if we're logging
-                                if (logErrorFunction) {
-                                    var failedUpdates = util.filterMaybeArrayValues(x.map(function(y) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    Promise.allSettled(accessCachesForServices.map(function(cache) {
+                                        return updateZoomCacheCapturingError(cache, accessToken);
+                                    }))
+                                ];
+                            case 1:
+                                settled = _state.sent();
+                                if (logErrorFunction != null) {
+                                    failedUpdates = util.filterMaybeArrayValues(settled.map(function(y) {
                                         return y.value;
                                     }));
                                     if (failedUpdates.length) {
                                         logErrorFunction(failedUpdates);
                                     }
                                 }
-                            })
-                        ];
+                                return [
+                                    2
+                                ];
+                        }
                     });
                 })();
             }
         };
-        return cacheForService;
-    };
+    }
     var allServiceAccessTokenCaches = allServices.map(function(service) {
         return service.loadZoomAccessTokenCache();
     });
@@ -437,11 +506,11 @@ exports.ZoomOAuthAccessTokenCacheService = __decorate([
         var allCaches = allServicesWithCacheForRefreshToken.map(function(x) {
             return x.cacheForRefreshToken(refreshToken);
         });
-        return loadZoomAccessTokenCache(allCaches);
+        return mergeCachesForService(allCaches);
     } : undefined;
     var service = {
-        loadZoomAccessTokenCache: function loadZoomAccessTokenCache1() {
-            return loadZoomAccessTokenCache(allServiceAccessTokenCaches);
+        loadZoomAccessTokenCache: function loadZoomAccessTokenCache() {
+            return mergeCachesForService(allServiceAccessTokenCaches);
         },
         cacheForRefreshToken: cacheForRefreshToken
     };
@@ -451,45 +520,65 @@ exports.ZoomOAuthAccessTokenCacheService = __decorate([
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that uses in-memory storage.
  *
+ * Backed by {@link inMemoryAsyncValueCache} so all consumers share the same single token slot.
+ *
  * @param existingToken Optional initial token to seed the cache with
  * @param logAccessToConsole Whether to log token access to console
  * @returns A memory-backed ZoomOAuthAccessTokenCacheService
  */ function memoryZoomOAuthAccessTokenCacheService(existingToken, logAccessToConsole) {
-    var token = existingToken;
+    var cache = util.inMemoryAsyncValueCache(existingToken);
     function loadZoomAccessTokenCache() {
-        var accessTokenCache = {
+        return {
             loadCachedToken: function loadCachedToken() {
                 return _async_to_generator$2(function() {
+                    var token;
                     return _ts_generator$2(this, function(_state) {
-                        if (logAccessToConsole) {
-                            console.log('retrieving access token from memory: ', {
-                                token: token
-                            });
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    cache.load()
+                                ];
+                            case 1:
+                                token = _state.sent();
+                                if (logAccessToConsole) {
+                                    console.log('retrieving access token from memory: ', {
+                                        hit: token != null,
+                                        expiresAt: token === null || token === void 0 ? void 0 : token.expiresAt
+                                    });
+                                }
+                                return [
+                                    2,
+                                    token
+                                ];
                         }
-                        return [
-                            2,
-                            token
-                        ];
                     });
                 })();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
                     return _ts_generator$2(this, function(_state) {
-                        token = accessToken;
-                        if (logAccessToConsole) {
-                            console.log('updating access token in memory: ', {
-                                accessToken: accessToken
-                            });
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    cache.update(accessToken)
+                                ];
+                            case 1:
+                                _state.sent();
+                                if (logAccessToConsole) {
+                                    console.log('updating access token in memory: ', {
+                                        expiresAt: accessToken === null || accessToken === void 0 ? void 0 : accessToken.expiresAt
+                                    });
+                                }
+                                return [
+                                    2
+                                ];
                         }
-                        return [
-                            2
-                        ];
                     });
                 })();
             }
         };
-        return accessTokenCache;
     }
     return {
         loadZoomAccessTokenCache: loadZoomAccessTokenCache,
@@ -500,9 +589,33 @@ exports.ZoomOAuthAccessTokenCacheService = __decorate([
 }
 // MARK: File System Access Token Cache
 var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-access-tokens.json';
+/**
+ * Reviver applied to the cached file payload on load so `expiresAt` is always a `Date`
+ * regardless of how it was serialized.
+ *
+ * @param raw - the raw JSON-parsed file payload
+ * @returns the revived ZoomAccessToken, or undefined when the payload is empty/invalid
+ */ function reviveZoomAccessTokenFile(raw) {
+    if (raw == null || (typeof raw === "undefined" ? "undefined" : _type_of(raw)) !== 'object') {
+        return undefined;
+    }
+    var wrapper = raw;
+    var token = wrapper.token;
+    if (token == null) {
+        return undefined;
+    }
+    var rawExpiresAt = token.expiresAt;
+    var expiresAt = rawExpiresAt != null && !_instanceof(rawExpiresAt, Date) ? new Date(rawExpiresAt) : rawExpiresAt;
+    return _object_spread_props$2(_object_spread$3({}, token), {
+        expiresAt: expiresAt
+    });
+}
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that reads and writes the access token to the file system.
  *
+ * Composes {@link createMemoizedJsonFileAsyncValueCache} (for the on-disk slot, with optional
+ * per-process memoization) so reads after the first hit memory.
+ *
  * Useful for testing.
  *
  * @param filename Path to the token cache file
@@ -510,165 +623,51 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
  * @returns A file-system-backed ZoomOAuthAccessTokenCacheService
  */ function fileZoomOAuthAccessTokenCacheService() {
     var filename = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH, useMemoryCache = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-    var loadedToken = null;
-    function loadTokenFile() {
-        return _async_to_generator$2(function() {
-            var token, _ref;
-            return _ts_generator$2(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        token = undefined;
-                        if (!!loadedToken) return [
-                            3,
-                            2
-                        ];
-                        return [
-                            4,
-                            readTokenFile()
-                        ];
-                    case 1:
-                        token = (_ref = _state.sent()) !== null && _ref !== void 0 ? _ref : {};
-                        return [
-                            3,
-                            3
-                        ];
-                    case 2:
-                        token = loadedToken;
-                        _state.label = 3;
-                    case 3:
-                        return [
-                            2,
-                            token
-                        ];
-                }
-            });
-        })();
-    }
-    function readTokenFile() {
-        return new Promise(function(resolve) {
-            node_fs.mkdirSync(node_path.dirname(filename), {
-                recursive: true
-            }); // make the directory first
-            node_fs.readFile(filename, {}, function(x, data) {
-                var result = undefined;
-                if (!x) {
-                    try {
-                        result = JSON.parse(data.toString());
-                        if (result === null || result === void 0 ? void 0 : result.token) {
-                            result.token.expiresAt = new Date(result.token.expiresAt);
-                        }
-                    } catch (e) {
-                        console.error('Failed reading token file: ', e);
-                    }
-                }
-                resolve(result);
-            });
-        }).then(function(x) {
-            // update loaded tokens
-            if (useMemoryCache) {
-                loadedToken = _object_spread$3({}, loadedToken, x);
-            }
-            return x;
-        });
-    }
-    function writeTokenFile(tokens) {
-        return _async_to_generator$2(function() {
-            return _ts_generator$2(this, function(_state) {
-                return [
-                    2,
-                    new Promise(function(resolve, reject) {
-                        node_fs.writeFile(filename, JSON.stringify(tokens), {}, function(x) {
-                            if (!x) {
-                                resolve();
-                            } else {
-                                reject(x);
-                            }
-                        });
-                    })
-                ];
-            });
-        })();
-    }
-    function deleteTokenFile() {
-        return _async_to_generator$2(function() {
-            return _ts_generator$2(this, function(_state) {
-                return [
-                    2,
-                    new Promise(function(resolve, reject) {
-                        node_fs.rm(filename, function(x) {
-                            if (!x) {
-                                resolve();
-                            } else {
-                                reject(x);
-                            }
-                        });
-                    })
-                ];
-            });
-        })();
-    }
+    var innerCacheInput = {
+        filePath: filename,
+        reviver: reviveZoomAccessTokenFile,
+        replacer: function replacer(token) {
+            return {
+                token: token
+            };
+        }
+    };
+    var cache = useMemoryCache ? nestjs.createMemoizedJsonFileAsyncValueCache(innerCacheInput) : nestjs.createJsonFileAsyncValueCache(innerCacheInput);
     function loadZoomAccessTokenCache() {
-        var accessTokenCache = {
+        return {
             loadCachedToken: function loadCachedToken() {
-                return _async_to_generator$2(function() {
-                    var tokens;
-                    return _ts_generator$2(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    loadTokenFile()
-                                ];
-                            case 1:
-                                tokens = _state.sent();
-                                // console.log('retrieving access token from file: ', { token });
-                                return [
-                                    2,
-                                    tokens.token
-                                ];
-                        }
-                    });
-                })();
+                return cache.load();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
-                    var tokenFile, e;
+                    var e;
                     return _ts_generator$2(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                return [
-                                    4,
-                                    loadTokenFile()
-                                ];
-                            case 1:
-                                tokenFile = _state.sent();
-                                tokenFile.token = accessToken;
-                                _state.label = 2;
-                            case 2:
                                 _state.trys.push([
+                                    0,
                                     2,
-                                    4,
                                     ,
-                                    5
+                                    3
                                 ]);
                                 return [
                                     4,
-                                    writeTokenFile(tokenFile)
+                                    cache.update(accessToken)
                                 ];
-                            case 3:
+                            case 1:
                                 _state.sent();
                                 return [
                                     3,
-                                    5
+                                    3
                                 ];
-                            case 4:
+                            case 2:
                                 e = _state.sent();
                                 console.error('Failed updating access token in file: ', e);
                                 return [
                                     3,
-                                    5
+                                    3
                                 ];
-                            case 5:
+                            case 3:
                                 return [
                                     2
                                 ];
@@ -677,7 +676,92 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
                 })();
             }
         };
-        return accessTokenCache;
+    }
+    function readTokenFile() {
+        return _async_to_generator$2(function() {
+            var raw, token;
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            nestjs.readJsonFile(filename)
+                        ];
+                    case 1:
+                        raw = _state.sent();
+                        if (raw == null) {
+                            return [
+                                2,
+                                undefined
+                            ];
+                        }
+                        token = reviveZoomAccessTokenFile(raw);
+                        return [
+                            2,
+                            {
+                                token: token
+                            }
+                        ];
+                }
+            });
+        })();
+    }
+    // Route the file-mutation helpers through the same `cache` instance used by
+    // loadZoomAccessTokenCache so the memoized in-memory layer (when useMemoryCache=true) stays
+    // consistent with disk. Direct writeJsonFile / removeFile would otherwise leave the memo
+    // holding a stale token that no future read could refresh.
+    function writeTokenFile(content) {
+        return _async_to_generator$2(function() {
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (!(content.token == null)) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            cache.clear()
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            3,
+                            4
+                        ];
+                    case 2:
+                        return [
+                            4,
+                            cache.update(content.token)
+                        ];
+                    case 3:
+                        _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    }
+    function deleteTokenFile() {
+        return _async_to_generator$2(function() {
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            cache.clear()
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
     }
     return {
         loadZoomAccessTokenCache: loadZoomAccessTokenCache,

package/nestjs/index.esm.js

@@ -1,19 +1,17 @@
 import { Injectable, Inject, Logger, Post, Res, Req, Controller, Module } from '@nestjs/common';
 import { zoomOAuthFactory, serverAccessToken, userAccessToken, zoomFactory, getUser, listUsers, listUsersPageFactory, listMeetingsForUser, listMeetingsForUserPageFactory, createMeetingForUser, getMeeting, updateMeeting, deleteMeeting, getPastMeeting, getPastMeetingParticipants } from '@dereekb/zoom';
-import { characterPrefixSuffixInstance, tryWithPromiseFactoriesFunction, isPast, filterMaybeArrayValues, handlerFactory, handlerConfigurerFactory, handlerMappedSetFunctionFactory } from '@dereekb/util';
-import { dirname } from 'node:path';
-import { mkdirSync, readFile, writeFile, rm } from 'node:fs';
+import { characterPrefixSuffixInstance, inMemoryAsyncValueCache, mergeAsyncValueCaches, isExpired, filterMaybeArrayValues, handlerFactory, handlerConfigurerFactory, handlerMappedSetFunctionFactory } from '@dereekb/util';
+import { createMemoizedJsonFileAsyncValueCache, createJsonFileAsyncValueCache, readJsonFile, RawBody } from '@dereekb/nestjs';
 import { ConfigService, ConfigModule } from '@nestjs/config';
-import { RawBody } from '@dereekb/nestjs';
 import { createHmac } from 'node:crypto';
 
-function _type_of(obj) {
+function _type_of$1(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 function __decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if ((typeof Reflect === "undefined" ? "undefined" : _type_of(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    if ((typeof Reflect === "undefined" ? "undefined" : _type_of$1(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
@@ -175,6 +173,14 @@ function _define_property$7(obj, key, value) {
     }
     return obj;
 }
+function _instanceof(left, right) {
+    "@swc/helpers - instanceof";
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _iterable_to_array$2(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -223,12 +229,35 @@ function _object_spread$3(target) {
     }
     return target;
 }
+function ownKeys$2(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props$2(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys$2(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array$2(arr, i) || _non_iterable_rest();
 }
 function _to_consumable_array$2(arr) {
     return _array_without_holes$2(arr) || _iterable_to_array$2(arr) || _unsupported_iterable_to_array$2(arr) || _non_iterable_spread$2();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array$2(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array$2(o, minLen);
@@ -344,6 +373,56 @@ function _ts_generator$2(thisArg, body) {
 ZoomOAuthAccessTokenCacheService = __decorate([
     Injectable()
 ], ZoomOAuthAccessTokenCacheService);
+// MARK: Merge
+function buildZoomReadAdapter(cache) {
+    return {
+        load: function load() {
+            return _async_to_generator$2(function() {
+                var value;
+                return _ts_generator$2(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                cache.loadCachedToken().catch(function() {
+                                    return undefined;
+                                })
+                            ];
+                        case 1:
+                            value = _state.sent();
+                            return [
+                                2,
+                                value != null && !isExpired(value) ? value : undefined
+                            ];
+                    }
+                });
+            })();
+        },
+        update: function update(token) {
+            return cache.updateCachedToken(token);
+        },
+        clear: function clear() {
+            return _async_to_generator$2(function() {
+                return _ts_generator$2(this, function(_state) {
+                    return [
+                        2
+                    ];
+                });
+            // ZoomAccessTokenCache does not expose a clear method.
+            })();
+        }
+    };
+}
+function updateZoomCacheCapturingError(cache, accessToken) {
+    return cache.updateCachedToken(accessToken).then(function() {
+        return null;
+    }).catch(function(e) {
+        return [
+            cache,
+            e
+        ];
+    });
+}
 /**
  * Default error logging function for merged cache service update failures.
  *
@@ -362,6 +441,11 @@ ZoomOAuthAccessTokenCacheService = __decorate([
  *
  * When updating a cached token, it will update the token across all services.
  *
+ * Read fall-through is delegated to {@link mergeAsyncValueCaches} after wrapping each
+ * underlying cache with an {@link isExpired}-aware filter, so an expired cached token
+ * never short-circuits the lookup. Updates run across all services in parallel via
+ * `Promise.allSettled`, mirroring the previous behavior, with optional error logging.
+ *
  * @param inputServicesToMerge Must include at least one service. Empty arrays will throw an error.
  * @param logError Optional error logging configuration. Pass a function, true for default logging, or false to disable.
  * @returns A merged ZoomOAuthAccessTokenCacheService
@@ -371,60 +455,45 @@ ZoomOAuthAccessTokenCacheService = __decorate([
     if (allServices.length === 0) {
         throw new Error('mergeZoomOAuthAccessTokenCacheServices() input cannot be empty.');
     }
-    var loadZoomAccessTokenCache = function loadZoomAccessTokenCache(accessCachesForServices) {
-        var loadCachedTokenFromFirstService = tryWithPromiseFactoriesFunction({
-            promiseFactories: accessCachesForServices.map(function(x) {
-                return function() {
-                    return x.loadCachedToken().catch(function() {
-                        return null;
-                    }).then(function(x) {
-                        var result = undefined;
-                        if (x && !isPast(x.expiresAt)) {
-                            result = x; // only return from cache if it is not expired
-                        }
-                        return result;
-                    });
-                };
-            }),
-            successOnMaybe: false,
-            throwErrors: false
-        });
-        var cacheForService = {
+    function mergeCachesForService(accessCachesForServices) {
+        // Per-cache adapters with expiry filtering so reads fall through to the next tier when a cache holds an expired token.
+        var readAdapters = accessCachesForServices.map(buildZoomReadAdapter);
+        var merged = mergeAsyncValueCaches(readAdapters);
+        return {
             loadCachedToken: function loadCachedToken() {
-                return loadCachedTokenFromFirstService();
+                return merged.load();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
+                    var settled, failedUpdates;
                     return _ts_generator$2(this, function(_state) {
-                        return [
-                            2,
-                            Promise.allSettled(accessCachesForServices.map(function(x) {
-                                return x.updateCachedToken(accessToken).then(function() {
-                                    return null;
-                                }).catch(function(e) {
-                                    return [
-                                        x,
-                                        e
-                                    ];
-                                });
-                            })).then(function(x) {
-                                // only find the failures if we're logging
-                                if (logErrorFunction) {
-                                    var failedUpdates = filterMaybeArrayValues(x.map(function(y) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    Promise.allSettled(accessCachesForServices.map(function(cache) {
+                                        return updateZoomCacheCapturingError(cache, accessToken);
+                                    }))
+                                ];
+                            case 1:
+                                settled = _state.sent();
+                                if (logErrorFunction != null) {
+                                    failedUpdates = filterMaybeArrayValues(settled.map(function(y) {
                                         return y.value;
                                     }));
                                     if (failedUpdates.length) {
                                         logErrorFunction(failedUpdates);
                                     }
                                 }
-                            })
-                        ];
+                                return [
+                                    2
+                                ];
+                        }
                     });
                 })();
             }
         };
-        return cacheForService;
-    };
+    }
     var allServiceAccessTokenCaches = allServices.map(function(service) {
         return service.loadZoomAccessTokenCache();
     });
@@ -435,11 +504,11 @@ ZoomOAuthAccessTokenCacheService = __decorate([
         var allCaches = allServicesWithCacheForRefreshToken.map(function(x) {
             return x.cacheForRefreshToken(refreshToken);
         });
-        return loadZoomAccessTokenCache(allCaches);
+        return mergeCachesForService(allCaches);
     } : undefined;
     var service = {
-        loadZoomAccessTokenCache: function loadZoomAccessTokenCache1() {
-            return loadZoomAccessTokenCache(allServiceAccessTokenCaches);
+        loadZoomAccessTokenCache: function loadZoomAccessTokenCache() {
+            return mergeCachesForService(allServiceAccessTokenCaches);
         },
         cacheForRefreshToken: cacheForRefreshToken
     };
@@ -449,45 +518,65 @@ ZoomOAuthAccessTokenCacheService = __decorate([
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that uses in-memory storage.
  *
+ * Backed by {@link inMemoryAsyncValueCache} so all consumers share the same single token slot.
+ *
  * @param existingToken Optional initial token to seed the cache with
  * @param logAccessToConsole Whether to log token access to console
  * @returns A memory-backed ZoomOAuthAccessTokenCacheService
  */ function memoryZoomOAuthAccessTokenCacheService(existingToken, logAccessToConsole) {
-    var token = existingToken;
+    var cache = inMemoryAsyncValueCache(existingToken);
     function loadZoomAccessTokenCache() {
-        var accessTokenCache = {
+        return {
             loadCachedToken: function loadCachedToken() {
                 return _async_to_generator$2(function() {
+                    var token;
                     return _ts_generator$2(this, function(_state) {
-                        if (logAccessToConsole) {
-                            console.log('retrieving access token from memory: ', {
-                                token: token
-                            });
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    cache.load()
+                                ];
+                            case 1:
+                                token = _state.sent();
+                                if (logAccessToConsole) {
+                                    console.log('retrieving access token from memory: ', {
+                                        hit: token != null,
+                                        expiresAt: token === null || token === void 0 ? void 0 : token.expiresAt
+                                    });
+                                }
+                                return [
+                                    2,
+                                    token
+                                ];
                         }
-                        return [
-                            2,
-                            token
-                        ];
                     });
                 })();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
                     return _ts_generator$2(this, function(_state) {
-                        token = accessToken;
-                        if (logAccessToConsole) {
-                            console.log('updating access token in memory: ', {
-                                accessToken: accessToken
-                            });
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    cache.update(accessToken)
+                                ];
+                            case 1:
+                                _state.sent();
+                                if (logAccessToConsole) {
+                                    console.log('updating access token in memory: ', {
+                                        expiresAt: accessToken === null || accessToken === void 0 ? void 0 : accessToken.expiresAt
+                                    });
+                                }
+                                return [
+                                    2
+                                ];
                         }
-                        return [
-                            2
-                        ];
                     });
                 })();
             }
         };
-        return accessTokenCache;
     }
     return {
         loadZoomAccessTokenCache: loadZoomAccessTokenCache,
@@ -498,9 +587,33 @@ ZoomOAuthAccessTokenCacheService = __decorate([
 }
 // MARK: File System Access Token Cache
 var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-access-tokens.json';
+/**
+ * Reviver applied to the cached file payload on load so `expiresAt` is always a `Date`
+ * regardless of how it was serialized.
+ *
+ * @param raw - the raw JSON-parsed file payload
+ * @returns the revived ZoomAccessToken, or undefined when the payload is empty/invalid
+ */ function reviveZoomAccessTokenFile(raw) {
+    if (raw == null || (typeof raw === "undefined" ? "undefined" : _type_of(raw)) !== 'object') {
+        return undefined;
+    }
+    var wrapper = raw;
+    var token = wrapper.token;
+    if (token == null) {
+        return undefined;
+    }
+    var rawExpiresAt = token.expiresAt;
+    var expiresAt = rawExpiresAt != null && !_instanceof(rawExpiresAt, Date) ? new Date(rawExpiresAt) : rawExpiresAt;
+    return _object_spread_props$2(_object_spread$3({}, token), {
+        expiresAt: expiresAt
+    });
+}
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that reads and writes the access token to the file system.
  *
+ * Composes {@link createMemoizedJsonFileAsyncValueCache} (for the on-disk slot, with optional
+ * per-process memoization) so reads after the first hit memory.
+ *
  * Useful for testing.
  *
  * @param filename Path to the token cache file
@@ -508,165 +621,51 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
  * @returns A file-system-backed ZoomOAuthAccessTokenCacheService
  */ function fileZoomOAuthAccessTokenCacheService() {
     var filename = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH, useMemoryCache = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-    var loadedToken = null;
-    function loadTokenFile() {
-        return _async_to_generator$2(function() {
-            var token, _ref;
-            return _ts_generator$2(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        token = undefined;
-                        if (!!loadedToken) return [
-                            3,
-                            2
-                        ];
-                        return [
-                            4,
-                            readTokenFile()
-                        ];
-                    case 1:
-                        token = (_ref = _state.sent()) !== null && _ref !== void 0 ? _ref : {};
-                        return [
-                            3,
-                            3
-                        ];
-                    case 2:
-                        token = loadedToken;
-                        _state.label = 3;
-                    case 3:
-                        return [
-                            2,
-                            token
-                        ];
-                }
-            });
-        })();
-    }
-    function readTokenFile() {
-        return new Promise(function(resolve) {
-            mkdirSync(dirname(filename), {
-                recursive: true
-            }); // make the directory first
-            readFile(filename, {}, function(x, data) {
-                var result = undefined;
-                if (!x) {
-                    try {
-                        result = JSON.parse(data.toString());
-                        if (result === null || result === void 0 ? void 0 : result.token) {
-                            result.token.expiresAt = new Date(result.token.expiresAt);
-                        }
-                    } catch (e) {
-                        console.error('Failed reading token file: ', e);
-                    }
-                }
-                resolve(result);
-            });
-        }).then(function(x) {
-            // update loaded tokens
-            if (useMemoryCache) {
-                loadedToken = _object_spread$3({}, loadedToken, x);
-            }
-            return x;
-        });
-    }
-    function writeTokenFile(tokens) {
-        return _async_to_generator$2(function() {
-            return _ts_generator$2(this, function(_state) {
-                return [
-                    2,
-                    new Promise(function(resolve, reject) {
-                        writeFile(filename, JSON.stringify(tokens), {}, function(x) {
-                            if (!x) {
-                                resolve();
-                            } else {
-                                reject(x);
-                            }
-                        });
-                    })
-                ];
-            });
-        })();
-    }
-    function deleteTokenFile() {
-        return _async_to_generator$2(function() {
-            return _ts_generator$2(this, function(_state) {
-                return [
-                    2,
-                    new Promise(function(resolve, reject) {
-                        rm(filename, function(x) {
-                            if (!x) {
-                                resolve();
-                            } else {
-                                reject(x);
-                            }
-                        });
-                    })
-                ];
-            });
-        })();
-    }
+    var innerCacheInput = {
+        filePath: filename,
+        reviver: reviveZoomAccessTokenFile,
+        replacer: function replacer(token) {
+            return {
+                token: token
+            };
+        }
+    };
+    var cache = useMemoryCache ? createMemoizedJsonFileAsyncValueCache(innerCacheInput) : createJsonFileAsyncValueCache(innerCacheInput);
     function loadZoomAccessTokenCache() {
-        var accessTokenCache = {
+        return {
             loadCachedToken: function loadCachedToken() {
-                return _async_to_generator$2(function() {
-                    var tokens;
-                    return _ts_generator$2(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    loadTokenFile()
-                                ];
-                            case 1:
-                                tokens = _state.sent();
-                                // console.log('retrieving access token from file: ', { token });
-                                return [
-                                    2,
-                                    tokens.token
-                                ];
-                        }
-                    });
-                })();
+                return cache.load();
             },
             updateCachedToken: function updateCachedToken(accessToken) {
                 return _async_to_generator$2(function() {
-                    var tokenFile, e;
+                    var e;
                     return _ts_generator$2(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                return [
-                                    4,
-                                    loadTokenFile()
-                                ];
-                            case 1:
-                                tokenFile = _state.sent();
-                                tokenFile.token = accessToken;
-                                _state.label = 2;
-                            case 2:
                                 _state.trys.push([
+                                    0,
                                     2,
-                                    4,
                                     ,
-                                    5
+                                    3
                                 ]);
                                 return [
                                     4,
-                                    writeTokenFile(tokenFile)
+                                    cache.update(accessToken)
                                 ];
-                            case 3:
+                            case 1:
                                 _state.sent();
                                 return [
                                     3,
-                                    5
+                                    3
                                 ];
-                            case 4:
+                            case 2:
                                 e = _state.sent();
                                 console.error('Failed updating access token in file: ', e);
                                 return [
                                     3,
-                                    5
+                                    3
                                 ];
-                            case 5:
+                            case 3:
                                 return [
                                     2
                                 ];
@@ -675,7 +674,92 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
                 })();
             }
         };
-        return accessTokenCache;
+    }
+    function readTokenFile() {
+        return _async_to_generator$2(function() {
+            var raw, token;
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            readJsonFile(filename)
+                        ];
+                    case 1:
+                        raw = _state.sent();
+                        if (raw == null) {
+                            return [
+                                2,
+                                undefined
+                            ];
+                        }
+                        token = reviveZoomAccessTokenFile(raw);
+                        return [
+                            2,
+                            {
+                                token: token
+                            }
+                        ];
+                }
+            });
+        })();
+    }
+    // Route the file-mutation helpers through the same `cache` instance used by
+    // loadZoomAccessTokenCache so the memoized in-memory layer (when useMemoryCache=true) stays
+    // consistent with disk. Direct writeJsonFile / removeFile would otherwise leave the memo
+    // holding a stale token that no future read could refresh.
+    function writeTokenFile(content) {
+        return _async_to_generator$2(function() {
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        if (!(content.token == null)) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            cache.clear()
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            3,
+                            4
+                        ];
+                    case 2:
+                        return [
+                            4,
+                            cache.update(content.token)
+                        ];
+                    case 3:
+                        _state.sent();
+                        _state.label = 4;
+                    case 4:
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    }
+    function deleteTokenFile() {
+        return _async_to_generator$2(function() {
+            return _ts_generator$2(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            cache.clear()
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
     }
     return {
         loadZoomAccessTokenCache: loadZoomAccessTokenCache,

package/nestjs/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/zoom/nestjs",
-  "version": "13.10.9",
+  "version": "13.11.1",
   "peerDependencies": {
-    "@dereekb/nestjs": "13.10.9",
-    "@dereekb/rxjs": "13.10.9",
-    "@dereekb/util": "13.10.9",
-    "@dereekb/zoom": "13.10.9",
+    "@dereekb/nestjs": "13.11.1",
+    "@dereekb/rxjs": "13.11.1",
+    "@dereekb/util": "13.11.1",
+    "@dereekb/zoom": "13.11.1",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "express": "^5.2.1"

package/nestjs/src/lib/oauth/oauth.service.d.ts

@@ -32,6 +32,11 @@ export declare function logMergeZoomOAuthAccessTokenCacheServiceErrorFunction(fa
  *
  * When updating a cached token, it will update the token across all services.
  *
+ * Read fall-through is delegated to {@link mergeAsyncValueCaches} after wrapping each
+ * underlying cache with an {@link isExpired}-aware filter, so an expired cached token
+ * never short-circuits the lookup. Updates run across all services in parallel via
+ * `Promise.allSettled`, mirroring the previous behavior, with optional error logging.
+ *
  * @param inputServicesToMerge Must include at least one service. Empty arrays will throw an error.
  * @param logError Optional error logging configuration. Pass a function, true for default logging, or false to disable.
  * @returns A merged ZoomOAuthAccessTokenCacheService
@@ -40,6 +45,8 @@ export declare function mergeZoomOAuthAccessTokenCacheServices(inputServicesToMe
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that uses in-memory storage.
  *
+ * Backed by {@link inMemoryAsyncValueCache} so all consumers share the same single token slot.
+ *
  * @param existingToken Optional initial token to seed the cache with
  * @param logAccessToConsole Whether to log token access to console
  * @returns A memory-backed ZoomOAuthAccessTokenCacheService
@@ -57,6 +64,9 @@ export type ZoomOAuthAccessTokenCacheFileContent = {
 /**
  * Creates a ZoomOAuthAccessTokenCacheService that reads and writes the access token to the file system.
  *
+ * Composes {@link createMemoizedJsonFileAsyncValueCache} (for the on-disk slot, with optional
+ * per-process memoization) so reads after the first hit memory.
+ *
  * Useful for testing.
  *
  * @param filename Path to the token cache file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/zoom",
-  "version": "13.10.9",
+  "version": "13.11.1",
   "exports": {
     "./nestjs": {
       "module": "./nestjs/index.esm.js",
@@ -17,9 +17,9 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/nestjs": "13.10.9",
-    "@dereekb/rxjs": "13.10.9",
-    "@dereekb/util": "13.10.9",
+    "@dereekb/nestjs": "13.11.1",
+    "@dereekb/rxjs": "13.11.1",
+    "@dereekb/util": "13.11.1",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "express": "^5.2.1",