Skip to content

Commit 4c331ae

Browse files
author
d.weizhe
committed
fixup! feat(@angular/build): add manualRebuild option to the dev-server
1 parent 6d53062 commit 4c331ae

3 files changed

Lines changed: 149 additions & 1 deletion

File tree

‎packages/angular/build/src/builders/application/build-action.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,12 @@ export async function* runEsBuildBuildAction(
165165
rebuilds = mapChanges(watcher);
166166
}
167167

168+
// Manual rebuild requests for the rebuild in progress. These are resolved as cancelled if the
169+
// loop exits before the rebuild completes (e.g., abort signal, build error, or consumer exit).
170+
let activeRequests: ((result: ManualRebuildResult) => void)[] | undefined;
168171
try {
169172
for await (const { changes, requests } of rebuilds) {
173+
activeRequests = requests;
170174
if (options.signal?.aborted) {
171175
break;
172176
}
@@ -235,8 +239,14 @@ export async function* runEsBuildBuildAction(
235239
resolve({ status });
236240
}
237241
}
242+
activeRequests = undefined;
238243
}
239244
} finally {
245+
if (activeRequests) {
246+
for (const resolve of activeRequests) {
247+
resolve({ status: 'cancelled' });
248+
}
249+
}
240250
manualRebuild?.close();
241251

242252
// Stop the watcher and cleanup incremental rebuild state

‎packages/angular/build/src/tools/vite/middlewares/rebuild-middleware.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ export function createAngularRebuildMiddleware(
4545

4646
// Reject cross-origin requests made by browsers to prevent arbitrary web pages from
4747
// triggering rebuilds. Non-browser clients (e.g., curl or tooling) do not send an origin.
48-
if (!isSameOrigin(req.headers.origin, req.headers.host)) {
48+
// HTTP/2 requests (used by the development server when SSL is enabled) provide the
49+
// `:authority` pseudo-header instead of `host`.
50+
const host = req.headers.host ?? (req.headers[':authority'] as string | undefined);
51+
if (!isSameOrigin(req.headers.origin, host)) {
4952
res.statusCode = 403;
5053
res.end();
5154

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
9+
import type { IncomingMessage, ServerResponse } from 'node:http';
10+
import { ManualRebuildController } from '../../../utils/manual-rebuild';
11+
import { createAngularRebuildMiddleware } from './rebuild-middleware';
12+
13+
interface MockResponse {
14+
statusCode: number;
15+
headers: Record<string, string>;
16+
body: string | undefined;
17+
ended: Promise<void>;
18+
}
19+
20+
function createRequest(
21+
url: string,
22+
method: string,
23+
headers: Record<string, string> = {},
24+
): IncomingMessage {
25+
return { url, method, headers } as unknown as IncomingMessage;
26+
}
27+
28+
function createResponse(): [ServerResponse, MockResponse] {
29+
let resolveEnded: () => void;
30+
const mock: MockResponse = {
31+
statusCode: 200,
32+
headers: {},
33+
body: undefined,
34+
ended: new Promise((resolve) => (resolveEnded = resolve)),
35+
};
36+
const res = {
37+
set statusCode(value: number) {
38+
mock.statusCode = value;
39+
},
40+
setHeader(name: string, value: string) {
41+
mock.headers[name.toLowerCase()] = value;
42+
},
43+
end(body?: string) {
44+
mock.body = body;
45+
resolveEnded();
46+
},
47+
};
48+
49+
return [res as unknown as ServerResponse, mock];
50+
}
51+
52+
describe('createAngularRebuildMiddleware', () => {
53+
let controller: ManualRebuildController;
54+
let middleware: ReturnType<typeof createAngularRebuildMiddleware>;
55+
56+
beforeEach(() => {
57+
controller = new ManualRebuildController();
58+
spyOn(controller, 'requestRebuild').and.resolveTo({ status: 'success' });
59+
middleware = createAngularRebuildMiddleware(controller);
60+
});
61+
62+
it('passes through requests for other routes', () => {
63+
const next = jasmine.createSpy('next');
64+
const [res] = createResponse();
65+
middleware(createRequest('/main.js', 'POST'), res, next);
66+
67+
expect(next).toHaveBeenCalled();
68+
expect(controller.requestRebuild).not.toHaveBeenCalled();
69+
});
70+
71+
it('requests a rebuild and responds with the result', async () => {
72+
const [res, mock] = createResponse();
73+
middleware(createRequest('/__ng_rebuild?x=1', 'POST'), res, jasmine.createSpy('next'));
74+
await mock.ended;
75+
76+
expect(mock.statusCode).toBe(200);
77+
expect(mock.headers['content-type']).toBe('application/json');
78+
expect(JSON.parse(mock.body ?? '')).toEqual({ status: 'success' });
79+
});
80+
81+
it('responds with 405 for non-POST requests', async () => {
82+
const [res, mock] = createResponse();
83+
middleware(createRequest('/__ng_rebuild', 'GET'), res, jasmine.createSpy('next'));
84+
await mock.ended;
85+
86+
expect(mock.statusCode).toBe(405);
87+
expect(controller.requestRebuild).not.toHaveBeenCalled();
88+
});
89+
90+
it('rejects cross-origin requests', async () => {
91+
const [res, mock] = createResponse();
92+
middleware(
93+
createRequest('/__ng_rebuild', 'POST', {
94+
host: 'localhost:4200',
95+
origin: 'http://example.com',
96+
}),
97+
res,
98+
jasmine.createSpy('next'),
99+
);
100+
await mock.ended;
101+
102+
expect(mock.statusCode).toBe(403);
103+
expect(controller.requestRebuild).not.toHaveBeenCalled();
104+
});
105+
106+
it('accepts same-origin requests', async () => {
107+
const [res, mock] = createResponse();
108+
middleware(
109+
createRequest('/__ng_rebuild', 'POST', {
110+
host: 'localhost:4200',
111+
origin: 'http://localhost:4200',
112+
}),
113+
res,
114+
jasmine.createSpy('next'),
115+
);
116+
await mock.ended;
117+
118+
expect(mock.statusCode).toBe(200);
119+
});
120+
121+
it('accepts same-origin HTTP/2 requests using the ":authority" header', async () => {
122+
const [res, mock] = createResponse();
123+
middleware(
124+
createRequest('/__ng_rebuild', 'POST', {
125+
':authority': 'localhost:4200',
126+
origin: 'https://localhost:4200',
127+
}),
128+
res,
129+
jasmine.createSpy('next'),
130+
);
131+
await mock.ended;
132+
133+
expect(mock.statusCode).toBe(200);
134+
});
135+
});

0 commit comments

Comments
 (0)