@nexus_js/server 0.9.29 → 0.9.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/actions.d.ts +71 -11
- package/dist/actions.d.ts.map +1 -1
- package/dist/actions.js +442 -51
- package/dist/actions.js.map +1 -1
- package/dist/build-id.d.ts +14 -0
- package/dist/build-id.d.ts.map +1 -0
- package/dist/build-id.js +40 -0
- package/dist/build-id.js.map +1 -0
- package/dist/context.d.ts +38 -4
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +13 -3
- package/dist/context.js.map +1 -1
- package/dist/csrf.d.ts +16 -2
- package/dist/csrf.d.ts.map +1 -1
- package/dist/csrf.js +68 -30
- package/dist/csrf.js.map +1 -1
- package/dist/dev-assets.d.ts +31 -0
- package/dist/dev-assets.d.ts.map +1 -1
- package/dist/dev-assets.js +372 -38
- package/dist/dev-assets.js.map +1 -1
- package/dist/dev-assets.test.d.ts +2 -0
- package/dist/dev-assets.test.d.ts.map +1 -0
- package/dist/dev-error-html.d.ts.map +1 -1
- package/dist/dev-error-html.js +24 -0
- package/dist/dev-error-html.js.map +1 -1
- package/dist/devradar.d.ts +1 -1
- package/dist/devradar.d.ts.map +1 -1
- package/dist/devradar.js.map +1 -1
- package/dist/head-renderer.test.d.ts +2 -0
- package/dist/head-renderer.test.d.ts.map +1 -0
- package/dist/head-renderer.test.js +78 -0
- package/dist/head-renderer.test.js.map +1 -0
- package/dist/index.d.ts +97 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +442 -47
- package/dist/index.js.map +1 -1
- package/dist/legacy-wrapper.d.ts +88 -0
- package/dist/legacy-wrapper.d.ts.map +1 -0
- package/dist/legacy-wrapper.js +104 -0
- package/dist/legacy-wrapper.js.map +1 -0
- package/dist/lib-assets.d.ts +5 -0
- package/dist/lib-assets.d.ts.map +1 -0
- package/dist/lib-assets.js +95 -0
- package/dist/lib-assets.js.map +1 -0
- package/dist/load-module.d.ts +6 -0
- package/dist/load-module.d.ts.map +1 -1
- package/dist/load-module.js +40 -53
- package/dist/load-module.js.map +1 -1
- package/dist/metadata.d.ts +95 -0
- package/dist/metadata.d.ts.map +1 -0
- package/dist/metadata.js +132 -0
- package/dist/metadata.js.map +1 -0
- package/dist/navigate.d.ts +0 -5
- package/dist/navigate.d.ts.map +1 -1
- package/dist/navigate.js +0 -1
- package/dist/navigate.js.map +1 -1
- package/dist/rate-limit.d.ts.map +1 -1
- package/dist/rate-limit.js +27 -14
- package/dist/rate-limit.js.map +1 -1
- package/dist/renderer.d.ts +27 -7
- package/dist/renderer.d.ts.map +1 -1
- package/dist/renderer.js +152 -25
- package/dist/renderer.js.map +1 -1
- package/dist/renderer.test.d.ts +2 -0
- package/dist/renderer.test.d.ts.map +1 -0
- package/dist/renderer.test.js +251 -0
- package/dist/renderer.test.js.map +1 -0
- package/dist/streaming.d.ts +3 -3
- package/dist/streaming.d.ts.map +1 -1
- package/dist/streaming.js +33 -13
- package/dist/streaming.js.map +1 -1
- package/dist/tenancy.d.ts +17 -0
- package/dist/tenancy.d.ts.map +1 -0
- package/dist/tenancy.js +132 -0
- package/dist/tenancy.js.map +1 -0
- package/dist/tenancy.test.d.ts +2 -0
- package/dist/tenancy.test.d.ts.map +1 -0
- package/dist/tenancy.test.js +38 -0
- package/dist/tenancy.test.js.map +1 -0
- package/package.json +26 -8
|
@@ -0,0 +1,251 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { mergeRoutePretext, renderRoute, wrapWithDocument } from './renderer.js';
|
|
3
|
+
import { flushHead } from '@nexus_js/head';
|
|
4
|
+
vi.mock('./load-module.js', () => ({
|
|
5
|
+
loadRouteModule: vi.fn(),
|
|
6
|
+
}));
|
|
7
|
+
vi.mock('./devradar.js', () => ({
|
|
8
|
+
emitDevRadar: vi.fn(),
|
|
9
|
+
}));
|
|
10
|
+
import { loadRouteModule } from './load-module.js';
|
|
11
|
+
function makeCtx() {
|
|
12
|
+
return {
|
|
13
|
+
request: new Request('http://example.com/'),
|
|
14
|
+
params: {},
|
|
15
|
+
url: new URL('http://example.com/'),
|
|
16
|
+
headers: new Headers(),
|
|
17
|
+
locals: {},
|
|
18
|
+
secrets: new Map(),
|
|
19
|
+
cspNonce: '',
|
|
20
|
+
setHeader: () => { },
|
|
21
|
+
setCookie: () => { },
|
|
22
|
+
getCookie: () => undefined,
|
|
23
|
+
redirect: (() => {
|
|
24
|
+
throw new Error('redirect');
|
|
25
|
+
}),
|
|
26
|
+
notFound: (() => {
|
|
27
|
+
throw new Error('notfound');
|
|
28
|
+
}),
|
|
29
|
+
__nexusHeadStack: [],
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
function makeOpts() {
|
|
33
|
+
return {
|
|
34
|
+
dev: false,
|
|
35
|
+
appRoot: '/app',
|
|
36
|
+
assets: {
|
|
37
|
+
runtime: '/_nexus/rt/index.js',
|
|
38
|
+
styles: [],
|
|
39
|
+
islands: new Map(),
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
function makeMatched(overrides) {
|
|
44
|
+
return {
|
|
45
|
+
layouts: [],
|
|
46
|
+
route: {
|
|
47
|
+
filepath: '/app/src/routes/+page.nx',
|
|
48
|
+
pattern: '/',
|
|
49
|
+
params: [],
|
|
50
|
+
isDynamic: false,
|
|
51
|
+
isLayout: false,
|
|
52
|
+
serverActions: [],
|
|
53
|
+
},
|
|
54
|
+
params: {},
|
|
55
|
+
...overrides,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
describe('mergeRoutePretext', () => {
|
|
59
|
+
beforeEach(() => {
|
|
60
|
+
vi.resetAllMocks();
|
|
61
|
+
flushHead();
|
|
62
|
+
});
|
|
63
|
+
it('collects head from load results and deletes it before pretext merge', async () => {
|
|
64
|
+
const ctx = makeCtx();
|
|
65
|
+
const matched = makeMatched();
|
|
66
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
67
|
+
nxPretext: async () => ({
|
|
68
|
+
data: 'value',
|
|
69
|
+
head: { title: 'My Title', description: 'My Desc' },
|
|
70
|
+
}),
|
|
71
|
+
});
|
|
72
|
+
const pretext = await mergeRoutePretext(matched, ctx, makeOpts());
|
|
73
|
+
expect(pretext.data).toBe('value');
|
|
74
|
+
expect('head' in pretext).toBe(false);
|
|
75
|
+
const heads = flushHead(ctx);
|
|
76
|
+
expect(heads).toHaveLength(1);
|
|
77
|
+
expect(heads[0]).toEqual({ title: 'My Title', description: 'My Desc' });
|
|
78
|
+
});
|
|
79
|
+
it('merges layout and page pretext (child wins)', async () => {
|
|
80
|
+
const ctx = makeCtx();
|
|
81
|
+
const matched = makeMatched({
|
|
82
|
+
layouts: [{ filepath: '/app/src/routes/+layout.nx', pattern: '/', params: [], isDynamic: false, isLayout: true, serverActions: [] }],
|
|
83
|
+
});
|
|
84
|
+
vi.mocked(loadRouteModule).mockImplementation(async (filepath) => {
|
|
85
|
+
if (filepath.includes('layout')) {
|
|
86
|
+
return {
|
|
87
|
+
nxPretext: async () => ({ shared: 'layout', layoutOnly: true }),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
nxPretext: async () => ({ shared: 'page', pageOnly: true }),
|
|
92
|
+
};
|
|
93
|
+
});
|
|
94
|
+
const pretext = await mergeRoutePretext(matched, ctx, makeOpts());
|
|
95
|
+
expect(pretext.shared).toBe('page'); // child wins
|
|
96
|
+
expect(pretext.layoutOnly).toBe(true);
|
|
97
|
+
expect(pretext.pageOnly).toBe(true);
|
|
98
|
+
});
|
|
99
|
+
it('ignores head when it is not a plain object (deletes it without defineHead)', async () => {
|
|
100
|
+
const ctx = makeCtx();
|
|
101
|
+
const matched = makeMatched();
|
|
102
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
103
|
+
nxPretext: async () => ({
|
|
104
|
+
data: 'value',
|
|
105
|
+
head: 'not-an-object',
|
|
106
|
+
}),
|
|
107
|
+
});
|
|
108
|
+
const pretext = await mergeRoutePretext(matched, ctx, makeOpts());
|
|
109
|
+
expect(pretext.data).toBe('value');
|
|
110
|
+
expect('head' in pretext).toBe(false); // deleted regardless
|
|
111
|
+
const heads = flushHead(ctx);
|
|
112
|
+
expect(heads).toHaveLength(0); // not passed to defineHead
|
|
113
|
+
});
|
|
114
|
+
it('handles load() returning a non-object by wrapping it', async () => {
|
|
115
|
+
const ctx = makeCtx();
|
|
116
|
+
const matched = makeMatched();
|
|
117
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
118
|
+
nxPretext: async () => 'plain-string',
|
|
119
|
+
});
|
|
120
|
+
const pretext = await mergeRoutePretext(matched, ctx, makeOpts());
|
|
121
|
+
expect(pretext.value).toBe('plain-string');
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
describe('wrapWithDocument', () => {
|
|
125
|
+
const opts = makeOpts();
|
|
126
|
+
it('replaces <!--nexus:head--> with injection', () => {
|
|
127
|
+
const content = '<html><head><!--nexus:head--></head><body>hi</body></html>';
|
|
128
|
+
const html = wrapWithDocument(content, opts, [], 0, null, '<title>Test</title>');
|
|
129
|
+
expect(html).toContain('<title>Test</title>');
|
|
130
|
+
expect(html).not.toContain('<!--nexus:head-->');
|
|
131
|
+
expect(html.indexOf('<title>Test</title>')).toBeLessThan(html.indexOf('</head>'));
|
|
132
|
+
});
|
|
133
|
+
it('injects before </head> when marker is absent', () => {
|
|
134
|
+
const content = '<html><head><meta charset="UTF-8"></head><body>hi</body></html>';
|
|
135
|
+
const html = wrapWithDocument(content, opts, [], 0, null, '<title>Test</title>');
|
|
136
|
+
expect(html).toContain('<title>Test</title>');
|
|
137
|
+
expect(html.indexOf('<title>Test</title>')).toBeLessThan(html.indexOf('</head>'));
|
|
138
|
+
});
|
|
139
|
+
it('injects after <head> when there is no closing </head>', () => {
|
|
140
|
+
const content = '<html><head><meta charset="UTF-8"></headx><body>hi</body></html>';
|
|
141
|
+
const html = wrapWithDocument(content, opts, [], 0, null, '<title>Test</title>');
|
|
142
|
+
expect(html).toContain('<title>Test</title>');
|
|
143
|
+
expect(html).toContain('<head>');
|
|
144
|
+
});
|
|
145
|
+
it('wraps fragments in default html shell', () => {
|
|
146
|
+
const content = '<main>hello</main>';
|
|
147
|
+
const html = wrapWithDocument(content, opts, [], 0, null, '<title>Test</title>');
|
|
148
|
+
expect(html).toContain('<html lang="en">');
|
|
149
|
+
expect(html).toContain('<title>Test</title>');
|
|
150
|
+
expect(html).toContain('<main>hello</main>');
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
describe('renderRoute', () => {
|
|
154
|
+
beforeEach(() => {
|
|
155
|
+
vi.resetAllMocks();
|
|
156
|
+
flushHead();
|
|
157
|
+
});
|
|
158
|
+
it('renders full HTML with injected head via marker', async () => {
|
|
159
|
+
const ctx = makeCtx();
|
|
160
|
+
const matched = makeMatched({
|
|
161
|
+
layouts: [{ filepath: '/app/src/routes/+layout.nx', pattern: '/', params: [], isDynamic: false, isLayout: true, serverActions: [] }],
|
|
162
|
+
});
|
|
163
|
+
vi.mocked(loadRouteModule).mockImplementation(async (filepath) => {
|
|
164
|
+
if (filepath.includes('layout')) {
|
|
165
|
+
return {
|
|
166
|
+
nxPretext: async () => ({
|
|
167
|
+
layout: true,
|
|
168
|
+
head: { title: 'Layout Title', description: 'Layout Desc' },
|
|
169
|
+
}),
|
|
170
|
+
render: async () => ({
|
|
171
|
+
html: `<html><head><!--nexus:head--></head><body><!--nexus:slot--></body></html>`,
|
|
172
|
+
}),
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
return {
|
|
176
|
+
nxPretext: async () => ({
|
|
177
|
+
page: true,
|
|
178
|
+
head: { title: 'Page Title', description: 'Page Desc' },
|
|
179
|
+
}),
|
|
180
|
+
render: async () => ({
|
|
181
|
+
html: `<main>Content</main>`,
|
|
182
|
+
}),
|
|
183
|
+
};
|
|
184
|
+
});
|
|
185
|
+
const result = await renderRoute(matched, ctx, makeOpts());
|
|
186
|
+
expect(result.status).toBe(200);
|
|
187
|
+
expect(result.html).toContain('<!DOCTYPE html>');
|
|
188
|
+
// Child wins on title merge
|
|
189
|
+
expect(result.html).toContain('<title>Page Title</title>');
|
|
190
|
+
expect(result.html).toContain('<meta name="description" content="Page Desc">');
|
|
191
|
+
expect(result.html).toContain('<main>Content</main>');
|
|
192
|
+
expect(result.html).not.toContain('<!--nexus:head-->');
|
|
193
|
+
});
|
|
194
|
+
it('renders full HTML injecting before </head> when no marker', async () => {
|
|
195
|
+
const ctx = makeCtx();
|
|
196
|
+
const matched = makeMatched();
|
|
197
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
198
|
+
nxPretext: async () => ({
|
|
199
|
+
head: { title: 'No Marker', description: 'No Marker Desc' },
|
|
200
|
+
}),
|
|
201
|
+
render: async () => ({
|
|
202
|
+
html: `<html><head><meta charset="UTF-8"></head><body>hello</body></html>`,
|
|
203
|
+
}),
|
|
204
|
+
});
|
|
205
|
+
const result = await renderRoute(matched, ctx, makeOpts());
|
|
206
|
+
expect(result.status).toBe(200);
|
|
207
|
+
expect(result.html).toContain('<title>No Marker</title>');
|
|
208
|
+
expect(result.html.indexOf('<title>No Marker</title>')).toBeLessThan(result.html.indexOf('</head>'));
|
|
209
|
+
});
|
|
210
|
+
it('returns 500 when page render throws', async () => {
|
|
211
|
+
const ctx = makeCtx();
|
|
212
|
+
const matched = makeMatched();
|
|
213
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
214
|
+
nxPretext: async () => ({}),
|
|
215
|
+
render: async () => {
|
|
216
|
+
throw new Error('render boom');
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
const result = await renderRoute(matched, ctx, makeOpts());
|
|
220
|
+
expect(result.status).toBe(500);
|
|
221
|
+
expect(result.headers['cache-control']).toBe('no-store');
|
|
222
|
+
expect(result.html).toContain('Something went wrong');
|
|
223
|
+
});
|
|
224
|
+
it('returns 500 when pretext throws', async () => {
|
|
225
|
+
const ctx = makeCtx();
|
|
226
|
+
const matched = makeMatched();
|
|
227
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
228
|
+
nxPretext: async () => {
|
|
229
|
+
throw new Error('pretext boom');
|
|
230
|
+
},
|
|
231
|
+
});
|
|
232
|
+
const result = await renderRoute(matched, ctx, makeOpts());
|
|
233
|
+
expect(result.status).toBe(500);
|
|
234
|
+
expect(result.headers['cache-control']).toBe('no-store');
|
|
235
|
+
});
|
|
236
|
+
it('sets cache-control headers based on TTL context', async () => {
|
|
237
|
+
const ctx = makeCtx();
|
|
238
|
+
const matched = makeMatched();
|
|
239
|
+
vi.mocked(loadRouteModule).mockResolvedValue({
|
|
240
|
+
nxPretext: async () => ({}),
|
|
241
|
+
render: async () => ({
|
|
242
|
+
html: `<html><head></head><body>hi</body></html>`,
|
|
243
|
+
}),
|
|
244
|
+
});
|
|
245
|
+
const result = await renderRoute(matched, ctx, makeOpts());
|
|
246
|
+
expect(result.status).toBe(200);
|
|
247
|
+
expect(result.headers['cache-control']).toBe('no-store');
|
|
248
|
+
expect(result.headers['x-nexus-cache-strategy']).toBe('dynamic-no-store');
|
|
249
|
+
});
|
|
250
|
+
});
|
|
251
|
+
//# sourceMappingURL=renderer.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"renderer.test.js","sourceRoot":"","sources":["../src/renderer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/streaming.d.ts
CHANGED
|
@@ -51,10 +51,10 @@ export interface StreamingBoundary {
|
|
|
51
51
|
id: string;
|
|
52
52
|
/** The promise that will resolve to HTML (or a structured payload for Pretext streaming). */
|
|
53
53
|
promise: Promise<StreamingPromiseValue>;
|
|
54
|
-
/** Fallback HTML shown while
|
|
54
|
+
/** Fallback HTML shown while the promise is pending. Injected next to the hole immediately on page paint. */
|
|
55
55
|
fallback?: string;
|
|
56
|
-
/** Error boundary HTML
|
|
57
|
-
errorFallback?: string;
|
|
56
|
+
/** Error boundary HTML or factory. Overrides `onError` at the boundary level. */
|
|
57
|
+
errorFallback?: string | ((err: unknown) => string);
|
|
58
58
|
}
|
|
59
59
|
export interface StreamController {
|
|
60
60
|
/** Write the initial HTML shell (immediately) */
|
package/dist/streaming.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAC7B,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,6FAA6F;IAC7F,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxC,
|
|
1
|
+
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAC7B,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,6FAA6F;IAC7F,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxC,6GAA6G;IAC7G,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iFAAiF;IACjF,aAAa,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,0CAA0C;IAC1C,KAAK,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AA0CD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAC1D,IAAI,GAAE;IACJ,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;CAC/B,GACL,QAAQ,CAwEV;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EACtC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,IAAI,EAAE;IACJ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC;CACrD,GACA;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,iBAAiB,CAAA;CAAE,CAmBlE;AAID;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,OAAO,WAAW,EAAE,cAAc,EAC3C,YAAY,CAAC,EAAE,CACb,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACtB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAoDD,8EAA8E;AAC9E,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C"}
|
package/dist/streaming.js
CHANGED
|
@@ -41,24 +41,40 @@
|
|
|
41
41
|
/** Bootstrap script injected once per page */
|
|
42
42
|
const BOOTSTRAP_SCRIPT = `<script id="__nx_stream_boot__">
|
|
43
43
|
(function(){
|
|
44
|
+
// Inject fallback content next to each hole immediately so users see a skeleton/spinner
|
|
45
|
+
// while the real content is still loading on the server.
|
|
46
|
+
function __nx_init_fallbacks(){
|
|
47
|
+
document.querySelectorAll('template[data-nx-fallback]').forEach(function(tmpl){
|
|
48
|
+
var fb=tmpl.getAttribute('data-nx-fallback');
|
|
49
|
+
if(!fb)return;
|
|
50
|
+
var id=tmpl.id.replace('nx-hole-','');
|
|
51
|
+
var el=document.createElement('div');
|
|
52
|
+
el.setAttribute('data-nx-hole-fb',id);
|
|
53
|
+
el.innerHTML=fb;
|
|
54
|
+
tmpl.parentNode&&tmpl.parentNode.insertBefore(el,tmpl.nextSibling);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
44
57
|
function __nx_fill(id){
|
|
45
58
|
var fill=document.getElementById('nx-fill-'+id);
|
|
46
59
|
var hole=document.getElementById('nx-hole-'+id);
|
|
60
|
+
var fb=document.querySelector('[data-nx-hole-fb="'+id+'"]');
|
|
47
61
|
if(fill&&hole){
|
|
48
62
|
hole.replaceWith(fill.content.cloneNode(true));
|
|
49
63
|
fill.remove();
|
|
50
64
|
}
|
|
51
|
-
|
|
52
|
-
function __nx_fill_error(id,html){
|
|
53
|
-
var hole=document.getElementById('nx-hole-'+id);
|
|
54
|
-
if(hole){var d=document.createElement('div');d.innerHTML=html;hole.replaceWith(d);}
|
|
65
|
+
if(fb)fb.remove();
|
|
55
66
|
}
|
|
56
67
|
function __nx_stream_complete(){
|
|
57
68
|
document.dispatchEvent(new Event('nexus:stream-complete'));
|
|
58
69
|
}
|
|
59
70
|
window.__nx_fill=__nx_fill;
|
|
60
|
-
window.__nx_fill_error=__nx_fill_error;
|
|
61
71
|
window.__nx_stream_complete=__nx_stream_complete;
|
|
72
|
+
// Run after HTML is parsed so all holes are present.
|
|
73
|
+
if(document.readyState==='loading'){
|
|
74
|
+
document.addEventListener('DOMContentLoaded',__nx_init_fallbacks);
|
|
75
|
+
}else{
|
|
76
|
+
__nx_init_fallbacks();
|
|
77
|
+
}
|
|
62
78
|
})();
|
|
63
79
|
</script>`;
|
|
64
80
|
/**
|
|
@@ -102,9 +118,12 @@ export function createStreamingResponse(renderFn, opts = {}) {
|
|
|
102
118
|
write(buildFillChunk(boundary.id, resolved));
|
|
103
119
|
}
|
|
104
120
|
catch (err) {
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
121
|
+
const ef = boundary.errorFallback;
|
|
122
|
+
const errorHtml = typeof ef === 'function'
|
|
123
|
+
? ef(err)
|
|
124
|
+
: ef ??
|
|
125
|
+
opts.onError?.(err) ??
|
|
126
|
+
buildDefaultErrorHTML(err);
|
|
108
127
|
write(buildErrorChunk(boundary.id, errorHtml));
|
|
109
128
|
}
|
|
110
129
|
});
|
|
@@ -153,9 +172,8 @@ export function createSuspenseBoundary(promise, opts) {
|
|
|
153
172
|
if (opts.fallback !== undefined) {
|
|
154
173
|
boundary.fallback = opts.fallback;
|
|
155
174
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
boundary.errorFallback = ef;
|
|
175
|
+
if (opts.errorFallback !== undefined) {
|
|
176
|
+
boundary.errorFallback = opts.errorFallback;
|
|
159
177
|
}
|
|
160
178
|
return { id, placeholder, boundary };
|
|
161
179
|
}
|
|
@@ -196,7 +214,7 @@ function buildFillChunk(id, resolved) {
|
|
|
196
214
|
const pretextWire = typeof resolved === 'object' && resolved !== null ? resolved.pretextWire : undefined;
|
|
197
215
|
const devBridge = typeof resolved === 'object' && resolved !== null ? resolved.devBridgeScript : undefined;
|
|
198
216
|
const pretextScript = pretextWire !== undefined
|
|
199
|
-
? `<script>(function(){var el=document.getElementById('__NEXUS_PRETEXT__');if(el)el.textContent=${JSON.stringify(pretextWire)};})();</script>`
|
|
217
|
+
? `<script>(function(){var el=document.getElementById('__NEXUS_PRETEXT__');if(el)el.textContent=${JSON.stringify(pretextWire).replace(/</g, '\\u003c').replace(/>/g, '\\u003e')};})();</script>`
|
|
200
218
|
: '';
|
|
201
219
|
const bridge = devBridge ?? '';
|
|
202
220
|
return (pretextScript +
|
|
@@ -210,7 +228,9 @@ function buildErrorChunk(id, html) {
|
|
|
210
228
|
}
|
|
211
229
|
function buildFatalErrorChunk(err) {
|
|
212
230
|
const msg = err instanceof Error ? err.message : String(err);
|
|
213
|
-
|
|
231
|
+
// Escape < to prevent </script> injection inside the inline script tag.
|
|
232
|
+
const safeMsg = JSON.stringify(msg).replace(/</g, '\\u003c').replace(/>/g, '\\u003e');
|
|
233
|
+
return `<script>console.error('[Nexus Stream] Fatal error:',${safeMsg})</script>`;
|
|
214
234
|
}
|
|
215
235
|
function buildDefaultErrorHTML(err) {
|
|
216
236
|
const msg = err instanceof Error ? err.message : String(err);
|
package/dist/streaming.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAiCH,8CAA8C;AAC9C,MAAM,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export type TenancyMode = 'disabled' | 'subdomain' | 'custom-domain' | 'path' | 'header' | 'jwt';
|
|
2
|
+
export interface TenancyConfig {
|
|
3
|
+
mode: TenancyMode;
|
|
4
|
+
baseDomain?: string;
|
|
5
|
+
pathPrefix?: string;
|
|
6
|
+
headerName?: string;
|
|
7
|
+
jwtHeader?: string;
|
|
8
|
+
jwtSecretName?: string;
|
|
9
|
+
customDomainMap?: Record<string, string>;
|
|
10
|
+
}
|
|
11
|
+
export interface TenantResolution {
|
|
12
|
+
id: string;
|
|
13
|
+
mode: Exclude<TenancyMode, 'disabled'>;
|
|
14
|
+
source: 'host' | 'header' | 'jwt' | 'path' | 'custom-domain';
|
|
15
|
+
}
|
|
16
|
+
export declare function resolveTenant(req: Request, config: TenancyConfig, secrets?: ReadonlyMap<string, string>): TenantResolution | null;
|
|
17
|
+
//# sourceMappingURL=tenancy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenancy.d.ts","sourceRoot":"","sources":["../src/tenancy.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEjG,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACvC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,GAAG,eAAe,CAAC;CAC9D;AAmED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,gBAAgB,GAAG,IAAI,CAoDjI"}
|
package/dist/tenancy.js
ADDED
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import { createHmac, timingSafeEqual } from 'node:crypto';
|
|
2
|
+
function hostWithoutPort(host) {
|
|
3
|
+
return host.split(':')[0] ?? host;
|
|
4
|
+
}
|
|
5
|
+
function extractSubdomain(host, baseDomain) {
|
|
6
|
+
const h = hostWithoutPort(host).toLowerCase();
|
|
7
|
+
if (!h || h === 'localhost' || h.endsWith('.localhost'))
|
|
8
|
+
return null;
|
|
9
|
+
if (baseDomain) {
|
|
10
|
+
const bd = baseDomain.toLowerCase();
|
|
11
|
+
if (h === bd)
|
|
12
|
+
return null;
|
|
13
|
+
if (!h.endsWith(`.${bd}`))
|
|
14
|
+
return null;
|
|
15
|
+
const prefix = h.slice(0, -(bd.length + 1));
|
|
16
|
+
const sub = prefix.split('.').filter(Boolean)[0] ?? '';
|
|
17
|
+
if (!sub || sub === 'www')
|
|
18
|
+
return null;
|
|
19
|
+
return sub;
|
|
20
|
+
}
|
|
21
|
+
const parts = h.split('.').filter(Boolean);
|
|
22
|
+
if (parts.length < 3)
|
|
23
|
+
return null;
|
|
24
|
+
const sub = parts[0] ?? '';
|
|
25
|
+
if (!sub || sub === 'www')
|
|
26
|
+
return null;
|
|
27
|
+
return sub;
|
|
28
|
+
}
|
|
29
|
+
function extractPathTenant(url, pathPrefix) {
|
|
30
|
+
const pfx = (pathPrefix ?? '').trim();
|
|
31
|
+
const prefix = pfx.startsWith('/') ? pfx : `/${pfx}`;
|
|
32
|
+
const pathname = url.pathname;
|
|
33
|
+
if (!prefix || prefix === '/')
|
|
34
|
+
return null;
|
|
35
|
+
if (!pathname.startsWith(prefix))
|
|
36
|
+
return null;
|
|
37
|
+
const rest = pathname.slice(prefix.length);
|
|
38
|
+
const seg = rest.split('/').filter(Boolean)[0] ?? '';
|
|
39
|
+
if (!seg)
|
|
40
|
+
return null;
|
|
41
|
+
return seg;
|
|
42
|
+
}
|
|
43
|
+
function base64urlDecodeToBuffer(s) {
|
|
44
|
+
const pad = s.length % 4 === 0 ? '' : '='.repeat(4 - (s.length % 4));
|
|
45
|
+
const b64 = (s + pad).replace(/-/g, '+').replace(/_/g, '/');
|
|
46
|
+
return Buffer.from(b64, 'base64');
|
|
47
|
+
}
|
|
48
|
+
function safeJsonParse(s) {
|
|
49
|
+
try {
|
|
50
|
+
return JSON.parse(s);
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function verifyJwtHs256(token, secret) {
|
|
57
|
+
const parts = token.split('.');
|
|
58
|
+
if (parts.length !== 3)
|
|
59
|
+
return null;
|
|
60
|
+
const [h, p, sig] = parts;
|
|
61
|
+
if (!h || !p || !sig)
|
|
62
|
+
return null;
|
|
63
|
+
const data = `${h}.${p}`;
|
|
64
|
+
const expected = createHmac('sha256', secret).update(data).digest('base64url');
|
|
65
|
+
const a = Buffer.from(expected);
|
|
66
|
+
const b = Buffer.from(sig);
|
|
67
|
+
if (a.length !== b.length)
|
|
68
|
+
return null;
|
|
69
|
+
if (!timingSafeEqual(a, b))
|
|
70
|
+
return null;
|
|
71
|
+
const payloadBuf = base64urlDecodeToBuffer(p);
|
|
72
|
+
const payload = safeJsonParse(payloadBuf.toString('utf8'));
|
|
73
|
+
return payload;
|
|
74
|
+
}
|
|
75
|
+
export function resolveTenant(req, config, secrets) {
|
|
76
|
+
const mode = config.mode;
|
|
77
|
+
if (mode === 'disabled')
|
|
78
|
+
return null;
|
|
79
|
+
if (mode === 'header') {
|
|
80
|
+
const headerName = (config.headerName ?? 'x-nexus-tenant-id').toLowerCase();
|
|
81
|
+
const v = req.headers.get(headerName) ?? req.headers.get(headerName.toUpperCase());
|
|
82
|
+
const id = String(v ?? '').trim();
|
|
83
|
+
if (!id)
|
|
84
|
+
return null;
|
|
85
|
+
return { id, mode, source: 'header' };
|
|
86
|
+
}
|
|
87
|
+
if (mode === 'jwt') {
|
|
88
|
+
const headerName = (config.jwtHeader ?? 'authorization').toLowerCase();
|
|
89
|
+
const raw = req.headers.get(headerName) ?? '';
|
|
90
|
+
const token = raw.toLowerCase().startsWith('bearer ') ? raw.slice(7).trim() : raw.trim();
|
|
91
|
+
if (!token)
|
|
92
|
+
return null;
|
|
93
|
+
const secretName = config.jwtSecretName ?? 'NEXUS_TENANT_JWT_SECRET';
|
|
94
|
+
const secret = (secrets?.get(secretName) ?? secrets?.get(`GLOBAL/${secretName}`) ?? '').trim();
|
|
95
|
+
if (!secret)
|
|
96
|
+
return null;
|
|
97
|
+
const payload = verifyJwtHs256(token, secret);
|
|
98
|
+
if (!payload || typeof payload !== 'object')
|
|
99
|
+
return null;
|
|
100
|
+
const p = payload;
|
|
101
|
+
const id = typeof p['tenantId'] === 'string' ? p['tenantId'] : typeof p['tenant'] === 'string' ? p['tenant'] : '';
|
|
102
|
+
if (!id)
|
|
103
|
+
return null;
|
|
104
|
+
return { id, mode, source: 'jwt' };
|
|
105
|
+
}
|
|
106
|
+
if (mode === 'path') {
|
|
107
|
+
const url = new URL(req.url);
|
|
108
|
+
const id = extractPathTenant(url, config.pathPrefix);
|
|
109
|
+
if (!id)
|
|
110
|
+
return null;
|
|
111
|
+
return { id, mode, source: 'path' };
|
|
112
|
+
}
|
|
113
|
+
if (mode === 'custom-domain') {
|
|
114
|
+
const host = req.headers.get('host') ?? '';
|
|
115
|
+
const h = hostWithoutPort(host).toLowerCase();
|
|
116
|
+
if (!h)
|
|
117
|
+
return null;
|
|
118
|
+
const mapped = config.customDomainMap?.[h];
|
|
119
|
+
if (!mapped)
|
|
120
|
+
return null;
|
|
121
|
+
return { id: mapped, mode, source: 'custom-domain' };
|
|
122
|
+
}
|
|
123
|
+
if (mode === 'subdomain') {
|
|
124
|
+
const host = req.headers.get('host') ?? '';
|
|
125
|
+
const id = extractSubdomain(host, config.baseDomain);
|
|
126
|
+
if (!id)
|
|
127
|
+
return null;
|
|
128
|
+
return { id, mode, source: 'host' };
|
|
129
|
+
}
|
|
130
|
+
return null;
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=tenancy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenancy.js","sourceRoot":"","sources":["../src/tenancy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenancy.test.d.ts","sourceRoot":"","sources":["../src/tenancy.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { createHmac } from 'node:crypto';
|
|
3
|
+
import { resolveTenant } from './tenancy.js';
|
|
4
|
+
function b64url(input) {
|
|
5
|
+
return Buffer.from(input, 'utf8').toString('base64url');
|
|
6
|
+
}
|
|
7
|
+
function signHs256(payload, secret) {
|
|
8
|
+
const header = b64url(JSON.stringify({ alg: 'HS256', typ: 'JWT' }));
|
|
9
|
+
const body = b64url(JSON.stringify(payload));
|
|
10
|
+
const data = `${header}.${body}`;
|
|
11
|
+
const sig = createHmac('sha256', secret).update(data).digest('base64url');
|
|
12
|
+
return `${data}.${sig}`;
|
|
13
|
+
}
|
|
14
|
+
describe('resolveTenant', () => {
|
|
15
|
+
it('header mode resolves tenant id', () => {
|
|
16
|
+
const cfg = { mode: 'header', headerName: 'x-nexus-tenant-id' };
|
|
17
|
+
const req = new Request('http://example.com/', { headers: { 'x-nexus-tenant-id': 'acme' } });
|
|
18
|
+
const t = resolveTenant(req, cfg);
|
|
19
|
+
expect(t?.id).toBe('acme');
|
|
20
|
+
expect(t?.source).toBe('header');
|
|
21
|
+
});
|
|
22
|
+
it('subdomain mode resolves tenant id', () => {
|
|
23
|
+
const cfg = { mode: 'subdomain', baseDomain: 'example.com' };
|
|
24
|
+
const req = new Request('http://example.com/', { headers: { host: 'acme.example.com' } });
|
|
25
|
+
const t = resolveTenant(req, cfg);
|
|
26
|
+
expect(t?.id).toBe('acme');
|
|
27
|
+
});
|
|
28
|
+
it('jwt mode resolves tenant id', () => {
|
|
29
|
+
const secret = 'test_secret';
|
|
30
|
+
const token = signHs256({ tenantId: 'acme' }, secret);
|
|
31
|
+
const cfg = { mode: 'jwt', jwtSecretName: 'NEXUS_TENANT_JWT_SECRET' };
|
|
32
|
+
const req = new Request('http://example.com/', { headers: { authorization: `Bearer ${token}` } });
|
|
33
|
+
const t = resolveTenant(req, cfg, new Map([['NEXUS_TENANT_JWT_SECRET', secret]]));
|
|
34
|
+
expect(t?.id).toBe('acme');
|
|
35
|
+
expect(t?.source).toBe('jwt');
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
//# sourceMappingURL=tenancy.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenancy.test.js","sourceRoot":"","sources":["../src/tenancy.test.ts"],"names":[],"mappings":"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"}
|