@stamhoofd/backend 2.118.1 → 2.120.0

package/src/helpers/FileCache.ts

@@ -3,8 +3,8 @@ import { Formatter } from '@stamhoofd/utility';
 import basex from 'base-x';
 import crypto from 'crypto';
 import fs from 'node:fs';
-import { Writable } from 'node:stream';
-import { Readable } from 'stream';
+import type { Writable } from 'node:stream';
+import type { Readable } from 'stream';
 
 const ALPHABET = '0123456789abcdefghijklmnopqrstuvwxyz';
 const baseEncoder = basex(ALPHABET);
@@ -61,7 +61,7 @@ export class FileCache {
             throw new SimpleError({
                 code: 'invalid_file',
                 message: 'Invalid file',
-                human: $t(`a175829f-1075-4e04-ab5f-8f65bb715635`),
+                human: $t(`%Fk`),
                 statusCode: 400,
             });
         }
@@ -73,7 +73,7 @@ export class FileCache {
             throw new SimpleError({
                 code: 'invalid_file',
                 message: 'Invalid file',
-                human: $t(`a175829f-1075-4e04-ab5f-8f65bb715635`),
+                human: $t(`%Fk`),
                 statusCode: 400,
             });
         }
@@ -86,7 +86,7 @@ export class FileCache {
                 throw new SimpleError({
                     code: 'invalid_file',
                     message: 'Invalid file',
-                    human: $t(`d5d7b908-50a5-4b3e-94d2-1e54e549764b`),
+                    human: $t(`%Fl`),
                     statusCode: 400,
                 });
             }
@@ -99,7 +99,7 @@ export class FileCache {
             throw new SimpleError({
                 code: 'invalid_file',
                 message: 'Invalid file',
-                human: $t(`594fab23-b257-4d51-8d7b-eb3e75bc48ba`),
+                human: $t(`%Fm`),
                 statusCode: 400,
             });
         }
@@ -111,7 +111,7 @@ export class FileCache {
             throw new SimpleError({
                 code: 'invalid_file',
                 message: 'Invalid file',
-                human: $t(`796645b6-ded0-4d1b-a439-0062f9b6edc1`),
+                human: $t(`%Fn`),
                 statusCode: 400,
             });
         }
@@ -126,7 +126,7 @@ export class FileCache {
             throw new SimpleError({
                 code: 'file_expired',
                 message: 'File expired',
-                human: $t(`8a9a35d5-ff86-48e3-81e1-42cf85708e06`),
+                human: $t(`%Fo`),
                 statusCode: 404,
             });
         }
@@ -142,7 +142,7 @@ export class FileCache {
                 throw new SimpleError({
                     code: 'file_expired',
                     message: 'File expired',
-                    human: $t(`d445388b-9062-488b-9fa7-d15682e26fd4`),
+                    human: $t(`%Fp`),
                     statusCode: 404,
                 });
             }

package/src/helpers/ForwardHandler.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import { Email, EmailAddress, EmailInterface, EmailInterfaceRecipient } from '@stamhoofd/email';
+import type { EmailInterface, EmailInterfaceRecipient } from '@stamhoofd/email';
+import { Email, EmailAddress } from '@stamhoofd/email';
 import { Organization, Platform } from '@stamhoofd/models';
 import { Formatter } from '@stamhoofd/utility';
 import { simpleParser } from 'mailparser';
@@ -67,7 +68,7 @@ export class ForwardHandler {
         let defaultEmail: EmailInterfaceRecipient[] = [Email.getWebmasterToEmail()];
         let organizationEmails: EmailInterfaceRecipient[] = [];
         const platform = await Platform.getShared();
-        const extraDescription = $t(`24bc9aad-bc92-4d27-bfcd-055113d792fa`) + ' ' + email + $t(`97b9b042-c5b6-42dc-8238-e0e8392fcf26`) + ' ' + platform.config.name + ' ' + $t(`f510fb0c-c180-455a-8f23-7e09e344e47a`);
+        const extraDescription = $t(`%Fq`) + ' ' + email + $t(`%Fr`) + ' ' + platform.config.name + ' ' + $t(`%Fs`);
 
         function doBounce() {
             if (!from) {

package/src/helpers/GlobalHelper.ts

@@ -9,7 +9,9 @@ export class GlobalHelper {
         await I18n.load();
         this.loadGlobalTranslateFunction();
         await FileSignService.load();
+        
         MemberRecordStore.init();
+        
         BalanceItemService.listen();
     }
 

package/src/helpers/GroupBuilder.ts

@@ -1,5 +1,6 @@
 import { GroupCategory, GroupCategorySettings, GroupGenderType, GroupSettings, Group as GroupStruct, OrganizationGenderType, OrganizationType, OrganizationTypeHelper, TranslatedString, UmbrellaOrganization } from '@stamhoofd/structures';
-import { Group, Organization, OrganizationRegistrationPeriod, RegistrationPeriod } from '@stamhoofd/models';
+import type { Organization} from '@stamhoofd/models';
+import { Group, OrganizationRegistrationPeriod, RegistrationPeriod } from '@stamhoofd/models';
 
 export class GroupBuilder {
     organization: Organization;

package/src/helpers/GroupedThrottledQueue.test.ts

@@ -3,19 +3,19 @@ import { GroupedThrottledQueue } from './GroupedThrottledQueue.js';
 describe('GroupedThrottledQueue', () => {
     // Mock timers for controlling setTimeout
     beforeEach(() => {
-        jest.useFakeTimers();
+        vitest.useFakeTimers();
     });
 
     afterEach(() => {
-        jest.useRealTimers();
+        vitest.useRealTimers();
     });
 
     afterAll(() => {
-        jest.clearAllMocks();
+        vitest.clearAllMocks();
     });
 
     it('should create an instance with the provided handler', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new GroupedThrottledQueue(handler);
 
         expect(queue.handler).toBe(handler);
@@ -23,7 +23,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should call handler when processing items from a group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -33,7 +33,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should process items from different groups separately', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -47,7 +47,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should batch items from the same group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItems('group1', [1, 2, 3]);
@@ -59,7 +59,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should flush only the specified group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -77,7 +77,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should remove the group when all items are processed', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -93,7 +93,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle multiple items added to the same group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -107,7 +107,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle large batch sizes correctly', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         // Create a large array of items
@@ -127,9 +127,9 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle errors in handler without failing the queue', async () => {
-        const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation();
+        const consoleErrorMock = vitest.spyOn(console, 'error');// .mockImplementation();
 
-        const handler = jest.fn().mockImplementation((group, items) => {
+        const handler = vitest.fn().mockImplementation((group, items) => {
             if (group === 'error-group') {
                 throw new Error('Test error');
             }
@@ -155,7 +155,7 @@ describe('GroupedThrottledQueue', () => {
     it('should handle async handler functions', async () => {
         let processingPromise: Promise<void> | null = null;
 
-        const handler = jest.fn().mockImplementation((group, items) => {
+        const handler = vitest.fn().mockImplementation((group, items) => {
             processingPromise = new Promise((resolve) => {
                 setTimeout(() => {
                     resolve();
@@ -174,7 +174,7 @@ describe('GroupedThrottledQueue', () => {
         expect(queue.queues.size).toBe(1);
 
         // Fast-forward time to resolve the processing promise
-        jest.advanceTimersByTime(100);
+        vitest.advanceTimersByTime(100);
 
         // Wait for the processing to complete
         await waitPromise;
@@ -184,7 +184,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should not error when flushing non-existing groups', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new GroupedThrottledQueue<number>(handler);
 
         await expect(queue.flushGroupAndWait('non-existing')).resolves.not.toThrow();
@@ -194,21 +194,21 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should automatically flush after maxDelay', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
         queue.addItem('group-1', 1);
         expect(queue.timeout).not.toBeNull();
 
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         queue.addItem('group-2', 2);
         await queue.wait();
         expect(handler).not.toHaveBeenCalled();
 
         // Fast-forward time
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         await queue.wait();
         expect(handler).toHaveBeenCalledWith('group-1', [1]);

package/src/helpers/LimitedFilteredRequestHelper.ts

@@ -1,5 +1,5 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLSortDefinitions } from '@stamhoofd/sql';
 import { getSortFilter, LimitedFilteredRequest } from '@stamhoofd/structures';
 
 export class LimitedFilteredRequestHelper {

package/src/helpers/MemberCharger.ts

@@ -1,5 +1,6 @@
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemType, MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import type { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import { BalanceItemType } from '@stamhoofd/structures';
 
 export class MemberCharger {
     static async chargeMany({ chargingOrganizationId, membersToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; membersToCharge: MemberWithRegistrationsBlob[]; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {

package/src/helpers/MemberUserSyncer.ts

@@ -1,7 +1,9 @@
-import { CachedBalance, Member, MemberResponsibilityRecord, MemberWithUsers, Organization, Platform, User } from '@stamhoofd/models';
+import type { MemberWithUsers } from '@stamhoofd/models';
+import { CachedBalance, Member, MemberResponsibilityRecord, Organization, Platform, User } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL } from '@stamhoofd/sql';
-import { AuditLogSource, MemberDetails, PermissionRole, Permissions, ReceivableBalanceType, UserPermissions } from '@stamhoofd/structures';
+import type { MemberDetails, PermissionRole } from '@stamhoofd/structures';
+import { AuditLogSource, Permissions, ReceivableBalanceType, UserPermissions } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import basex from 'base-x';
 import crypto from 'crypto';
@@ -96,7 +98,8 @@ export class MemberUserSyncerStatic {
                     }
                 }
 
-                if (member.details.securityCode === null) {
+                // Generate security code (only for userMode platform)
+                if (STAMHOOFD.userMode !== 'organization' && member.details.securityCode === null) {
                     console.log('Generating security code for member ' + member.id);
 
                     const length = 16;

package/src/helpers/MembershipCharger.ts

@@ -17,7 +17,7 @@ export const MembershipCharger = {
             throw new SimpleError({
                 code: 'missing_membership_organization',
                 message: 'Missing membershipOrganizationId',
-                human: $t(`dd9d20ea-cf50-46be-8eb3-5c85bc5f30c8`),
+                human: $t(`%Ft`),
             });
         }
 
@@ -97,7 +97,7 @@ export const MembershipCharger = {
                 const balanceItem = new BalanceItem();
                 balanceItem.unitPrice = membership.price;
                 balanceItem.amount = 1;
-                balanceItem.description = Formatter.dateNumber(membership.startDate, true) + ' ' + $t(`3e515054-91e7-43ed-a9ce-563b626f337d`) + ' ' + Formatter.dateNumber(membership.expireDate ?? membership.endDate, true);
+                balanceItem.description = Formatter.dateNumber(membership.startDate, true) + ' ' + $t(`%10C`) + ' ' + Formatter.dateNumber(membership.expireDate ?? membership.endDate, true);
                 balanceItem.relations = new Map([
                     [
                         BalanceItemRelationType.Member,

package/src/helpers/OrganizationCharger.ts

@@ -1,5 +1,6 @@
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemType, Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { BalanceItemType } from '@stamhoofd/structures';
 
 export class OrganizationCharger {
     static async chargeMany({ chargingOrganizationId, organizationsToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; organizationsToCharge: OrganizationStruct[]; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {

package/src/helpers/PeriodHelper.ts

@@ -1,5 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
+import type { RegistrationPeriod } from '@stamhoofd/models';
+import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { AuditLogSource, Group as GroupStruct, PermissionLevel } from '@stamhoofd/structures';
 import { PatchOrganizationRegistrationPeriodsEndpoint } from '../endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.js';

package/src/helpers/SQLTranslatedString.ts

@@ -1,5 +1,6 @@
-import { SQLColumnExpression, SQLExpression, SQLExpressionOptions, SQLQuery, SQLTranslatedStringHelper } from '@stamhoofd/sql';
-import { Language } from '@stamhoofd/structures';
+import type { SQLColumnExpression, SQLExpression, SQLExpressionOptions, SQLQuery } from '@stamhoofd/sql';
+import { SQLTranslatedStringHelper } from '@stamhoofd/sql';
+import { Language } from '@stamhoofd/types/Language';
 
 export class SQLTranslatedString implements SQLExpression {
     private helper: SQLTranslatedStringHelper;

package/src/helpers/ServiceFeeHelper.ts

@@ -1,4 +1,4 @@
-import { Organization, Payment } from '@stamhoofd/models';
+import type { Organization, Payment } from '@stamhoofd/models';
 import { calculateVATPercentage, PaymentProvider, STPackageType } from '@stamhoofd/structures';
 
 export class ServiceFeeHelper {

package/src/helpers/SetupStepUpdater.ts

@@ -11,14 +11,15 @@ import {
 } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
+import type {
+    MemberResponsibility,
+    Platform as PlatformStruct,
+    SetupSteps} from '@stamhoofd/structures';
 import {
     AuditLogSource,
     GroupType,
-    MemberResponsibility,
-    Platform as PlatformStruct,
     RecordCategory,
-    SetupStepType,
-    SetupSteps,
+    SetupStepType
 } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { AuditLogService } from '../services/AuditLogService.js';
@@ -195,7 +196,7 @@ export class SetupStepUpdater {
             throw new SimpleError({
                 code: 'not_found',
                 message: 'Organization not found',
-                human: $t(`e73b24c3-584d-4a0c-beae-c50f46c33d90`),
+                human: $t(`%Fu`),
             });
         }
 

package/src/helpers/StripeHelper.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { BalanceItem, BalanceItemPayment, Organization, Payment, StripeAccount, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
+import type { I18n } from '@stamhoofd/backend-i18n';
+import type { BalanceItem, BalanceItemPayment, Organization, StripeAccount} from '@stamhoofd/models';
+import { Payment, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
 import { calculateVATPercentage, PaymentMethod, PaymentMethodHelper, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import Stripe from 'stripe';
@@ -11,7 +12,7 @@ export class StripeHelper {
         return new SimpleError({
             code: 'not_configured',
             message: 'Stripe is not yet configured for this platform',
-            human: $t('4f1361c2-c860-46e7-a242-933bfe56a7ed'),
+            human: $t('%Fv'),
         });
     }
 
@@ -225,7 +226,7 @@ export class StripeHelper {
         if (!stripeAccount) {
             throw new SimpleError({
                 code: '',
-                message: $t(`b77e1f68-8928-42a2-802b-059fa73bedc3`, { method: PaymentMethodHelper.getName(payment.method) }),
+                message: $t(`%w3`, { method: PaymentMethodHelper.getName(payment.method) }),
             });
         }
 
@@ -235,7 +236,7 @@ export class StripeHelper {
             throw new SimpleError({
                 code: 'minimum_amount',
                 message: 'The minimum amount for an online payment is € 0,50',
-                human: $t(`dae9058f-0aa7-4fcb-9f1d-fc918c65784b`),
+                human: $t(`%wl`),
             });
         }
 
@@ -280,7 +281,7 @@ export class StripeHelper {
             const paymentMethod = await stripe.paymentMethods.create({
                 type: payment.method.toLowerCase() as 'bancontact' | 'ideal',
                 billing_details: {
-                    name: payment.customer?.dynamicName || (customer.name.length > 2 ? customer.name : $t(`bd1e59c8-3d4c-4097-ab35-0ce7b20d0e50`)),
+                    name: payment.customer?.dynamicName || (customer.name.length > 2 ? customer.name : $t(`%Gr`)),
                     email: payment.customer?.dynamicEmail || customer.email,
                     address: payment.customer?.company?.address
                         ? {
@@ -319,7 +320,7 @@ export class StripeHelper {
                 console.error('Stripe payment intent status is not requires_action', paymentIntent);
                 throw new SimpleError({
                     code: 'invalid_status',
-                    message: $t(`55d699ae-3da4-45ca-a30e-0f194b08edf7`) + ' ' + PaymentMethodHelper.getName(payment.method) + ' ' + $t(`277dc49e-922a-444f-ba2b-b3442d855358`),
+                    message: $t(`%wm`) + ' ' + PaymentMethodHelper.getName(payment.method) + ' ' + $t(`%wn`),
                 });
             }
 
@@ -387,7 +388,7 @@ export class StripeHelper {
                 console.error('Stripe session has no url', session);
                 throw new SimpleError({
                     code: 'invalid_status',
-                    message: $t(`55d699ae-3da4-45ca-a30e-0f194b08edf7`) + ' ' + PaymentMethodHelper.getName(payment.method) + ' ' + $t(`277dc49e-922a-444f-ba2b-b3442d855358`),
+                    message: $t(`%wm`) + ' ' + PaymentMethodHelper.getName(payment.method) + ' ' + $t(`%wn`),
                 });
             }
             paymentUrl = session.url;

package/src/helpers/TagHelper.test.ts

@@ -292,8 +292,8 @@ describe('TagHelper', () => {
             const result2 = TagHelper.validateTags(validPlatformTags);
 
             // assert
-            expect(result1).toBeFalse();
-            expect(result2).toBeTrue();
+            expect(result1).toBe(false);
+            expect(result2).toBe(true);
         });
 
         it('should return false if a tag is a child tag of multiple tags', () => {
@@ -339,8 +339,8 @@ describe('TagHelper', () => {
             const result2 = TagHelper.validateTags(validPlatformTags);
 
             // assert
-            expect(result1).toBeFalse();
-            expect(result2).toBeTrue();
+            expect(result1).toBe(false);
+            expect(result2).toBe(true);
         });
 
         it('should return false if the child tags contain an infinite loop', () => {
@@ -367,7 +367,7 @@ describe('TagHelper', () => {
             const result = TagHelper.validateTags(platformTagsWithInfiniteLoop);
 
             // assert
-            expect(result).toBeFalse();
+            expect(result).toBe(false);
         });
     });
 });

package/src/helpers/TagHelper.ts

@@ -1,6 +1,7 @@
 import { Organization, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, OrganizationTag, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
+import type { OrganizationTag} from '@stamhoofd/structures';
+import { AuditLogSource, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
 import { AuditLogService } from '../services/AuditLogService.js';
 
 export class TagHelper extends SharedTagHelper {

package/src/helpers/TemporaryMemberAccess.ts

@@ -1,4 +1,5 @@
-import { getPermissionLevelNumber, PermissionLevel } from '@stamhoofd/structures';
+import type { PermissionLevel } from '@stamhoofd/structures';
+import { getPermissionLevelNumber } from '@stamhoofd/structures';
 
 const userMemberTemporaryAccessCache = new Map<string, { memberId: string; level: PermissionLevel; validUntil: Date }[]>();
 

package/src/helpers/ThrottledQueue.test.ts

@@ -3,19 +3,19 @@ import { ThrottledQueue } from './ThrottledQueue.js';
 describe('ThrottledQueue', () => {
     // Mock timers for controlling setTimeout
     beforeEach(() => {
-        jest.useFakeTimers();
+        vitest.useFakeTimers();
     });
 
     afterEach(() => {
-        jest.useRealTimers();
+        vitest.useRealTimers();
     });
 
     afterAll(() => {
-        jest.clearAllMocks();
+        vitest.clearAllMocks();
     });
 
     it('should create an instance with the provided handler', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         expect(queue.handler).toBe(handler);
@@ -24,7 +24,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should add items to the queue', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         queue.addItem(1);
@@ -33,7 +33,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should add multiple items to the queue', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         queue.addItems([1, 2, 3]);
@@ -44,12 +44,12 @@ describe('ThrottledQueue', () => {
     });
 
     it('should flush automatically when reaching maxBatchSize', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxBatchSize = 3;
 
         // Spy on flushAll to check if it's called
-        const flushAllSpy = jest.spyOn(queue, 'flushAll');
+        const flushAllSpy = vitest.spyOn(queue, 'flushAll');
 
         queue.addItems([1, 2]);
         expect(flushAllSpy).not.toHaveBeenCalled();
@@ -65,7 +65,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should process items in batches when exceeding maxBatchSize', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxBatchSize = 3;
 
@@ -88,9 +88,9 @@ describe('ThrottledQueue', () => {
     });
 
     it('should call emptyHandler when queue becomes empty', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
-        const emptyHandler = jest.fn();
+        const emptyHandler = vitest.fn();
         queue.emptyHandler = emptyHandler;
 
         queue.maxBatchSize = 3;
@@ -101,9 +101,9 @@ describe('ThrottledQueue', () => {
     });
 
     it('should not call emptyHandler when queue is filled during processing', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
-        const emptyHandler = jest.fn();
+        const emptyHandler = vitest.fn();
         queue.emptyHandler = emptyHandler;
 
         queue.maxBatchSize = 3;
@@ -120,11 +120,11 @@ describe('ThrottledQueue', () => {
 
     it('should not fail if handler throws an error', async () => {
         const error = new Error('Test error');
-        const handler = jest.fn().mockRejectedValue(error);
+        const handler = vitest.fn().mockRejectedValue(error);
         const queue = new ThrottledQueue(handler);
 
         // Spy on console.error
-        const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+        const consoleErrorSpy = vitest.spyOn(console, 'error').mockImplementation(() => {});
 
         queue.addItem(1);
         await queue.flushAndWait();
@@ -137,7 +137,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should handle flushAndWait when queue is empty', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         await queue.flushAndWait();
@@ -160,7 +160,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should handle startTimeout and stopTimeout correctly', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
@@ -172,19 +172,19 @@ describe('ThrottledQueue', () => {
     });
 
     it('should automatically flush after maxDelay', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
         queue.addItem(1);
         expect(queue.timeout).not.toBeNull();
 
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
         await queue.wait();
         expect(handler).not.toHaveBeenCalled();
 
         // Fast-forward time
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         await queue.wait();
         expect(handler).toHaveBeenCalledWith([1]);