Update prod

.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

.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

.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

.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

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'],
 };

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);
   }

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",

workers/email/src/templates/emails/events-limit-almost-reached/html.twig

@@ -14,23 +14,25 @@
     <td align="center" style="padding: 15px 0;">
       <font color="#dbe6ff" style="font-size: 15px; text-align: center; color: #dbe6ff; letter-spacing: 0.4px;">
         <span style="vertical-align: middle; display: inline-block;">
-          Warning of the Used Volume
+          You’re almost out of your error tracking limit
         </span>
       </font>
     </td>
   </tr>
   <tr>
     <td style="display: block; padding: 20px; margin-bottom: 30px; border-width: 1px; border-color: #494f5e; border-style: solid; border-radius: 10px; line-height: 1.47">
       <font color="#dbe6ff" style="font-size: 15px; letter-spacing: 0.4px;">
-        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.
       </font>
     </td>
   </tr>
   <tr>
     <td style="padding-right: 20px; padding-left: 20px; padding-bottom: 40px;">
-      {% 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₽'} %}
     </td>
   </tr>
 {% endblock %}

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

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
 
 ***
 

workers/javascript/src/index.ts

@@ -228,7 +228,7 @@
      * 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,40 +247,43 @@
       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
    */
   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 @@
         /**
          * 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,24 +308,28 @@
         },
         /**
          * 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;
           }
         },
         /**
          * 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 @@
             }
             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

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();
 
         /**

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