hectorzhao/lislgosms
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: make downstream connection events idempotent

Browse Source
This commit is contained in:
hectorzhao
2026-08-25 17:53:05 +08:00
parent 394949f9f6
commit b5005f21d5
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/sms-config/application-lifecycle.service.ts
+7 -2
View File
@@ -203,7 +203,8 @@ export class SmsApplicationLifecycleService {
orderBy: [{ connectedAt: 'asc' }, { connectionId: 'asc' }],
});
const allowedConnectionIds = activeConnections.slice(0, application.cmppMaxConnections).map((item) => item.connectionId);
if ((!existing && activeConnections.length >= application.cmppMaxConnections)
const currentConnectionAlreadyActive = activeConnections.some((item) => item.connectionId === data.connectionId);
if ((!existing && !currentConnectionAlreadyActive && activeConnections.length >= application.cmppMaxConnections)
|| (existing && activeConnections.length > application.cmppMaxConnections && !allowedConnectionIds.includes(data.connectionId))) {
throw new ForbiddenException(`CMPP connection limit exceeded (${application.cmppMaxConnections})`);
}
@@ -224,7 +225,11 @@ export class SmsApplicationLifecycleService {
};
const connection = existing
? await this.prisma.cmppDownstreamConnection.update({ where: { id: existing.id }, data: payload })
: await this.prisma.cmppDownstreamConnection.create({ data: { connectionId: data.connectionId, ...payload } });
: await this.prisma.cmppDownstreamConnection.upsert({
where: { connectionId: data.connectionId },
create: { connectionId: data.connectionId, ...payload },
update: payload,
});
if (data.status === 'connected') {
await this.writeOperationLog(application.tenantId, undefined, `cmpp_downstream_connection.${data.status}`, 'cmpp_downstream_connection', data.connectionId, {
applicationId: application.id,
api/src/sms-config/sms-config.service.spec.ts
+26 -2
View File
@@ -147,6 +147,7 @@ function createPrismaMock() {
findMany: jest.fn().mockResolvedValue([{ id: 'downstream-1', applicationId: 'app-1', tenantId: 'tenant-1', account: '100001', enterpriseCode: 'APP-EC', connectionId: 'gateway-1-1', status: 'connected', connectedAt: new Date(), lastHeartbeatAt: new Date() }]),
findUnique: jest.fn().mockResolvedValue(null),
create: jest.fn().mockImplementation(({ data }) => Promise.resolve({ id: 'downstream-1', ...data })),
upsert: jest.fn().mockImplementation(({ create, update }) => Promise.resolve({ id: 'downstream-1', ...(create ?? update) })),
update: jest.fn().mockImplementation(({ data }) => Promise.resolve({ id: 'downstream-1', ...data })),
delete: jest.fn().mockResolvedValue({ id: 'downstream-1' }),
deleteMany: jest.fn().mockResolvedValue({ count: 0 }),
@@ -646,8 +647,9 @@ describe('SmsConfigService', () => {
observedAt: '2026-07-11T11:00:00.000Z',
});
expect(prisma.cmppDownstreamConnection.create).toHaveBeenCalledWith({
data: expect.objectContaining({
expect(prisma.cmppDownstreamConnection.upsert).toHaveBeenCalledWith({
where: { connectionId: 'gateway-1-1' },
create: expect.objectContaining({
applicationId: 'app-1',
tenantId: 'tenant-1',
account: '100001',
@@ -656,6 +658,10 @@ describe('SmsConfigService', () => {
status: 'connected',
remoteIp: '127.0.0.1',
}),
update: expect.objectContaining({
applicationId: 'app-1',
status: 'connected',
}),
});
expect(prisma.cmppDownstreamConnection.deleteMany).toHaveBeenCalledWith({
where: {
@@ -1103,6 +1109,24 @@ describe('SmsConfigService', () => {
expect(prisma.smsSignature.update).not.toHaveBeenCalled();
});
it('accepts concurrent state callbacks for the same newly connected Gateway session', async () => {
const prisma = createPrismaMock();
prisma.smsApplication.findUnique.mockResolvedValue({
id: 'app-1', tenantId: 'tenant-1', cmppEnterpriseCode: 'APP-EC', cmppMaxConnections: 1,
interfaceEnabled: true, status: 'active', ipAllowlist: [],
});
prisma.cmppDownstreamConnection.findUnique.mockResolvedValue(null);
prisma.cmppDownstreamConnection.findMany.mockResolvedValue([{ connectionId: 'gateway-current' }]);
const service = new SmsConfigService(prisma as never);
await expect(service.recordDownstreamConnectionEvent({
account: '100001', connectionId: 'gateway-current', status: 'submit', remoteIp: '127.0.0.1',
})).resolves.toEqual(expect.objectContaining({ connectionId: 'gateway-current' }));
expect(prisma.cmppDownstreamConnection.upsert).toHaveBeenCalledWith(expect.objectContaining({
where: { connectionId: 'gateway-current' },
}));
});
it('applies the audit submission range to signatures, templates and drainage records', async () => {
const prisma = createPrismaMock();
const service = new SmsConfigService(prisma as never);