serverless-ircd 0.2.0 → 0.3.0

package/packages/irc-core/tests/commands/registration.test.ts

@@ -11,7 +11,13 @@ import {
 } from '../../src/commands/registration';
 import { Effect } from '../../src/effects';
 import type { Effect as EffectType, RawLine } from '../../src/effects';
-import { EmptyMotdProvider, FakeClock, SequentialIdFactory } from '../../src/ports';
+import {
+  EmptyMotdProvider,
+  FakeClock,
+  SequentialIdFactory,
+  StaticMotdProvider,
+} from '../../src/ports';
+import type { MotdProvider } from '../../src/ports';
 import { type ConnectionState, createConnection } from '../../src/state/connection';
 import { type Ctx, type ServerConfig, buildCtx } from '../../src/types';
 
@@ -27,12 +33,16 @@ const serverConfig: ServerConfig = {
   quitMessage: 'Client Quit',
 };
 
-function makeCtx(state: ConnectionState, clock = new FakeClock(1_000)): Ctx {
+function makeCtx(
+  state: ConnectionState,
+  clock = new FakeClock(1_000),
+  motd: MotdProvider = EmptyMotdProvider,
+): Ctx {
   return buildCtx({
     serverConfig,
     clock,
     ids: new SequentialIdFactory(),
-    motd: EmptyMotdProvider,
+    motd,
     connection: state,
   });
 }
@@ -80,9 +90,7 @@ function expectedWelcome(nick: string, user: string, host: string | undefined):
     L(`${prefix} 003 ${nick} :This server was created in Phase 1`),
     L(`${prefix} 004 ${nick} ${sv} 0.2.0 iosw biklmnstp`),
     ...isupport,
-    L(`${prefix} 375 ${nick} :- ${sv} Message of the day -`),
-    L(`${prefix} 372 ${nick} :- MOTD placeholder`),
-    L(`${prefix} 376 ${nick} :End of MOTD command`),
+    L(`${prefix} 422 ${nick} :MOTD File is missing`),
   ];
 }
 
@@ -489,19 +497,22 @@ describe('passReducer', () => {
 // ============================================================================
 
 describe('buildWelcomeLines', () => {
-  it('produces the welcome block in the correct numeric order', () => {
+  it('produces the welcome block in the correct numeric order with MOTD content', () => {
     const state = makeState();
     state.nick = 'alice';
     state.user = 'alice';
     state.host = 'example.com';
-    const lines = buildWelcomeLines(state, makeCtx(state));
-    // 8 base lines (001-004, one or more 005, 375, 372, 376).
+    const lines = buildWelcomeLines(
+      state,
+      makeCtx(state, new FakeClock(1_000), new StaticMotdProvider(['line one', 'line two'])),
+    );
     expect(lines.length).toBeGreaterThanOrEqual(8);
     const codes = lines.map((l) => l.text.split(' ')[1]);
-    // First four numerics in fixed order; 005 (>=1); final three in order.
+    // First four numerics in fixed order; 005 (>=1); MOTD block last.
     expect(codes.slice(0, 4)).toEqual(['001', '002', '003', '004']);
     expect(codes[4]).toBe('005');
-    expect(codes.at(-3)).toBe('375');
+    expect(codes.at(-4)).toBe('375');
+    expect(codes.at(-3)).toBe('372');
     expect(codes.at(-2)).toBe('372');
     expect(codes.at(-1)).toBe('376');
   });
@@ -557,6 +568,89 @@ describe('buildWelcomeLines', () => {
   });
 });
 
+// ============================================================================
+// buildWelcomeLines — MOTD driven from MotdProvider
+// ============================================================================
+
+describe('buildWelcomeLines — MOTD content', () => {
+  it('emits one 372 per MOTD line sourced from the MotdProvider', () => {
+    const state = makeState();
+    state.nick = 'alice';
+    state.user = 'alice';
+    state.host = 'example.com';
+    const lines = buildWelcomeLines(
+      state,
+      makeCtx(state, new FakeClock(1_000), new StaticMotdProvider(['line A', 'line B'])),
+    );
+    const rpl372 = lines.filter((l) => l.text.split(' ')[1] === '372');
+    expect(rpl372).toHaveLength(2);
+    expect(rpl372[0]).toEqual(L(':irc.example.com 372 alice :- line A'));
+    expect(rpl372[1]).toEqual(L(':irc.example.com 372 alice :- line B'));
+  });
+
+  it('frames the MOTD content with 375 start and 376 end', () => {
+    const state = makeState();
+    state.nick = 'alice';
+    state.user = 'alice';
+    const lines = buildWelcomeLines(
+      state,
+      makeCtx(state, new FakeClock(1_000), new StaticMotdProvider(['hi'])),
+    );
+    expect(lines).toContainEqual(
+      L(':irc.example.com 375 alice :- irc.example.com Message of the day -'),
+    );
+    expect(lines).toContainEqual(L(':irc.example.com 372 alice :- hi'));
+    expect(lines).toContainEqual(L(':irc.example.com 376 alice :End of MOTD command'));
+  });
+
+  it('reads MOTD lines fresh from the provider on each call', () => {
+    const state = makeState();
+    state.nick = 'alice';
+    state.user = 'alice';
+    const provider = new StaticMotdProvider(['first']);
+    const ctx = makeCtx(state, new FakeClock(1_000), provider);
+    const first = buildWelcomeLines(state, ctx).filter((l) => l.text.split(' ')[1] === '372');
+    provider.setLines(['first', 'second']);
+    const second = buildWelcomeLines(state, ctx).filter((l) => l.text.split(' ')[1] === '372');
+    expect(first).toHaveLength(1);
+    expect(second).toHaveLength(2);
+  });
+
+  it('splits over-long MOTD lines so every emitted line fits the 510-byte budget', () => {
+    const state = makeState();
+    state.nick = 'alice';
+    state.user = 'alice';
+    state.host = 'example.com';
+    const long = 'A'.repeat(2_000);
+    const lines = buildWelcomeLines(
+      state,
+      makeCtx(state, new FakeClock(1_000), new StaticMotdProvider([long])),
+    );
+    for (const line of lines) {
+      expect(line.text.length).toBeLessThanOrEqual(510);
+    }
+    // The single over-long line is hard-wrapped into many 372 chunks.
+    const rpl372 = lines.filter((l) => l.text.split(' ')[1] === '372');
+    expect(rpl372.length).toBeGreaterThan(1);
+  });
+});
+
+describe('buildWelcomeLines — empty MOTD', () => {
+  it('emits 422 ERR_NOMOTD instead of a placeholder when no MOTD is configured', () => {
+    const state = makeState();
+    state.nick = 'alice';
+    state.user = 'alice';
+    const lines = buildWelcomeLines(state, makeCtx(state));
+    const codes = lines.map((l) => l.text.split(' ')[1]);
+    expect(codes.at(-1)).toBe('422');
+    expect(lines).toContainEqual(L(':irc.example.com 422 alice :MOTD File is missing'));
+    // No MOTD framing numerics leak through on the empty path.
+    expect(codes).not.toContain('375');
+    expect(codes).not.toContain('372');
+    expect(codes).not.toContain('376');
+  });
+});
+
 // ============================================================================
 // emitWelcomeIfReady
 // ============================================================================
@@ -860,8 +954,6 @@ function expectedWelcomeWithHost(nick: string, hostmask: string): RawLine[] {
     L(`${prefix} 003 ${nick} :This server was created in Phase 1`),
     L(`${prefix} 004 ${nick} ${sv} 0.2.0 iosw biklmnstp`),
     ...isupport,
-    L(`${prefix} 375 ${nick} :- ${sv} Message of the day -`),
-    L(`${prefix} 372 ${nick} :- MOTD placeholder`),
-    L(`${prefix} 376 ${nick} :End of MOTD command`),
+    L(`${prefix} 422 ${nick} :MOTD File is missing`),
   ];
 }