@checkfirst/nestjs-outlook 8.0.2 → 8.0.3

package/dist/constants.d.ts

@@ -1,4 +1,6 @@
 export declare const MICROSOFT_CONFIG = "MICROSOFT_CONFIG";
+export declare const OUTLOOK_LOCK_STORE = "OUTLOOK_LOCK_STORE";
+export declare const OUTLOOK_RATE_LIMIT_STORE = "OUTLOOK_RATE_LIMIT_STORE";
 export declare const GRAPH_ERROR_CODES: {
     readonly MAILBOX_NOT_ENABLED: "MailboxNotEnabledForRESTAPI";
 };

package/dist/constants.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GRAPH_ERROR_CODES = exports.MICROSOFT_CONFIG = void 0;
+exports.GRAPH_ERROR_CODES = exports.OUTLOOK_RATE_LIMIT_STORE = exports.OUTLOOK_LOCK_STORE = exports.MICROSOFT_CONFIG = void 0;
 exports.MICROSOFT_CONFIG = 'MICROSOFT_CONFIG';
+exports.OUTLOOK_LOCK_STORE = 'OUTLOOK_LOCK_STORE';
+exports.OUTLOOK_RATE_LIMIT_STORE = 'OUTLOOK_RATE_LIMIT_STORE';
 exports.GRAPH_ERROR_CODES = {
     MAILBOX_NOT_ENABLED: 'MailboxNotEnabledForRESTAPI',
 };

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AAGtC,QAAA,iBAAiB,GAAG;IAE/B,mBAAmB,EAAE,6BAA6B;CAC1C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,gBAAgB,GAAG,kBAAkB,CAAC;AAGtC,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAC1C,QAAA,wBAAwB,GAAG,0BAA0B,CAAC;AAGtD,QAAA,iBAAiB,GAAG;IAE/B,mBAAmB,EAAE,6BAA6B;CAC1C,CAAC"}

package/dist/index.d.ts

@@ -5,10 +5,13 @@ export * from './services/email/email.service';
 export * from './services/shared/user-id-converter.service';
 export * from './services/subscription/microsoft-subscription.service';
 export * from './services/shared/graph-rate-limiter.service';
+export * from './services/shared/outlook-lock.store';
+export * from './services/shared/outlook-rate-limit.store';
 export * from './microsoft-outlook.module';
 export * from './interfaces/outlook/token-response.interface';
 export * from './interfaces/config/outlook-config.interface';
 export * from './interfaces/recurrence.interfaces';
+export * from './interfaces/state/redis-like.interface';
 export * from './enums/permission-scope.enum';
 export * from './enums/event-types.enum';
 export * from './enums/show-as-type.enum';

package/dist/index.js

@@ -21,10 +21,13 @@ __exportStar(require("./services/email/email.service"), exports);
 __exportStar(require("./services/shared/user-id-converter.service"), exports);
 __exportStar(require("./services/subscription/microsoft-subscription.service"), exports);
 __exportStar(require("./services/shared/graph-rate-limiter.service"), exports);
+__exportStar(require("./services/shared/outlook-lock.store"), exports);
+__exportStar(require("./services/shared/outlook-rate-limit.store"), exports);
 __exportStar(require("./microsoft-outlook.module"), exports);
 __exportStar(require("./interfaces/outlook/token-response.interface"), exports);
 __exportStar(require("./interfaces/config/outlook-config.interface"), exports);
 __exportStar(require("./interfaces/recurrence.interfaces"), exports);
+__exportStar(require("./interfaces/state/redis-like.interface"), exports);
 __exportStar(require("./enums/permission-scope.enum"), exports);
 __exportStar(require("./enums/event-types.enum"), exports);
 __exportStar(require("./enums/show-as-type.enum"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,yEAAuD;AACvD,uEAAqD;AACrD,yEAAuD;AACvD,iEAA+C;AAC/C,8EAA4D;AAC5D,yFAAuE;AACvE,+EAA6D;AAG7D,6DAA2C;AAG3C,gFAA8D;AAC9D,+EAA6D;AAC7D,qEAAmD;AAGnD,gEAA8C;AAC9C,2DAAyC;AACzC,4DAA0C;AAC1C,qEAAmD;AAGnD,8CAA4B;AAG5B,kEAAgD;AAChD,iEAA+C;AAC/C,oEAAkD;AAGlD,oEAAkD;AAClD,0EAAwD;AACxD,iEAA+C;AAG/C,yEAAuD;AAGvD,iFAA+D;AAC/D,mEAAiD;AAGjD,yFAAuE;AAGvE,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,yEAAuD;AACvD,uEAAqD;AACrD,yEAAuD;AACvD,iEAA+C;AAC/C,8EAA4D;AAC5D,yFAAuE;AACvE,+EAA6D;AAC7D,uEAAqD;AACrD,6EAA2D;AAG3D,6DAA2C;AAG3C,gFAA8D;AAC9D,+EAA6D;AAC7D,qEAAmD;AACnD,0EAAwD;AAGxD,gEAA8C;AAC9C,2DAAyC;AACzC,4DAA0C;AAC1C,qEAAmD;AAGnD,8CAA4B;AAG5B,kEAAgD;AAChD,iEAA+C;AAC/C,oEAAkD;AAGlD,oEAAkD;AAClD,0EAAwD;AACxD,iEAA+C;AAG/C,yEAAuD;AAGvD,iFAA+D;AAC/D,mEAAiD;AAGjD,yFAAuE;AAGvE,0CAAwB"}

package/dist/interfaces/config/outlook-config.interface.d.ts

@@ -1,3 +1,11 @@
+import { RedisLike } from "../state/redis-like.interface";
+export interface MicrosoftOutlookStateConfig {
+    redis?: {
+        client: RedisLike;
+        keyPrefix?: string;
+        required?: boolean;
+    };
+}
 export interface MicrosoftOutlookConfig {
     clientId: string;
     clientSecret: string;
@@ -5,4 +13,6 @@ export interface MicrosoftOutlookConfig {
     backendBaseUrl: string;
     basePath?: string;
     calendarWebhookPath?: string;
+    state?: MicrosoftOutlookStateConfig;
+    revocationEmitFlagTtlMs?: number;
 }

package/dist/interfaces/state/redis-like.interface.d.ts

@@ -0,0 +1,13 @@
+export interface RedisLike {
+    ping(...args: any[]): Promise<any>;
+    set(...args: any[]): Promise<any>;
+    get(...args: any[]): Promise<any>;
+    del(...args: any[]): Promise<any>;
+    pexpire(...args: any[]): Promise<any>;
+    eval(...args: any[]): Promise<any>;
+    zadd(...args: any[]): Promise<any>;
+    zremrangebyscore(...args: any[]): Promise<any>;
+    zcard(...args: any[]): Promise<any>;
+    hset(...args: any[]): Promise<any>;
+    hgetall(...args: any[]): Promise<any>;
+}

package/dist/interfaces/state/redis-like.interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=redis-like.interface.js.map

package/dist/interfaces/state/redis-like.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-like.interface.js","sourceRoot":"","sources":["../../../src/interfaces/state/redis-like.interface.ts"],"names":[],"mappings":""}

package/dist/microsoft-outlook.module.js

@@ -32,9 +32,60 @@ const lifecycle_event_handler_service_1 = require("./services/calendar/lifecycle
 const recurrence_service_1 = require("./services/calendar/recurrence.service");
 const microsoft_subscription_service_1 = require("./services/subscription/microsoft-subscription.service");
 const graph_rate_limiter_service_1 = require("./services/shared/graph-rate-limiter.service");
+const outlook_lock_store_1 = require("./services/shared/outlook-lock.store");
+const outlook_rate_limit_store_1 = require("./services/shared/outlook-rate-limit.store");
 _a = new common_1.ConfigurableModuleBuilder()
     .setClassMethodName("forRoot")
     .build(), exports.ConfigurableModuleClass = _a.ConfigurableModuleClass, exports.MODULE_OPTIONS_TOKEN = _a.MODULE_OPTIONS_TOKEN;
+const stateLogger = new common_1.Logger("MicrosoftOutlookStateBackend");
+async function buildLockStore(options) {
+    var _a, _b;
+    const redisCfg = (_a = options.state) === null || _a === void 0 ? void 0 : _a.redis;
+    if (!(redisCfg === null || redisCfg === void 0 ? void 0 : redisCfg.client)) {
+        stateLogger.log("OutlookLockStore backend: in-memory");
+        return new outlook_lock_store_1.InMemoryOutlookLockStore();
+    }
+    const prefix = (_b = redisCfg.keyPrefix) !== null && _b !== void 0 ? _b : "outlook:";
+    try {
+        await redisCfg.client.ping();
+        stateLogger.log(`OutlookLockStore backend: redis (keyPrefix="${prefix}")`);
+        return new outlook_lock_store_1.RedisOutlookLockStore(redisCfg.client, prefix);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (redisCfg.required) {
+            stateLogger.error(`Redis PING failed and state.redis.required=true. Crashing module init: ${msg}`);
+            throw new Error(`MicrosoftOutlookModule: Redis state backend unreachable (required=true): ${msg}`);
+        }
+        stateLogger.error(`Redis PING failed (required=false), falling back to in-memory OutlookLockStore: ${msg}. ` +
+            `metric=outlook.state.backend.inmemory_fallback`);
+        return new outlook_lock_store_1.InMemoryOutlookLockStore();
+    }
+}
+async function buildRateLimitStore(options) {
+    var _a, _b;
+    const redisCfg = (_a = options.state) === null || _a === void 0 ? void 0 : _a.redis;
+    if (!(redisCfg === null || redisCfg === void 0 ? void 0 : redisCfg.client)) {
+        stateLogger.log("OutlookRateLimitStore backend: in-memory");
+        return new outlook_rate_limit_store_1.InMemoryOutlookRateLimitStore();
+    }
+    const prefix = (_b = redisCfg.keyPrefix) !== null && _b !== void 0 ? _b : "outlook:";
+    try {
+        await redisCfg.client.ping();
+        stateLogger.log(`OutlookRateLimitStore backend: redis (keyPrefix="${prefix}")`);
+        return new outlook_rate_limit_store_1.RedisOutlookRateLimitStore(redisCfg.client, prefix);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (redisCfg.required) {
+            stateLogger.error(`Redis PING failed and state.redis.required=true. Crashing module init: ${msg}`);
+            throw new Error(`MicrosoftOutlookModule: Redis state backend unreachable (required=true): ${msg}`);
+        }
+        stateLogger.error(`Redis PING failed (required=false), falling back to in-memory OutlookRateLimitStore: ${msg}. ` +
+            `metric=outlook.state.backend.inmemory_fallback`);
+        return new outlook_rate_limit_store_1.InMemoryOutlookRateLimitStore();
+    }
+}
 let MicrosoftOutlookModule = class MicrosoftOutlookModule extends exports.ConfigurableModuleClass {
 };
 exports.MicrosoftOutlookModule = MicrosoftOutlookModule;
@@ -57,6 +108,16 @@ exports.MicrosoftOutlookModule = MicrosoftOutlookModule = __decorate([
                 useFactory: (options) => options,
                 inject: [exports.MODULE_OPTIONS_TOKEN],
             },
+            {
+                provide: constants_1.OUTLOOK_LOCK_STORE,
+                useFactory: (options) => buildLockStore(options),
+                inject: [exports.MODULE_OPTIONS_TOKEN],
+            },
+            {
+                provide: constants_1.OUTLOOK_RATE_LIMIT_STORE,
+                useFactory: (options) => buildRateLimitStore(options),
+                inject: [exports.MODULE_OPTIONS_TOKEN],
+            },
             outlook_webhook_subscription_repository_1.OutlookWebhookSubscriptionRepository,
             microsoft_csrf_token_repository_1.MicrosoftCsrfTokenRepository,
             calendar_service_1.CalendarService,
@@ -80,6 +141,8 @@ exports.MicrosoftOutlookModule = MicrosoftOutlookModule = __decorate([
             user_id_converter_service_1.UserIdConverterService,
             microsoft_subscription_service_1.MicrosoftSubscriptionService,
             graph_rate_limiter_service_1.GraphRateLimiterService,
+            constants_1.OUTLOOK_LOCK_STORE,
+            constants_1.OUTLOOK_RATE_LIMIT_STORE,
         ],
     })
 ], MicrosoftOutlookModule);

package/dist/microsoft-outlook.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"microsoft-outlook.module.js","sourceRoot":"","sources":["../src/microsoft-outlook.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAmE;AACnE,6CAAgD;AAChD,+CAAkD;AAClD,yDAA2D;AAC3D,mFAA8E;AAC9E,uFAAkF;AAClF,2EAAuE;AACvE,qEAAiE;AACjE,wGAA4F;AAC5F,oHAA8G;AAC9G,2CAA+C;AAE/C,oEAAkE;AAClE,oGAA8F;AAC9F,2EAAuE;AACvE,kEAA8D;AAC9D,4EAAiE;AACjE,oEAAgE;AAChE,gGAA0F;AAC1F,6EAAwE;AACxE,2FAAqF;AACrF,yGAAmG;AACnG,+EAA2E;AAC3E,2GAAsG;AACtG,6FAAuF;AAE1E,KACX,IAAI,kCAAyB,EAA0B;KACpD,kBAAkB,CAAC,SAAS,CAAC;KAC7B,KAAK,EAAE,EAHG,+BAAuB,+BAAE,4BAAoB,2BAG/C;AAiDN,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,+BAAuB;CAAG,CAAA;AAAzD,wDAAsB;iCAAtB,sBAAsB;IA3ClC,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,yBAAc,CAAC,OAAO,EAAE;YACxB,uBAAa,CAAC,UAAU,CAAC;gBACvB,gEAA0B;gBAC1B,sCAAkB;gBAClB,qCAAa;gBACb,oCAAgB;aACjB,CAAC;YACF,kCAAkB,CAAC,OAAO,EAAE;SAC7B;QACD,WAAW,EAAE,CAAC,mDAAuB,EAAE,wCAAkB,EAAE,kCAAe,CAAC;QAC3E,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,4BAAgB;gBACzB,UAAU,EAAE,CAAC,OAA+B,EAAE,EAAE,CAAC,OAAO;gBACxD,MAAM,EAAE,CAAC,4BAAoB,CAAC;aAC/B;YACD,8EAAoC;YACpC,8DAA4B;YAC5B,kCAAe;YACf,4BAAY;YACZ,6CAAoB;YACpB,0DAA0B;YAC1B,qCAAgB;YAChB,kDAAsB;YACtB,8DAA4B;YAC5B,sCAAiB;YACjB,6DAA4B;YAC5B,oDAAuB;SACxB;QACD,OAAO,EAAE;YACP,kCAAe;YACf,sCAAiB;YACjB,4BAAY;YACZ,6CAAoB;YACpB,0DAA0B;YAC1B,qCAAgB;YAChB,kDAAsB;YACtB,6DAA4B;YAC5B,oDAAuB;SACxB;KACF,CAAC;GACW,sBAAsB,CAAmC"}
+{"version":3,"file":"microsoft-outlook.module.js","sourceRoot":"","sources":["../src/microsoft-outlook.module.ts"],"names":[],"mappings":"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"}

package/dist/services/auth/microsoft-auth.service.d.ts

@@ -2,6 +2,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { TokenResponse } from '../../interfaces/outlook/token-response.interface';
 import { EmailService } from '../email/email.service';
 import { MicrosoftSubscriptionService } from '../subscription/microsoft-subscription.service';
+import { OutlookLockStore } from '../shared/outlook-lock.store';
 import { MicrosoftOutlookConfig } from '../../interfaces/config/outlook-config.interface';
 import { MicrosoftCsrfTokenRepository } from '../../repositories/microsoft-csrf-token.repository';
 import { StateObject } from '../../interfaces/microsoft-auth/state-object.interface';
@@ -15,6 +16,7 @@ export declare class MicrosoftAuthService {
     private readonly microsoftConfig;
     private readonly csrfTokenRepository;
     private readonly microsoftUserRepository;
+    private readonly lockStore;
     private readonly logger;
     private readonly clientId;
     private readonly clientSecret;
@@ -24,9 +26,10 @@ export declare class MicrosoftAuthService {
     private readonly requiredScopes;
     private readonly defaultScopes;
     private readonly CSRF_TOKEN_EXPIRY;
+    private readonly DEFAULT_REVOCATION_EMIT_FLAG_TTL_MS;
     private subscriptionInProgress;
     private readonly microsoftUserCache;
-    constructor(eventEmitter: EventEmitter2, emailService: EmailService, subscriptionService: MicrosoftSubscriptionService, microsoftConfig: MicrosoftOutlookConfig, csrfTokenRepository: MicrosoftCsrfTokenRepository, microsoftUserRepository: Repository<MicrosoftUser>);
+    constructor(eventEmitter: EventEmitter2, emailService: EmailService, subscriptionService: MicrosoftSubscriptionService, microsoftConfig: MicrosoftOutlookConfig, csrfTokenRepository: MicrosoftCsrfTokenRepository, microsoftUserRepository: Repository<MicrosoftUser>, lockStore: OutlookLockStore);
     private mapToMicrosoftScopes;
     private buildRedirectUri;
     cleanupExpiredTokens(): Promise<void>;
@@ -50,6 +53,7 @@ export declare class MicrosoftAuthService {
     private markSubscriptionFailed;
     private setupSubscriptions;
     refreshAccessToken(refreshToken: string, internalUserId: number): Promise<string>;
+    private revocationEmitFlagKey;
     private markUserAsCorrupted;
     revokeRefreshToken(refreshToken: string): Promise<void>;
     private hasCalendarSubscriptionPermission;

package/dist/services/auth/microsoft-auth.service.js

@@ -42,13 +42,14 @@ const CORRUPTED_TRIGGER_ERROR_CODES = new Set([
     'login_required',
 ]);
 let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
-    constructor(eventEmitter, emailService, subscriptionService, microsoftConfig, csrfTokenRepository, microsoftUserRepository) {
+    constructor(eventEmitter, emailService, subscriptionService, microsoftConfig, csrfTokenRepository, microsoftUserRepository, lockStore) {
         this.eventEmitter = eventEmitter;
         this.emailService = emailService;
         this.subscriptionService = subscriptionService;
         this.microsoftConfig = microsoftConfig;
         this.csrfTokenRepository = csrfTokenRepository;
         this.microsoftUserRepository = microsoftUserRepository;
+        this.lockStore = lockStore;
         this.logger = new common_1.Logger(MicrosoftAuthService_1.name);
         this.tenantId = 'common';
         this.requiredScopes = ['offline_access', 'User.Read'];
@@ -60,6 +61,7 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
             permission_scope_enum_1.PermissionScope.EMAIL_WRITE,
         ];
         this.CSRF_TOKEN_EXPIRY = 30 * 60 * 1000;
+        this.DEFAULT_REVOCATION_EMIT_FLAG_TTL_MS = 7 * 24 * 60 * 60 * 1000;
         this.subscriptionInProgress = new Map();
         this.microsoftUserCache = new ttl_cache_util_1.TtlCache(30000);
         console.log('MicrosoftAuthService constructor - microsoftConfig:', {
@@ -199,6 +201,7 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
         user.status = microsoft_user_status_enum_1.MicrosoftUserStatus.ACTIVE;
         await this.microsoftUserRepository.save(user);
         this.invalidateUserCache(user);
+        await this.lockStore.clearLock(this.revocationEmitFlagKey(externalUserId));
     }
     async getMicrosoftUser(params) {
         const { internalUserId, externalUserId, includeInactive = false, cache = true } = params;
@@ -551,8 +554,11 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
             throw new Error('Failed to refresh access token from Microsoft');
         }
     }
+    revocationEmitFlagKey(externalUserId) {
+        return `revocation-emit:${externalUserId}`;
+    }
     async markUserAsCorrupted(user, reason) {
-        const wasAlreadyCorrupted = user.status === microsoft_user_status_enum_1.MicrosoftUserStatus.CORRUPTED;
+        var _a;
         try {
             user.status = microsoft_user_status_enum_1.MicrosoftUserStatus.CORRUPTED;
             await this.microsoftUserRepository.save(user);
@@ -563,8 +569,10 @@ let MicrosoftAuthService = MicrosoftAuthService_1 = class MicrosoftAuthService {
             this.logger.error(`Failed to mark user ${String(user.id)} as CORRUPTED: ${dbErr instanceof Error ? dbErr.message : 'unknown'}`);
             return;
         }
-        if (wasAlreadyCorrupted)
+        const emitToken = await this.lockStore.acquireLock(this.revocationEmitFlagKey(user.externalUserId), (_a = this.microsoftConfig.revocationEmitFlagTtlMs) !== null && _a !== void 0 ? _a : this.DEFAULT_REVOCATION_EMIT_FLAG_TTL_MS);
+        if (!emitToken) {
             return;
+        }
         this.eventEmitter.emit(event_types_enum_1.OutlookEventTypes.USER_REFRESH_TOKEN_INVALID, user.externalUserId, {
             internalUserId: user.id,
             externalUserId: user.externalUserId,
@@ -613,9 +621,10 @@ exports.MicrosoftAuthService = MicrosoftAuthService = MicrosoftAuthService_1 = _
     __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => microsoft_subscription_service_1.MicrosoftSubscriptionService))),
     __param(3, (0, common_1.Inject)(constants_1.MICROSOFT_CONFIG)),
     __param(5, (0, typeorm_1.InjectRepository)(microsoft_user_entity_1.MicrosoftUser)),
+    __param(6, (0, common_1.Inject)(constants_1.OUTLOOK_LOCK_STORE)),
     __metadata("design:paramtypes", [event_emitter_1.EventEmitter2,
         email_service_1.EmailService,
         microsoft_subscription_service_1.MicrosoftSubscriptionService, Object, microsoft_csrf_token_repository_1.MicrosoftCsrfTokenRepository,
-        typeorm_2.Repository])
+        typeorm_2.Repository, Object])
 ], MicrosoftAuthService);
 //# sourceMappingURL=microsoft-auth.service.js.map

package/dist/services/auth/microsoft-auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"microsoft-auth.service.js","sourceRoot":"","sources":["../../../src/services/auth/microsoft-auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"microsoft-auth.service.js","sourceRoot":"","sources":["../../../src/services/auth/microsoft-auth.service.ts"],"names":[],"mappings":"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"}

package/dist/services/calendar/calendar.service.d.ts

@@ -64,7 +64,7 @@ export declare class CalendarService {
     streamCalendarChanges(externalUserId: string, forceReset?: boolean, dateRange?: {
         startDate: Date;
         endDate: Date;
-    }, saveDeltaLink?: boolean): AsyncGenerator<Event[], string | null, unknown>;
+    }, saveDeltaLink?: boolean, skipCursorAdvanceOnEmpty?: boolean): AsyncGenerator<Event[], string | null, unknown>;
     getAuthenticatedClient(externalUserId: string): Promise<Client>;
     saveDeltaLink(externalUserId: string, deltaLink: string): Promise<void>;
     getEventDetails(resource: string, externalUserId: string): Promise<Event | null>;

package/dist/services/calendar/calendar.service.js

@@ -624,12 +624,12 @@ let CalendarService = CalendarService_1 = class CalendarService {
         };
     }
     streamCalendarChanges(externalUserId_1) {
-        return __asyncGenerator(this, arguments, function* streamCalendarChanges_1(externalUserId, forceReset = false, dateRange, saveDeltaLink = true) {
+        return __asyncGenerator(this, arguments, function* streamCalendarChanges_1(externalUserId, forceReset = false, dateRange, saveDeltaLink = true, skipCursorAdvanceOnEmpty = false) {
             const client = yield __await(this.getAuthenticatedClient(externalUserId));
             const requestUrl = "/me/events/delta";
             try {
-                this.logger.log(`[streamCalendarChanges] Starting stream for user ${externalUserId} (saveDeltaLink: ${saveDeltaLink})`);
-                const deltaLink = yield __await(yield* __asyncDelegator(__asyncValues(this.deltaSyncService.streamDeltaChanges(client, requestUrl, externalUserId, forceReset, dateRange, saveDeltaLink))));
+                this.logger.log(`[streamCalendarChanges] Starting stream for user ${externalUserId} (saveDeltaLink: ${saveDeltaLink}, skipCursorAdvanceOnEmpty: ${skipCursorAdvanceOnEmpty})`);
+                const deltaLink = yield __await(yield* __asyncDelegator(__asyncValues(this.deltaSyncService.streamDeltaChanges(client, requestUrl, externalUserId, forceReset, dateRange, saveDeltaLink, skipCursorAdvanceOnEmpty))));
                 this.logger.log(`[streamCalendarChanges] Completed streaming for user ${externalUserId}, deltaLink: ${deltaLink ? 'received' : 'none'}`);
                 return yield __await(deltaLink);
             }
@@ -746,7 +746,7 @@ let CalendarService = CalendarService_1 = class CalendarService {
                 if (retryableEvents.length > 0) {
                     const retryAfterSeconds = (0, retry_util_1.extractRetryAfterSeconds)(response);
                     if (retryAfterSeconds) {
-                        this.rateLimiter.handleRateLimitResponse(externalUserId, retryAfterSeconds);
+                        await this.rateLimiter.handleRateLimitResponse(externalUserId, retryAfterSeconds);
                     }
                     this.logger.log(`[getEventsBatch] Retrying ${retryableEvents.length} rate-limited events after ${retryAfterSeconds}s`);
                     if (retryAfterSeconds) {