Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/path-addressed-server-functions.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@solidjs/vite-plugin": minor
---

Route path-addressed server function calls (solidjs/solid#3076). A call's address is now `<endpoint>/<id>` with arguments in the query, so the dev middleware and the generated request-dispatch gate match the endpoint by mount prefix instead of exact pathname, and the dev middleware's module-preload id comes from the path segment. The retired `X-Server-Function-Id` header and `?id=` forms remain as transitional fallbacks for the RC window only — they will be dropped before the stable release.
4 changes: 2 additions & 2 deletions examples/start-ssr/test/host-dispatch.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ try {
// same-origin protection rejects dispatches without it.
const response = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(match[1])}&args=${encodeURIComponent('["host"]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(match[1])}?args=${encodeURIComponent('["host"]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
);
Expand All@@ -46,7 +46,7 @@ try {
if (!nativeMatch) throw new Error('could not extract nativeAddress function id');
const nativeResponse = await handler.handleServerFunctionRequest(
new Request(
`http://localhost${handler.endpoint}?id=${encodeURIComponent(nativeMatch[1])}&args=${encodeURIComponent('[]')}`,
`http://localhost${handler.endpoint}/${encodeURIComponent(nativeMatch[1])}?args=${encodeURIComponent('[]')}`,
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
),
{ event: { nativeEvent: { socket: { remoteAddress: '198.51.100.7' } } } },
Expand Down
32 changes: 16 additions & 16 deletions examples/start-ssr/test/run.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,7 +307,7 @@ function extractFunctionId(transformedCode, name) {
}

async function runCsrfChecks(mode, origin) {
const crossSite = await fetch(origin + '/_server?id=csrf-probe', {
const crossSite = await fetch(origin + '/_server/csrf-probe', {
method: 'POST',
headers: { 'Sec-Fetch-Site': 'cross-site' },
});
Expand All@@ -318,7 +318,7 @@ async function runCsrfChecks(mode, origin) {
crossSite.status === 403,
);

const sameOrigin = await fetch(origin + '/_server?id=csrf-probe', { method: 'POST' });
const sameOrigin = await fetch(origin + '/_server/csrf-probe', { method: 'POST' });
record(mode, 'csrf', 'same-origin request reaches dispatch', sameOrigin.status === 404);
}

Expand DownExpand Up@@ -910,7 +910,7 @@ async function runDevMode() {
// from the query string when no instance header is present.
const cold = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["start-ssr"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["start-ssr"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -922,7 +922,7 @@ async function runDevMode() {
coldText === 'hello start-ssr from the server',
functionId ? `got ${JSON.stringify(coldText)}` : 'could not extract function id',
);
const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'dev middleware rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1190,7 +1190,7 @@ async function runProdMode() {
try {
await waitForHttp(origin + '/', 30000, { headers: { accept: 'text/html' } });

const bogus = await fetch(origin + '/_server?id=bogus-0');
const bogus = await fetch(origin + '/_server/bogus-0');
record(mode, 'sf', 'prod handler rejects unknown id', bogus.status === 404);
await runCsrfChecks(mode, origin);

Expand DownExpand Up@@ -1621,7 +1621,7 @@ async function runEndpointMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const custom = functionId
? await fetch(
`${origin}${endpoint}?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["endpoint"]')}`,
`${origin}${endpoint}/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["endpoint"]')}`,
{ method: 'POST' },
)
: null;
Expand All@@ -1634,7 +1634,7 @@ async function runEndpointMode() {
functionId ? `got ${JSON.stringify(customText)}` : 'could not extract function id',
);

const fallback = await fetch(`${origin}/_server?id=${encodeURIComponent(functionId || '')}`);
const fallback = await fetch(`${origin}/_server/${encodeURIComponent(functionId || '')}`);
record(
mode,
'rpc',
Expand DownExpand Up@@ -1687,7 +1687,7 @@ async function runConfigureMode() {
};
const dispatch = async (id) => {
const res = await fetch(
`${origin}/_server?id=${encodeURIComponent(id)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(id)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
return {
Expand DownExpand Up@@ -1849,7 +1849,7 @@ async function runNoMiddlewareMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const res = functionId
? await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["nobody"]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["nobody"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -2614,7 +2614,7 @@ async function runMiddlewareChecksOverHttp(mode, origin, functionId) {

if (functionId) {
const fn = await fetch(
`${origin}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('[]')}`,
`${origin}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('[]')}`,
{ method: 'POST' },
);
const fnBody = await fn.text();
Expand DownExpand Up@@ -2920,7 +2920,7 @@ async function runPreviewMode() {
}

// The endpoint dispatches through the same handler.
const bogus = await fetch(origin + '/_server?id=bogus-0', { method: 'POST' });
const bogus = await fetch(origin + '/_server/bogus-0', { method: 'POST' });
record(mode, 'sf', 'preview dispatches /_server (unknown id rejected)', bogus.status === 404);

// Middleware fronts preview exactly like dev and prod.
Expand DownExpand Up@@ -3035,7 +3035,7 @@ async function runBaseMode() {
const functionId = extractFunctionId(clientModule, 'getServerMessage');
const call = functionId
? await fetch(
`${devOrigin}${basePrefix}/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["base"]')}`,
`${devOrigin}${basePrefix}/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["base"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3098,7 +3098,7 @@ async function runBaseMode() {
// #300: the server-function endpoint must dispatch through the built
// handler even though preview stripped the base from req.url. Under the
// bug this request fell through to page rendering (200 text/html).
const bogus = await fetch(previewOrigin + basePrefix + '/_server?id=bogus-0', {
const bogus = await fetch(previewOrigin + basePrefix + '/_server/bogus-0', {
method: 'POST',
});
record(
Expand All@@ -3119,7 +3119,7 @@ async function runBaseMode() {
)?.[1];
const call = prodId
? await fetch(
`${previewOrigin}${basePrefix}/_server?id=${encodeURIComponent(prodId)}&args=${encodeURIComponent('["preview"]')}`,
`${previewOrigin}${basePrefix}/_server/${encodeURIComponent(prodId)}?args=${encodeURIComponent('["preview"]')}`,
{ method: 'POST' },
)
: null;
Expand DownExpand Up@@ -3241,7 +3241,7 @@ async function runExternalMode() {
const functionResponse = functionId
? await handler.handleRequest(
new Request(
`http://localhost/_server?id=${encodeURIComponent(functionId)}&args=${encodeURIComponent('["external"]')}`,
`http://localhost/_server/${encodeURIComponent(functionId)}?args=${encodeURIComponent('["external"]')}`,
// The composing host forwards the browser's fetch metadata; the
// runtime's same-origin protection rejects dispatches without it.
{ method: 'POST', headers: { 'Sec-Fetch-Site': 'same-origin' } },
Expand DownExpand Up@@ -3310,7 +3310,7 @@ async function runDetectMode() {
await new Promise((resolve) => httpServer.listen(0, '127.0.0.1', resolve));
const origin = `http://127.0.0.1:${httpServer.address().port}`;

const endpointResponse = await fetch(`${origin}/_server?id=x&args=%5B%5D`, { method: 'POST' });
const endpointResponse = await fetch(`${origin}/_server/x?args=%5B%5D`, { method: 'POST' });
record(
mode,
'sf',
Expand Down
Loading
Loading