ваше сообщение коммита
This commit is contained in:
@@ -25,9 +25,10 @@
|
||||
"@langchain/community": "^0.3.34",
|
||||
"@langchain/core": "0.3.0",
|
||||
"@langchain/ollama": "^0.2.0",
|
||||
"@openzeppelin/contracts": "4.5.0",
|
||||
"axios": "^1.6.7",
|
||||
"@openzeppelin/contracts": "^5.2.0",
|
||||
"axios": "^1.8.4",
|
||||
"connect-pg-simple": "^10.0.0",
|
||||
"cookie": "^1.0.2",
|
||||
"cors": "^2.8.5",
|
||||
"cron": "^4.1.0",
|
||||
"csurf": "^1.11.0",
|
||||
@@ -39,16 +40,20 @@
|
||||
"helmet": "^8.0.0",
|
||||
"hnswlib-node": "^3.0.0",
|
||||
"imap": "^0.8.19",
|
||||
"langchain": "0.0.200",
|
||||
"langchain": "^0.3.19",
|
||||
"mailparser": "^3.7.2",
|
||||
"node-cron": "^3.0.3",
|
||||
"node-telegram-bot-api": "^0.66.0",
|
||||
"nodemailer": "^6.10.0",
|
||||
"pg": "^8.10.0",
|
||||
"semver": "^7.7.1",
|
||||
"session-file-store": "^1.5.0",
|
||||
"siwe": "^2.1.4",
|
||||
"telegraf": "^4.16.3",
|
||||
"winston": "^3.17.0"
|
||||
"utf7": "^1.0.2",
|
||||
"viem": "^2.23.15",
|
||||
"winston": "^3.17.0",
|
||||
"ws": "^8.18.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
|
||||
@@ -68,12 +73,18 @@
|
||||
"eslint-config-prettier": "^10.0.2",
|
||||
"globals": "^16.0.0",
|
||||
"hardhat": "^2.22.19",
|
||||
"hardhat-gas-reporter": "^1.0.8",
|
||||
"hardhat-gas-reporter": "^2.2.2",
|
||||
"nodemon": "^3.1.9",
|
||||
"prettier": "^3.5.3",
|
||||
"solidity-coverage": "^0.8.1",
|
||||
"ts-node": ">=8.0.0",
|
||||
"typechain": "^8.3.0",
|
||||
"typescript": ">=4.5.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"ws": "^8.18.1",
|
||||
"cookie": "^1.0.2",
|
||||
"semver": "^7.7.1",
|
||||
"**/utf7/semver": "^7.7.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const { ChatOllama } = require('@langchain/ollama');
|
||||
const { HNSWLib } = require('langchain/vectorstores/hnswlib');
|
||||
const { OpenAIEmbeddings } = require('langchain/embeddings/openai');
|
||||
const { HNSWLib } = require('@langchain/community/vectorstores/hnswlib');
|
||||
const { OpenAIEmbeddings } = require('@langchain/openai');
|
||||
const logger = require('../utils/logger');
|
||||
|
||||
class AIAssistant {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
const { pool } = require('../db');
|
||||
const nodemailer = require('nodemailer');
|
||||
const Imap = require('imap');
|
||||
const simpleParser = require('mailparser').simpleParser;
|
||||
const { processMessage } = require('./ai-assistant');
|
||||
const { inspect } = require('util');
|
||||
const logger = require('../utils/logger');
|
||||
const verificationService = require('./verification-service');
|
||||
@@ -18,11 +21,46 @@ const transporter = nodemailer.createTransport({
|
||||
}
|
||||
});
|
||||
|
||||
// Конфигурация для получения писем
|
||||
const imapConfig = {
|
||||
user: process.env.EMAIL_USER,
|
||||
password: process.env.EMAIL_PASSWORD,
|
||||
host: process.env.EMAIL_IMAP_HOST,
|
||||
port: process.env.EMAIL_IMAP_PORT,
|
||||
tls: true,
|
||||
tlsOptions: { rejectUnauthorized: false },
|
||||
keepalive: {
|
||||
interval: 10000, // Проверка соединения каждые 10 секунд
|
||||
idleInterval: 300000, // Сброс соединения через 5 минут простоя
|
||||
forceNoop: true // Принудительная отправка NOOP для поддержания соединения
|
||||
}
|
||||
};
|
||||
|
||||
class EmailBotService {
|
||||
constructor(user, password) {
|
||||
this.user = user;
|
||||
this.password = password;
|
||||
this.transporter = transporter;
|
||||
this.imap = new Imap(imapConfig);
|
||||
this.initialize();
|
||||
this.listenForReplies();
|
||||
}
|
||||
|
||||
initialize() {
|
||||
this.imap.once('error', (err) => {
|
||||
logger.error(`IMAP connection error: ${err.message}`);
|
||||
// Пробуем переподключиться через 1 минуту при ошибке
|
||||
setTimeout(() => {
|
||||
try {
|
||||
if (this.imap.state !== 'connected') {
|
||||
this.imap = new Imap(imapConfig);
|
||||
this.initialize();
|
||||
}
|
||||
} catch (e) {
|
||||
logger.error(`Error reconnecting IMAP: ${e.message}`);
|
||||
}
|
||||
}, 60000);
|
||||
});
|
||||
}
|
||||
|
||||
async sendVerificationCode(toEmail, userId) {
|
||||
@@ -65,6 +103,157 @@ class EmailBotService {
|
||||
}
|
||||
}
|
||||
|
||||
listenForReplies() {
|
||||
// Запускаем проверку почты каждые 60 секунд
|
||||
setInterval(() => {
|
||||
this.checkEmails();
|
||||
}, 60000);
|
||||
}
|
||||
|
||||
checkEmails() {
|
||||
try {
|
||||
// Добавляем обработчики ошибок
|
||||
this.imap.once('error', (err) => {
|
||||
logger.error(`IMAP connection error during check: ${err.message}`);
|
||||
// Пытаемся закрыть соединение при ошибке
|
||||
try {
|
||||
this.imap.end();
|
||||
} catch (e) {
|
||||
// Игнорируем ошибки при закрытии
|
||||
}
|
||||
});
|
||||
|
||||
this.imap.once('ready', () => {
|
||||
this.imap.openBox('INBOX', false, (err, box) => {
|
||||
if (err) {
|
||||
logger.error(`Error opening inbox: ${err}`);
|
||||
this.imap.end();
|
||||
return;
|
||||
}
|
||||
|
||||
// Ищем непрочитанные письма
|
||||
this.imap.search(['UNSEEN'], (err, results) => {
|
||||
if (err) {
|
||||
logger.error(`Error searching messages: ${err}`);
|
||||
this.imap.end();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!results || results.length === 0) {
|
||||
logger.info('No new messages found');
|
||||
this.imap.end();
|
||||
return;
|
||||
}
|
||||
|
||||
// Защищаемся от пустых результатов
|
||||
try {
|
||||
const f = this.imap.fetch(results, { bodies: '' });
|
||||
|
||||
f.on('message', (msg, seqno) => {
|
||||
msg.on('body', (stream, info) => {
|
||||
simpleParser(stream, async (err, parsed) => {
|
||||
if (err) {
|
||||
logger.error(`Error parsing message: ${err}`);
|
||||
return;
|
||||
}
|
||||
|
||||
// Обработка входящего письма для Ollama
|
||||
try {
|
||||
// Проверяем, что это действительно письмо (защита от ошибок)
|
||||
if (parsed && parsed.text && parsed.from && parsed.from.value &&
|
||||
parsed.from.value.length > 0 && parsed.from.value[0].address) {
|
||||
|
||||
const fromEmail = parsed.from.value[0].address.toLowerCase();
|
||||
const subject = parsed.subject || '';
|
||||
const text = parsed.text || '';
|
||||
|
||||
// Передаем письмо в Ollama для обработки
|
||||
await this.processOllamaEmail(fromEmail, subject, text);
|
||||
}
|
||||
} catch (e) {
|
||||
logger.error(`Error processing email for Ollama: ${e.message}`);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
f.once('error', (err) => {
|
||||
logger.error(`Fetch error: ${err}`);
|
||||
});
|
||||
|
||||
f.once('end', () => {
|
||||
try {
|
||||
this.imap.end();
|
||||
} catch (e) {
|
||||
logger.error(`Error ending IMAP connection: ${e.message}`);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
logger.error(`Error fetching messages: ${e.message}`);
|
||||
try {
|
||||
this.imap.end();
|
||||
} catch (e) {
|
||||
// Игнорируем ошибки при закрытии
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
this.imap.connect();
|
||||
} catch (error) {
|
||||
logger.error(`Global error checking emails: ${error.message}`);
|
||||
// Обеспечиваем корректное завершение IMAP сессии
|
||||
try {
|
||||
this.imap.end();
|
||||
} catch (e) {
|
||||
// Игнорируем ошибки при закрытии
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Метод для обработки письма с помощью Ollama
|
||||
async processOllamaEmail(fromEmail, subject, text) {
|
||||
try {
|
||||
// Проверяем, есть ли текст для обработки
|
||||
if (!text || text.trim() === '') {
|
||||
logger.info(`Empty message from ${fromEmail}, skipping Ollama processing`);
|
||||
return;
|
||||
}
|
||||
|
||||
logger.info(`Processing message from ${fromEmail} for Ollama`);
|
||||
|
||||
// Получаем ответ от Ollama
|
||||
const response = await processMessage(text);
|
||||
|
||||
if (response) {
|
||||
// Отправляем ответ обратно пользователю
|
||||
await this.transporter.sendMail({
|
||||
from: this.user,
|
||||
to: fromEmail,
|
||||
subject: `Re: ${subject}`,
|
||||
text: response
|
||||
});
|
||||
|
||||
logger.info(`Ollama response sent to ${fromEmail}`);
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error(`Error in Ollama email processing: ${error}`);
|
||||
|
||||
// Отправляем сообщение об ошибке пользователю
|
||||
try {
|
||||
await this.transporter.sendMail({
|
||||
from: this.user,
|
||||
to: fromEmail,
|
||||
subject: 'Error processing your request',
|
||||
text: 'Sorry, we encountered an error processing your message. Please try again later.'
|
||||
});
|
||||
} catch (e) {
|
||||
logger.error(`Error sending error notification: ${e}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Метод для проверки кода без IMAP
|
||||
async verifyCode(email, code) {
|
||||
return await verificationService.verifyCode(code, 'email', email.toLowerCase());
|
||||
|
||||
1085
backend/yarn.lock
1085
backend/yarn.lock
File diff suppressed because it is too large
Load Diff
@@ -13,14 +13,14 @@
|
||||
"format:check": "prettier --check \"**/*.{js,vue,json,md}\""
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.8.1",
|
||||
"axios": "^1.8.4",
|
||||
"buffer": "^6.0.3",
|
||||
"connect-pg-simple": "^10.0.0",
|
||||
"ethers": "6.13.5",
|
||||
"siwe": "^2.1.4",
|
||||
"sortablejs": "^1.15.6",
|
||||
"vue": "^3.2.47",
|
||||
"vue-i18n": "9",
|
||||
"vue-i18n": "^11.1.2",
|
||||
"vue-router": "^4.1.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -35,6 +35,6 @@
|
||||
"prettier": "^3.5.3",
|
||||
"rollup": "^3.29.4",
|
||||
"rollup-plugin-polyfill-node": "^0.12.0",
|
||||
"vite": "^6.2.0"
|
||||
"vite": "^6.2.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -246,26 +246,26 @@
|
||||
resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.2.tgz#1860473de7dfa1546767448f333db80cb0ff2161"
|
||||
integrity sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==
|
||||
|
||||
"@intlify/core-base@9.14.2":
|
||||
version "9.14.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.2.tgz#2c074506ea72425e937f911c95c0d845b43f7fdf"
|
||||
integrity sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==
|
||||
"@intlify/core-base@11.1.2":
|
||||
version "11.1.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-11.1.2.tgz#f924d60a94b6ab5222848ff0af678c461a1b6a7d"
|
||||
integrity sha512-nmG512G8QOABsserleechwHGZxzKSAlggGf9hQX0nltvSwyKNVuB/4o6iFeG2OnjXK253r8p8eSDOZf8PgFdWw==
|
||||
dependencies:
|
||||
"@intlify/message-compiler" "9.14.2"
|
||||
"@intlify/shared" "9.14.2"
|
||||
"@intlify/message-compiler" "11.1.2"
|
||||
"@intlify/shared" "11.1.2"
|
||||
|
||||
"@intlify/message-compiler@9.14.2":
|
||||
version "9.14.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.2.tgz#7217842ea1875d80bbf0f708e9b3ef5ad7c57a03"
|
||||
integrity sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==
|
||||
"@intlify/message-compiler@11.1.2":
|
||||
version "11.1.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-11.1.2.tgz#711af9421fa8c0339501eb67fa90ebe00cbd3725"
|
||||
integrity sha512-T/xbNDzi+Yv0Qn2Dfz2CWCAJiwNgU5d95EhhAEf4YmOgjCKktpfpiUSmLcBvK1CtLpPQ85AMMQk/2NCcXnNj1g==
|
||||
dependencies:
|
||||
"@intlify/shared" "9.14.2"
|
||||
"@intlify/shared" "11.1.2"
|
||||
source-map-js "^1.0.2"
|
||||
|
||||
"@intlify/shared@9.14.2":
|
||||
version "9.14.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.2.tgz#f7dceea32db44c9253e3f965745a42a5cb3a1883"
|
||||
integrity sha512-uRAHAxYPeF+G5DBIboKpPgC/Waecd4Jz8ihtkpJQD5ycb5PwXp0k/+hBGl5dAjwF7w+l74kz/PKA8r8OK//RUw==
|
||||
"@intlify/shared@11.1.2":
|
||||
version "11.1.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-11.1.2.tgz#d780bc8eb4e3c3ef8a3e45c421f0f5ecf59651f2"
|
||||
integrity sha512-dF2iMMy8P9uKVHV/20LA1ulFLL+MKSbfMiixSmn6fpwqzvix38OIc7ebgnFbBqElvghZCW9ACtzKTGKsTGTWGA==
|
||||
|
||||
"@jridgewell/sourcemap-codec@^1.5.0":
|
||||
version "1.5.0"
|
||||
@@ -506,7 +506,7 @@
|
||||
"@vue/compiler-dom" "3.5.13"
|
||||
"@vue/shared" "3.5.13"
|
||||
|
||||
"@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.6.3", "@vue/devtools-api@^6.6.4":
|
||||
"@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.6.4":
|
||||
version "6.6.4"
|
||||
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343"
|
||||
integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==
|
||||
@@ -612,10 +612,10 @@ axios-mock-adapter@^2.1.0:
|
||||
fast-deep-equal "^3.1.3"
|
||||
is-buffer "^2.0.5"
|
||||
|
||||
axios@^1.8.1:
|
||||
version "1.8.1"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.1.tgz#7c118d2146e9ebac512b7d1128771cdd738d11e3"
|
||||
integrity sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==
|
||||
axios@^1.8.4:
|
||||
version "1.8.4"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
|
||||
integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
|
||||
dependencies:
|
||||
follow-redirects "^1.15.6"
|
||||
form-data "^4.0.0"
|
||||
@@ -1381,14 +1381,6 @@ picomatch@^4.0.2:
|
||||
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
|
||||
integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
|
||||
|
||||
pinia@^2.0.33:
|
||||
version "2.3.1"
|
||||
resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.3.1.tgz#54c476675b72f5abcfafa24a7582531ea8c23d94"
|
||||
integrity sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==
|
||||
dependencies:
|
||||
"@vue/devtools-api" "^6.6.3"
|
||||
vue-demi "^0.14.10"
|
||||
|
||||
postcss-selector-parser@^6.0.15:
|
||||
version "6.1.2"
|
||||
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
|
||||
@@ -1608,10 +1600,10 @@ valid-url@^1.0.9:
|
||||
resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
|
||||
integrity sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==
|
||||
|
||||
vite@^6.2.0:
|
||||
version "6.2.0"
|
||||
resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.0.tgz#9dcb543380dab18d8384eb840a76bf30d78633f0"
|
||||
integrity sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==
|
||||
vite@^6.2.3:
|
||||
version "6.2.3"
|
||||
resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.3.tgz#249e92d32886981ab46bc1f049ac72abc6fa81e2"
|
||||
integrity sha512-IzwM54g4y9JA/xAeBPNaDXiBF8Jsgl3VBQ2YQ/wOY6fyW3xMdSoltIV3Bo59DErdqdE6RxUfv8W69DvUorE4Eg==
|
||||
dependencies:
|
||||
esbuild "^0.25.0"
|
||||
postcss "^8.5.3"
|
||||
@@ -1619,11 +1611,6 @@ vite@^6.2.0:
|
||||
optionalDependencies:
|
||||
fsevents "~2.3.3"
|
||||
|
||||
vue-demi@^0.14.10:
|
||||
version "0.14.10"
|
||||
resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
|
||||
integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
|
||||
|
||||
vue-eslint-parser@^9.4.3:
|
||||
version "9.4.3"
|
||||
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"
|
||||
@@ -1637,13 +1624,13 @@ vue-eslint-parser@^9.4.3:
|
||||
lodash "^4.17.21"
|
||||
semver "^7.3.6"
|
||||
|
||||
vue-i18n@9:
|
||||
version "9.14.2"
|
||||
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.14.2.tgz#e7f657664fcb3ccf99ecea684fc56e0f8e5335ce"
|
||||
integrity sha512-JK9Pm80OqssGJU2Y6F7DcM8RFHqVG4WkuCqOZTVsXkEzZME7ABejAUqUdA931zEBedc4thBgSUWxeQh4uocJAQ==
|
||||
vue-i18n@^11.1.2:
|
||||
version "11.1.2"
|
||||
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-11.1.2.tgz#187ded4132027a58045cb7ab7e65756575045bca"
|
||||
integrity sha512-MfdkdKGUHN+jkkaMT5Zbl4FpRmN7kfelJIwKoUpJ32ONIxdFhzxZiLTVaAXkAwvH3y9GmWpoiwjDqbPIkPIMFA==
|
||||
dependencies:
|
||||
"@intlify/core-base" "9.14.2"
|
||||
"@intlify/shared" "9.14.2"
|
||||
"@intlify/core-base" "11.1.2"
|
||||
"@intlify/shared" "11.1.2"
|
||||
"@vue/devtools-api" "^6.5.0"
|
||||
|
||||
vue-router@^4.1.6:
|
||||
|
||||
Reference in New Issue
Block a user