Merge branch 'master' into feat/redis-rate-limit-series

neSpecc · web-flow · commit c1a1d41605df · 2025-11-26T22:14:15.000+03:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {
@@ -34,12 +34,13 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
+    "@ai-sdk/openai": "^2.0.64",
     "@amplitude/node": "^1.10.0",
     "@graphql-tools/merge": "^8.3.1",
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
     "@hawk.so/nodejs": "^3.1.1",
-    "@hawk.so/types": "^0.1.33",
+    "@hawk.so/types": "^0.1.37",
     "@n1ru4l/json-patch-plus": "^0.2.0",
     "@types/amqp-connection-manager": "^2.0.4",
     "@types/bson": "^4.0.5",
@@ -53,9 +54,9 @@
     "@types/mongodb": "^3.6.20",
     "@types/morgan": "^1.9.10",
     "@types/node": "^16.11.46",
-    "@types/node-fetch": "^2.5.4",
     "@types/safe-regex": "^1.1.6",
     "@types/uuid": "^8.3.4",
+    "ai": "^5.0.89",
     "amqp-connection-manager": "^3.1.0",
     "amqplib": "^0.5.5",
     "apollo-server-express": "^3.10.0",
@@ -86,6 +87,7 @@
     "redis": "^4.7.0",
     "safe-regex": "^2.1.0",
     "ts-node-dev": "^2.0.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "zod": "^3.25.76"
   }
 }
diff --git a/src/integrations/vercel-ai/index.ts b/src/integrations/vercel-ai/index.ts
@@ -0,0 +1,41 @@
+import { EventAddons, EventData } from '@hawk.so/types';
+import { generateText } from 'ai';
+import { openai } from '@ai-sdk/openai';
+import { eventSolvingInput } from './inputs/eventSolving';
+import { ctoInstruction } from './instructions/cto';
+
+/**
+ * Interface for interacting with Vercel AI Gateway
+ */
+class VercelAIApi {
+    /**
+     * Model ID to use for generating suggestions
+     */
+    private readonly modelId: string;
+
+    constructor() {
+      /**
+       * @todo make it dynamic, get from project settings
+       */
+      this.modelId = 'gpt-4o';
+    }
+
+    /**
+     * Generate AI suggestion for the event
+     *
+     * @param {EventData<EventAddons>} payload - event data
+     * @returns {Promise<string>} AI suggestion for the event
+     * @todo add defence against invalid prompt injection
+     */
+    public async generateSuggestion(payload: EventData<EventAddons>) {
+      const { text } = await generateText({
+        model: openai(this.modelId),
+        system: ctoInstruction,
+        prompt: eventSolvingInput(payload),
+      });
+
+      return text;
+    }
+}
+
+export const vercelAIApi = new VercelAIApi();
diff --git a/src/integrations/vercel-ai/inputs/eventSolving.ts b/src/integrations/vercel-ai/inputs/eventSolving.ts
@@ -0,0 +1,5 @@
+import { EventData, EventAddons } from '@hawk.so/types';
+
+export const eventSolvingInput = (payload: EventData<EventAddons>) => `
+Payload: ${JSON.stringify(payload)}
+`;
diff --git a/src/integrations/vercel-ai/instructions/cto.ts b/src/integrations/vercel-ai/instructions/cto.ts
@@ -0,0 +1,9 @@
+export const ctoInstruction = `Ты технический директор ИТ компании, тебе нужно пояснить ошибку и предложить решение.
+
+Предоставь ответ в следующем формате:
+
+1. Описание проблемы
+2. Решение проблемы
+3. Описание того, как можно предотвратить подобную ошибку в будущем
+
+Ответь на русском языке.`;
diff --git a/src/models/eventsFactory.js b/src/models/eventsFactory.js
@@ -292,6 +292,12 @@ class EventsFactory extends Factory {
     const searchFilter = search.trim().length > 0
       ? {
         $or: [
+          {
+            'repetition.delta': {
+              $regex: escapedSearch,
+              $options: 'i',
+            },
+          },
           {
             'event.payload.title': {
               $regex: escapedSearch,
@@ -640,7 +646,6 @@ class EventsFactory extends Factory {
   /**
    * Returns Event repetitions
    *
-   * @param {string|ObjectID} eventId - Event's id, could be repetitionId in case when we want to get repetitions portion by one repetition
    * @param {string|ObjectID} originalEventId - id of the original event
    * @param {Number} limit - count limitations
    * @param {Number} cursor - pointer to the next repetition
@@ -735,7 +740,7 @@ class EventsFactory extends Factory {
     /**
      * If originalEventId equals repetitionId than user wants to get first repetition which is original event
      */
-    if (repetitionId === originalEventId) {
+    if (repetitionId.toString() === originalEventId.toString()) {
       const originalEvent = await this.eventsDataLoader.load(originalEventId);
 
       /**
diff --git a/src/models/notify.js b/src/models/notify.js
@@ -90,6 +90,11 @@ class Notify {
             endpoint: 'slack',
             minPeriod: 60,
           },
+          loop: {
+            isEnabled: true,
+            endpoint: 'loop',
+            minPeriod: 60,
+          },
           telegram: {
             isEnabled: true,
             endpoint: 'telegram',
diff --git a/src/rabbitmq.ts b/src/rabbitmq.ts
@@ -27,6 +27,7 @@ export enum Queues {
   Email = 'sender/email',
   Telegram = 'notify/telegram',
   Slack = 'notify/slack',
+  Loop = 'notify/loop',
   Limiter = 'cron-tasks/limiter',
 }
 
@@ -81,6 +82,14 @@ export const WorkerPaths: Record<string, WorkerPath> = {
     queue: Queues.Slack,
   },
 
+  /**
+   * Path to loop worker
+   */
+  Loop: {
+    exchange: Exchanges.Notify,
+    queue: Queues.Loop,
+  },
+
   /**
    * Path to limiter worker
    */
diff --git a/src/resolvers/event.js b/src/resolvers/event.js
@@ -1,5 +1,6 @@
 const getEventsFactory = require('./helpers/eventsFactory').default;
 const sendPersonalNotification = require('../utils/personalNotifications').default;
+const { aiService } = require('../services/ai');
 
 /**
  * See all types and fields here {@see ../typeDefs/event.graphql}
@@ -89,6 +90,20 @@ module.exports = {
       return factory.getEventDailyChart(groupHash, days, timezoneOffset);
     },
 
+    /**
+     * Return AI suggestion for the event
+     *
+     * @param {string} projectId - event's project
+     * @param {string} eventId - event id
+     * @param {string} originalEventId - original event id
+     * @returns {Promise<string>} AI suggestion for the event
+     */
+    async aiSuggestion({ projectId, _id: eventId, originalEventId }, _args, context) {
+      const factory = getEventsFactory(context, projectId);
+
+      return aiService.generateSuggestion(factory, eventId, originalEventId);
+    },
+
     /**
      * Return release data for the event
      *
diff --git a/src/resolvers/project.js b/src/resolvers/project.js
@@ -90,6 +90,11 @@ module.exports = {
               endpoint: '',
               minPeriod: 60,
             },
+            loop: {
+              isEnabled: false,
+              endpoint: '',
+              minPeriod: 60,
+            },
           },
         }, true);
 
diff --git a/src/resolvers/projectNotifications.ts b/src/resolvers/projectNotifications.ts
@@ -114,6 +114,12 @@ function validateNotificationsRuleChannels(channels: NotificationsChannelsDBSche
     }
   }
 
+  if (channels.loop!.isEnabled) {
+    if (!/^https:\/\/.+\/hooks\/.+$/.test(channels.loop!.endpoint)) {
+      return 'Invalid loop endpoint passed';
+    }
+  }
+
   if (channels.telegram!.isEnabled) {
     if (!/^https:\/\/notify\.bot\.codex\.so\/u\/[A-Za-z0-9]+$/.test(channels.telegram!.endpoint)) {
       return 'Invalid telegram endpoint passed';
diff --git a/src/services/ai.ts b/src/services/ai.ts
@@ -0,0 +1,27 @@
+import { vercelAIApi } from '../integrations/vercel-ai/';
+import { EventsFactoryInterface } from './types';
+
+/**
+ * Service for interacting with AI
+ */
+export class AIService {
+  /**
+   * Generate suggestion for the event
+   *
+   * @param eventsFactory - events factory
+   * @param eventId - event id
+   * @param originalEventId - original event id
+   * @returns {Promise<string>} - suggestion
+   */
+  public async generateSuggestion(eventsFactory: EventsFactoryInterface, eventId: string, originalEventId: string): Promise<string> {
+    const event = await eventsFactory.getEventRepetition(eventId, originalEventId);
+
+    if (!event) {
+      throw new Error('Event not found');
+    }
+
+    return vercelAIApi.generateSuggestion(event.payload);
+  }
+}
+
+export const aiService = new AIService();
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -0,0 +1,23 @@
+import { EventAddons, EventData } from '@hawk.so/types';
+
+/**
+ * Event type which is returned by events factory
+ */
+type Event = {
+    _id: string;
+    payload: EventData<EventAddons>;
+};
+
+/**
+ * Interface for interacting with events factory
+ */
+export interface EventsFactoryInterface {
+  /**
+   * Get event repetition
+   *
+   * @param repetitionId - repetition id
+   * @param originalEventId - original event id
+   * @returns {Promise<EventData<EventAddons>>} - event repetition
+   */
+  getEventRepetition(repetitionId: string, originalEventId: string): Promise<Event>;
+}
diff --git a/src/typeDefs/event.ts b/src/typeDefs/event.ts
@@ -262,6 +262,11 @@ type Event {
   """
   repetitionsPortion(cursor: String = null, limit: Int = 10): RepetitionsPortion!
 
+  """
+  AI suggestion for the event
+  """
+  aiSuggestion: String
+
   """
   Array of users who visited event
   """
diff --git a/src/typeDefs/notifications.ts b/src/typeDefs/notifications.ts
@@ -44,6 +44,11 @@ export default gql`
     """
     slack: NotificationsChannelSettings
 
+    """
+    Loop channel
+    """
+    loop: NotificationsChannelSettings
+
     """
     Webpush
     """
diff --git a/src/typeDefs/notificationsInput.ts b/src/typeDefs/notificationsInput.ts
@@ -40,6 +40,11 @@ export default gql`
     """
     slack: NotificationsChannelSettingsInput
 
+    """
+    Loop channel
+    """
+    loop: NotificationsChannelSettingsInput
+
     """
     Web push
     """
diff --git a/src/types/notification-channels.d.ts b/src/types/notification-channels.d.ts
@@ -17,6 +17,11 @@ export interface NotificationsChannelsDBScheme {
    */
   slack?: NotificationsChannelSettingsDBScheme;
 
+  /**
+   * Alerts through the Loop
+   */
+  loop?: NotificationsChannelSettingsDBScheme;
+
   /**
    * Alerts through the Telegram
    */
@@ -43,7 +48,7 @@ export interface NotificationsChannelSettingsDBScheme {
   isEnabled: boolean;
 
   /**
-   * Endpoint: email, slack webhook, telegram bot webhook, push subscription id, etc
+   * Endpoint: email, slack/loop webhook, telegram bot webhook, push subscription id, etc
    */
   endpoint: string;
 
diff --git a/src/types/vercel-ai.d.ts b/src/types/vercel-ai.d.ts
@@ -0,0 +1,18 @@
+declare module 'ai' {
+    /**
+     * Minimal type for generateText used in server-side integration.
+     */
+    export function generateText(input: {
+        model: any;
+        system?: string;
+        prompt: string;
+    }): Promise<{ text: string }>;
+}
+
+declare module '@ai-sdk/openai' {
+    /**
+     * Minimal types for OpenAI provider.
+     */
+    export function createOpenAI(config?: { apiKey?: string }): (model: string) => any;
+    export const openai: (model: string) => any;
+}
diff --git a/src/types/zod-v4.d.ts b/src/types/zod-v4.d.ts
@@ -0,0 +1,5 @@
+declare module 'zod/v4' {
+    export * from 'zod';
+    import z from 'zod';
+    export default z;
+}
diff --git a/src/utils/personalNotifications.ts b/src/utils/personalNotifications.ts
@@ -42,4 +42,14 @@ export default async function sendNotification(user: UserDBScheme, task: SenderW
       },
     });
   }
+
+  if (user.notifications.channels.loop?.isEnabled) {
+    await enqueue(WorkerPaths.Loop, {
+      type: task.type,
+      payload: {
+        ...task.payload,
+        endpoint: user.notifications.channels.loop.endpoint,
+      },
+    });
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -41,13 +41,16 @@
 
     /* Module Resolution Options */
     // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    "paths": {                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+      "zod/v4": ["src/types/zod-v4.d.ts"]
+    },
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "skipLibCheck": true
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
     // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,12 @@ function validateNotificationsRuleChannels(channels: NotificationsChannelsDBSche`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ if (channels.loop!.isEnabled) {`
	`118`	`+ if (!/^https:\/\/.+\/hooks\/.+$/.test(channels.loop!.endpoint)) {`
	`119`	`+ return 'Invalid loop endpoint passed';`
	`120`	`+ }`
	`121`	`+ }`
	`122`	`+`
`117`	`123`	`if (channels.telegram!.isEnabled) {`
`118`	`124`	`if (!/^https:\/\/notify\.bot\.codex\.so\/u\/[A-Za-z0-9]+$/.test(channels.telegram!.endpoint)) {`
`119`	`125`	`return 'Invalid telegram endpoint passed';`