From 33afd7f45ad4f47a72889402c3ef16d6dc19fd1d Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:20:41 +0000 Subject: [PATCH 1/7] feat(support-chat): infer intent with model and remove scope tabs --- backend/src/support-chat/support-chat.dto.ts | 3 +- .../support-chat/support-chat.http.spec.ts | 22 ++++++---- .../support-chat/support-chat.service.spec.ts | 20 ++++----- .../src/support-chat/support-chat.service.ts | 18 ++++++-- .../components/SupportChat.test.tsx | 5 ++- .../application/components/SupportChat.tsx | 41 +------------------ scripts/support-chat/policy.py | 9 ++++ scripts/support-chat/server.py | 39 +++++++++++++++++- scripts/support-chat/test_policy.py | 13 ++++++ scripts/support-chat/verify-stage.cjs | 8 ++-- 10 files changed, 110 insertions(+), 68 deletions(-) diff --git a/backend/src/support-chat/support-chat.dto.ts b/backend/src/support-chat/support-chat.dto.ts index b4617fdd..0bfdd94e 100644 --- a/backend/src/support-chat/support-chat.dto.ts +++ b/backend/src/support-chat/support-chat.dto.ts @@ -1,5 +1,4 @@ -import { IsIn, IsString, Length } from 'class-validator'; +import { IsString, Length } from 'class-validator'; export class SupportChatDto { @IsString() @Length(1, 1500) message!: string; - @IsIn(['public', 'orders', 'wallet']) scope: 'public' | 'orders' | 'wallet' = 'public'; } diff --git a/backend/src/support-chat/support-chat.http.spec.ts b/backend/src/support-chat/support-chat.http.spec.ts index f1a6542c..f96a9436 100644 --- a/backend/src/support-chat/support-chat.http.spec.ts +++ b/backend/src/support-chat/support-chat.http.spec.ts @@ -22,20 +22,28 @@ describe('support HTTP boundary', () => { app = mod.createNestApplication(); app.useGlobalPipes(new ValidationPipe({ transform: true, whitelist: true, forbidNonWhitelisted: true })); await app.init(); }); afterAll(() => app.close()); - beforeEach(() => { jest.clearAllMocks(); }); - it.each(['userId','history','context','sessionId','conversationId'])('rejects untrusted %s', async field => { await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سلام', [field]:'alice'}).expect(400); }); + beforeEach(() => { + jest.restoreAllMocks(); jest.clearAllMocks(); + process.env.SUPPORT_CHAT_URL='http://internal/ask'; process.env.SUPPORT_CHAT_KEY='test'; + jest.spyOn(global,'fetch').mockImplementation(async (url, opts) => { + const message=JSON.parse(opts!.body as string).message; + const intent=message==='کیف پول'?'wallet':message==='سفارش من'||message==='سفارش'?'orders':'public'; + return {ok:true,status:200,json:async()=>String(url).endsWith('/classify')?{intent}:{answer:'راهنمای محصولات کنینا'}} as any; + }); + }); + it.each(['scope','userId','history','context','sessionId','conversationId'])('rejects untrusted %s', async field => { await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سلام', [field]:'alice'}).expect(400); }); it.each(['Bearer broken','Basic abc','', 'Bearer '])('rejects supplied invalid auth %j', async auth => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization',auth).send({message:'سلام'}).expect(401); }); - it('fails closed when configured JWT secret is missing', async () => { const saved=process.env.JWT_ACCESS_SECRET; delete process.env.JWT_ACCESS_SECRET; await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'کیف پول',scope:'wallet'}).expect(401); process.env.JWT_ACCESS_SECRET=saved; }); + it('fails closed when configured JWT secret is missing', async () => { const saved=process.env.JWT_ACCESS_SECRET; delete process.env.JWT_ACCESS_SECRET; await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'کیف پول'}).expect(401); process.env.JWT_ACCESS_SECRET=saved; }); it('rejects expired JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'}, {expiresIn:-1})).send({message:'سلام'}).expect(401); }); it('rejects cookie JWT rather than downgrading to guest', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Cookie','accessToken=broken').send({message:'سلام'}).expect(401); }); - it('guest orders do not touch any private rows', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سفارش من',scope:'orders'}).expect(201); expect(r.body.answer).toContain('وارد'); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); + it('guest orders do not touch any private rows', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'سفارش من'}).expect(201); expect(r.body.answer).toContain('وارد'); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); it('scopes wallet to validated identity across concurrent callers', async () => { - const replies=await Promise.all(['alice','bob'].map(sub => request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub})).send({message:'کیف پول',scope:'wallet'}).expect(201))); + const replies=await Promise.all(['alice','bob'].map(sub => request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub})).send({message:'کیف پول'}).expect(201))); expect(replies[0].body.answer).toContain('11'); expect(replies[0].body.answer).not.toContain('22'); expect(replies[1].body.answer).toContain('22'); expect(prisma.product.findMany).not.toHaveBeenCalled(); }); - it('scopes bounded orders to identity', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'bob'})).send({message:'سفارش',scope:'orders'}).expect(201); expect(r.body.answer).toContain('bob-order'); expect(prisma.order.findMany).toHaveBeenCalledWith(expect.objectContaining({ where:{userId:'bob'}, take:5 })); }); + it('scopes bounded orders to identity', async () => { const r=await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'bob'})).send({message:'سفارش'}).expect(201); expect(r.body.answer).toContain('bob-order'); expect(prisma.order.findMany).toHaveBeenCalledWith(expect.objectContaining({ where:{userId:'bob'}, take:5 })); }); it.each(['', 'x'.repeat(1501)])('bounds message length', async message => { await request(app.getHttpServer()).post('/support-chat/ask').send({message}).expect(400); }); - it('does not query private data in public scope even with valid JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'سلام',scope:'public'}); expect(prisma.user.findUnique).not.toHaveBeenCalled(); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); + it('does not query private data in public scope even with valid JWT', async () => { await request(app.getHttpServer()).post('/support-chat/ask').set('Authorization','Bearer '+jwt.sign({sub:'alice'})).send({message:'سلام'}); expect(prisma.user.findUnique).not.toHaveBeenCalled(); expect(prisma.order.findMany).not.toHaveBeenCalled(); }); it.each([{error:'upstream-secret'}, {answer:'Provider authentication failed Hermes'}, {answer:''}])('filters malformed and default upstream failures', async body => { process.env.SUPPORT_CHAT_URL='http://internal/ask'; process.env.SUPPORT_CHAT_KEY='test'; const f=jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'مکمل سگ'}).expect(503); expect(r.body.message).toBe(UNAVAILABLE); expect(JSON.stringify(r.body)).not.toContain('upstream-secret'); f.mockRestore(); }); it('returns safe unavailable on network errors', async () => { const f=jest.spyOn(global,'fetch').mockRejectedValue(new Error('private-secret')); const r=await request(app.getHttpServer()).post('/support-chat/ask').send({message:'مکمل سگ'}).expect(503); expect(r.body.message).toBe(UNAVAILABLE); f.mockRestore(); }); }); diff --git a/backend/src/support-chat/support-chat.service.spec.ts b/backend/src/support-chat/support-chat.service.spec.ts index 2eb8736c..4389c0bb 100644 --- a/backend/src/support-chat/support-chat.service.spec.ts +++ b/backend/src/support-chat/support-chat.service.spec.ts @@ -1,13 +1,13 @@ import { SupportChatService, UNAVAILABLE } from './support-chat.service'; -describe('SupportChatService', () => { - const prisma: any = { product: { findMany: jest.fn().mockResolvedValue([]) }, order: { findMany: jest.fn().mockResolvedValue([]) }, user: { findUnique: jest.fn().mockResolvedValue({ walletBalance: '17' }) } }; - let service: SupportChatService; - beforeEach(() => { jest.clearAllMocks(); service = new SupportChatService(prisma); }); - it('does not load private rows for a guest asking about wallet', async () => { - const result = await service.ask({ message: 'موجودی کیف پول من', scope: 'wallet' }); - expect(result.answer).toContain('وارد'); - expect(prisma.user.findUnique).not.toHaveBeenCalled(); - expect(prisma.order.findMany).not.toHaveBeenCalled(); - }); +describe('model intent routing', () => { + const prisma: any = { product:{findMany:jest.fn().mockResolvedValue([])}, order:{findMany:jest.fn().mockResolvedValue([])}, user:{findUnique:jest.fn().mockResolvedValue({walletBalance:'17'})} }; + let service: SupportChatService; + beforeEach(()=>{jest.clearAllMocks();process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='test';service=new SupportChatService(prisma);}); + afterEach(()=>jest.restoreAllMocks()); + function model(body:any) { return jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>body} as any); } + it('guest model wallet does not load private rows',async()=>{model({intent:'wallet'});expect((await service.ask({message:'cheghadr etebar daram'})).answer).toContain('وارد');expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();}); + it('uses semantic model intent rather than message keywords',async()=>{const f=model({intent:'wallet'});expect((await service.ask({message:'چقدر اعتبار دارم؟'},{id:'alice'})).answer).toContain('17');expect(prisma.user.findUnique).toHaveBeenCalledWith({where:{id:'alice'},select:{walletBalance:true}});expect(JSON.parse(f.mock.calls[0][1]!.body as string)).toEqual({message:'چقدر اعتبار دارم؟'});expect(f).toHaveBeenCalledTimes(1);}); + it.each([{intent:'admin'},{intent:'wallet',userId:'bob'},{answer:'orders'},{intent:null},{}])('fails closed on invalid classifier %j',async body=>{model(body);await expect(service.ask({message:'سلام'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();expect(prisma.order.findMany).not.toHaveBeenCalled();expect(prisma.product.findMany).not.toHaveBeenCalled();}); + it('classifier outage does not fall back to keyword routing',async()=>{jest.spyOn(global,'fetch').mockRejectedValue(new Error('secret'));await expect(service.ask({message:'کیف پول'},{id:'alice'})).rejects.toThrow(UNAVAILABLE);expect(prisma.user.findUnique).not.toHaveBeenCalled();}); }); diff --git a/backend/src/support-chat/support-chat.service.ts b/backend/src/support-chat/support-chat.service.ts index 11b2fd5a..b8127f75 100644 --- a/backend/src/support-chat/support-chat.service.ts +++ b/backend/src/support-chat/support-chat.service.ts @@ -7,13 +7,25 @@ export const UNAVAILABLE = 'پشتیبان هوشمند فعلاً در دستر export class SupportChatService { constructor(private readonly prisma: PrismaService) {} async ask(input: SupportChatDto, user?: { id: string }) { - if (input.scope !== 'public' && !user) return { answer: 'برای مشاهده سفارش‌ها یا کیف پول خود ابتدا وارد حساب کاربری شوید.' }; - if (input.scope === 'wallet') { + const url = process.env.SUPPORT_CHAT_URL; + const key = process.env.SUPPORT_CHAT_KEY; + let intent: 'public' | 'orders' | 'wallet'; + try { + if (!url || !key || !url.endsWith('/ask')) throw new Error('disabled'); + const response = await fetch(url.replace(/\/ask$/, '/classify'), { method: 'POST', headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` }, signal: AbortSignal.timeout(45000), body: JSON.stringify({ message: input.message }) }); + if (response.status === 400) return { answer: 'فقط درباره محصولات و سلامت حیوانات خانگی و خدمات کنینا پاسخ می‌دهم. پیوند دلخواه پذیرفته نمی‌شود.' }; + if (!response.ok) throw new Error('upstream'); + const data = await response.json(); + if (!data || Object.keys(data).length !== 1 || !['public', 'orders', 'wallet'].includes(data.intent)) throw new Error('intent'); + intent = data.intent; + } catch { throw new ServiceUnavailableException(UNAVAILABLE); } + if (intent !== 'public' && !user) return { answer: 'برای مشاهده سفارش‌ها یا کیف پول خود ابتدا وارد حساب کاربری شوید.' }; + if (intent === 'wallet') { const row = await this.prisma.user.findUnique({ where: { id: user!.id }, select: { walletBalance: true } }); if (!row) throw new ServiceUnavailableException(UNAVAILABLE); return { answer: `موجودی کیف پول شما: ${row.walletBalance.toString()} تومان.` }; } - if (input.scope === 'orders') { + if (intent === 'orders') { const rows = await this.prisma.order.findMany({ where: { userId: user!.id }, select: { id: true, status: true, totalAmount: true, createdAt: true }, take: 5, orderBy: { createdAt: 'desc' } }); return { answer: rows.length ? rows.map(r => `سفارش ${r.id}: ${r.status} — ${r.totalAmount.toString()} تومان`).join('\n') : 'سفارشی برای حساب شما ثبت نشده است.' }; } diff --git a/frontend/application/components/SupportChat.test.tsx b/frontend/application/components/SupportChat.test.tsx index d32e4c2a..6e65b327 100644 --- a/frontend/application/components/SupportChat.test.tsx +++ b/frontend/application/components/SupportChat.test.tsx @@ -5,13 +5,14 @@ import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/re import SupportChat from './SupportChat'; afterEach(() => { cleanup(); vi.restoreAllMocks(); localStorage.clear(); }); describe('support widget', () => { - it('submits only message and explicit scope, renders text safely', async () => { + it('submits only message without scope tabs, renders text safely', async () => { const fetcher=vi.spyOn(globalThis,'fetch').mockResolvedValue({ok:true,json:async()=>({answer:''})} as Response); render(); fireEvent.click(screen.getByRole('button',{name:/گفتگو با پشتیبان/})); fireEvent.change(screen.getByLabelText('پیام شما'),{target:{value:'مکمل سگ'}}); fireEvent.click(screen.getByRole('button',{name:'ارسال'})); await waitFor(()=>expect(screen.getByText('')).toBeTruthy()); - expect(JSON.parse(fetcher.mock.calls[0][1]!.body as string)).toEqual({message:'مکمل سگ',scope:'public'}); + expect(JSON.parse(fetcher.mock.calls[0][1]!.body as string)).toEqual({message:'مکمل سگ'}); expect(document.querySelector('script')).toBeNull(); + for (const label of ['محصولات و عمومی','سفارش‌های من','کیف پول']) expect(screen.queryByRole('button',{name:label})).toBeNull(); }); it('does not expose upstream errors', async()=> { vi.spyOn(globalThis,'fetch').mockResolvedValue({ok:false,status:503,json:async()=>({message:'secret-provider'})} as Response); diff --git a/frontend/application/components/SupportChat.tsx b/frontend/application/components/SupportChat.tsx index 57f72732..d496c942 100644 --- a/frontend/application/components/SupportChat.tsx +++ b/frontend/application/components/SupportChat.tsx @@ -13,7 +13,6 @@ const token = () => { export default function SupportChat() { const [open, setOpen] = useState(false); const [message, setMessage] = useState(''); - const [scope, setScope] = useState<'public' | 'orders' | 'wallet'>('public'); const [busy, setBusy] = useState(false); const [rows, setRows] = useState<{ question: string; answer: string }[]>([]); const identity = useRef(''); @@ -28,7 +27,6 @@ export default function SupportChat() { pending.current?.abort(); setRows([]); setMessage(''); - setScope('public'); setBusy(false); } }; @@ -72,7 +70,7 @@ export default function SupportChat() { ...(current ? { Authorization: `Bearer ${current}` } : {}) }, credentials: 'include', - body: JSON.stringify({ message: question, scope }), + body: JSON.stringify({ message: question }), signal: AbortSignal.any([controller.signal, AbortSignal.timeout(50000)]) }); if (response.status === 401) { @@ -151,43 +149,6 @@ export default function SupportChat() { - {/* Scope Selector Bar */} -
- - - -
- {/* Message Area */}
orders; cheghadr etebar daram => wallet; chetor sefaresh bedam => public.') + return safe_intent(agent.run_conversation(json.dumps({'message': message}, ensure_ascii=False), system_message=prompt, conversation_history=[])) + finally: + with contextlib.suppress(Exception): agent.close() + +async def classify(request): + key = os.environ.get('SUPPORT_INTERNAL_KEY', '') + if len(key) < 32 or not hmac.compare_digest(request.headers.get('Authorization', ''), 'Bearer '+key): + return web.json_response({'answer': UNAVAILABLE}, status=401) + try: + data = await request.json() + if not isinstance(data, dict) or set(data) != {'message'}: raise ValueError('payload') + message = validate_message(data['message']) + except Exception: + return web.json_response({'answer': DOMAIN}, status=400) + if LIMIT.locked(): return web.json_response({'answer': UNAVAILABLE}, status=503) + try: + async with LIMIT: + intent = await asyncio.to_thread(classify_once, message) + return web.json_response({'intent': intent}, headers={'Cache-Control': 'no-store'}) + except Exception: + return web.json_response({'answer': UNAVAILABLE}, status=503) + async def ask(request): key = os.environ.get('SUPPORT_INTERNAL_KEY', '') if len(key) < 32 or not hmac.compare_digest(request.headers.get('Authorization', ''), 'Bearer '+key): @@ -73,5 +109,6 @@ async def ask(request): app = web.Application(client_max_size=100000) app.router.add_post('/support/ask', ask) +app.router.add_post('/support/classify', classify) if __name__ == '__main__': web.run_app(app, host='0.0.0.0', port=8643, print=None, access_log=None) diff --git a/scripts/support-chat/test_policy.py b/scripts/support-chat/test_policy.py index 3a2fcce1..264aa44a 100644 --- a/scripts/support-chat/test_policy.py +++ b/scripts/support-chat/test_policy.py @@ -1,3 +1,4 @@ +import json import unittest from policy import validate_message, safe_answer @@ -39,3 +40,15 @@ class PolicyTests(unittest.TestCase): if __name__ == '__main__': unittest.main() + + +class IntentPolicyTests(unittest.TestCase): + def test_allowlisted_intents(self): + from policy import safe_intent + for intent in ('public', 'orders', 'wallet'): + self.assertEqual(safe_intent({'final_response': json.dumps({'intent': intent})}), intent) + def test_invalid_intents_fail_closed(self): + from policy import safe_intent + for value in ('{}', '{"intent":"admin"}', '{"intent":"wallet","userId":"other"}', 'garbage'): + with self.assertRaises((ValueError, TypeError)): + safe_intent({'final_response': value}) diff --git a/scripts/support-chat/verify-stage.cjs b/scripts/support-chat/verify-stage.cjs index f4a957e3..18c56031 100644 --- a/scripts/support-chat/verify-stage.cjs +++ b/scripts/support-chat/verify-stage.cjs @@ -15,11 +15,13 @@ async function check(name, body, expected, token, test=()=>true){ const ids=[randomUUID(),randomUUID()]; try { for(let i=0;i<2;i++)await p.user.create({data:{id:ids[i],firstName:'Synthetic',lastName:'ChatTest',mobile:'T'+ids[i].replaceAll('-','').slice(0,13),walletBalance:i?222:111}}); - await check('guest wallet',{message:'کیف پول',scope:'wallet'},201,null,d=>d.answer.includes('وارد')); + await check('guest wallet',{message:'کیف پول'},201,null,d=>d.answer.includes('وارد')); + await check('guest orders real model',{message:'سفارشم کجا رسیده؟'},201,null,d=>d.answer.includes('وارد')); + await check('guest orders Finglish real model',{message:'sefaresham koja reside?'},201,null,d=>d.answer.includes('وارد')); await check('invalid JWT',{message:'سلام'},401,'invalid'); await check('expired JWT',{message:'سلام'},401,jwt.sign({sub:ids[0]},{expiresIn:-1})); - for(const field of ['userId','history','context','sessionId'])await check('reject '+field,{message:'سلام',[field]:ids[1]},400); - await Promise.all(ids.map((id,i)=>check('wallet isolation '+i,{message:'کیف پول',scope:'wallet'},201,jwt.sign({sub:id}),d=>d.answer.includes(i?'222':'111')&&!d.answer.includes(i?'111':'222')))); + for(const field of ['scope','userId','history','context','sessionId'])await check('reject '+field,{message:'سلام',[field]:ids[1]},400); + await Promise.all(ids.map((id,i)=>check('wallet isolation '+i,{message:'کیف پول'},201,jwt.sign({sub:id}),d=>d.answer.includes(i?'222':'111')&&!d.answer.includes(i?'111':'222')))); await check('guest public real model',{message:'مکمل سگ کنینا'},201,null,d=>typeof d.answer==='string'&&!/provider|hermes|api.key/i.test(d.answer)); await new Promise(resolve=>setTimeout(resolve,61000)); await check('finglish dog query allowed',{message:'Sagam qaza nemikhore chizi darin?'},201,null,d=>typeof d.answer==='string'&&d.answer.length>10); From f4e715f2d17f4fa84f6b82095de2a49a6ff34810 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:27:13 +0000 Subject: [PATCH 2/7] fix(seo): paginate sitemap blogs outside Next data cache [skip ci] --- frontend/application/app/sitemap.test.ts | 53 ++++++++++++++++++++++++ frontend/application/app/sitemap.ts | 28 +++++++++---- 2 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 frontend/application/app/sitemap.test.ts diff --git a/frontend/application/app/sitemap.test.ts b/frontend/application/app/sitemap.test.ts new file mode 100644 index 00000000..6a20e044 --- /dev/null +++ b/frontend/application/app/sitemap.test.ts @@ -0,0 +1,53 @@ +import { afterEach, describe, expect, it, vi } from 'vitest'; +import sitemap from './sitemap'; + +vi.mock('../lib/services/productService', () => ({ + productService: { + getProducts: vi.fn().mockResolvedValue({ data: [] }), + getActiveFilters: vi.fn().mockResolvedValue({ categories: [] }), + }, +})); + +afterEach(() => { vi.unstubAllGlobals(); vi.unstubAllEnvs(); }); + +describe('sitemap blog retrieval', () => { + it('retrieves every page without putting full blog content in the Next data cache', async () => { + vi.stubEnv('INTERNAL_API_URL', 'http://backend:3000/api/'); + vi.stubEnv('NEXT_PUBLIC_SITE_URL', 'https://stage.canina.ir'); + const fetchMock = vi.fn() + .mockResolvedValueOnce({ ok: true, json: async () => ({ data: [ + { slug: 'first', status: 'PUBLISHED', updatedAt: '2026-10-01', featured: true }, + { slug: 'hidden', status: 'PUBLISHED', noIndex: true }, + { slug: 'draft', status: 'DRAFT' }, + ], meta: { lastPage: 2 } }) }) + .mockResolvedValueOnce({ ok: true, json: async () => ({ data: [ + { slug: 'last', status: 'PUBLISHED' }, + ], meta: { lastPage: 2 } }) }); + vi.stubGlobal('fetch', fetchMock); + const routes = await sitemap(); + expect(fetchMock.mock.calls).toEqual([ + ['http://backend:3000/api/blogs?page=1&limit=10', { cache: 'no-store' }], + ['http://backend:3000/api/blogs?page=2&limit=10', { cache: 'no-store' }], + ]); + const blogs = routes.filter(r => r.url.includes('/blog/')); + expect(blogs.map(r => r.url)).toEqual(['https://stage.canina.ir/blog/first', 'https://stage.canina.ir/blog/last']); + expect(blogs[0].priority).toBe(0.9); + expect(blogs[0].lastModified).toEqual(new Date('2026-10-01')); + }); + + it('terminates on an empty page even when pagination metadata is stale', async () => { + const fetchMock = vi.fn().mockResolvedValue({ ok: true, json: async () => ({ data: [], meta: { lastPage: 999 } }) }); + vi.stubGlobal('fetch', fetchMock); + expect((await sitemap()).filter(r => r.url.includes('/blog/'))).toEqual([]); + expect(fetchMock).toHaveBeenCalledTimes(1); + }); + + it('falls back without publishing a partial blog sitemap when a later page fails', async () => { + vi.stubGlobal('fetch', vi.fn() + .mockResolvedValueOnce({ ok: true, json: async () => ({ data: [{ slug: 'first', status: 'PUBLISHED' }], meta: { lastPage: 2 } }) }) + .mockResolvedValueOnce({ ok: false, status: 503 })); + const routes = await sitemap(); + expect(routes.filter(r => r.url.includes('/blog/'))).toEqual([]); + expect(routes.some(r => r.url.endsWith('/shop'))).toBe(true); + }); +}); diff --git a/frontend/application/app/sitemap.ts b/frontend/application/app/sitemap.ts index 7868a4f8..2ecfa395 100644 --- a/frontend/application/app/sitemap.ts +++ b/frontend/application/app/sitemap.ts @@ -89,20 +89,30 @@ export default async function sitemap(): Promise { let blogRoutes: MetadataRoute.Sitemap = []; try { const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:4001/api'; - const apiBase = apiUrl.endsWith('/api') ? apiUrl : `${apiUrl.replace(/\/$/, '')}/api`; - const res = await fetch(`${apiBase}/blogs?page=1&limit=999`, { next: { revalidate: 3600 } }); - if (res.ok) { + const normalizedApiUrl = apiUrl.replace(/\/$/, ''); + const apiBase = normalizedApiUrl.endsWith('/api') ? normalizedApiUrl : `${normalizedApiUrl}/api`; + type SitemapBlog = { slug: string; noIndex?: boolean; status: string; updatedAt?: string; featured?: boolean }; + // The public list includes article bodies. Keep requests small and bypass + // Next's 2MB per-entry data cache, even for an unusually large article. + let page = 1; + let lastPage = 1; + do { + const res = await fetch(`${apiBase}/blogs?page=${page}&limit=10`, { cache: 'no-store' }); + if (!res.ok) throw new Error(`Blog sitemap request failed: ${res.status}`); const data = await res.json(); - const blogsList = data.data || []; - blogRoutes = blogsList - .filter((b: any) => !b.noIndex && b.status === 'PUBLISHED') - .map((b: any) => ({ + const blogsList: SitemapBlog[] = data.data || []; + if (!blogsList.length) break; + blogRoutes.push(...blogsList + .filter((b) => !b.noIndex && b.status === 'PUBLISHED') + .map((b): MetadataRoute.Sitemap[number] => ({ url: `${baseUrl}/blog/${b.slug}`, lastModified: b.updatedAt ? new Date(b.updatedAt) : new Date(), changeFrequency: 'weekly', priority: b.featured ? 0.9 : 0.7, - })); - } + }))); + lastPage = Number(data.meta?.lastPage) || 1; + page += 1; + } while (page <= lastPage); } catch { // Fallback if backend not reachable at build time blogRoutes = []; From d87885826c161b674d718364b38ae577e738f3e4 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:28:37 +0000 Subject: [PATCH 3/7] fix(support-chat): retain model token budget and safe stage startup --- scripts/support-chat/compose.stage.override.example.yml | 4 ++++ scripts/support-chat/server.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/support-chat/compose.stage.override.example.yml b/scripts/support-chat/compose.stage.override.example.yml index ff0c0d42..63cd9707 100644 --- a/scripts/support-chat/compose.stage.override.example.yml +++ b/scripts/support-chat/compose.stage.override.example.yml @@ -4,3 +4,7 @@ services: SUPPORT_CHAT_URL: http://canina-bot:8643/support/ask env_file: - .support-chat.env + # Support-only deployment does not change the schema. Never run db push here. + command: ["node", "dist/main.js"] + frontend_stage: + command: ["sh", "-c", "sed -i 's/__BACKEND_HOST__/backend_stage/g' /etc/nginx/conf.d/default.conf /etc/nginx/http.d/default.conf && nginx && npm start"] diff --git a/scripts/support-chat/server.py b/scripts/support-chat/server.py index 0236de0f..4fb11c7e 100644 --- a/scripts/support-chat/server.py +++ b/scripts/support-chat/server.py @@ -57,7 +57,7 @@ def classify_once(message): config = load_config() model = config.get('model', {}) runtime = resolve_runtime_provider(requested=model.get('provider'), target_model=model.get('default')) - agent = AIAgent(model=model.get('default'), provider=runtime.get('provider'), base_url=runtime.get('base_url'), api_key=runtime.get('api_key'), api_mode=runtime.get('api_mode'), enabled_toolsets=[], disabled_toolsets=['all'], skip_memory=True, skip_context_files=True, skip_background_review=True, load_soul_identity=False, session_id=str(uuid.uuid4()), session_db=None, save_trajectories=False, quiet_mode=True, max_iterations=2, max_tokens=150, run_budget_seconds=35, checkpoints_enabled=False) + agent = AIAgent(model=model.get('default'), provider=runtime.get('provider'), base_url=runtime.get('base_url'), api_key=runtime.get('api_key'), api_mode=runtime.get('api_mode'), enabled_toolsets=[], disabled_toolsets=['all'], skip_memory=True, skip_context_files=True, skip_background_review=True, load_soul_identity=False, session_id=str(uuid.uuid4()), session_db=None, save_trajectories=False, quiet_mode=True, max_iterations=2, max_tokens=1800, run_budget_seconds=35, checkpoints_enabled=False) agent._persist_disabled = True try: if getattr(agent, 'tools', None): raise RuntimeError('tools enabled') From 30cebb92faa2ee582e924948ab19aa702862de97 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:33:03 +0000 Subject: [PATCH 4/7] test(torob): verify PostgreSQL feed regression and guard invalid pagination --- .gitea/workflows/torob.yml | 32 +++++++++++++ backend/src/products/torob.controller.spec.ts | 12 +++++ backend/src/products/torob.controller.ts | 6 ++- backend/test/jest-torob.json | 13 +++++ backend/test/torob.integration.ts | 47 +++++++++++++++++++ 5 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 .gitea/workflows/torob.yml create mode 100644 backend/test/jest-torob.json create mode 100644 backend/test/torob.integration.ts diff --git a/.gitea/workflows/torob.yml b/.gitea/workflows/torob.yml new file mode 100644 index 00000000..e4a24995 --- /dev/null +++ b/.gitea/workflows/torob.yml @@ -0,0 +1,32 @@ +name: Torob regression +on: + push: + branches: [develop, main] + pull_request: + branches: [develop, main] +jobs: + torob-regression: + runs-on: ubuntu-latest + services: + torob-test-db: + image: postgres:16-alpine + env: + POSTGRES_USER: torob + POSTGRES_PASSWORD: disposable-fixture-only + POSTGRES_DB: torob_test + options: >- + --health-cmd "pg_isready -U torob -d torob_test" + --health-interval 5s + --health-timeout 5s + --health-retries 10 + container: node:20 + env: + DATABASE_URL: postgresql://torob:disposable-fixture-only@torob-test-db:5432/torob_test + steps: + - uses: actions/checkout@v4 + - name: Install and generate isolated client + run: cd backend && npm ci && npx prisma generate + - name: Unit regressions + run: cd backend && npm test -- --runInBand src/products/torob.controller.spec.ts + - name: Disposable PostgreSQL integration + run: cd backend && npx prisma db push --skip-generate && npx jest --config test/jest-torob.json --runInBand diff --git a/backend/src/products/torob.controller.spec.ts b/backend/src/products/torob.controller.spec.ts index 37cc2c4c..b56153cf 100644 --- a/backend/src/products/torob.controller.spec.ts +++ b/backend/src/products/torob.controller.spec.ts @@ -140,6 +140,18 @@ describe("TorobController", () => { expect(result.max_pages).toBe(1); }); + it.each([['garbage', 'garbage', 100], ['2', 'garbage', 100], ['garbage', '20', 20]])( + "defaults nonnumeric pagination safely (%s, %s)", async (page, size, take) => { + mockPrismaService.product.count.mockResolvedValue(0); + mockPrismaService.product.findMany.mockResolvedValue([]); + const result = await controller.getTorobProducts(page, size); + expect(mockPrismaService.product.findMany).toHaveBeenCalledWith( + expect.objectContaining({ skip: page === '2' ? 100 : 0, take }), + ); + expect(result.max_pages).toBe(1); + }, + ); + it("should correctly mark out-of-stock products", async () => { const mockOutOfStock = [ { diff --git a/backend/src/products/torob.controller.ts b/backend/src/products/torob.controller.ts index 33726b9f..c23f1f98 100644 --- a/backend/src/products/torob.controller.ts +++ b/backend/src/products/torob.controller.ts @@ -141,10 +141,12 @@ export class TorobController { @Query("page") pageQuery?: string, @Query("page_size") pageSizeQuery?: string, ) { - const page = Math.max(1, parseInt(pageQuery || "1", 10)); + const parsedPage = parseInt(pageQuery || "1", 10); + const parsedSize = parseInt(pageSizeQuery || "100", 10); + const page = Math.max(1, Number.isFinite(parsedPage) ? parsedPage : 1); const pageSize = Math.min( 100, - Math.max(10, parseInt(pageSizeQuery || "100", 10)), + Math.max(10, Number.isFinite(parsedSize) ? parsedSize : 100), ); const baseUrl = (process.env.FRONTEND_URL || "https://canina.ir").replace( /\/$/, diff --git a/backend/test/jest-torob.json b/backend/test/jest-torob.json new file mode 100644 index 00000000..4dde7ea2 --- /dev/null +++ b/backend/test/jest-torob.json @@ -0,0 +1,13 @@ +{ + "moduleFileExtensions": [ + "js", + "json", + "ts" + ], + "rootDir": "..", + "testRegex": "test/torob.integration.ts$", + "transform": { + "^.+\\.(t|j)s$": "ts-jest" + }, + "testEnvironment": "node" +} diff --git a/backend/test/torob.integration.ts b/backend/test/torob.integration.ts new file mode 100644 index 00000000..4a5c0e13 --- /dev/null +++ b/backend/test/torob.integration.ts @@ -0,0 +1,47 @@ +import { PrismaClient } from '@prisma/client'; +import { TorobController } from '../src/products/torob.controller'; +import { PrismaService } from '../src/prisma/prisma.service'; + +// Dedicated disposable DB only. Never initializes PrismaService's DDL hooks. +describe('Torob real PostgreSQL regression', () => { + let db: PrismaClient; + let controller: TorobController; + const originalUrl = process.env.FRONTEND_URL; + beforeAll(async () => { + const url = new URL(process.env.DATABASE_URL || ''); + if (url.hostname !== 'torob-test-db' || url.pathname !== '/torob_test') { + throw new Error('Refusing any DB other than disposable torob-test-db/torob_test'); + } + process.env.FRONTEND_URL = 'https://stage.canina.ir'; + db = new PrismaClient(); + await db.$connect(); + const category = await db.category.create({data: {name: 'Fixture', slug: 'fixture'}}); + const common = {categoryId: category.id, categorySlug: category.slug, nameFa: 'آزمون', nameEn: 'Fixture', description: 'test fixture', priceValue: '123456.78', priceDisplay: 'fixture', unit: 'g', packageSize: 10, suitableFor: 'DOG', imageUrl: '/uploads/fixture.png'}; + await db.product.createMany({data: [ + {...common, artNo: 'T1', slug: 'fixture-in', stock: 3, stockStatus: 'IN_STOCK'}, + {...common, artNo: 'T2', slug: 'fixture-zero', stock: 0, stockStatus: 'IN_STOCK'}, + {...common, artNo: 'T3', slug: 'fixture-out', stock: 3, stockStatus: 'OUT_OF_STOCK'}, + {...common, artNo: 'T4', slug: 'fixture-hidden', noIndex: true}, + {...common, artNo: 'T5', slug: 'fixture-discontinued', stockStatus: 'DISCONTINUED'}, + ]}); + controller = new TorobController(db as PrismaService); + }); + afterAll(async () => { + if (db) await db.$disconnect(); + if (originalUrl === undefined) delete process.env.FRONTEND_URL; + else process.env.FRONTEND_URL = originalUrl; + }); + it('filters hidden/discontinued rows and preserves DB decimal price, stock and URLs', async () => { + const result = await controller.getTorobProducts(); + expect(result.count).toBe(3); + expect(result.results.map(p => p.product_id).sort()).toEqual(['T1', 'T2', 'T3']); + for (const item of result.results) { + const row = await db.product.findUniqueOrThrow({where: {artNo: item.product_id}}); + expect(item.price).toBe(Number(row.priceValue)); + expect(item.old_price).toBe(Number(row.priceValue)); + expect(item.availability).toBe(row.artNo === 'T1' ? 'instock' : 'outofstock'); + expect(item.page_url).toBe(`https://stage.canina.ir/shop/${row.slug}`); + expect(item.image_link).toBe('https://stage.canina.ir/api/uploads/fixture.png'); + } + }); +}); From fa4f1124e6acfa26b30ac33e71dbeb152b83081d Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:36:18 +0000 Subject: [PATCH 5/7] fix(stage): deploy Torob backend without schema writes [skip ci] --- scripts/compose.stage.yml | 3 +++ scripts/deploy.sh | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/scripts/compose.stage.yml b/scripts/compose.stage.yml index 0d3cebb2..6f5fff0b 100644 --- a/scripts/compose.stage.yml +++ b/scripts/compose.stage.yml @@ -39,6 +39,9 @@ services: - REDIS_HOST=redis_stage - REDIS_PORT=6379 - PORT=3000 + - FRONTEND_URL=https://stage.canina.ir + # Code-only stage startup: schema/seed changes require separate authorization. + command: ["node", "dist/main.js"] volumes: - canina_stage_uploads:/app/uploads - /opt/services/proxy/certs/canina:/app/ssl_certs diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 743cf099..a9a176b6 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,6 +1,22 @@ #!/bin/bash set -e +# Explicit no-data-write stage rollout. Run only after testing and pushing HEAD. +if [ "${2:-}" = "stage-backend-only" ]; then + [ "${1:-}" = "develop" ] || exit 2 + cd /opt/services/canina/stage + exec 9>/opt/services/canina/stage-backend-deploy.lock + flock -n 9 || { echo "Stage deployment already in progress"; exit 1; } + [ "$(git branch --show-current)" = develop ] + git fetch origin develop + [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/develop)" ] + git diff --quiet -- backend scripts/compose.stage.yml scripts/deploy.sh + # Read tracked compose directly; preserve generated config and nginx. + docker compose -p stage -f scripts/compose.stage.yml --project-directory . build backend_stage + docker compose -p stage -f scripts/compose.stage.yml --project-directory . up -d --no-deps --remove-orphans backend_stage + exit 0 +fi + export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 From f6736cd43fcba034cd5e618c5d16d66bea5563ca Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:36:18 +0000 Subject: [PATCH 6/7] fix(stage): deploy Torob backend without schema writes [skip ci] --- scripts/compose.stage.yml | 3 +++ scripts/deploy.sh | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/scripts/compose.stage.yml b/scripts/compose.stage.yml index 0d3cebb2..6f5fff0b 100644 --- a/scripts/compose.stage.yml +++ b/scripts/compose.stage.yml @@ -39,6 +39,9 @@ services: - REDIS_HOST=redis_stage - REDIS_PORT=6379 - PORT=3000 + - FRONTEND_URL=https://stage.canina.ir + # Code-only stage startup: schema/seed changes require separate authorization. + command: ["node", "dist/main.js"] volumes: - canina_stage_uploads:/app/uploads - /opt/services/proxy/certs/canina:/app/ssl_certs diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 743cf099..ef1b8fcb 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,6 +1,25 @@ #!/bin/bash set -e +# Explicit no-data-write stage rollout. Run only after testing and pushing HEAD. +if [ "${2:-}" = "stage-backend-only" ]; then + [ "${1:-}" = "develop" ] || exit 2 + cd /opt/services/canina/stage + exec 9>/opt/services/canina/stage-backend-deploy.lock + flock -n 9 || { echo "Stage deployment already in progress"; exit 1; } + [ "$(git branch --show-current)" = develop ] + git fetch origin develop + [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/develop)" ] + git diff --quiet -- backend scripts/compose.stage.yml scripts/deploy.sh + TESTED_HEAD=$(git rev-parse HEAD) + # Read tracked compose directly; preserve generated config and nginx. + docker compose -p stage -f scripts/compose.stage.yml --project-directory . build backend_stage + [ "$(git rev-parse HEAD)" = "$TESTED_HEAD" ] + git diff --quiet -- backend scripts/compose.stage.yml scripts/deploy.sh + docker compose -p stage -f scripts/compose.stage.yml --project-directory . up -d --no-deps --remove-orphans backend_stage + exit 0 +fi + export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 From b6735b5a9c98c1742041a1faeee9c876cce1d439 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 19:44:16 +0000 Subject: [PATCH 7/7] feat(support-chat): add admin smart chat settings --- backend/src/settings/settings.service.ts | 3 +- .../support-chat-settings.controller.ts | 17 ++++++ .../support-chat-settings.service.ts | 51 ++++++++++++++++ .../support-chat-settings.spec.ts | 42 +++++++++++++ .../support-chat/support-chat.http.spec.ts | 3 +- .../src/support-chat/support-chat.module.ts | 4 +- .../support-chat/support-chat.service.spec.ts | 4 +- .../src/support-chat/support-chat.service.ts | 10 +++- frontend/admin-panel/src/pages/Settings.tsx | 1 + .../src/pages/SmartChatSettingsPage.tsx | 59 +++++++++++++++++++ .../admin-panel/src/routes/adminRoutes.tsx | 2 + .../application/components/SupportChat.tsx | 31 ++++++++-- scripts/support-chat/provider_catalog.py | 52 ++++++++++++++++ scripts/support-chat/server.py | 31 ++++++---- 14 files changed, 285 insertions(+), 25 deletions(-) create mode 100644 backend/src/support-chat/support-chat-settings.controller.ts create mode 100644 backend/src/support-chat/support-chat-settings.service.ts create mode 100644 backend/src/support-chat/support-chat-settings.spec.ts create mode 100644 frontend/admin-panel/src/pages/SmartChatSettingsPage.tsx create mode 100644 scripts/support-chat/provider_catalog.py diff --git a/backend/src/settings/settings.service.ts b/backend/src/settings/settings.service.ts index 032224a1..df63c507 100644 --- a/backend/src/settings/settings.service.ts +++ b/backend/src/settings/settings.service.ts @@ -247,7 +247,7 @@ export class SettingsService implements OnModuleInit { }); // 2. Add from settings and unpack object keys - settings.forEach((s) => { + settings.filter((s) => s.key !== "support_chat").forEach((s) => { const valStr = typeof s.value === "string" ? s.value : JSON.stringify(s.value); mergedMap.set(s.key, valStr); @@ -276,6 +276,7 @@ export class SettingsService implements OnModuleInit { } async updateUiText(key: string, value: string) { + if (key === "support_chat") throw new Error("Use support-chat settings API"); const strVal = String(value ?? ""); const allKeysToUpdate = new Set([key]); const aliases = CANONICAL_ALIASES[key] || []; diff --git a/backend/src/support-chat/support-chat-settings.controller.ts b/backend/src/support-chat/support-chat-settings.controller.ts new file mode 100644 index 00000000..a8d3cec1 --- /dev/null +++ b/backend/src/support-chat/support-chat-settings.controller.ts @@ -0,0 +1,17 @@ +import { Body, Controller, Get, Put, UseGuards, Header } from '@nestjs/common'; +import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { RolesGuard } from '../common/guards/roles.guard'; +import { Roles } from '../common/decorators/roles.decorator'; +import { SupportChatSettingsService } from './support-chat-settings.service'; +@Controller('support-chat') +export class SupportChatSettingsController { + constructor(private readonly settings: SupportChatSettingsService) {} + @Get('config') @Header('Cache-Control', 'no-store') + config() { return this.settings.publicConfig(); } + @Get('settings') @UseGuards(JwtAuthGuard, RolesGuard) @Roles('Admin') @Header('Cache-Control', 'no-store') + read() { return this.settings.read(); } + @Get('catalog') @UseGuards(JwtAuthGuard, RolesGuard) @Roles('Admin') @Header('Cache-Control', 'no-store') + catalog() { return this.settings.catalog(); } + @Put('settings') @UseGuards(JwtAuthGuard, RolesGuard) @Roles('Admin') + save(@Body() body: unknown) { return this.settings.save(body); } +} diff --git a/backend/src/support-chat/support-chat-settings.service.ts b/backend/src/support-chat/support-chat-settings.service.ts new file mode 100644 index 00000000..dc5a4de1 --- /dev/null +++ b/backend/src/support-chat/support-chat-settings.service.ts @@ -0,0 +1,51 @@ +import { BadRequestException, Injectable, ServiceUnavailableException } from '@nestjs/common'; +import { PrismaService } from '../prisma/prisma.service'; + +export const CHAT_SETTINGS_KEY = 'support_chat'; +export type ChatSettings = { enabled: boolean; provider: string; model: string; label: string; icon: string }; +const fail = () => new ServiceUnavailableException('تنظیمات پشتیبان هوشمند در دسترس نیست.'); +export const ICONS = ['chat', 'paw', 'bot'] as const; +export function validateSettings(value: any): ChatSettings { + if (!value || typeof value !== 'object' || Array.isArray(value) || Object.keys(value).sort().join(',') !== 'enabled,icon,label,model,provider' || typeof value.enabled !== 'boolean' || typeof value.provider !== 'string' || typeof value.model !== 'string' || value.provider.length > 100 || value.model.length > 160 || typeof value.label !== 'string' || !value.label.trim() || value.label.length > 60 || /[<>\x00-\x1f]/.test(value.label) || !ICONS.includes(value.icon)) throw new BadRequestException('تنظیمات پشتیبان نامعتبر است.'); + return { enabled: value.enabled, provider: value.provider, model: value.model, label: value.label.trim(), icon: value.icon }; +} +@Injectable() +export class SupportChatSettingsService { + constructor(private readonly prisma: PrismaService) {} + async read(): Promise { + try { + const row = await this.prisma.setting.findUnique({ where: { key: CHAT_SETTINGS_KEY } }); + if (!row) throw fail(); + return validateSettings(row.value); + } catch { throw fail(); } + } + async publicConfig() { + const { enabled, label, icon } = await this.read(); + return { enabled, label, icon }; + } + async catalog(): Promise<{ providers: { id: string; label: string; models: string[] }[] }> { + try { + const url = process.env.SUPPORT_CHAT_URL; + const key = process.env.SUPPORT_CHAT_KEY; + if (!url?.endsWith('/ask') || !key) throw fail(); + const response = await fetch(url.replace(/\/ask$/, '/catalog'), { headers: { Authorization: `Bearer ${key}` }, signal: AbortSignal.timeout(100000), redirect: 'error' }); + if (!response.ok) throw fail(); + const data = await response.json(); + if (!Array.isArray(data.providers) || !data.providers.length || data.providers.length > 50) throw fail(); + const safe = (s: any) => typeof s === 'string' && s.length > 0 && s.length <= 160 && /^[\w .:/@+\[\]()-]+$/.test(s) && !s.includes('://'); + return { providers: data.providers.map((p: any) => { + if (!/^configured-[a-f0-9]{16}$/.test(p.id) || !safe(p.label) || !Array.isArray(p.models) || !p.models.length || p.models.length > 2000 || !p.models.every(safe)) throw fail(); + return { id: p.id, label: p.label, models: p.models }; + }) }; + } catch { throw fail(); } + } + async save(input: unknown) { + const value = validateSettings(input); + if (value.provider || value.model || value.enabled) { + const catalog = await this.catalog(); + if (!catalog.providers.some(p => p.id === value.provider && p.models.includes(value.model))) throw new BadRequestException('مدل متعلق به ارائه‌دهنده انتخاب‌شده نیست.'); + } + await this.prisma.setting.upsert({ where: { key: CHAT_SETTINGS_KEY }, create: { key: CHAT_SETTINGS_KEY, category: 'support-chat', value }, update: { value } }); + return this.read(); + } +} diff --git a/backend/src/support-chat/support-chat-settings.spec.ts b/backend/src/support-chat/support-chat-settings.spec.ts new file mode 100644 index 00000000..742c802d --- /dev/null +++ b/backend/src/support-chat/support-chat-settings.spec.ts @@ -0,0 +1,42 @@ +import { SupportChatSettingsService, validateSettings } from './support-chat-settings.service'; +import { SupportChatService } from './support-chat.service'; +import { SupportChatSettingsController } from './support-chat-settings.controller'; +import { Test } from '@nestjs/testing'; +import { PassportModule, PassportStrategy } from '@nestjs/passport'; +import { ExtractJwt, Strategy } from 'passport-jwt'; +import { JwtService } from '@nestjs/jwt'; +import request from 'supertest'; +class TestJwt extends PassportStrategy(Strategy) { + constructor() { super({ jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(), secretOrKey:'test' }); } + validate(p: any) { return { id:p.sub, role:p.role }; } +} +const selected = { enabled:true, provider:'configured-1234567890abcdef', model:'real-model', label:'پشتیبان تست', icon:'paw' }; +describe('smart chat settings', () => { + let stored:any = null; + const prisma:any = { setting:{ findUnique:jest.fn(async()=>stored), upsert:jest.fn(async(q:any)=>{stored={value:q.create.value};return stored;}) }, product:{findMany:jest.fn(async()=>[])}, user:{findUnique:jest.fn()}, order:{findMany:jest.fn()} }; + let service:SupportChatSettingsService; + beforeEach(()=>{stored=null;jest.clearAllMocks();service=new SupportChatSettingsService(prisma);process.env.SUPPORT_CHAT_URL='http://internal/ask';process.env.SUPPORT_CHAT_KEY='key';}); + afterEach(()=>jest.restoreAllMocks()); + const catalog=()=>jest.spyOn(global,'fetch').mockResolvedValue({ok:true,json:async()=>({providers:[{id:selected.provider,label:'Configured',models:[selected.model]}]})} as any); + it('persists and reads exact fields and projects safe public config',async()=>{catalog();expect(await service.save(selected)).toEqual(selected);expect(await service.read()).toEqual(selected);expect(await service.publicConfig()).toEqual({enabled:true,label:selected.label,icon:'paw'});}); + it.each([{...selected,model:'unknown'},{...selected,provider:'http://127.0.0.1'},{...selected,provider:'configured-ffffffffffffffff'}])('rejects invalid combination %j',async s=>{catalog();await expect(service.save(s)).rejects.toThrow();expect(prisma.setting.upsert).not.toHaveBeenCalled();}); + it.each(['https://evil/a.svg','','data:image/svg+xml,abc','/uploads/x.svg'])('rejects unsafe icon %s',icon=>{expect(()=>validateSettings({...selected,icon})).toThrow();}); + it('rejects unknown fields and invalid label',()=>{expect(()=>validateSettings({...selected,baseUrl:'https://evil'})).toThrow();expect(()=>validateSettings({...selected,label:'
+ ← تنظیمات فروشگاه +

پشتیبان هوشمند سایت

+

انتخاب مدل برای تشخیص درخواست و پاسخ‌گویی یکسان است. اطلاعات حساب مشتری به مدل ارسال نمی‌شود.

+ {error &&
{error}
} + {!settings ? : +
+ + + + + +

برای امنیت سایت فقط آیکون‌های داخلی قابل انتخاب هستند؛ نشانی یا SVG دلخواه پذیرفته نمی‌شود.

+
{icons[settings.icon]}{settings.label}
+
+
} +
; +} diff --git a/frontend/admin-panel/src/routes/adminRoutes.tsx b/frontend/admin-panel/src/routes/adminRoutes.tsx index cda50df4..9d94ea3d 100644 --- a/frontend/admin-panel/src/routes/adminRoutes.tsx +++ b/frontend/admin-panel/src/routes/adminRoutes.tsx @@ -12,6 +12,7 @@ const Users = lazyWithRetry(() => import('../pages/Users')); const Products = lazyWithRetry(() => import('../pages/Products')); const Orders = lazyWithRetry(() => import('../pages/Orders')); const Coupons = lazyWithRetry(() => import('../pages/Coupons')); +const SmartChatSettingsPage = lazyWithRetry(() => import('../pages/SmartChatSettingsPage')); const Settings = lazyWithRetry(() => import('../pages/Settings')); const Reports = lazyWithRetry(() => import('../pages/Reports')); const Categories = lazyWithRetry(() => import('../pages/Categories')); @@ -79,6 +80,7 @@ export const router = createBrowserRouter([ { path: 'zibal-portal/*', element: }, { path: 'coupons/*', element: }, { path: 'settings', element: }, + { path: 'settings/smart-chat', element: }, { path: 'settings/payment-methods', element: }, { path: 'settings/shipping', element: }, { path: 'settings/ssl', element: }, diff --git a/frontend/application/components/SupportChat.tsx b/frontend/application/components/SupportChat.tsx index d496c942..22425594 100644 --- a/frontend/application/components/SupportChat.tsx +++ b/frontend/application/components/SupportChat.tsx @@ -11,7 +11,26 @@ const token = () => { }; export default function SupportChat() { + const [config, setConfig] = useState<{ enabled: boolean; label: string; icon: string } | null>(null); + const [configError, setConfigError] = useState(false); const [open, setOpen] = useState(false); + useEffect(() => { + let active = true; + const refresh = async () => { + try { + const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL || '/api'}/support-chat/config`, { cache: 'no-store' }); + if (!response.ok) throw new Error('config'); + const raw = await response.json(); + const value = raw.data ?? raw; + if (typeof value.enabled !== 'boolean' || typeof value.label !== 'string' || !['chat', 'paw', 'bot'].includes(value.icon)) throw new Error('config'); + if (active) { setConfig(value); setConfigError(false); if (!value.enabled) { setOpen(false); pending.current?.abort(); setRows([]); } } + } catch { if (active) { setConfig(null); setConfigError(true); setOpen(false); pending.current?.abort(); setRows([]); } } + }; + void refresh(); + const timer = window.setInterval(refresh, 10000); + window.addEventListener('focus', refresh); + return () => { active = false; clearInterval(timer); window.removeEventListener('focus', refresh); }; + }, []); const [message, setMessage] = useState(''); const [busy, setBusy] = useState(false); const [rows, setRows] = useState<{ question: string; answer: string }[]>([]); @@ -49,7 +68,7 @@ export default function SupportChat() { async function send(event: FormEvent) { event.preventDefault(); - if (busy || !message.trim()) return; + if (busy || !message.trim() || !config?.enabled) return; const current = token(); if (current !== identity.current) { setRows([]); @@ -88,6 +107,8 @@ export default function SupportChat() { if (pending.current === controller) setBusy(false); } + if (!config?.enabled) return configError ? تنظیمات پشتیبان هوشمند در دسترس نیست. : null; + const botIcon = { chat: '💬', paw: '🐾', bot: '🤖' }[config.icon]; return (