Update prod (#483)

* feat(noti): added loop sender worker (#479)

* feat(noti): added loop sender worker

* fix tests

* added numbers declension

* fix lint

* added examples for decl

* Update workers/loop/src/provider.ts

Co-authored-by: e11sy <130844513+e11sy@users.noreply.github.com>

* Update workers/loop/src/provider.ts

Co-authored-by: e11sy <130844513+e11sy@users.noreply.github.com>

* fix tests

---------

Co-authored-by: e11sy <130844513+e11sy@users.noreply.github.com>

* fix(js): jsx plugin integration (#482)

* fix(js): use babel parser plugins based on type extension

* fix(): comments

* fix(): duplicated variable

* Update mail message for "blocked workspace" event (#478)

* Localize block workspace email templates to Russian

Translated block workspace email subject, text, and layout components from English to Russian to improve localization for Russian-speaking users. Updated button label and system name references accordingly.

* Update block workspace email wording

Rephrased notification messages in both HTML and text email templates for blocked workspaces to improve clarity and conciseness.

* Update workers/email/src/templates/emails/block-workspace/html.twig

Co-authored-by: Peter <specc.dev@gmail.com>

* Update block workspace email templates wording

Revised subject and body text in block workspace email templates for clarity and consistency. The new wording emphasizes that the workspace no longer receives events and that users are not tracking new errors due to plan limits or expiration.

* Update button label based on tariff plan

The button label in the block workspace email template now changes to 'Увеличить лимит от 99₽' if the workspace's tariffPlanId matches a specific value, otherwise it remains 'Открыть настройки'.

* Fix spacing in button label currency symbol

Added a space between the amount and the ₽ currency symbol in the button label for improved readability in the block workspace email template.

* Fix punctuation in block workspace email template

Added a missing period and line break to improve readability and clarity in the block workspace notification email template.

* Improve block workspace email template formatting

Replaces line breaks with paragraph tags for better readability and updates Twig syntax for tariff plan comparison in the button label.

---------

Co-authored-by: Peter <specc.dev@gmail.com>

---------

Co-authored-by: Vyacheslav Chernyshev <81693471+slaveeks@users.noreply.github.com>
Co-authored-by: e11sy <130844513+e11sy@users.noreply.github.com>
Co-authored-by: Taly <vitalik7tv@yandex.ru>
Co-authored-by: Peter <specc.dev@gmail.com>

Author: 5 people

workers/email/src/templates/components/layout.twig

@@ -123,7 +123,7 @@
                            style="text-decoration: none; border-bottom: 1px solid #494F5E;">
                             <font color="#969FB3"
                                   style="font-size: 13px; line-height: 1.46; letter-spacing: 0.16px; color: #969FB3;">
-                                Unsubscribe
+                                Отписаться
                             </font>
                         </a>
                     </td>
@@ -143,7 +143,7 @@
                         <a href="{{ host }}" style="text-decoration: none;">
                             <font color="#969FB3"
                                   style="font-size: 13px; line-height: 1.46; letter-spacing: 0.16px; color: #969FB3;">
-                                Hawk
+                                Хоук
                             </font>
                         </a>
                     </td>
@@ -152,7 +152,7 @@
                     <td style="text-align: center">
                         <font color="#969FB3"
                               style="font-size: 13px; line-height: 1.46; letter-spacing: 0.16px; color: #969FB3;">
-                            Errors tracking system
+                            Российский трекер ошибок
                         </font>
                     </td>
                 </tr>

workers/email/src/templates/emails/block-workspace/html.twig

@@ -14,21 +14,26 @@
     <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;">
-          Workspace was blocked
+          «{{ workspace.name | escape }}» не принимает события
         </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;">
-        Your workspace "{{ workspace.name | escape }}" was blocked because the plan was not renewed or events limit has been reached. Please, check payment settings and renew the plan.
+        <p style="margin-top: 0;">
+          Вы больше не отслеживаете новые ошибки, потому что закончился лимит или срок действия тарифного плана.
+        </p>
+        <p style="margin-bottom: 0;">
+          Чтобы продолжить получать события, выберите подходящий тарифный план и продлите подписку в настройках оплаты.
+        </p>
       </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/billing', label: 'Go to payment settings'} %}
+      {% include '../../components/button.twig' with {href: host ~ '/workspace/' ~ workspace._id ~ '/settings/billing', label: workspace.tariffPlanId is same as('5f47f031ff71510040f433c1') ? 'Увеличить лимит от 99 ₽' : 'Открыть настройки'} %}
     </td>
   </tr>
 {% endblock %}

workers/email/src/templates/emails/block-workspace/subject.twig

@@ -1 +1 @@
-Workspace {{ workspace.name | escape }} was blocked!
+Мониторинг ошибок остановлен

workers/email/src/templates/emails/block-workspace/text.twig

@@ -1,10 +1,12 @@
-Your workspace "{{ workspace.name | escape }}"  was blocked because the plan was not renewed or events limit has been reached.
+Мониторинг ошибок остановлен
 
-Please, check payment settings and renew the plan: {{ host }}/workspace/{{ workspace._id }}/settings/billing
+Вы больше не отслеживаете новые ошибки «{{ workspace.name | escape }}», потому что закончился лимит или срок действия тарифного плана
+
+Чтобы продолжить получать события, выберите подходящий тарифный план и продлите подписку в настройках оплаты: {{ host }}/workspace/{{ workspace._id }}/settings/billing
 
 ***
 
-Hawk
-Errors tracking system
+Хоук
+Российский трекер ошибок
 
-Made by CodeX
+Made by CodeX

workers/javascript/src/index.ts

@@ -14,6 +14,7 @@ import { beautifyUserAgent } from './utils';
 import { Collection } from 'mongodb';
 import { parse } from '@babel/parser';
 import traverse from '@babel/traverse';
+import { extname } from 'path';
 /* eslint-disable-next-line no-unused-vars */
 import { memoize } from '../../../lib/memoize';
 
@@ -231,7 +232,11 @@ export default class JavascriptEventWorker extends EventWorker {
 
         const originalContent = consumer.sourceContentFor(originalLocation.source);
 
-        functionContext = await this.getFunctionContext(originalContent, originalLocation.line) ?? originalLocation.name;
+        functionContext = await this.getFunctionContext(
+          originalContent,
+          originalLocation.line,
+          originalLocation.source
+        ) ?? originalLocation.name;
       } catch (e) {
         HawkCatcher.send(e);
         this.logger.error('Can\'t get function context');
@@ -253,28 +258,20 @@ export default class JavascriptEventWorker extends EventWorker {
    *
    * @param sourceCode - content of the source file
    * @param line - number of the line from the stack trace
+   * @param sourcePath - original source path from the source map (used to pick parser plugins)
    * @returns {string | null} - string of the function context or null if it could not be parsed
    */
-  private getFunctionContext(sourceCode: string, line: number): string | null {
+  private getFunctionContext(sourceCode: string, line: number, sourcePath?: string): string | null {
     let functionName: string | null = null;
     let className: string | null = null;
     let isAsync = false;
 
     try {
-      // @todo choose plugins based on source code file extention (related to possible jsx parser usage in future)
+      const parserPlugins = this.getBabelParserPluginsForFile(sourcePath);
+
       const ast = parse(sourceCode, {
         sourceType: 'module',
-        plugins: [
-          'jsx',
-          'typescript',
-          'classProperties',
-          'decorators',
-          'optionalChaining',
-          'nullishCoalescingOperator',
-          'dynamicImport',
-          'bigInt',
-          'topLevelAwait',
-        ],
+        plugins: parserPlugins,
       });
 
       traverse(ast as any, {
@@ -454,4 +451,55 @@ export default class JavascriptEventWorker extends EventWorker {
       this.logger.error(`Error on source-map consumer initialization: ${e}`);
     }
   }
+
+  /**
+   * Choose babel parser plugins based on source file extension
+   *
+   * @param sourcePath - original file path from source map (e.g. "src/App.tsx")
+   */
+  private getBabelParserPluginsForFile(sourcePath?: string): any[] {
+    const basePlugins: string[] = [
+      'classProperties',
+      'decorators',
+      'optionalChaining',
+      'nullishCoalescingOperator',
+      'dynamicImport',
+      'bigInt',
+      'topLevelAwait',
+    ];
+
+    /**
+     * Default - use only typescript plugin because it's more stable and less likely will produce errors
+     */
+    let enableTypeScript = true;
+    let enableJSX = false;
+
+    if (sourcePath) {
+      // remove query/hash if there is any
+      const cleanPath = sourcePath.split('?')[0].split('#')[0];
+      const ext = extname(cleanPath).toLowerCase();
+
+      const isTs   = ext === '.ts' || ext === '.d.ts';
+      const isTsx  = ext === '.tsx';
+      const isJs   = ext === '.js' || ext === '.mjs' || ext === '.cjs';
+      const isJsx  = ext === '.jsx';
+
+      enableTypeScript = isTs || isTsx;
+      // JSX:
+      //  - for .ts/.d.ts — DISABLE
+      //  - for .tsx/.jsx — ENABLE
+      //  - for .js — keep enabled, to not break App.js with JSX
+      enableJSX = isTsx || isJsx || isJs;
+    }
+
+    if (enableTypeScript) {
+      basePlugins.push('typescript');
+    }
+
+    if (enableJSX) {
+      basePlugins.push('jsx');
+    }
+
+    return basePlugins;
+  }
 }

workers/javascript/tests/index.test.ts

@@ -442,4 +442,118 @@ describe('JavaScript event worker', () => {
 
     await worker.finish();
   });
+
+  it('should resolve function context for TypeScript function with angle-bracket type assertion', () => {
+    const worker = new JavascriptEventWorker();
+
+    const tsSource = `
+      const foo: string | null = 'bar';
+
+      function throwError() {
+        const value = <string>foo;
+        throw new Error(value);
+      }
+
+      export { throwError };
+    `;
+
+    /**
+     * String with throw new Error(...) is the 6th line (if counting from 1)
+     * 1: ''
+     * 2: const foo...
+     * 3: ''
+     * 4: function throwError() {
+     * 5:   const value = <string>foo;
+     * 6:   throw new Error(value);
+     * ...
+     */
+    const context = (worker as any).getFunctionContext(tsSource, 6, 'example.ts');
+
+    /**
+     * We expect that the build with fixes will return the function name,
+     * but with the current configuration the jsx+typescript parser fails
+     * and getFunctionContext returns null.
+     */
+    expect(context).toBe('throwError');
+  });
+
+  it('should resolve function context for TypeScript generic arrow function', () => {
+    const worker = new JavascriptEventWorker();
+
+    const tsSource = `
+      type User = {
+        id: string;
+        name: string;
+      };
+
+      const wrap = <T>(value: T): T => {
+        return value;
+      };
+
+      export const useUser = () => {
+        const user: User = wrap<User>({ id: '1', name: 'John' });
+
+        return user;
+      };
+    `;
+
+    /**
+     * String inside useUser - where we want to get context:
+     * 1: ''
+     * 2: type User = { ...
+     * ...
+     * 7: const wrap = <T>(value: T): T => {
+     * ...
+     * 12: export const useUser = () => {
+     * 13:   const user: User = wrap<User>({ id: '1', name: 'John' });
+     * 14: 
+     * 15:   return user;
+     * 16: };
+     */
+    const context = (worker as any).getFunctionContext(tsSource, 13, 'example.ts');
+
+    expect(context).toBe('useUser');
+  });
+
+  it('should resolve class method context for TypeScript class with type assertion', () => {
+    const worker = new JavascriptEventWorker();
+
+    const tsSource = `
+      class ApiClient {
+        private baseUrl: string = 'https://example.com';
+
+        public request() {
+          const raw = '{"ok":true}';
+          const parsed = <Record<string, unknown>>JSON.parse(raw);
+
+          if (!parsed.ok) {
+            throw new Error('Request failed');
+          }
+
+          return parsed;
+        }
+      }
+
+      export default ApiClient;
+    `;
+
+    /**
+     * String where we want to get context - inside the request method:
+     * 1: ''
+     * 2: class ApiClient {
+     * 3:   private baseUrl...
+     * 4: 
+     * 5:   public request() {
+     * 6:     const raw = '{"ok":true}';
+     * 7:     const parsed = <Record<string, unknown>>JSON.parse(raw);
+     * 8: 
+     * 9:     if (!parsed.ok) {
+     * 10:      throw new Error('Request failed');
+     * ...
+     */
+    const context = (worker as any).getFunctionContext(tsSource, 7, 'example.ts');
+
+    // We expect "ApiClient.request"
+    expect(context).toBe('ApiClient.request');
+  });
 });