Skip to content

fix(cache): invalidate link resolution cache on update and delete #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RaoUsama7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cache): invalidate link resolution cache on update and delete #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/lib/client-ip.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ describe('getClientIp', () => {
expect(getClientIp(request)).toBe('192.168.1.1');
});

it('returns socket.remoteAddress when request.ip is undefined', () => {
it('returns raw.socket.remoteAddress when request.ip is undefined', () => {
const request = {
ip: undefined,
socket: { remoteAddress: '10.0.0.2' },
raw: { socket: { remoteAddress: '10.0.0.2' } },
} as unknown as FastifyRequest;
expect(getClientIp(request)).toBe('10.0.0.2');
});
Expand All @@ -25,14 +25,14 @@ describe('getClientIp', () => {
expect(getClientIp(request)).toBe('192.168.1.1');
});

it('returns "unknown" when neither ip nor socket.remoteAddress is available', () => {
const request = { ip: undefined, socket: {} } as unknown as FastifyRequest;
expect(getClientIp(request)).toBe('unknown');
it('returns empty string when neither ip nor socket.remoteAddress is available', () => {
const request = { ip: undefined, raw: { socket: {} } } as unknown as FastifyRequest;
expect(getClientIp(request)).toBe('');
});

it('returns "unknown" when request has no socket', () => {
const request = { ip: undefined } as unknown as FastifyRequest;
expect(getClientIp(request)).toBe('unknown');
it('returns empty string when request.raw has no socket', () => {
const request = { ip: undefined, raw: {} } as unknown as FastifyRequest;
expect(getClientIp(request)).toBe('');
});
});

Expand Down
4 changes: 2 additions & 2 deletions src/lib/client-ip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import type { FastifyRequest } from 'fastify';
* returns that trusted value.
*/
export function getClientIp(request: FastifyRequest): string {
const ip = request.ip ?? (request as any).socket?.remoteAddress;
const ip = request.ip ?? request.raw.socket?.remoteAddress;
if (ip && typeof ip === 'string') {
// IPv6-mapped IPv4: ::ffff:192.168.1.1 -> 192.168.1.1
if (ip.startsWith('::ffff:')) return ip.slice(7);
return ip;
}
return 'unknown';
return '';
}
Loading