@tanstack/start-server-core 1.132.0-alpha.1 → 1.132.0-alpha.2

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.
Files changed (5) hide show
  1. package/dist/esm/server-functions-handler.js +52 -19
  2. package/dist/esm/server-functions-handler.js.map +1 -1
  3. package/dist/esm/session.d.ts +0 -2
  4. package/package.json +4 -4
  5. package/src/server-functions-handler.ts +64 -24
package/dist/esm/server-functions-handler.js CHANGED
@@ -12,24 +12,31 @@ function sanitizeBase(base) {
12
12
  }
13
13
  return base.replace(/^\/|\/$/g, "");
14
14
  }
15
- const handleServerAction = async ({ request }) => {
16
- const controller = new AbortController();
17
- const signal = controller.signal;
18
- const abort = () => controller.abort();
19
- request.signal.addEventListener("abort", abort);
20
- const method = request.method;
21
- const url = new URL(request.url, "http://localhost:3000");
22
- const regex = new RegExp(
23
- `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`
24
- );
25
- const match = url.pathname.match(regex);
26
- const serverFnId = match ? match[1] : null;
27
- const search = Object.fromEntries(url.searchParams.entries());
28
- const isCreateServerFn = "createServerFn" in search;
29
- const isRaw = "raw" in search;
30
- if (typeof serverFnId !== "string") {
31
- throw new Error("Invalid server action param for serverFnId: " + serverFnId);
15
+ async function revive(root, reviver) {
16
+ async function reviveNode(holder2, key) {
17
+ const value = holder2[key];
18
+ if (value && typeof value === "object") {
19
+ await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)));
20
+ }
21
+ if (reviver) {
22
+ holder2[key] = await reviver(key, holder2[key]);
23
+ }
24
+ }
25
+ const holder = { "": root };
26
+ await reviveNode(holder, "");
27
+ return holder[""];
28
+ }
29
+ async function reviveServerFns(key, value) {
30
+ if (value && value.__serverFn === true && value.functionId) {
31
+ const serverFn = await getServerFnById(value.functionId);
32
+ return async (opts, signal) => {
33
+ const result = await serverFn(opts ?? {}, signal);
34
+ return result.result;
35
+ };
32
36
  }
37
+ return value;
38
+ }
39
+ async function getServerFnById(serverFnId) {
33
40
  const { default: serverFnManifest } = await loadVirtualModule(
34
41
  VIRTUAL_MODULES.serverFnManifest
35
42
  );
@@ -51,6 +58,32 @@ const handleServerAction = async ({ request }) => {
51
58
  `Server function module export not resolved for serverFn ID: ${serverFnId}`
52
59
  );
53
60
  }
61
+ return action;
62
+ }
63
+ async function parsePayload(payload) {
64
+ const parsedPayload = startSerializer.parse(payload);
65
+ await revive(parsedPayload, reviveServerFns);
66
+ return parsedPayload;
67
+ }
68
+ const handleServerAction = async ({ request }) => {
69
+ const controller = new AbortController();
70
+ const signal = controller.signal;
71
+ const abort = () => controller.abort();
72
+ request.signal.addEventListener("abort", abort);
73
+ const method = request.method;
74
+ const url = new URL(request.url, "http://localhost:3000");
75
+ const regex = new RegExp(
76
+ `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`
77
+ );
78
+ const match = url.pathname.match(regex);
79
+ const serverFnId = match ? match[1] : null;
80
+ const search = Object.fromEntries(url.searchParams.entries());
81
+ const isCreateServerFn = "createServerFn" in search;
82
+ const isRaw = "raw" in search;
83
+ if (typeof serverFnId !== "string") {
84
+ throw new Error("Invalid server action param for serverFnId: " + serverFnId);
85
+ }
86
+ const action = await getServerFnById(serverFnId);
54
87
  const formDataContentTypes = [
55
88
  "multipart/form-data",
56
89
  "application/x-www-form-urlencoded"
@@ -72,11 +105,11 @@ const handleServerAction = async ({ request }) => {
72
105
  if (isCreateServerFn) {
73
106
  payload2 = search.payload;
74
107
  }
75
- payload2 = payload2 ? startSerializer.parse(payload2) : payload2;
108
+ payload2 = payload2 ? await parsePayload(payload2) : payload2;
76
109
  return await action(payload2, signal);
77
110
  }
78
111
  const jsonPayloadAsString = await request.text();
79
- const payload = startSerializer.parse(jsonPayloadAsString);
112
+ const payload = await parsePayload(jsonPayloadAsString);
80
113
  if (isCreateServerFn) {
81
114
  return await action(payload, signal);
82
115
  }
package/dist/esm/server-functions-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport { VIRTUAL_MODULES } from './virtual-modules'\nimport { loadVirtualModule } from './loadVirtualModule'\nimport { getResponse } from './request-response'\n\nfunction sanitizeBase(base: string | undefined) {\n if (!base) {\n throw new Error(\n '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n )\n }\n\n return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n const controller = new AbortController()\n const signal = controller.signal\n const abort = () => controller.abort()\n request.signal.addEventListener('abort', abort)\n\n const method = request.method\n const url = new URL(request.url, 'http://localhost:3000')\n // extract the serverFnId from the url as host/_serverFn/:serverFnId\n // Define a regex to match the path and extract the :thing part\n const regex = new RegExp(\n `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n )\n\n // Execute the regex\n const match = url.pathname.match(regex)\n const serverFnId = match ? match[1] : null\n const search = Object.fromEntries(url.searchParams.entries()) as {\n payload?: any\n createServerFn?: boolean\n }\n\n const isCreateServerFn = 'createServerFn' in search\n const isRaw = 'raw' in search\n\n if (typeof serverFnId !== 'string') {\n throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n }\n\n const { default: serverFnManifest } = await loadVirtualModule(\n VIRTUAL_MODULES.serverFnManifest,\n )\n\n const serverFnInfo = serverFnManifest[serverFnId]\n\n if (!serverFnInfo) {\n console.info('serverFnManifest', serverFnManifest)\n throw new Error('Server function info not found for ' + serverFnId)\n }\n\n const fnModule = await serverFnInfo.importer()\n\n if (!fnModule) {\n console.info('serverFnInfo', serverFnInfo)\n throw new Error('Server function module not resolved for ' + serverFnId)\n }\n\n const action = fnModule[serverFnInfo.functionName]\n\n if (!action) {\n console.info('serverFnInfo', serverFnInfo)\n console.info('fnModule', fnModule)\n throw new Error(\n `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n )\n }\n\n // Known FormData 'Content-Type' header values\n const formDataContentTypes = [\n 'multipart/form-data',\n 'application/x-www-form-urlencoded',\n ]\n\n const response = await (async () => {\n try {\n let result = await (async () => {\n // FormData\n if (\n request.headers.get('Content-Type') &&\n formDataContentTypes.some((type) =>\n request.headers.get('Content-Type')?.includes(type),\n )\n ) {\n // We don't support GET requests with FormData payloads... that seems impossible\n invariant(\n method.toLowerCase() !== 'get',\n 'GET requests with FormData payloads are not supported',\n )\n\n return await action(await request.formData(), signal)\n }\n\n // Get requests use the query string\n if (method.toLowerCase() === 'get') {\n // By default the payload is the search params\n let payload: any = search\n\n // If this GET request was created by createServerFn,\n // then the payload will be on the payload param\n if (isCreateServerFn) {\n payload = search.payload\n }\n\n // If there's a payload, we should try to parse it\n payload = payload ? startSerializer.parse(payload) : payload\n\n // Send it through!\n return await action(payload, signal)\n }\n\n // This must be a POST request, likely JSON???\n const jsonPayloadAsString = await request.text()\n\n // We should probably try to deserialize the payload\n // as JSON, but we'll just pass it through for now.\n const payload = startSerializer.parse(jsonPayloadAsString)\n\n // If this POST request was created by createServerFn,\n // it's payload will be the only argument\n if (isCreateServerFn) {\n return await action(payload, signal)\n }\n\n // Otherwise, we'll spread the payload. Need to\n // support `use server` functions that take multiple\n // arguments.\n return await action(...(payload as any), signal)\n })()\n\n // Any time we get a Response back, we should just\n // return it immediately.\n if (result.result instanceof Response) {\n return result.result\n }\n\n // If this is a non createServerFn request, we need to\n // pull out the result from the result object\n if (!isCreateServerFn) {\n result = result.result\n\n // The result might again be a response,\n // and if it is, return it.\n if (result instanceof Response) {\n return result\n }\n }\n\n // if (!search.createServerFn) {\n // result = result.result\n // }\n\n // else if (\n // isPlainObject(result) &&\n // 'result' in result &&\n // result.result instanceof Response\n // ) {\n // return result.result\n // }\n\n // TODO: RSCs Where are we getting this package?\n // if (isValidElement(result)) {\n // const { renderToPipeableStream } = await import(\n // // @ts-expect-error\n // 'react-server-dom/server'\n // )\n\n // const pipeableStream = renderToPipeableStream(result)\n\n // setHeaders(event, {\n // 'Content-Type': 'text/x-component',\n // } as any)\n\n // sendStream(event, response)\n // event._handled = true\n\n // return new Response(null, { status: 200 })\n // }\n\n if (isNotFound(result)) {\n return isNotFoundResponse(result)\n }\n\n const response = getResponse()\n return new Response(\n result !== undefined ? startSerializer.stringify(result) : undefined,\n {\n status: response?.status,\n statusText: response?.statusText,\n headers: {\n 'Content-Type': 'application/json',\n },\n },\n )\n } catch (error: any) {\n if (error instanceof Response) {\n return error\n }\n // else if (\n // isPlainObject(error) &&\n // 'result' in error &&\n // error.result instanceof Response\n // ) {\n // return error.result\n // }\n\n // Currently this server-side context has no idea how to\n // build final URLs, so we need to defer that to the client.\n // The client will check for __redirect and __notFound keys,\n // and if they exist, it will handle them appropriately.\n\n if (isNotFound(error)) {\n return isNotFoundResponse(error)\n }\n\n console.info()\n console.info('Server Fn Error!')\n console.info()\n console.error(error)\n console.info()\n\n return new Response(startSerializer.stringify(error), {\n status: 500,\n headers: {\n 'Content-Type': 'application/json',\n },\n })\n }\n })()\n\n request.signal.removeEventListener('abort', abort)\n\n if (isRaw) {\n return response\n }\n\n return response\n}\n\nfunction isNotFoundResponse(error: any) {\n const { headers, ...rest } = error\n\n return new Response(JSON.stringify(rest), {\n status: 404,\n headers: {\n 'Content-Type': 'application/json',\n ...(headers || {}),\n },\n })\n}\n"],"names":["payload","response"],"mappings":"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"}
1
+ {"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport { VIRTUAL_MODULES } from './virtual-modules'\nimport { loadVirtualModule } from './loadVirtualModule'\nimport { getResponse } from './request-response'\n\nfunction sanitizeBase(base: string | undefined) {\n if (!base) {\n throw new Error(\n '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n )\n }\n\n return base.replace(/^\\/|\\/$/g, '')\n}\n\nasync function revive(root: any, reviver?: (key: string, value: any) => any) {\n async function reviveNode(holder: any, key: string) {\n const value = holder[key]\n\n if (value && typeof value === 'object') {\n await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)))\n }\n\n if (reviver) {\n holder[key] = await reviver(key, holder[key])\n }\n }\n\n const holder = { '': root }\n await reviveNode(holder, '')\n return holder['']\n}\n\nasync function reviveServerFns(key: string, value: any) {\n if (value && value.__serverFn === true && value.functionId) {\n const serverFn = await getServerFnById(value.functionId)\n return async (opts: any, signal: any): Promise<any> => {\n const result = await serverFn(opts ?? {}, signal)\n return result.result\n }\n }\n return value\n}\n\nasync function getServerFnById(serverFnId: string) {\n const { default: serverFnManifest } = await loadVirtualModule(\n VIRTUAL_MODULES.serverFnManifest,\n )\n\n const serverFnInfo = serverFnManifest[serverFnId]\n\n if (!serverFnInfo) {\n console.info('serverFnManifest', serverFnManifest)\n throw new Error('Server function info not found for ' + serverFnId)\n }\n\n const fnModule = await serverFnInfo.importer()\n\n if (!fnModule) {\n console.info('serverFnInfo', serverFnInfo)\n throw new Error('Server function module not resolved for ' + serverFnId)\n }\n\n const action = fnModule[serverFnInfo.functionName]\n\n if (!action) {\n console.info('serverFnInfo', serverFnInfo)\n console.info('fnModule', fnModule)\n throw new Error(\n `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n )\n }\n return action\n}\n\nasync function parsePayload(payload: any) {\n const parsedPayload = startSerializer.parse(payload)\n await revive(parsedPayload, reviveServerFns)\n return parsedPayload\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n const controller = new AbortController()\n const signal = controller.signal\n const abort = () => controller.abort()\n request.signal.addEventListener('abort', abort)\n\n const method = request.method\n const url = new URL(request.url, 'http://localhost:3000')\n // extract the serverFnId from the url as host/_serverFn/:serverFnId\n // Define a regex to match the path and extract the :thing part\n const regex = new RegExp(\n `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n )\n\n // Execute the regex\n const match = url.pathname.match(regex)\n const serverFnId = match ? match[1] : null\n const search = Object.fromEntries(url.searchParams.entries()) as {\n payload?: any\n createServerFn?: boolean\n }\n\n const isCreateServerFn = 'createServerFn' in search\n const isRaw = 'raw' in search\n\n if (typeof serverFnId !== 'string') {\n throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n }\n\n const action = await getServerFnById(serverFnId)\n\n // Known FormData 'Content-Type' header values\n const formDataContentTypes = [\n 'multipart/form-data',\n 'application/x-www-form-urlencoded',\n ]\n\n const response = await (async () => {\n try {\n let result = await (async () => {\n // FormData\n if (\n request.headers.get('Content-Type') &&\n formDataContentTypes.some((type) =>\n request.headers.get('Content-Type')?.includes(type),\n )\n ) {\n // We don't support GET requests with FormData payloads... that seems impossible\n invariant(\n method.toLowerCase() !== 'get',\n 'GET requests with FormData payloads are not supported',\n )\n\n return await action(await request.formData(), signal)\n }\n\n // Get requests use the query string\n if (method.toLowerCase() === 'get') {\n // By default the payload is the search params\n let payload: any = search\n\n // If this GET request was created by createServerFn,\n // then the payload will be on the payload param\n if (isCreateServerFn) {\n payload = search.payload\n }\n\n // If there's a payload, we should try to parse it\n payload = payload ? await parsePayload(payload) : payload\n\n // Send it through!\n return await action(payload, signal)\n }\n\n // This must be a POST request, likely JSON???\n const jsonPayloadAsString = await request.text()\n\n // We should probably try to deserialize the payload\n // as JSON, but we'll just pass it through for now.\n const payload = await parsePayload(jsonPayloadAsString)\n\n // If this POST request was created by createServerFn,\n // it's payload will be the only argument\n if (isCreateServerFn) {\n return await action(payload, signal)\n }\n\n // Otherwise, we'll spread the payload. Need to\n // support `use server` functions that take multiple\n // arguments.\n return await action(...(payload as any), signal)\n })()\n\n // Any time we get a Response back, we should just\n // return it immediately.\n if (result.result instanceof Response) {\n return result.result\n }\n\n // If this is a non createServerFn request, we need to\n // pull out the result from the result object\n if (!isCreateServerFn) {\n result = result.result\n\n // The result might again be a response,\n // and if it is, return it.\n if (result instanceof Response) {\n return result\n }\n }\n\n // if (!search.createServerFn) {\n // result = result.result\n // }\n\n // else if (\n // isPlainObject(result) &&\n // 'result' in result &&\n // result.result instanceof Response\n // ) {\n // return result.result\n // }\n\n // TODO: RSCs Where are we getting this package?\n // if (isValidElement(result)) {\n // const { renderToPipeableStream } = await import(\n // // @ts-expect-error\n // 'react-server-dom/server'\n // )\n\n // const pipeableStream = renderToPipeableStream(result)\n\n // setHeaders(event, {\n // 'Content-Type': 'text/x-component',\n // } as any)\n\n // sendStream(event, response)\n // event._handled = true\n\n // return new Response(null, { status: 200 })\n // }\n\n if (isNotFound(result)) {\n return isNotFoundResponse(result)\n }\n\n const response = getResponse()\n return new Response(\n result !== undefined ? startSerializer.stringify(result) : undefined,\n {\n status: response?.status,\n statusText: response?.statusText,\n headers: {\n 'Content-Type': 'application/json',\n },\n },\n )\n } catch (error: any) {\n if (error instanceof Response) {\n return error\n }\n // else if (\n // isPlainObject(error) &&\n // 'result' in error &&\n // error.result instanceof Response\n // ) {\n // return error.result\n // }\n\n // Currently this server-side context has no idea how to\n // build final URLs, so we need to defer that to the client.\n // The client will check for __redirect and __notFound keys,\n // and if they exist, it will handle them appropriately.\n\n if (isNotFound(error)) {\n return isNotFoundResponse(error)\n }\n\n console.info()\n console.info('Server Fn Error!')\n console.info()\n console.error(error)\n console.info()\n\n return new Response(startSerializer.stringify(error), {\n status: 500,\n headers: {\n 'Content-Type': 'application/json',\n },\n })\n }\n })()\n\n request.signal.removeEventListener('abort', abort)\n\n if (isRaw) {\n return response\n }\n\n return response\n}\n\nfunction isNotFoundResponse(error: any) {\n const { headers, ...rest } = error\n\n return new Response(JSON.stringify(rest), {\n status: 404,\n headers: {\n 'Content-Type': 'application/json',\n ...(headers || {}),\n },\n })\n}\n"],"names":["holder","payload","response"],"mappings":"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"}
package/dist/esm/session.d.ts CHANGED
@@ -3,8 +3,6 @@ import { CookieSerializeOptions } from 'cookie-es';
3
3
  type EncryptionAlgorithm = 'aes-128-ctr' | 'aes-256-cbc';
4
4
  /** Algorithm used for integrity verification. */
5
5
  type IntegrityAlgorithm = 'sha256';
6
- /** @internal */
7
- type _Algorithm = EncryptionAlgorithm | IntegrityAlgorithm;
8
6
  /**
9
7
  * Options for customizing the key derivation algorithm used to generate encryption and integrity verification keys as well as the algorithms and salt sizes used.
10
8
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/start-server-core",
3
- "version": "1.132.0-alpha.1",
3
+ "version": "1.132.0-alpha.2",
4
4
  "description": "Modern and scalable routing for React applications",
5
5
  "author": "Tanner Linsley",
6
6
  "license": "MIT",
@@ -49,9 +49,9 @@
49
49
  "h3": "2.0.0-beta.3",
50
50
  "tiny-invariant": "^1.3.3",
51
51
  "@tanstack/history": "1.132.0-alpha.1",
52
- "@tanstack/start-client-core": "1.132.0-alpha.1",
53
- "@tanstack/start-storage-context": "1.132.0-alpha.1",
54
- "@tanstack/router-core": "1.132.0-alpha.1"
52
+ "@tanstack/router-core": "1.132.0-alpha.2",
53
+ "@tanstack/start-client-core": "1.132.0-alpha.2",
54
+ "@tanstack/start-storage-context": "1.132.0-alpha.2"
55
55
  },
56
56
  "scripts": {}
57
57
  }
package/src/server-functions-handler.ts CHANGED
@@ -15,35 +15,36 @@ function sanitizeBase(base: string | undefined) {
15
15
  return base.replace(/^\/|\/$/g, '')
16
16
  }
17
17
 
18
- export const handleServerAction = async ({ request }: { request: Request }) => {
19
- const controller = new AbortController()
20
- const signal = controller.signal
21
- const abort = () => controller.abort()
22
- request.signal.addEventListener('abort', abort)
18
+ async function revive(root: any, reviver?: (key: string, value: any) => any) {
19
+ async function reviveNode(holder: any, key: string) {
20
+ const value = holder[key]
23
21
 
24
- const method = request.method
25
- const url = new URL(request.url, 'http://localhost:3000')
26
- // extract the serverFnId from the url as host/_serverFn/:serverFnId
27
- // Define a regex to match the path and extract the :thing part
28
- const regex = new RegExp(
29
- `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,
30
- )
22
+ if (value && typeof value === 'object') {
23
+ await Promise.all(Object.keys(value).map((k) => reviveNode(value, k)))
24
+ }
31
25
 
32
- // Execute the regex
33
- const match = url.pathname.match(regex)
34
- const serverFnId = match ? match[1] : null
35
- const search = Object.fromEntries(url.searchParams.entries()) as {
36
- payload?: any
37
- createServerFn?: boolean
26
+ if (reviver) {
27
+ holder[key] = await reviver(key, holder[key])
28
+ }
38
29
  }
39
30
 
40
- const isCreateServerFn = 'createServerFn' in search
41
- const isRaw = 'raw' in search
31
+ const holder = { '': root }
32
+ await reviveNode(holder, '')
33
+ return holder['']
34
+ }
42
35
 
43
- if (typeof serverFnId !== 'string') {
44
- throw new Error('Invalid server action param for serverFnId: ' + serverFnId)
36
+ async function reviveServerFns(key: string, value: any) {
37
+ if (value && value.__serverFn === true && value.functionId) {
38
+ const serverFn = await getServerFnById(value.functionId)
39
+ return async (opts: any, signal: any): Promise<any> => {
40
+ const result = await serverFn(opts ?? {}, signal)
41
+ return result.result
42
+ }
45
43
  }
44
+ return value
45
+ }
46
46
 
47
+ async function getServerFnById(serverFnId: string) {
47
48
  const { default: serverFnManifest } = await loadVirtualModule(
48
49
  VIRTUAL_MODULES.serverFnManifest,
49
50
  )
@@ -71,6 +72,45 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
71
72
  `Server function module export not resolved for serverFn ID: ${serverFnId}`,
72
73
  )
73
74
  }
75
+ return action
76
+ }
77
+
78
+ async function parsePayload(payload: any) {
79
+ const parsedPayload = startSerializer.parse(payload)
80
+ await revive(parsedPayload, reviveServerFns)
81
+ return parsedPayload
82
+ }
83
+
84
+ export const handleServerAction = async ({ request }: { request: Request }) => {
85
+ const controller = new AbortController()
86
+ const signal = controller.signal
87
+ const abort = () => controller.abort()
88
+ request.signal.addEventListener('abort', abort)
89
+
90
+ const method = request.method
91
+ const url = new URL(request.url, 'http://localhost:3000')
92
+ // extract the serverFnId from the url as host/_serverFn/:serverFnId
93
+ // Define a regex to match the path and extract the :thing part
94
+ const regex = new RegExp(
95
+ `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,
96
+ )
97
+
98
+ // Execute the regex
99
+ const match = url.pathname.match(regex)
100
+ const serverFnId = match ? match[1] : null
101
+ const search = Object.fromEntries(url.searchParams.entries()) as {
102
+ payload?: any
103
+ createServerFn?: boolean
104
+ }
105
+
106
+ const isCreateServerFn = 'createServerFn' in search
107
+ const isRaw = 'raw' in search
108
+
109
+ if (typeof serverFnId !== 'string') {
110
+ throw new Error('Invalid server action param for serverFnId: ' + serverFnId)
111
+ }
112
+
113
+ const action = await getServerFnById(serverFnId)
74
114
 
75
115
  // Known FormData 'Content-Type' header values
76
116
  const formDataContentTypes = [
@@ -109,7 +149,7 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
109
149
  }
110
150
 
111
151
  // If there's a payload, we should try to parse it
112
- payload = payload ? startSerializer.parse(payload) : payload
152
+ payload = payload ? await parsePayload(payload) : payload
113
153
 
114
154
  // Send it through!
115
155
  return await action(payload, signal)
@@ -120,7 +160,7 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
120
160
 
121
161
  // We should probably try to deserialize the payload
122
162
  // as JSON, but we'll just pass it through for now.
123
- const payload = startSerializer.parse(jsonPayloadAsString)
163
+ const payload = await parsePayload(jsonPayloadAsString)
124
164
 
125
165
  // If this POST request was created by createServerFn,
126
166
  // it's payload will be the only argument