From f3de07412f08d02b9e7c9f6b470255949a516793 Mon Sep 17 00:00:00 2001 From: e11sy <130844513+e11sy@users.noreply.github.com> Date: Thu, 10 Apr 2025 16:03:26 +0300 Subject: [PATCH 1/3] fix(releases): cover case with empty map body (#397) --- workers/release/src/index.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/workers/release/src/index.ts b/workers/release/src/index.ts index 3899ee55..17fe1fba 100644 --- a/workers/release/src/index.ts +++ b/workers/release/src/index.ts @@ -248,22 +248,30 @@ export default class ReleaseWorker extends Worker { * @param {SourcemapCollectedData[]} sourceMaps — source maps passed from user after bundle */ private extendReleaseInfo(sourceMaps: SourcemapCollectedData[]): SourceMapDataExtended[] { - return sourceMaps.map((file: SourcemapCollectedData) => { + return sourceMaps.flatMap((file: SourcemapCollectedData) => { /** * Decode base64 source map content */ const buffer = Buffer.from(file.payload, 'base64'); const mapBodyString = buffer.toString(); + + /** + * If content is empty, return nothing for this file + */ + if (!mapBodyString || mapBodyString.trim().length === 0) { + return []; + } + /** * @todo use more efficient method to extract "file" from big JSON */ const mapContent = JSON.parse(mapBodyString) as RawSourceMap; - return { + return [{ mapFileName: file.name, originFileName: mapContent.file, content: mapBodyString, - }; + }]; }); } From 8fb660dad47be08b61570c7ff91a0c9f6ec7a1cc Mon Sep 17 00:00:00 2001 From: e11sy <130844513+e11sy@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:10:19 +0300 Subject: [PATCH 2/3] imp(email): link to billing (#398) * imp(email): link to billing * chore(email): update patterns --- .../emails/events-limit-almost-reached/html.twig | 10 ++++++---- .../emails/events-limit-almost-reached/subject.twig | 2 +- .../emails/events-limit-almost-reached/text.twig | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig index 05dd0c35..d5b3a1d1 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/html.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/html.twig @@ -14,7 +14,7 @@ - Warning of the Used Volume + You’re almost out of your error tracking limit @@ -22,15 +22,17 @@ - You've used {{ eventsCount }} of {{ eventsLimit }} events available on {{ workspace.name | escape }} workspace. + You’ve used {{ eventsCount }} of {{ eventsLimit }} events this month in the {{ workspace.name | escape }} workspace. - Increase used volume and don't miss the new ones. + Your project is growing — that’s awesome! Let’s make sure you don’t miss any important errors. + + Upgrade your plan to stay on top of everything. - {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/volume', label: 'Go to event usage settings'} %} + {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: 'Increase limit — from 99₽'} %} {% endblock %} diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig b/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig index 4a43e8b9..7acf1826 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/subject.twig @@ -1 +1 @@ -Warning of the Used Volume for workspace {{ workspace.name | escape }}! +You’re almost out of error tracking events in {{ workspace.name }} workspace \ No newline at end of file diff --git a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig index 8e2cc7f0..c6c41314 100644 --- a/workers/email/src/templates/emails/events-limit-almost-reached/text.twig +++ b/workers/email/src/templates/emails/events-limit-almost-reached/text.twig @@ -1,6 +1,8 @@ -You've used {{ eventsCount }} of {{ eventsLimit }} events available on {{ workspace.name | escape }} workspace plan. +You’ve used {{ eventsCount }} of {{ eventsLimit }} events this month in the {{ workspace.name | escape }} workspace. -Upgrade the plan and don't miss the new ones: {{ host }}/workspace/{{ workspace._id }}/settings/billing +Your project is growing — that’s awesome! Let’s make sure you don’t miss any important errors. + +Upgrade your plan to stay on top of everything: {{ host }}/workspace/{{ workspace._id }}/settings/billing *** From b9aeb412af288d2134eb0d1b30efd85d9aa1528d Mon Sep 17 00:00:00 2001 From: e11sy <130844513+e11sy@users.noreply.github.com> Date: Tue, 22 Apr 2025 21:39:44 +0300 Subject: [PATCH 3/3] imp(paymaster): add paid until field for workspace (#400) * feat(paymaster): support paid until workspace field * chore(paymaster): update types and test * chore(): lint fix * chore(): lint fix * imp(CI): update ubuntu version * test(paymaster): add new testcase * chore(paymaster): lint fix --- .../workflows/build-and-push-docker-image.yml | 2 +- .github/workflows/check-build.yaml | 2 +- .github/workflows/tests.yml | 2 +- .github/workflows/update-monorepository.yml | 2 +- jest.config.js | 2 +- jest.setup.mongo-repl-set.js | 19 +-- package.json | 2 +- workers/javascript/src/index.ts | 57 +++++---- workers/notifier/tests/redisHelper.test.ts | 9 +- workers/paymaster/src/index.ts | 37 +++--- workers/paymaster/tests/index.test.ts | 116 +++++++++++++++++- workers/release/src/index.ts | 4 +- workers/release/tests/index.test.ts | 13 +- workers/sentry/tests/index.test.ts | 10 +- yarn.lock | 16 +-- 15 files changed, 207 insertions(+), 86 deletions(-) diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml index ee6a9af0..e50aa4e2 100644 --- a/.github/workflows/build-and-push-docker-image.yml +++ b/.github/workflows/build-and-push-docker-image.yml @@ -7,7 +7,7 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: endsWith(github.ref, '/prod') || endsWith(github.ref, '/stage') || endsWith(github.ref, '/migration') steps: - name: Checkout repository diff --git a/.github/workflows/check-build.yaml b/.github/workflows/check-build.yaml index d940b734..f4e2c900 100644 --- a/.github/workflows/check-build.yaml +++ b/.github/workflows/check-build.yaml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 75086ec1..c1576189 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,7 +5,7 @@ on: [push] jobs: lint: name: Unit testing - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Use Node.js 16.x diff --git a/.github/workflows/update-monorepository.yml b/.github/workflows/update-monorepository.yml index 0a6ed811..c86b5283 100644 --- a/.github/workflows/update-monorepository.yml +++ b/.github/workflows/update-monorepository.yml @@ -7,7 +7,7 @@ env: REPOSITORY_MONO_PATH: workers jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Mono repository update uses: peter-evans/repository-dispatch@v1 diff --git a/jest.config.js b/jest.config.js index 28aa802a..f805cf64 100644 --- a/jest.config.js +++ b/jest.config.js @@ -27,5 +27,5 @@ module.exports = { setupFiles: [ './jest.setup.js' ], - setupFilesAfterEnv: [ './jest.setup.redis-mock.js', './jest.setup.mongo-repl-set.js' ], + setupFilesAfterEnv: ['./jest.setup.redis-mock.js', './jest.setup.mongo-repl-set.js'], }; diff --git a/jest.setup.mongo-repl-set.js b/jest.setup.mongo-repl-set.js index 11480eba..2cb302f8 100644 --- a/jest.setup.mongo-repl-set.js +++ b/jest.setup.mongo-repl-set.js @@ -4,7 +4,7 @@ let admin; let connection; beforeAll(async () => { - connection = await MongoClient.connect("mongodb://127.0.0.1:55010/hawk?", { + connection = await MongoClient.connect('mongodb://127.0.0.1:55010/hawk?', { useNewUrlParser: true, useUnifiedTopology: true, }); @@ -13,11 +13,12 @@ beforeAll(async () => { try { let status = await admin.command({ replSetGetStatus: 1 }).catch(() => null); + if (status && status.ok) { - console.log("✅ Replica set already initialized"); + console.log('✅ Replica set already initialized'); } else { await admin.command({ replSetInitiate: {} }); - console.log("✅ Replica set initiated"); + console.log('✅ Replica set initiated'); } const startTime = Date.now(); @@ -30,15 +31,15 @@ beforeAll(async () => { await new Promise(resolve => setTimeout(resolve, 1000)); status = await admin.command({ replSetGetStatus: 1 }); - const primary = status.members.find(member => member.stateStr === "PRIMARY"); - const secondary = status.members.find(member => member.stateStr === "SECONDARY"); + const primary = status.members.find(member => member.stateStr === 'PRIMARY'); + const secondary = status.members.find(member => member.stateStr === 'SECONDARY'); - if (primary && secondary) break; + if (primary && secondary) { + break; + } } while (Date.now() - startTime < timeout); - - console.log("✅ Replica set is stable"); - + console.log('✅ Replica set is stable'); } catch (err) { console.error('❌ Failed to initiate replica set:', err); } diff --git a/package.json b/package.json index c81aee2e..174f356a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@hawk.so/nodejs": "^3.1.1", - "@hawk.so/types": "^0.1.28", + "@hawk.so/types": "^0.1.29", "@types/amqplib": "^0.8.2", "@types/jest": "^29.2.3", "@types/mongodb": "^3.5.15", diff --git a/workers/javascript/src/index.ts b/workers/javascript/src/index.ts index 9652be22..d1807d7e 100644 --- a/workers/javascript/src/index.ts +++ b/workers/javascript/src/index.ts @@ -228,7 +228,7 @@ export default class JavascriptEventWorker extends EventWorker { * Fixes bug: https://github.com/codex-team/hawk.workers/issues/121 */ if (originalLocation.source) { - console.log('original location source found') + console.log('original location source found'); /** * Get 5 lines above and 5 below */ @@ -247,9 +247,10 @@ export default class JavascriptEventWorker extends EventWorker { sourceCode: lines, }) as BacktraceFrame; } - + /** * Method that is used to parse full function context of the code position + * * @param sourceCode - content of the source file * @param line - number of the line from the stack trace * @returns - string of the function context or null if it could not be parsed @@ -257,30 +258,32 @@ export default class JavascriptEventWorker extends EventWorker { private getFunctionContext(sourceCode: string, line: number): string | null { let functionName: string | null = null; let className: string | null = null; - let isAsync: boolean = false; + let isAsync = false; try { const ast = parse(sourceCode, { - sourceType: "module", + sourceType: 'module', plugins: [ - "typescript", - "jsx", - "classProperties", - "decorators", - "optionalChaining", - "nullishCoalescingOperator", - "dynamicImport", - "bigInt", - "topLevelAwait" - ] + 'typescript', + 'jsx', + 'classProperties', + 'decorators', + 'optionalChaining', + 'nullishCoalescingOperator', + 'dynamicImport', + 'bigInt', + 'topLevelAwait', + ], }); traverse(ast as any, { /** * It is used to get class decorator of the position, it will save class that is related to original position + * + * @param path */ ClassDeclaration(path) { - console.log(`class declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`) + console.log(`class declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`); if (path.node.loc && path.node.loc.start.line <= line && path.node.loc.end.line >= line) { className = path.node.id.name || null; @@ -289,9 +292,11 @@ export default class JavascriptEventWorker extends EventWorker { /** * It is used to get class and its method decorator of the position * It will save class and method, that are related to original position + * + * @param path */ ClassMethod(path) { - console.log(`class declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`) + console.log(`class declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`); if (path.node.loc && path.node.loc.start.line <= line && path.node.loc.end.line >= line) { // Handle different key types @@ -303,10 +308,12 @@ export default class JavascriptEventWorker extends EventWorker { }, /** * It is used to get function name that is declared out of class + * + * @param path */ FunctionDeclaration(path) { - console.log(`function declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`) - + console.log(`function declaration: loc: ${path.node.loc}, line: ${line}, node.start.line: ${path.node.loc.start.line}, node.end.line: ${path.node.loc.end.line}`); + if (path.node.loc && path.node.loc.start.line <= line && path.node.loc.end.line >= line) { functionName = path.node.id.name || null; isAsync = path.node.async; @@ -314,13 +321,15 @@ export default class JavascriptEventWorker extends EventWorker { }, /** * It is used to get anonimous function names in function expressions or arrow function expressions + * + * @param path */ VariableDeclarator(path) { - console.log(`variable declaration: node.type: ${path.node.init.type}, line: ${line}, `) + console.log(`variable declaration: node.type: ${path.node.init.type}, line: ${line}, `); if ( path.node.init && - (path.node.init.type === "FunctionExpression" || path.node.init.type === "ArrowFunctionExpression") && + (path.node.init.type === 'FunctionExpression' || path.node.init.type === 'ArrowFunctionExpression') && path.node.loc && path.node.loc.start.line <= line && path.node.loc.end.line >= line @@ -331,14 +340,14 @@ export default class JavascriptEventWorker extends EventWorker { } isAsync = (path.node.init as any).async; } - } + }, }); } catch (e) { - console.error(`Failed to parse source code: ${e.message}`); + console.error(`Failed to parse source code: ${e.message}`); } - return functionName ? `${isAsync ? "async " : ""}${className ? `${className}.` : ""}${functionName}` : null; -} + return functionName ? `${isAsync ? 'async ' : ''}${className ? `${className}.` : ''}${functionName}` : null; + } /** * Downloads source map file from Grid FS diff --git a/workers/notifier/tests/redisHelper.test.ts b/workers/notifier/tests/redisHelper.test.ts index 5dac298b..c059b610 100644 --- a/workers/notifier/tests/redisHelper.test.ts +++ b/workers/notifier/tests/redisHelper.test.ts @@ -103,15 +103,16 @@ describe('RedisHelper', () => { const thresholdPeriod = 2000; // 2 seconds in milliseconds const key = `${projectId}:${ruleId}:${groupHash}:${thresholdPeriod}:times`; - /** - * Call computeEventCountForPeriod to set the key - */ - await redisHelper.computeEventCountForPeriod(projectId, ruleId, groupHash, thresholdPeriod); + /** + * Call computeEventCountForPeriod to set the key + */ + await redisHelper.computeEventCountForPeriod(projectId, ruleId, groupHash, thresholdPeriod); /** * Verify, that key exists */ let value = await redisClient.hGet(key, 'eventsCount'); + expect(value).not.toBeNull(); /** diff --git a/workers/paymaster/src/index.ts b/workers/paymaster/src/index.ts index f9448242..45b4370b 100644 --- a/workers/paymaster/src/index.ts +++ b/workers/paymaster/src/index.ts @@ -63,14 +63,15 @@ export default class PaymasterWorker extends Worker { * Pay day is calculated by formula: last charge date + 30 days * * @param date - last charge date - * @param isDebug + * @param paidUntil - paid until date + * @param isDebug - flag for debug purposes */ - private static isTimeToPay(date: Date, isDebug = false): boolean { - const expectedPayDay = new Date(date); + private static isTimeToPay(date: Date, paidUntil: Date, isDebug = false): boolean { + const expectedPayDay = paidUntil ? new Date(paidUntil) : new Date(date); if (isDebug) { expectedPayDay.setDate(date.getDate() + 1); - } else { + } else if (!paidUntil) { expectedPayDay.setMonth(date.getMonth() + 1); } @@ -82,17 +83,18 @@ export default class PaymasterWorker extends Worker { /** * Returns difference between now and payday in days * - * Pay day is calculated by formula: last charge date + 30 days + * Pay day is calculated by formula: paidUntil date or last charge date + 1 month * * @param date - last charge date - * @param isDebug + * @param paidUntil - paid until date + * @param isDebug - flag for debug purposes */ - private static daysBeforePayday(date: Date, isDebug = false): number { - const expectedPayDay = new Date(date); + private static daysBeforePayday(date: Date, paidUntil: Date = null, isDebug = false): number { + const expectedPayDay = paidUntil ? new Date(paidUntil) : new Date(date); if (isDebug) { expectedPayDay.setDate(date.getDate() + 1); - } else { + } else if (!paidUntil) { expectedPayDay.setMonth(date.getMonth() + 1); } @@ -104,17 +106,18 @@ export default class PaymasterWorker extends Worker { /** * Returns difference between payday and now in days * - * Pay day is calculated by formula: last charge date + 30 days + * Pay day is calculated by formula: paidUntil date or last charge date + 1 month * * @param date - last charge date - * @param isDebug + * @param paidUntil - paid until date + * @param isDebug - flag for debug purposes */ - private static daysAfterPayday(date: Date, isDebug = false): number { - const expectedPayDay = new Date(date); + private static daysAfterPayday(date: Date, paidUntil: Date = null, isDebug = false): number { + const expectedPayDay = paidUntil ? new Date(paidUntil) : new Date(date); if (isDebug) { expectedPayDay.setDate(date.getDate() + 1); - } else { + } else if (!paidUntil) { expectedPayDay.setMonth(date.getMonth() + 1); } @@ -209,19 +212,19 @@ export default class PaymasterWorker extends Worker { * Is it time to pay */ // @ts-expect-error debug - const isTimeToPay = PaymasterWorker.isTimeToPay(workspace.lastChargeDate, workspace.isDebug); + const isTimeToPay = PaymasterWorker.isTimeToPay(workspace.lastChargeDate, workspace.paidUntil, workspace.isDebug); /** * How many days have passed since payments the expected day of payments */ // @ts-expect-error debug - const daysAfterPayday = PaymasterWorker.daysAfterPayday(workspace.lastChargeDate, workspace.isDebug); + const daysAfterPayday = PaymasterWorker.daysAfterPayday(workspace.lastChargeDate, workspace.paidUntil, workspace.isDebug); /** * How many days left for the expected day of payments */ // @ts-expect-error debug - const daysLeft = PaymasterWorker.daysBeforePayday(workspace.lastChargeDate, workspace.isDebug); + const daysLeft = PaymasterWorker.daysBeforePayday(workspace.lastChargeDate, workspace.paidUntil, workspace.isDebug); /** * Do we need to ask for money diff --git a/workers/paymaster/tests/index.test.ts b/workers/paymaster/tests/index.test.ts index 28fd54fb..7d7e1620 100644 --- a/workers/paymaster/tests/index.test.ts +++ b/workers/paymaster/tests/index.test.ts @@ -46,8 +46,9 @@ const createWorkspaceMock = (parameters: { lastChargeDate: Date | undefined; subscriptionId: string; isBlocked: boolean; + paidUntil?: Date; }): WorkspaceDBScheme => { - return { + const workspace: WorkspaceDBScheme = { _id: new ObjectId(), name: 'Mocked workspace', inviteHash: '', @@ -59,6 +60,12 @@ const createWorkspaceMock = (parameters: { subscriptionId: parameters.subscriptionId, isBlocked: parameters.isBlocked, }; + + if (parameters.paidUntil) { + workspace.paidUntil = parameters.paidUntil; + } + + return workspace; }; describe('PaymasterWorker', () => { @@ -92,6 +99,7 @@ describe('PaymasterWorker', () => { beforeEach(async () => { await workspacesCollection.deleteMany({}); await tariffCollection.deleteMany({}); + jest.clearAllMocks(); }); test('Should block workspace if it hasn\'t subscription and it\'s time to pay', async () => { @@ -352,7 +360,7 @@ describe('PaymasterWorker', () => { */ const currentDate = new Date('2005-12-22'); const plan = createPlanMock({ - monthlyCharge: 0, + monthlyCharge: 10, isDefault: true, }); const workspace = createWorkspaceMock({ @@ -397,8 +405,112 @@ describe('PaymasterWorker', () => { }); }); + test('Should not send notification if paidUntil is set to the several months in the future', async () => { + /** + * Arrange + */ + const currentDate = new Date(); + const paidUntil = new Date(currentDate.getTime()); + + paidUntil.setMonth(paidUntil.getMonth() + 3); + + const plan = createPlanMock({ + monthlyCharge: 100, + isDefault: true, + }); + const workspace = createWorkspaceMock({ + plan, + subscriptionId: null, + lastChargeDate: new Date('2005-11-22'), + isBlocked: false, + billingPeriodEventsCount: 10, + paidUntil, + }); + + const addTaskSpy = jest.spyOn(PaymasterWorker.prototype, 'addTask'); + + await fillDatabaseWithMockedData({ + workspace, + plan, + }); + + MockDate.set(currentDate); + + /** + * Act + */ + const worker = new PaymasterWorker(); + + await worker.start(); + await worker.handle(WORKSPACE_SUBSCRIPTION_CHECK); + await worker.finish(); + + /** + * Assert + */ + expect(addTaskSpy).not.toHaveBeenCalled(); + MockDate.reset(); + }); + afterAll(async () => { await connection.close(); MockDate.reset(); }); + + test('Should send notification if payday is coming for workspace with paidUntil value', async () => { + /** + * Arrange + */ + const currentDate = new Date(); + const paidUntil = new Date(currentDate.getTime()); + + paidUntil.setDate(paidUntil.getDate() + 1); + + const plan = createPlanMock({ + monthlyCharge: 1, + isDefault: true, + }); + const workspace = createWorkspaceMock({ + plan, + subscriptionId: null, + lastChargeDate: new Date('2005-11-22'), + isBlocked: false, + billingPeriodEventsCount: 10, + paidUntil, + }); + + await fillDatabaseWithMockedData({ + workspace, + plan, + }); + + const addTaskSpy = jest.spyOn(PaymasterWorker.prototype, 'addTask'); + + MockDate.set(currentDate); + + /** + * Act + */ + const worker = new PaymasterWorker(); + + await worker.start(); + await worker.handle(WORKSPACE_SUBSCRIPTION_CHECK); + await worker.finish(); + + /** + * Assert + */ + expect(addTaskSpy).toHaveBeenCalledWith( + 'sender/email', + { + type: 'days-limit-almost-reached', + payload: { + workspaceId: workspace._id, + daysLeft: 1, + }, + } + ); + + MockDate.reset(); + }); }); diff --git a/workers/release/src/index.ts b/workers/release/src/index.ts index 17fe1fba..9e8de3b4 100644 --- a/workers/release/src/index.ts +++ b/workers/release/src/index.ts @@ -267,11 +267,11 @@ export default class ReleaseWorker extends Worker { */ const mapContent = JSON.parse(mapBodyString) as RawSourceMap; - return [{ + return [ { mapFileName: file.name, originFileName: mapContent.file, content: mapBodyString, - }]; + } ]; }); } diff --git a/workers/release/tests/index.test.ts b/workers/release/tests/index.test.ts index f80345d2..24f5f46e 100644 --- a/workers/release/tests/index.test.ts +++ b/workers/release/tests/index.test.ts @@ -207,15 +207,16 @@ describe('Release Worker', () => { test('should correctly handle release with multiple source maps in a single transaction', async () => { const map = await mockBundle.getSourceMap(); - + /** * Create multiple files with the same content */ const numberOfFiles = 10; - const collectedData: SourcemapCollectedData[] = Array(numberOfFiles).fill(null).map((_, index) => ({ - name: `main${index}.js.map`, - payload: map, - })); + const collectedData: SourcemapCollectedData[] = Array(numberOfFiles).fill(null) + .map((_, index) => ({ + name: `main${index}.js.map`, + payload: map, + })); await worker.handle({ projectId, @@ -233,6 +234,7 @@ describe('Release Worker', () => { projectId: projectId, release: releasePayload.release, }); + await expect(releasesCount).toEqual(1); /** @@ -242,6 +244,7 @@ describe('Release Worker', () => { projectId: projectId, release: releasePayload.release, }); + await expect(release.files).toHaveLength(numberOfFiles); /** diff --git a/workers/sentry/tests/index.test.ts b/workers/sentry/tests/index.test.ts index bb851396..82732cb4 100644 --- a/workers/sentry/tests/index.test.ts +++ b/workers/sentry/tests/index.test.ts @@ -688,11 +688,11 @@ describe('SentryEventWorker', () => { describe('envelope parsing', () => { const event = { - "projectId": "67ed371b4196dcbd73537c64", - "payload": { - "envelope": "{"event_id":"4b6140fb97504945908fe52c5b0dd123","sdk":{"name":"sentry.java.android","version":"8.6.0","packages":[{"name":"maven:io.sentry:sentry","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-core","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-replay","version":"8.6.0"},{"name":"maven:io.sentry:sentry-compose","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-ndk","version":"8.6.0"}],"integrations":["AppStartInstrumentation","ComposeInstrumentation","DatabaseInstrumentation","FileIOInstrumentation","LogcatInstrumentation","UncaughtExceptionHandler","ShutdownHook","SendCachedEnvelope","Ndk","AppLifecycle","AnrV2","AppComponentsBreadcrumbs","EnvelopeFileObserver","SystemEventsBreadcrumbs"]},"trace":{"trace_id":"39b1fa44e1d5451e96aba1061a56692f","public_key":"77e8ca0d39e3495fa7e360d960b76e5f789377f1fa2b4fe2bffb68649593a123","release":"com.example.myapplication@1.0+1","environment":"production","sample_rand":"0.356417907292463"},"sent_at":"2025-04-03T13:27:27.348Z"}
{"content_type":"application/json","type":"event","length":8403}
{"timestamp":"2025-04-03T13:16:38.430Z","exception":{"values":[{"type":"Exception","value":"Тестовая ошибка #287","module":"java.lang","thread_id":2,"stacktrace":{"frames":[{"filename":"ZygoteInit.java","function":"main","module":"com.android.internal.os.ZygoteInit","lineno":932,"native":false},{"filename":"RuntimeInit.java","function":"run","module":"com.android.internal.os.RuntimeInit$MethodAndArgsCaller","lineno":593,"native":false},{"filename":"Method.java","function":"invoke","module":"java.lang.reflect.Method","native":true},{"filename":"ActivityThread.java","function":"main","module":"android.app.ActivityThread","lineno":8982,"native":false},{"filename":"Looper.java","function":"loop","module":"android.os.Looper","lineno":338,"native":false},{"filename":"Looper.java","function":"loopOnce","module":"android.os.Looper","lineno":248,"native":false},{"filename":"Handler.java","function":"dispatchMessage","module":"android.os.Handler","lineno":103,"native":false},{"filename":"Handler.java","function":"handleCallback","module":"android.os.Handler","lineno":995,"native":false},{"filename":"Runnable.kt","function":"run","module":"kotlinx.coroutines.android.HandlerContext$scheduleResumeAfterDelay$$inlined$Runnable$1","lineno":19,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeUndispatched","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":595,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeImpl$default","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":497,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeImpl","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":508,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"dispatchResume","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":474,"native":false},{"filename":"DispatchedTask.kt","function":"dispatch","module":"kotlinx.coroutines.DispatchedTaskKt","lineno":168,"native":false},{"filename":"DispatchedTask.kt","function":"resume","module":"kotlinx.coroutines.DispatchedTaskKt","lineno":235,"native":false},{"filename":"ContinuationImpl.kt","function":"resumeWith","module":"kotlin.coroutines.jvm.internal.BaseContinuationImpl","lineno":33,"native":false},{"filename":"MainActivity.kt","function":"invokeSuspend","module":"com.example.myapplication.MainActivity$onCreate$2","lineno":38,"in_app":true,"native":false}]},"mechanism":{"type":"chained","exception_id":0}}]},"fingerprint":[],"modules":{"androidx.arch.core:core-runtime":"2.2.0","androidx.core:core-ktx":"1.13.1","org.jetbrains.kotlin:kotlin-stdlib-jdk7":"1.9.24","org.jetbrains.kotlin:kotlin-stdlib-jdk8":"1.9.24","androidx.concurrent:concurrent-futures":"1.1.0","androidx.compose.ui:ui-android":"1.7.0","androidx.lifecycle:lifecycle-runtime-android":"2.8.3","androidx.compose.ui:ui-util-android":"1.7.0","androidx.compose.ui:ui-tooling-android":"1.7.0","androidx.compose.ui:ui-tooling-data-android":"1.7.0","androidx.startup:startup-runtime":"1.1.1","androidx.lifecycle:lifecycle-viewmodel-android":"2.8.3","androidx.lifecycle:lifecycle-viewmodel-ktx":"2.8.3","org.jetbrains.kotlin:kotlin-stdlib":"2.0.21","androidx.compose.ui:ui-text-android":"1.7.0","com.google.guava:listenablefuture":"1.0","androidx.lifecycle:lifecycle-process":"2.8.3","io.sentry:sentry-compose-android":"8.6.0","androidx.activity:activity-compose":"1.8.2","androidx.compose.ui:ui-geometry-android":"1.7.0","io.sentry:sentry-android-replay":"8.6.0","androidx.compose.animation:animation-android":"1.7.0","androidx.compose.foundation:foundation-android":"1.7.0","io.sentry:sentry-native-ndk":"0.8.3","androidx.activity:activity-ktx":"1.8.2","androidx.lifecycle:lifecycle-runtime-compose-android":"2.8.3","org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm":"1.7.3","io.sentry:sentry-android-core":"8.6.0","androidx.compose.ui:ui-graphics-android":"1.7.0","androidx.activity:activity":"1.8.2","androidx.compose.runtime:runtime-android":"1.7.0","androidx.compose.ui:ui-test-manifest":"1.7.0","androidx.emoji2:emoji2":"1.3.0","androidx.lifecycle:lifecycle-viewmodel-savedstate":"2.8.3","androidx.graphics:graphics-path":"1.0.1","androidx.compose.material3:material3-android":"1.3.0","androidx.annotation:annotation-experimental":"1.4.0","androidx.savedstate:savedstate-ktx":"1.2.1","androidx.collection:collection-jvm":"1.4.0","io.sentry:sentry-kotlin-extensions":"8.6.0","org.jetbrains.kotlinx:kotlinx-coroutines-android":"1.7.3","androidx.compose.runtime:runtime-saveable-android":"1.7.0","androidx.compose.material:material-android":"1.7.0","androidx.savedstate:savedstate":"1.2.1","androidx.compose.ui:ui-unit-android":"1.7.0","androidx.core:core":"1.13.1","androidx.collection:collection-ktx":"1.4.0","androidx.compose.material:material-icons-core-android":"1.7.0","io.sentry:sentry-android":"8.6.0","androidx.lifecycle:lifecycle-runtime-ktx-android":"2.8.3","io.sentry:sentry-android-ndk":"8.6.0","androidx.arch.core:core-common":"2.2.0","androidx.compose.animation:animation-core-android":"1.7.0","androidx.lifecycle:lifecycle-common-java8":"2.8.3","androidx.customview:customview-poolingcontainer":"1.0.0","org.jetbrains:annotations":"23.0.0","androidx.lifecycle:lifecycle-common-jvm":"2.8.3","io.sentry:sentry-android-navigation":"8.6.0","androidx.compose.material:material-ripple-android":"1.7.0","androidx.lifecycle:lifecycle-livedata-core":"2.8.3","io.sentry:sentry":"8.6.0","androidx.profileinstaller:profileinstaller":"1.3.1","androidx.autofill:autofill":"1.0.0","androidx.interpolator:interpolator":"1.0.0","androidx.tracing:tracing":"1.0.0","androidx.annotation:annotation-jvm":"1.8.0","androidx.versionedparcelable:versionedparcelable":"1.1.1","androidx.compose.foundation:foundation-layout-android":"1.7.0","androidx.compose.ui:ui-tooling-preview-android":"1.7.0"},"event_id":"4b6140fb97504945908fe52c5b0dd123","contexts":{"app":{"app_identifier":"com.example.myapplication","app_name":"My Application","app_version":"1.0","app_build":"1","permissions":{"DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION":"granted","INTERNET":"granted"},"in_foreground":true,"is_split_apks":false},"device":{"manufacturer":"Google","brand":"google","family":"sdk_gphone64_x86_64","model":"sdk_gphone64_x86_64","model_id":"BP22.250221.010","archs":["x86_64","arm64-v8a"],"battery_level":100.0,"charging":false,"orientation":"portrait","simulator":true,"memory_size":2067255296,"free_memory":650518528,"low_memory":false,"storage_size":6228115456,"free_storage":4472373248,"external_storage_size":534761472,"external_free_storage":534704128,"screen_width_pixels":720,"screen_height_pixels":1280,"screen_density":2.0,"screen_dpi":320,"boot_time":"2025-04-03T12:46:30.968Z","timezone":"GMT","id":"61ff44980d954195b08c2eed81e19104","battery_temperature":25.0,"locale":"en_US","processor_count":4,"processor_frequency":0.0},"os":{"name":"Android","version":"16","build":"BP22.250221.010","kernel_version":"6.6.66-android15-8-g807ce3b4f02f-ab12996908","rooted":false},"trace":{"trace_id":"39b1fa44e1d5451e96aba1061a56692f","span_id":"dc8dfb64259d4c13","op":"default","origin":"manual","data":{"thread.name":"main","thread.id":"9536"}}},"sdk":{"name":"sentry.java.android","version":"8.6.0","packages":[{"name":"maven:io.sentry:sentry","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-core","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-replay","version":"8.6.0"},{"name":"maven:io.sentry:sentry-compose","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-ndk","version":"8.6.0"}],"integrations":["AppStartInstrumentation","ComposeInstrumentation","DatabaseInstrumentation","FileIOInstrumentation","LogcatInstrumentation","UncaughtExceptionHandler","ShutdownHook","SendCachedEnvelope","Ndk","AppLifecycle","AnrV2","AppComponentsBreadcrumbs","EnvelopeFileObserver","SystemEventsBreadcrumbs"]},"tags":{"isSideLoaded":"true"},"release":"com.example.myapplication@1.0+1","environment":"production","platform":"java","user":{"id":"61ff44980d954195b08c2eed81e19104"},"dist":"1","breadcrumbs":[{"timestamp":"2025-04-03T13:16:02.609Z","type":"navigation","data":{"state":"foreground"},"category":"app.lifecycle","level":"info"},{"timestamp":"2025-04-03T13:16:04.331Z","type":"system","data":{"level":100.0,"charging":false,"action":"BATTERY_CHANGED"},"category":"device.event","level":"info"}]}
{"content_type":"application/json","type":"session","length":287}
{"sid":"713ed035bb294263962a8a01dcde5c52","did":"61ff44980d954195b08c2eed81e19104","started":"2025-04-03T13:16:02.177Z","status":"ok","seq":1743686198467,"errors":287,"timestamp":"2025-04-03T13:16:38.467Z","attrs":{"release":"com.example.myapplication@1.0+1","environment":"production"}}
" + projectId: '67ed371b4196dcbd73537c64', + payload: { + envelope: '{"event_id":"4b6140fb97504945908fe52c5b0dd123","sdk":{"name":"sentry.java.android","version":"8.6.0","packages":[{"name":"maven:io.sentry:sentry","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-core","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-replay","version":"8.6.0"},{"name":"maven:io.sentry:sentry-compose","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-ndk","version":"8.6.0"}],"integrations":["AppStartInstrumentation","ComposeInstrumentation","DatabaseInstrumentation","FileIOInstrumentation","LogcatInstrumentation","UncaughtExceptionHandler","ShutdownHook","SendCachedEnvelope","Ndk","AppLifecycle","AnrV2","AppComponentsBreadcrumbs","EnvelopeFileObserver","SystemEventsBreadcrumbs"]},"trace":{"trace_id":"39b1fa44e1d5451e96aba1061a56692f","public_key":"77e8ca0d39e3495fa7e360d960b76e5f789377f1fa2b4fe2bffb68649593a123","release":"com.example.myapplication@1.0+1","environment":"production","sample_rand":"0.356417907292463"},"sent_at":"2025-04-03T13:27:27.348Z"}
{"content_type":"application/json","type":"event","length":8403}
{"timestamp":"2025-04-03T13:16:38.430Z","exception":{"values":[{"type":"Exception","value":"Тестовая ошибка #287","module":"java.lang","thread_id":2,"stacktrace":{"frames":[{"filename":"ZygoteInit.java","function":"main","module":"com.android.internal.os.ZygoteInit","lineno":932,"native":false},{"filename":"RuntimeInit.java","function":"run","module":"com.android.internal.os.RuntimeInit$MethodAndArgsCaller","lineno":593,"native":false},{"filename":"Method.java","function":"invoke","module":"java.lang.reflect.Method","native":true},{"filename":"ActivityThread.java","function":"main","module":"android.app.ActivityThread","lineno":8982,"native":false},{"filename":"Looper.java","function":"loop","module":"android.os.Looper","lineno":338,"native":false},{"filename":"Looper.java","function":"loopOnce","module":"android.os.Looper","lineno":248,"native":false},{"filename":"Handler.java","function":"dispatchMessage","module":"android.os.Handler","lineno":103,"native":false},{"filename":"Handler.java","function":"handleCallback","module":"android.os.Handler","lineno":995,"native":false},{"filename":"Runnable.kt","function":"run","module":"kotlinx.coroutines.android.HandlerContext$scheduleResumeAfterDelay$$inlined$Runnable$1","lineno":19,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeUndispatched","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":595,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeImpl$default","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":497,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"resumeImpl","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":508,"native":false},{"filename":"CancellableContinuationImpl.kt","function":"dispatchResume","module":"kotlinx.coroutines.CancellableContinuationImpl","lineno":474,"native":false},{"filename":"DispatchedTask.kt","function":"dispatch","module":"kotlinx.coroutines.DispatchedTaskKt","lineno":168,"native":false},{"filename":"DispatchedTask.kt","function":"resume","module":"kotlinx.coroutines.DispatchedTaskKt","lineno":235,"native":false},{"filename":"ContinuationImpl.kt","function":"resumeWith","module":"kotlin.coroutines.jvm.internal.BaseContinuationImpl","lineno":33,"native":false},{"filename":"MainActivity.kt","function":"invokeSuspend","module":"com.example.myapplication.MainActivity$onCreate$2","lineno":38,"in_app":true,"native":false}]},"mechanism":{"type":"chained","exception_id":0}}]},"fingerprint":[],"modules":{"androidx.arch.core:core-runtime":"2.2.0","androidx.core:core-ktx":"1.13.1","org.jetbrains.kotlin:kotlin-stdlib-jdk7":"1.9.24","org.jetbrains.kotlin:kotlin-stdlib-jdk8":"1.9.24","androidx.concurrent:concurrent-futures":"1.1.0","androidx.compose.ui:ui-android":"1.7.0","androidx.lifecycle:lifecycle-runtime-android":"2.8.3","androidx.compose.ui:ui-util-android":"1.7.0","androidx.compose.ui:ui-tooling-android":"1.7.0","androidx.compose.ui:ui-tooling-data-android":"1.7.0","androidx.startup:startup-runtime":"1.1.1","androidx.lifecycle:lifecycle-viewmodel-android":"2.8.3","androidx.lifecycle:lifecycle-viewmodel-ktx":"2.8.3","org.jetbrains.kotlin:kotlin-stdlib":"2.0.21","androidx.compose.ui:ui-text-android":"1.7.0","com.google.guava:listenablefuture":"1.0","androidx.lifecycle:lifecycle-process":"2.8.3","io.sentry:sentry-compose-android":"8.6.0","androidx.activity:activity-compose":"1.8.2","androidx.compose.ui:ui-geometry-android":"1.7.0","io.sentry:sentry-android-replay":"8.6.0","androidx.compose.animation:animation-android":"1.7.0","androidx.compose.foundation:foundation-android":"1.7.0","io.sentry:sentry-native-ndk":"0.8.3","androidx.activity:activity-ktx":"1.8.2","androidx.lifecycle:lifecycle-runtime-compose-android":"2.8.3","org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm":"1.7.3","io.sentry:sentry-android-core":"8.6.0","androidx.compose.ui:ui-graphics-android":"1.7.0","androidx.activity:activity":"1.8.2","androidx.compose.runtime:runtime-android":"1.7.0","androidx.compose.ui:ui-test-manifest":"1.7.0","androidx.emoji2:emoji2":"1.3.0","androidx.lifecycle:lifecycle-viewmodel-savedstate":"2.8.3","androidx.graphics:graphics-path":"1.0.1","androidx.compose.material3:material3-android":"1.3.0","androidx.annotation:annotation-experimental":"1.4.0","androidx.savedstate:savedstate-ktx":"1.2.1","androidx.collection:collection-jvm":"1.4.0","io.sentry:sentry-kotlin-extensions":"8.6.0","org.jetbrains.kotlinx:kotlinx-coroutines-android":"1.7.3","androidx.compose.runtime:runtime-saveable-android":"1.7.0","androidx.compose.material:material-android":"1.7.0","androidx.savedstate:savedstate":"1.2.1","androidx.compose.ui:ui-unit-android":"1.7.0","androidx.core:core":"1.13.1","androidx.collection:collection-ktx":"1.4.0","androidx.compose.material:material-icons-core-android":"1.7.0","io.sentry:sentry-android":"8.6.0","androidx.lifecycle:lifecycle-runtime-ktx-android":"2.8.3","io.sentry:sentry-android-ndk":"8.6.0","androidx.arch.core:core-common":"2.2.0","androidx.compose.animation:animation-core-android":"1.7.0","androidx.lifecycle:lifecycle-common-java8":"2.8.3","androidx.customview:customview-poolingcontainer":"1.0.0","org.jetbrains:annotations":"23.0.0","androidx.lifecycle:lifecycle-common-jvm":"2.8.3","io.sentry:sentry-android-navigation":"8.6.0","androidx.compose.material:material-ripple-android":"1.7.0","androidx.lifecycle:lifecycle-livedata-core":"2.8.3","io.sentry:sentry":"8.6.0","androidx.profileinstaller:profileinstaller":"1.3.1","androidx.autofill:autofill":"1.0.0","androidx.interpolator:interpolator":"1.0.0","androidx.tracing:tracing":"1.0.0","androidx.annotation:annotation-jvm":"1.8.0","androidx.versionedparcelable:versionedparcelable":"1.1.1","androidx.compose.foundation:foundation-layout-android":"1.7.0","androidx.compose.ui:ui-tooling-preview-android":"1.7.0"},"event_id":"4b6140fb97504945908fe52c5b0dd123","contexts":{"app":{"app_identifier":"com.example.myapplication","app_name":"My Application","app_version":"1.0","app_build":"1","permissions":{"DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION":"granted","INTERNET":"granted"},"in_foreground":true,"is_split_apks":false},"device":{"manufacturer":"Google","brand":"google","family":"sdk_gphone64_x86_64","model":"sdk_gphone64_x86_64","model_id":"BP22.250221.010","archs":["x86_64","arm64-v8a"],"battery_level":100.0,"charging":false,"orientation":"portrait","simulator":true,"memory_size":2067255296,"free_memory":650518528,"low_memory":false,"storage_size":6228115456,"free_storage":4472373248,"external_storage_size":534761472,"external_free_storage":534704128,"screen_width_pixels":720,"screen_height_pixels":1280,"screen_density":2.0,"screen_dpi":320,"boot_time":"2025-04-03T12:46:30.968Z","timezone":"GMT","id":"61ff44980d954195b08c2eed81e19104","battery_temperature":25.0,"locale":"en_US","processor_count":4,"processor_frequency":0.0},"os":{"name":"Android","version":"16","build":"BP22.250221.010","kernel_version":"6.6.66-android15-8-g807ce3b4f02f-ab12996908","rooted":false},"trace":{"trace_id":"39b1fa44e1d5451e96aba1061a56692f","span_id":"dc8dfb64259d4c13","op":"default","origin":"manual","data":{"thread.name":"main","thread.id":"9536"}}},"sdk":{"name":"sentry.java.android","version":"8.6.0","packages":[{"name":"maven:io.sentry:sentry","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-core","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-replay","version":"8.6.0"},{"name":"maven:io.sentry:sentry-compose","version":"8.6.0"},{"name":"maven:io.sentry:sentry-android-ndk","version":"8.6.0"}],"integrations":["AppStartInstrumentation","ComposeInstrumentation","DatabaseInstrumentation","FileIOInstrumentation","LogcatInstrumentation","UncaughtExceptionHandler","ShutdownHook","SendCachedEnvelope","Ndk","AppLifecycle","AnrV2","AppComponentsBreadcrumbs","EnvelopeFileObserver","SystemEventsBreadcrumbs"]},"tags":{"isSideLoaded":"true"},"release":"com.example.myapplication@1.0+1","environment":"production","platform":"java","user":{"id":"61ff44980d954195b08c2eed81e19104"},"dist":"1","breadcrumbs":[{"timestamp":"2025-04-03T13:16:02.609Z","type":"navigation","data":{"state":"foreground"},"category":"app.lifecycle","level":"info"},{"timestamp":"2025-04-03T13:16:04.331Z","type":"system","data":{"level":100.0,"charging":false,"action":"BATTERY_CHANGED"},"category":"device.event","level":"info"}]}
{"content_type":"application/json","type":"session","length":287}
{"sid":"713ed035bb294263962a8a01dcde5c52","did":"61ff44980d954195b08c2eed81e19104","started":"2025-04-03T13:16:02.177Z","status":"ok","seq":1743686198467,"errors":287,"timestamp":"2025-04-03T13:16:38.467Z","attrs":{"release":"com.example.myapplication@1.0+1","environment":"production"}}
', }, - "catcherType": "external/sentry" + catcherType: 'external/sentry', }; it('should correctly parse string envelope with cyrillic chars in exception title', async () => { @@ -716,7 +716,7 @@ describe('SentryEventWorker', () => { (eventBuffered.payload as { envelope: Buffer - }).envelope = base64toBuffer(event.payload.envelope) + }).envelope = base64toBuffer(event.payload.envelope); await worker.handle(event as SentryEventWorkerTask); diff --git a/yarn.lock b/yarn.lock index a0cb9a4d..c83d5fac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -354,14 +354,6 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@7.26.9", "@babel/types@^7.26.9": - version "7.26.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.9.tgz#08b43dec79ee8e682c2ac631c010bdcac54a21ce" - integrity sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw== - dependencies: - "@babel/helper-string-parser" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": version "7.15.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" @@ -436,10 +428,10 @@ dependencies: "@types/mongodb" "^3.5.34" -"@hawk.so/types@^0.1.28": - version "0.1.28" - resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.28.tgz#a479f411a4ae1855a6661084fa4396c7f323b170" - integrity sha512-W8xNlbkQuffwhVn/ja5Bo4EglN0waSM0Rx3R+jGmcrbYi1a4g6kGPQFYkMSd0WadikOH1nd9NrfmyJB9cVOBWA== +"@hawk.so/types@^0.1.29": + version "0.1.29" + resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.29.tgz#95b32d2a9ea7771ecceede50e419741f2fc0746a" + integrity sha512-skPS8ypvlR0hAMDxxJ6Yx96EhssLuOSrNm6lZS08FZESA/crldxK4D7OHV/EPxJccmEJLegXq3PEk4zJfC76YA== dependencies: "@types/mongodb" "^3.5.34"