@thednp/rpc 0.1.1 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +43 -26
- package/CHANGELOG.md +100 -0
- package/README.md +39 -31
- package/dist/express/express.d.mts +14 -2
- package/dist/express/express.d.mts.map +1 -1
- package/dist/express/express.mjs +103 -70
- package/dist/express/express.mjs.map +1 -1
- package/dist/fastify/fastify.d.mts +16 -1
- package/dist/fastify/fastify.d.mts.map +1 -1
- package/dist/fastify/fastify.mjs +61 -63
- package/dist/fastify/fastify.mjs.map +1 -1
- package/dist/fastify/plugin/fastify/plugin.d.mts +20 -3
- package/dist/fastify/plugin/fastify/plugin.d.mts.map +1 -1
- package/dist/fastify/plugin/fastify/plugin.mjs +60 -62
- package/dist/fastify/plugin/fastify/plugin.mjs.map +1 -1
- package/dist/h3/h3.d.mts +94 -0
- package/dist/h3/h3.d.mts.map +1 -0
- package/dist/h3/h3.mjs +267 -0
- package/dist/h3/h3.mjs.map +1 -0
- package/dist/helpers/helpers.d.mts +2 -0
- package/dist/helpers/helpers.d.mts.map +1 -1
- package/dist/helpers/helpers.mjs.map +1 -1
- package/dist/hono/hono.d.mts +14 -40
- package/dist/hono/hono.d.mts.map +1 -1
- package/dist/hono/hono.mjs +61 -73
- package/dist/hono/hono.mjs.map +1 -1
- package/dist/index.d.mts +36 -5
- package/dist/index.d.mts.map +1 -1
- package/dist/index.mjs +4 -0
- package/dist/index.mjs.map +1 -1
- package/dist/koa/koa.d.mts +12 -1
- package/dist/koa/koa.d.mts.map +1 -1
- package/dist/koa/koa.mjs +69 -64
- package/dist/koa/koa.mjs.map +1 -1
- package/dist/server/server.d.mts +180 -3
- package/dist/server/server.d.mts.map +1 -1
- package/dist/server/server.mjs +157 -1
- package/dist/server/server.mjs.map +1 -1
- package/package.json +10 -4
package/dist/h3/h3.mjs
ADDED
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
import { escapeRegExp, formatError, hasContentTypeMismatch, provideRequestContext, scanForServerFiles, serverFunctionsMap } from "@thednp/rpc/server";
|
|
2
|
+
import { HTTPResponse, redirect as redirect$1 } from "h3";
|
|
3
|
+
//#region src/constants.ts
|
|
4
|
+
const FUNCTION_NOT_FOUND = "Function not found";
|
|
5
|
+
const METHOD_NOT_ALLOWED = "Method Not Allowed";
|
|
6
|
+
const REQUEST_FORBIDDEN = "Forbidden";
|
|
7
|
+
const UNSUPPORTED_MEDIA_TYPE = "Unsupported Media Type";
|
|
8
|
+
const BAD_REQUEST = "Bad Request";
|
|
9
|
+
const CLIENT_DISCONNECTED = "client disconnected";
|
|
10
|
+
/** Returns a warning when a middleware name is reused, preventing registration conflicts. @param name - The duplicate middleware name */
|
|
11
|
+
const MIDDLEWARE_NAME_USED = (name) => `The middleware name "${name}" is already used.`;
|
|
12
|
+
//#endregion
|
|
13
|
+
//#region src/options.ts
|
|
14
|
+
const defaultRPCOptions = {
|
|
15
|
+
rpcPrefix: "__rpc",
|
|
16
|
+
adapter: "express",
|
|
17
|
+
serverFiles: "exact",
|
|
18
|
+
scanRoot: void 0
|
|
19
|
+
};
|
|
20
|
+
const defaultMiddlewareOptions = {
|
|
21
|
+
rpcPrefix: void 0,
|
|
22
|
+
path: void 0,
|
|
23
|
+
origin: void 0
|
|
24
|
+
};
|
|
25
|
+
//#endregion
|
|
26
|
+
//#region src/h3/helpers.ts
|
|
27
|
+
/**
|
|
28
|
+
* Convenience function to load RPC config and attach the RPC middleware to an h3 app.
|
|
29
|
+
* Dynamically imports loadRPCConfig and registers the middleware.
|
|
30
|
+
* @param app - h3 application instance
|
|
31
|
+
*/
|
|
32
|
+
async function attachRPC(app) {
|
|
33
|
+
const { loadRPCConfig } = await import("@thednp/rpc");
|
|
34
|
+
const { adapter: _adapter, ...options } = await loadRPCConfig();
|
|
35
|
+
app.use(createRPCMiddleware(options));
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Attaches Vite's dev server middlewares to an h3 app for development mode.
|
|
39
|
+
* Uses the viteMiddleware wrapper to bridge Vite's Connect-compatible stack into h3.
|
|
40
|
+
* @param app - h3 application instance
|
|
41
|
+
* @param vite - Running Vite dev server
|
|
42
|
+
*/
|
|
43
|
+
const attachVite = (app, vite) => {
|
|
44
|
+
app.use(viteMiddleware(vite));
|
|
45
|
+
};
|
|
46
|
+
/**
|
|
47
|
+
* Creates an h3-compatible middleware from a Vite dev server middleware stack.
|
|
48
|
+
* Bridges the Connect/Express middleware interface to h3's event-based request/response model.
|
|
49
|
+
* Supports both Node.js and web runtimes with separate polyfill paths.
|
|
50
|
+
* @param vite - Running Vite dev server
|
|
51
|
+
* @returns An h3 middleware function
|
|
52
|
+
*/
|
|
53
|
+
const viteMiddleware = (vite) => {
|
|
54
|
+
return (event, next) => new Promise((resolve) => {
|
|
55
|
+
const node = event.runtime?.node;
|
|
56
|
+
if (node?.req && node?.res) {
|
|
57
|
+
const nodeReq = node.req;
|
|
58
|
+
const nodeRes = node.res;
|
|
59
|
+
let settled = false;
|
|
60
|
+
const settle = (value) => {
|
|
61
|
+
if (settled) return;
|
|
62
|
+
settled = true;
|
|
63
|
+
resolve(value);
|
|
64
|
+
};
|
|
65
|
+
nodeRes.once("close", () => settle(new Response(null)));
|
|
66
|
+
nodeRes.once("finish", () => settle(new Response(null)));
|
|
67
|
+
vite.middlewares(nodeReq, nodeRes, () => {
|
|
68
|
+
if (nodeRes.writableEnded || nodeRes.headersSent) settle(new Response(null));
|
|
69
|
+
else settle(next());
|
|
70
|
+
});
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
let sent = false;
|
|
74
|
+
const headers = new Headers();
|
|
75
|
+
const req = {
|
|
76
|
+
url: event.url.pathname + event.url.search,
|
|
77
|
+
method: event.req.method,
|
|
78
|
+
headers: Object.fromEntries(event.req.headers)
|
|
79
|
+
};
|
|
80
|
+
vite.middlewares(req, {
|
|
81
|
+
setHeader(name, value) {
|
|
82
|
+
headers.set(name, String(value));
|
|
83
|
+
return this;
|
|
84
|
+
},
|
|
85
|
+
writeHead(status) {
|
|
86
|
+
return this;
|
|
87
|
+
},
|
|
88
|
+
end(body) {
|
|
89
|
+
sent = true;
|
|
90
|
+
resolve(new HTTPResponse(body == null ? "" : body, { headers }));
|
|
91
|
+
return this;
|
|
92
|
+
}
|
|
93
|
+
}, () => {
|
|
94
|
+
if (!sent) resolve(next());
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
};
|
|
98
|
+
/**
|
|
99
|
+
* Reads and parses the HTTP request body from an h3 event.
|
|
100
|
+
* Supports JSON, text, urlencoded, and multipart content types.
|
|
101
|
+
* @param event - h3 event object
|
|
102
|
+
* @returns A promise resolving to the parsed body with its content type
|
|
103
|
+
*/
|
|
104
|
+
const readBody = async (event) => {
|
|
105
|
+
const contentType = event.req.headers.get("content-type")?.toLowerCase() || "";
|
|
106
|
+
const isJSON = contentType.includes("json");
|
|
107
|
+
const isMultipart = contentType.includes("multipart/form-data");
|
|
108
|
+
const isUrlEncoded = contentType.includes("urlencoded");
|
|
109
|
+
const text = await event.req.text();
|
|
110
|
+
if (isJSON) return {
|
|
111
|
+
contentType: "application/json",
|
|
112
|
+
data: JSON.parse(text)
|
|
113
|
+
};
|
|
114
|
+
return {
|
|
115
|
+
contentType: isMultipart ? "multipart/form-data" : isUrlEncoded ? "application/x-www-form-urlencoded" : "text/plain",
|
|
116
|
+
data: isMultipart ? { raw: text } : isUrlEncoded ? Object.fromEntries(new URLSearchParams(text)) : String(text)
|
|
117
|
+
};
|
|
118
|
+
};
|
|
119
|
+
/**
|
|
120
|
+
* Issues an HTTP redirect. h3's `redirect()` returns an `HTTPResponse`
|
|
121
|
+
* object that the handler must return (it never writes directly). Defaults
|
|
122
|
+
* to `303 See Other` for convention (Post/Redirect/Get).
|
|
123
|
+
* @param location - The URL to redirect to
|
|
124
|
+
* @param status - HTTP status code, defaults to 303
|
|
125
|
+
* @returns An h3 `HTTPResponse` to return from the handler
|
|
126
|
+
*/
|
|
127
|
+
const redirect = (location, status = 303) => {
|
|
128
|
+
return redirect$1(location, status, status === 303 ? "See Other" : void 0);
|
|
129
|
+
};
|
|
130
|
+
//#endregion
|
|
131
|
+
//#region src/h3/createMiddleware.ts
|
|
132
|
+
let middlewareCount = 0;
|
|
133
|
+
const middlewareStack = /* @__PURE__ */ new Set();
|
|
134
|
+
/**
|
|
135
|
+
* Creates an h3 middleware with optional path and rpcPrefix filtering.
|
|
136
|
+
* Middleware names are deduplicated. Prefix and path regexes are compiled once at creation time.
|
|
137
|
+
* h3 URL is normalized via `event.url` (query strings are not part of the pathname).
|
|
138
|
+
* @param initialOptions - Options for rpcPrefix, path matching, and the handler function
|
|
139
|
+
* @returns An h3 middleware function
|
|
140
|
+
*/
|
|
141
|
+
const createMiddleware = (initialOptions = {}) => {
|
|
142
|
+
const options = Object.assign({}, defaultMiddlewareOptions, initialOptions);
|
|
143
|
+
const middlewareName = options.name;
|
|
144
|
+
const rpcPrefix = options.rpcPrefix;
|
|
145
|
+
const path = options.path;
|
|
146
|
+
const handler = options.handler;
|
|
147
|
+
let name = middlewareName;
|
|
148
|
+
if (!name) {
|
|
149
|
+
name = "viteRPCMiddleware-" + middlewareCount;
|
|
150
|
+
middlewareCount += 1;
|
|
151
|
+
}
|
|
152
|
+
if (middlewareStack.has(name)) throw new Error(MIDDLEWARE_NAME_USED(name));
|
|
153
|
+
middlewareStack.add(name);
|
|
154
|
+
const prefixRegex = rpcPrefix ? new RegExp(`^/${escapeRegExp(rpcPrefix)}/`) : null;
|
|
155
|
+
const pathMatcher = path ? typeof path === "string" ? new RegExp(path) : path : null;
|
|
156
|
+
const middlewareHandler = async (event, next) => {
|
|
157
|
+
const url = event.url.pathname;
|
|
158
|
+
if (serverFunctionsMap.size === 0) await scanForServerFiles();
|
|
159
|
+
if (!handler) return next();
|
|
160
|
+
if (pathMatcher && !pathMatcher.test(url)) return next();
|
|
161
|
+
if (prefixRegex && !prefixRegex.test(url)) return next();
|
|
162
|
+
return handler(event, next);
|
|
163
|
+
};
|
|
164
|
+
Object.defineProperty(middlewareHandler, "name", { value: name });
|
|
165
|
+
return middlewareHandler;
|
|
166
|
+
};
|
|
167
|
+
/**
|
|
168
|
+
* Creates the h3 RPC middleware that routes incoming requests to registered server functions.
|
|
169
|
+
* Wraps the generic createMiddleware with the RPC handler that reads the body, dispatches
|
|
170
|
+
* to the matching function, and returns the JSON-serialized result.
|
|
171
|
+
* @param initialOptions - Options including rpcPrefix for URL routing
|
|
172
|
+
* @returns An h3 middleware function
|
|
173
|
+
*/
|
|
174
|
+
const createRPCMiddleware = (initialOptions = {}) => {
|
|
175
|
+
const options = Object.assign({}, defaultMiddlewareOptions, { rpcPrefix: defaultRPCOptions.rpcPrefix }, initialOptions);
|
|
176
|
+
const rpcPrefix = options.rpcPrefix;
|
|
177
|
+
const prefixRegex = rpcPrefix ? new RegExp(`^/${escapeRegExp(rpcPrefix)}/`) : null;
|
|
178
|
+
const prefixReplace = `/${rpcPrefix}/`;
|
|
179
|
+
return createMiddleware({
|
|
180
|
+
...options,
|
|
181
|
+
handler: async (event, _next) => {
|
|
182
|
+
const url = event.url.pathname;
|
|
183
|
+
if (prefixRegex && !prefixRegex.test(url)) return;
|
|
184
|
+
const origin = options.origin;
|
|
185
|
+
const requestOrigin = event.req.headers.get("origin") ?? void 0;
|
|
186
|
+
if (origin && requestOrigin && requestOrigin !== origin) {
|
|
187
|
+
event.res.status = 403;
|
|
188
|
+
return { error: REQUEST_FORBIDDEN };
|
|
189
|
+
}
|
|
190
|
+
const functionName = url.replace(prefixReplace, "");
|
|
191
|
+
const serverFunction = serverFunctionsMap.get(functionName);
|
|
192
|
+
if (!serverFunction) {
|
|
193
|
+
event.res.status = 404;
|
|
194
|
+
return { error: FUNCTION_NOT_FOUND };
|
|
195
|
+
}
|
|
196
|
+
try {
|
|
197
|
+
const method = serverFunction.options?.method || "POST";
|
|
198
|
+
if (event.req.method.toUpperCase() !== method) {
|
|
199
|
+
event.res.status = 405;
|
|
200
|
+
return { error: METHOD_NOT_ALLOWED };
|
|
201
|
+
}
|
|
202
|
+
let args = [];
|
|
203
|
+
if (method === "GET") {
|
|
204
|
+
const raw = event.url.searchParams.get("args");
|
|
205
|
+
if (raw) {
|
|
206
|
+
const parsed = JSON.parse(raw);
|
|
207
|
+
if (!Array.isArray(parsed)) {
|
|
208
|
+
event.res.status = 400;
|
|
209
|
+
return { error: BAD_REQUEST };
|
|
210
|
+
}
|
|
211
|
+
args = parsed;
|
|
212
|
+
}
|
|
213
|
+
} else {
|
|
214
|
+
if (hasContentTypeMismatch(serverFunction.options?.contentType ?? "application/json", event.req.headers.get("content-type") ?? void 0)) {
|
|
215
|
+
event.res.status = 415;
|
|
216
|
+
return { error: UNSUPPORTED_MEDIA_TYPE };
|
|
217
|
+
}
|
|
218
|
+
const body = await readBody(event);
|
|
219
|
+
args = Array.isArray(body.data) ? body.data : [body.data];
|
|
220
|
+
}
|
|
221
|
+
const requestEvent = {
|
|
222
|
+
request: event.req,
|
|
223
|
+
response: event.res,
|
|
224
|
+
nativeEvent: event,
|
|
225
|
+
locals: event.context,
|
|
226
|
+
functionName,
|
|
227
|
+
redirect: (location, status = 303) => {
|
|
228
|
+
requestEvent.redirected = {
|
|
229
|
+
location,
|
|
230
|
+
status
|
|
231
|
+
};
|
|
232
|
+
},
|
|
233
|
+
send: (status, body, headers) => {
|
|
234
|
+
requestEvent.sent = {
|
|
235
|
+
status,
|
|
236
|
+
body,
|
|
237
|
+
headers
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
};
|
|
241
|
+
const fnResult = provideRequestContext(requestEvent, () => serverFunction.handler(...args));
|
|
242
|
+
const onClose = () => fnResult.cancel(CLIENT_DISCONNECTED);
|
|
243
|
+
const nodeReq = event.runtime?.node?.req;
|
|
244
|
+
if (nodeReq) nodeReq.on("close", onClose);
|
|
245
|
+
const result = await fnResult.data;
|
|
246
|
+
if (nodeReq) nodeReq.off("close", onClose);
|
|
247
|
+
if (requestEvent.redirected) return redirect(requestEvent.redirected.location, requestEvent.redirected.status);
|
|
248
|
+
if (requestEvent.sent) {
|
|
249
|
+
const { status, body, headers } = requestEvent.sent;
|
|
250
|
+
event.res.status = status;
|
|
251
|
+
if (headers) for (const [name, value] of Object.entries(headers)) event.res.headers.set(name, value);
|
|
252
|
+
return body;
|
|
253
|
+
}
|
|
254
|
+
return { data: result };
|
|
255
|
+
} catch (err) {
|
|
256
|
+
console.error(String(err));
|
|
257
|
+
const isProduction = process.env.NODE_ENV === "production";
|
|
258
|
+
event.res.status = 500;
|
|
259
|
+
return formatError(err, isProduction);
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
});
|
|
263
|
+
};
|
|
264
|
+
//#endregion
|
|
265
|
+
export { attachRPC, attachVite, createMiddleware, createRPCMiddleware, readBody, redirect, viteMiddleware };
|
|
266
|
+
|
|
267
|
+
//# sourceMappingURL=h3.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"h3.mjs","names":["h3Redirect","h3Redirect"],"sources":["../../src/constants.ts","../../src/options.ts","../../src/h3/helpers.ts","../../src/h3/createMiddleware.ts"],"sourcesContent":["export const OPERATION_ABORTED = \"Operation aborted\";\n\nexport const REQUEST_CANCELLED = \"Request was cancelled\";\n\nexport const FETCH_ERROR_PREFIX = \"Fetch error: \";\n\nexport const NO_SERVER_FUNCTION_FOUND = \"No server function found.\";\n\nexport const ERROR_LOADING_FILE = \"Error loading file:\";\n\nexport const FUNCTION_NOT_FOUND = \"Function not found\";\n\nexport const METHOD_NOT_ALLOWED = \"Method Not Allowed\";\n\nexport const REQUEST_FORBIDDEN = \"Forbidden\";\n\nexport const UNSUPPORTED_MEDIA_TYPE = \"Unsupported Media Type\";\n\nexport const BAD_REQUEST = \"Bad Request\";\n\nexport const INTERNAL_SERVER_ERROR = \"Internal Server Error\";\n\nexport const CLIENT_DISCONNECTED = \"client disconnected\";\n\n/** Returns a warning when a middleware name is reused, preventing registration conflicts. @param name - The duplicate middleware name */\nexport const MIDDLEWARE_NAME_USED = (name: string) =>\n `The middleware name \"${name}\" is already used.`;\n\n/** Error message when a value fails the safe-identifier validation. @param label - What kind of value was being validated. @param name - The rejected value */\nexport const INVALID_IDENTIFIER = (label: string, name: string) =>\n `Invalid ${label}: \"${name}\" must match /^[A-Za-z_$][A-Za-z0-9_$]*$/`;\n\n/** Error message when a value fails the safe-path-segment validation. @param label - What kind of value was being validated. @param segment - The rejected value */\nexport const INVALID_PATH_SEGMENT = (label: string, segment: string) =>\n `Invalid ${label}: \"${segment}\" must match /^[A-Za-z0-9_$][A-Za-z0-9_$/-]*$/`;\n\n/** Warning message when a specified RPC config file cannot be resolved on disk. @param configFile - The requested config filename. @param configFilePath - The resolved absolute path */\nexport const CONFIG_FILE_NOT_FOUND = (\n configFile: string,\n configFilePath: string,\n) =>\n ` ⚠︎ The specified RPC config file ${configFile} cannot be found at ${configFilePath}, loading the defaults..`;\n\nexport const NO_CONFIG_FOUND = ` ⚡︎ No RPC config found, loading the defaults..`;\n\nexport const FAILED_LOAD_CONFIG = ` ⚠︎ Failed to load RPC config:`;\n\n/** Error template for duplicate server function names across files. @param name - The duplicate registered name */\nexport const DUPLICATE_FUNCTION_NAME = (name: string) =>\n `Duplicate server function \"${name}\" detected. Each server function must have a unique name. Remove or rename the duplicate.`;\n","import type {\n MiddlewareOptions,\n RpcPluginOptions,\n ServerFunctionOptions,\n} from \"./types.d.ts\";\n\nexport const defaultServerFnOptions = {\n contentType: \"application/json\",\n credentials: \"same-origin\",\n method: \"POST\",\n} satisfies ServerFunctionOptions;\n\nexport const defaultRPCOptions: RpcPluginOptions = {\n rpcPrefix: \"__rpc\",\n adapter: \"express\",\n serverFiles: \"exact\",\n scanRoot: undefined,\n};\n\nexport const defaultMiddlewareOptions = {\n rpcPrefix: undefined,\n path: undefined,\n origin: undefined,\n} satisfies MiddlewareOptions;\n","// src/h3/helpers.ts\nimport type { H3Event, Middleware } from \"h3\";\nimport { HTTPResponse, redirect as h3Redirect } from \"h3\";\nimport type { IncomingMessage, ServerResponse } from \"node:http\";\nimport type { ViteDevServer } from \"vite\";\nimport type { BodyResult } from \"@thednp/rpc\";\nimport type { H3App } from \"./types.d.ts\";\nimport { createRPCMiddleware } from \"./createMiddleware.ts\";\n\n/**\n * Convenience function to load RPC config and attach the RPC middleware to an h3 app.\n * Dynamically imports loadRPCConfig and registers the middleware.\n * @param app - h3 application instance\n */\nexport async function attachRPC(app: H3App) {\n // The main plugin entry statically imports Vite, so loadRPCConfig is\n // imported lazily: function bundles that never call attachRPC (e.g.\n // serverless functions) keep Vite out of the bundle (or externalized).\n const { loadRPCConfig } = await import(\"@thednp/rpc\");\n const { adapter: _adapter, ...options } = await loadRPCConfig();\n\n app.use(createRPCMiddleware(options));\n}\n\n/**\n * Attaches Vite's dev server middlewares to an h3 app for development mode.\n * Uses the viteMiddleware wrapper to bridge Vite's Connect-compatible stack into h3.\n * @param app - h3 application instance\n * @param vite - Running Vite dev server\n */\nexport const attachVite = (app: H3App, vite: ViteDevServer): void => {\n app.use(viteMiddleware(vite));\n};\n\n/**\n * Creates an h3-compatible middleware from a Vite dev server middleware stack.\n * Bridges the Connect/Express middleware interface to h3's event-based request/response model.\n * Supports both Node.js and web runtimes with separate polyfill paths.\n * @param vite - Running Vite dev server\n * @returns An h3 middleware function\n */\nexport const viteMiddleware = (vite: ViteDevServer): Middleware => {\n return (event, next) =>\n new Promise((resolve) => {\n const node = event.runtime?.node;\n if (node?.req && node?.res) {\n const nodeReq = node.req;\n const nodeRes = node.res;\n // ─── Node.js runtime ─────────────────────────────────────────────\n // Forward to the real node req/res: if the Vite/Connect stack writes\n // the response, the socket is already flushed (dev-mode asset serving,\n // HMR). Connect never calls the final callback once a middleware has\n // written the response, so also settle on the response lifecycle\n // events. Stop the chain with an empty response once the socket is\n // used; the runtime's write guard prevents a second write. When the\n // stack passes through, continue to the next middleware.\n let settled = false;\n const settle = (value: unknown) => {\n // istanbul ignore if\n if (settled) return;\n settled = true;\n resolve(value);\n };\n nodeRes.once(\"close\", () => settle(new Response(null)));\n nodeRes.once(\"finish\", () => settle(new Response(null)));\n vite.middlewares(\n nodeReq as IncomingMessage,\n nodeRes as ServerResponse,\n () => {\n if (nodeRes.writableEnded || nodeRes.headersSent) {\n settle(new Response(null));\n } else {\n settle(next());\n }\n },\n );\n return;\n }\n\n // ─── Web runtime fallback ──────────────────────────────────────────\n let sent = false;\n const headers = new Headers();\n const req = {\n url: event.url.pathname + event.url.search,\n method: event.req.method,\n headers: Object.fromEntries(event.req.headers),\n } as IncomingMessage;\n const res = {\n setHeader(name: string, value: unknown) {\n headers.set(name, String(value));\n return this;\n },\n writeHead(status: number) {\n void status;\n return this;\n },\n end(body?: unknown) {\n sent = true;\n resolve(\n new HTTPResponse(body == null ? \"\" : (body as BodyInit), {\n headers,\n }),\n );\n return this;\n },\n } as ServerResponse;\n vite.middlewares(req, res, () => {\n if (!sent) resolve(next());\n });\n });\n};\n\n/**\n * Reads and parses the HTTP request body from an h3 event.\n * Supports JSON, text, urlencoded, and multipart content types.\n * @param event - h3 event object\n * @returns A promise resolving to the parsed body with its content type\n */\nexport const readBody = async (event: H3Event): Promise<BodyResult> => {\n const contentType = event.req.headers.get(\"content-type\")?.toLowerCase() ||\n \"\";\n const isJSON = contentType.includes(\"json\");\n const isMultipart = contentType.includes(\"multipart/form-data\");\n const isUrlEncoded = contentType.includes(\"urlencoded\");\n const text = await event.req.text();\n if (isJSON) {\n return {\n contentType: \"application/json\",\n data: JSON.parse(text),\n } as BodyResult;\n }\n return {\n contentType: isMultipart\n ? \"multipart/form-data\"\n : isUrlEncoded\n ? \"application/x-www-form-urlencoded\"\n : \"text/plain\",\n data: isMultipart\n ? ({ raw: text } as Record<string, unknown>)\n : isUrlEncoded\n ? Object.fromEntries(new URLSearchParams(text))\n : String(text),\n } as BodyResult;\n};\n\n/**\n * Issues an HTTP redirect. h3's `redirect()` returns an `HTTPResponse`\n * object that the handler must return (it never writes directly). Defaults\n * to `303 See Other` for convention (Post/Redirect/Get).\n * @param location - The URL to redirect to\n * @param status - HTTP status code, defaults to 303\n * @returns An h3 `HTTPResponse` to return from the handler\n */\nexport const redirect = (\n location: string,\n status = 303,\n): HTTPResponse => {\n return h3Redirect(\n location,\n status,\n status === 303 ? \"See Other\" : undefined,\n );\n};\n","// src/h3/createMiddleware.ts\nimport type { H3Event, Middleware } from \"h3\";\nimport type { H3MiddlewareFn, H3MiddlewareOptions } from \"./types.d.ts\";\nimport type { JsonValue } from \"@thednp/rpc\";\nimport type { RequestEvent } from \"@thednp/rpc/server\";\nimport {\n escapeRegExp,\n formatError,\n hasContentTypeMismatch,\n provideRequestContext,\n scanForServerFiles,\n serverFunctionsMap,\n} from \"@thednp/rpc/server\";\nimport {\n BAD_REQUEST,\n CLIENT_DISCONNECTED,\n FUNCTION_NOT_FOUND,\n METHOD_NOT_ALLOWED,\n MIDDLEWARE_NAME_USED,\n REQUEST_FORBIDDEN,\n UNSUPPORTED_MEDIA_TYPE,\n} from \"../constants.ts\";\nimport { defaultMiddlewareOptions, defaultRPCOptions } from \"../options.ts\";\nimport { readBody, redirect as h3Redirect } from \"./helpers.ts\";\n\nlet middlewareCount = 0;\nconst middlewareStack = new Set<string>();\n\n/**\n * Creates an h3 middleware with optional path and rpcPrefix filtering.\n * Middleware names are deduplicated. Prefix and path regexes are compiled once at creation time.\n * h3 URL is normalized via `event.url` (query strings are not part of the pathname).\n * @param initialOptions - Options for rpcPrefix, path matching, and the handler function\n * @returns An h3 middleware function\n */\nexport const createMiddleware: H3MiddlewareFn = (initialOptions = {}) => {\n const options = Object.assign(\n {},\n defaultMiddlewareOptions,\n initialOptions,\n ) as H3MiddlewareOptions;\n\n const middlewareName = options.name;\n const rpcPrefix = options.rpcPrefix;\n const path = options.path;\n const handler = options.handler;\n\n let name = middlewareName;\n if (!name) {\n name = \"viteRPCMiddleware-\" + middlewareCount;\n middlewareCount += 1;\n }\n if (middlewareStack.has(name)) {\n throw new Error(MIDDLEWARE_NAME_USED(name));\n }\n middlewareStack.add(name);\n\n // Hoist regex compilation out of per-request path. Escape the prefix to\n // prevent regex injection via metacharacters in the config string.\n const prefixRegex: RegExp | null = rpcPrefix\n ? new RegExp(`^/${escapeRegExp(rpcPrefix)}/`)\n : null;\n const pathMatcher: RegExp | null = path\n ? (typeof path === \"string\" ? new RegExp(path) : path)\n : null;\n\n const middlewareHandler: Middleware = async (event: H3Event, next) => {\n const url = event.url.pathname;\n\n if (serverFunctionsMap.size === 0) {\n await scanForServerFiles();\n }\n\n // No need to continue when no handler provided\n if (!handler) {\n return next();\n }\n\n if (pathMatcher && !pathMatcher.test(url)) {\n return next();\n }\n\n if (prefixRegex && !prefixRegex.test(url)) {\n return next();\n }\n\n return handler(event, next);\n };\n\n Object.defineProperty(middlewareHandler, \"name\", {\n value: name,\n });\n\n return middlewareHandler;\n};\n\n/**\n * Creates the h3 RPC middleware that routes incoming requests to registered server functions.\n * Wraps the generic createMiddleware with the RPC handler that reads the body, dispatches\n * to the matching function, and returns the JSON-serialized result.\n * @param initialOptions - Options including rpcPrefix for URL routing\n * @returns An h3 middleware function\n */\nexport const createRPCMiddleware: H3MiddlewareFn = (initialOptions = {}) => {\n const options = Object.assign(\n {},\n defaultMiddlewareOptions,\n { rpcPrefix: defaultRPCOptions.rpcPrefix },\n initialOptions,\n ) as H3MiddlewareOptions;\n\n // Hoist prefix regex (escaped) and the literal prefix-for-replace out of the\n // per-request handler to avoid regex injection and per-request compilation.\n const rpcPrefix = options.rpcPrefix;\n const prefixRegex = rpcPrefix\n ? new RegExp(`^/${escapeRegExp(rpcPrefix)}/`)\n : /* istanbul ignore next */ null;\n const prefixReplace = `/${rpcPrefix}/`;\n\n return createMiddleware({\n ...options,\n handler: async (event: H3Event, _next?: () => unknown) => {\n const url = event.url.pathname;\n // const { rpcPrefix } = options;\n\n // Defense-in-depth: validate prefix match via escaped regex even though\n // the outer createMiddleware gates on the same prefix already.\n // istanbul ignore if\n if (prefixRegex && !prefixRegex.test(url)) {\n /* istanbul ignore next */\n return undefined;\n }\n\n // Optional origin check: reject requests whose Origin header does not\n // match the configured origin. Requests without an Origin header\n // (curl, native clients) pass through unchecked.\n const origin = options.origin;\n const requestOrigin = event.req.headers.get(\"origin\") ?? undefined;\n if (origin && requestOrigin && requestOrigin !== origin) {\n event.res.status = 403;\n return { error: REQUEST_FORBIDDEN };\n }\n\n const functionName = url.replace(prefixReplace, \"\");\n const serverFunction = serverFunctionsMap.get(functionName);\n\n if (!serverFunction) {\n event.res.status = 404;\n return { error: FUNCTION_NOT_FOUND };\n }\n\n try {\n const method = serverFunction.options?.method || \"POST\";\n if (event.req.method.toUpperCase() !== method) {\n event.res.status = 405;\n return { error: METHOD_NOT_ALLOWED };\n }\n\n let args: JsonValue[] = [];\n if (method === \"GET\") {\n const raw = event.url.searchParams.get(\"args\");\n if (raw) {\n const parsed: unknown = JSON.parse(raw);\n if (!Array.isArray(parsed)) {\n event.res.status = 400;\n return { error: BAD_REQUEST };\n }\n args = parsed as JsonValue[];\n }\n } else {\n // Content-type enforcement: strict for json/text, lenient between forms.\n // Requests without a Content-Type header are exempt (curl/GET compat).\n // Checked BEFORE readBody so mismatched bodies are never buffered.\n if (\n hasContentTypeMismatch(\n serverFunction.options?.contentType ?? \"application/json\",\n event.req.headers.get(\"content-type\") ?? undefined,\n )\n ) {\n event.res.status = 415;\n return { error: UNSUPPORTED_MEDIA_TYPE };\n }\n const body = await readBody(event);\n args = Array.isArray(body.data)\n ? body.data as JsonValue[]\n : [body.data as JsonValue];\n }\n const requestEvent: RequestEvent = {\n request: event.req,\n response: event.res,\n nativeEvent: event,\n locals: event.context,\n functionName,\n // h3's `redirect()` returns an `HTTPResponse` (never writes directly),\n // so the bound redirect/send only record the intent; the middleware\n // uses them after the dispatch to return the response body.\n redirect: (location, status = 303) => {\n requestEvent.redirected = { location, status };\n },\n send: (status, body, headers) => {\n requestEvent.sent = { status, body, headers };\n },\n };\n const fnResult = provideRequestContext(\n requestEvent,\n () => serverFunction.handler(...args),\n );\n const onClose = () => fnResult.cancel(CLIENT_DISCONNECTED);\n // The node runtime gives us the raw incoming stream for close events;\n // other runtimes have no node req, so the abort hook is skipped.\n const nodeReq = event.runtime?.node?.req;\n if (nodeReq) nodeReq.on(\"close\", onClose);\n const result = await fnResult.data;\n if (nodeReq) nodeReq.off(\"close\", onClose);\n\n if (requestEvent.redirected) {\n return h3Redirect(\n requestEvent.redirected.location,\n requestEvent.redirected.status,\n );\n }\n\n if (requestEvent.sent) {\n const { status, body, headers } = requestEvent.sent;\n event.res.status = status;\n if (headers) {\n for (const [name, value] of Object.entries(headers)) {\n event.res.headers.set(name, value);\n }\n }\n return body;\n }\n\n return { data: result };\n } catch (err) {\n console.error(String(err));\n const isProduction = process.env.NODE_ENV === \"production\";\n event.res.status = 500;\n\n return formatError(err, isProduction);\n }\n },\n });\n};\n"],"mappings":"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"}
|
|
@@ -3,10 +3,12 @@ import "@thednp/rpc";
|
|
|
3
3
|
import "express";
|
|
4
4
|
import "hono";
|
|
5
5
|
import "@hono/node-server";
|
|
6
|
+
import "hono/utils/http-status";
|
|
6
7
|
import "hono/factory";
|
|
7
8
|
import "fastify";
|
|
8
9
|
import "fastify-plugin";
|
|
9
10
|
import "koa";
|
|
11
|
+
import "h3";
|
|
10
12
|
//#region src/types.d.ts
|
|
11
13
|
/**
|
|
12
14
|
* Fetch `credentials` policy used by the generated client modules.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.mts","names":[],"sources":["../../src/types.d.ts","../../src/client-helpers.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.mts","names":[],"sources":["../../src/types.d.ts","../../src/client-helpers.ts"],"mappings":";;;;;;;;;;;;;;;KA2EY;;;;;KA0CA;;;;KAIA;GAAgB,cAAc,YAAY;;;;;KAI1C,aAAa,WAAW;;;;KAIxB,YAAY,gBAAgB,YAAY;;;;;KAqNxC;;EAEV,MAAM,QAAQ;;EAEd,SAAS;;;;;;;;;;;;cC9UE,iBAAc,UACf,aACT,QAAQ;;;;;;;;;;;;;;cAyBE,cAAW,MAChB,UAAQ,SACL,aAAW,aACP,aAAW,gBACV,cACF,4BAEX"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.mjs","names":[],"sources":["../../src/constants.ts","../../src/client-helpers.ts"],"sourcesContent":["export const OPERATION_ABORTED = \"Operation aborted\";\n\nexport const REQUEST_CANCELLED = \"Request was cancelled\";\n\nexport const FETCH_ERROR_PREFIX = \"Fetch error: \";\n\nexport const NO_SERVER_FUNCTION_FOUND = \"No server function found.\";\n\nexport const ERROR_LOADING_FILE = \"Error loading file:\";\n\nexport const FUNCTION_NOT_FOUND = \"Function not found\";\n\nexport const METHOD_NOT_ALLOWED = \"Method Not Allowed\";\n\nexport const REQUEST_FORBIDDEN = \"Forbidden\";\n\nexport const INTERNAL_SERVER_ERROR = \"Internal Server Error\";\n\nexport const CLIENT_DISCONNECTED = \"client disconnected\";\n\n/** Returns a warning when a middleware name is reused, preventing registration conflicts. @param name - The duplicate middleware name */\nexport const MIDDLEWARE_NAME_USED = (name: string) =>\n `The middleware name \"${name}\" is already used.`;\n\n/** Error message when a value fails the safe-identifier validation. @param label - What kind of value was being validated. @param name - The rejected value */\nexport const INVALID_IDENTIFIER = (label: string, name: string) =>\n `Invalid ${label}: \"${name}\" must match /^[A-Za-z_$][A-Za-z0-9_$]*$/`;\n\n/** Error message when a value fails the safe-path-segment validation. @param label - What kind of value was being validated. @param segment - The rejected value */\nexport const INVALID_PATH_SEGMENT = (label: string, segment: string) =>\n `Invalid ${label}: \"${segment}\" must match /^[A-Za-z0-9_$][A-Za-z0-9_$/-]*$/`;\n\n/** Warning message when a specified RPC config file cannot be resolved on disk. @param configFile - The requested config filename. @param configFilePath - The resolved absolute path */\nexport const CONFIG_FILE_NOT_FOUND = (\n configFile: string,\n configFilePath: string,\n) =>\n ` ⚠︎ The specified RPC config file ${configFile} cannot be found at ${configFilePath}, loading the defaults..`;\n\nexport const NO_CONFIG_FOUND = ` ⚡︎ No RPC config found, loading the defaults..`;\n\nexport const FAILED_LOAD_CONFIG = ` ⚠︎ Failed to load RPC config:`;\n\n/** Error template for duplicate server function names across files. @param name - The duplicate registered name */\nexport const DUPLICATE_FUNCTION_NAME = (name: string) =>\n `Duplicate server function \"${name}\" detected. Each server function must have a unique name. Remove or rename the duplicate.`;\n","/** @module Client-side helper utilities. Exports `handleResponse` for processing fetch responses and `innerModule` for creating AbortController-bound RPC fetch calls. This module is bundled into the generated client modules — keep it free of server-only code. */\nimport type { Credentials, InnerModReturn, JsonValue } from \"./types.d.ts\";\nimport { FETCH_ERROR_PREFIX, REQUEST_CANCELLED } from \"./constants.ts\";\n\n/**\n * Processes an HTTP fetch response from the RPC server.\n * On HTTP 499 or 408 (client cancellation), logs a warning and returns undefined.\n * On other error statuses, throws a Fetch error.\n * On success, parses JSON and returns `result.data` — or throws if `result.error` is set.\n * @param response - Fetch Response object from the RPC endpoint\n * @returns The response data, or void on cancellation\n */\nexport const handleResponse = async (\n response: Response,\n): Promise<JsonValue | void> => {\n if (!response.ok) {\n if (response.status === 499 || response.status === 408) {\n return console.warn(REQUEST_CANCELLED);\n }\n throw new Error(FETCH_ERROR_PREFIX + response.statusText);\n }\n const result = await response.json();\n if (result.error) throw new Error(result.error);\n return result.data;\n};\n\n/**\n * Creates an AbortController-bound fetch call for a single RPC function.\n * Used by the auto-generated client modules to issue HTTP requests with cancellation support.\n * GET requests carry arguments as an `?args=` JSON query parameter, since a fetch\n * request body is not allowed on GET.\n * @param body - Serialized request body (JSON string or raw text)\n * @param headers - HTTP headers (Content-Type, etc.)\n * @param credentials - Fetch credentials policy (\"same-origin\", \"include\", or \"omit\")\n * @param prefix - RPC endpoint prefix (e.g. \"__rpc\")\n * @param name - Registered server function name\n * @param method - HTTP method to use, \"POST\" by default\n * @returns An object with `data` (promise resolving to the server response) and `cancel` (abort function)\n */\nexport const innerModule = (\n body: BodyInit,\n headers: HeadersInit,\n credentials: Credentials,\n prefix: string,\n name: string,\n method?: \"GET\" | \"POST\",\n): InnerModReturn => {\n const controller = new AbortController();\n const cancel = (reason: string) => controller.abort(reason);\n\n const fetcher = async () => {\n try {\n const isGet = method === \"GET\";\n const url = isGet\n ? `/${prefix}/${name}?args=${encodeURIComponent(String(body))}`\n : `/${prefix}/${name}`;\n const response = await fetch(url, {\n method: isGet ? \"GET\" : \"POST\",\n headers,\n credentials,\n body: isGet ? undefined : body,\n signal: controller.signal,\n });\n return await handleResponse(response);\n } catch (err) {\n throw err;\n }\n };\n\n return {\n data: fetcher(),\n cancel,\n };\n};\n"],"mappings":";AAEA,MAAa,oBAAoB;AAEjC,MAAa,qBAAqB;;;;;;;;;;;ACQlC,MAAa,iBAAiB,OAC5B,aAC8B;CAC9B,IAAI,CAAC,SAAS,IAAI;EAChB,IAAI,SAAS,WAAW,OAAO,SAAS,WAAW,KACjD,OAAO,QAAQ,KAAK,iBAAiB;EAEvC,MAAM,IAAI,MAAM,qBAAqB,SAAS,UAAU;CAC1D;CACA,MAAM,SAAS,MAAM,SAAS,KAAK;CACnC,IAAI,OAAO,OAAO,MAAM,IAAI,MAAM,OAAO,KAAK;CAC9C,OAAO,OAAO;AAChB;;;;;;;;;;;;;;AAeA,MAAa,eACX,MACA,SACA,aACA,QACA,MACA,WACmB;CACnB,MAAM,aAAa,IAAI,gBAAgB;CACvC,MAAM,UAAU,WAAmB,WAAW,MAAM,MAAM;CAE1D,MAAM,UAAU,YAAY;EAC1B,IAAI;GACF,MAAM,QAAQ,WAAW;GACzB,MAAM,MAAM,QACR,IAAI,OAAO,GAAG,KAAK,QAAQ,mBAAmB,OAAO,IAAI,CAAC,MAC1D,IAAI,OAAO,GAAG;GAClB,MAAM,WAAW,MAAM,MAAM,KAAK;IAChC,QAAQ,QAAQ,QAAQ;IACxB;IACA;IACA,MAAM,QAAQ,KAAA,IAAY;IAC1B,QAAQ,WAAW;GACrB,CAAC;GACD,OAAO,MAAM,eAAe,QAAQ;EACtC,SAAS,KAAK;GACZ,MAAM;EACR;CACF;CAEA,OAAO;EACL,MAAM,QAAQ;EACd;CACF;AACF"}
|
|
1
|
+
{"version":3,"file":"helpers.mjs","names":[],"sources":["../../src/constants.ts","../../src/client-helpers.ts"],"sourcesContent":["export const OPERATION_ABORTED = \"Operation aborted\";\n\nexport const REQUEST_CANCELLED = \"Request was cancelled\";\n\nexport const FETCH_ERROR_PREFIX = \"Fetch error: \";\n\nexport const NO_SERVER_FUNCTION_FOUND = \"No server function found.\";\n\nexport const ERROR_LOADING_FILE = \"Error loading file:\";\n\nexport const FUNCTION_NOT_FOUND = \"Function not found\";\n\nexport const METHOD_NOT_ALLOWED = \"Method Not Allowed\";\n\nexport const REQUEST_FORBIDDEN = \"Forbidden\";\n\nexport const UNSUPPORTED_MEDIA_TYPE = \"Unsupported Media Type\";\n\nexport const BAD_REQUEST = \"Bad Request\";\n\nexport const INTERNAL_SERVER_ERROR = \"Internal Server Error\";\n\nexport const CLIENT_DISCONNECTED = \"client disconnected\";\n\n/** Returns a warning when a middleware name is reused, preventing registration conflicts. @param name - The duplicate middleware name */\nexport const MIDDLEWARE_NAME_USED = (name: string) =>\n `The middleware name \"${name}\" is already used.`;\n\n/** Error message when a value fails the safe-identifier validation. @param label - What kind of value was being validated. @param name - The rejected value */\nexport const INVALID_IDENTIFIER = (label: string, name: string) =>\n `Invalid ${label}: \"${name}\" must match /^[A-Za-z_$][A-Za-z0-9_$]*$/`;\n\n/** Error message when a value fails the safe-path-segment validation. @param label - What kind of value was being validated. @param segment - The rejected value */\nexport const INVALID_PATH_SEGMENT = (label: string, segment: string) =>\n `Invalid ${label}: \"${segment}\" must match /^[A-Za-z0-9_$][A-Za-z0-9_$/-]*$/`;\n\n/** Warning message when a specified RPC config file cannot be resolved on disk. @param configFile - The requested config filename. @param configFilePath - The resolved absolute path */\nexport const CONFIG_FILE_NOT_FOUND = (\n configFile: string,\n configFilePath: string,\n) =>\n ` ⚠︎ The specified RPC config file ${configFile} cannot be found at ${configFilePath}, loading the defaults..`;\n\nexport const NO_CONFIG_FOUND = ` ⚡︎ No RPC config found, loading the defaults..`;\n\nexport const FAILED_LOAD_CONFIG = ` ⚠︎ Failed to load RPC config:`;\n\n/** Error template for duplicate server function names across files. @param name - The duplicate registered name */\nexport const DUPLICATE_FUNCTION_NAME = (name: string) =>\n `Duplicate server function \"${name}\" detected. Each server function must have a unique name. Remove or rename the duplicate.`;\n","/** @module Client-side helper utilities. Exports `handleResponse` for processing fetch responses and `innerModule` for creating AbortController-bound RPC fetch calls. This module is bundled into the generated client modules — keep it free of server-only code. */\nimport type { Credentials, InnerModReturn, JsonValue } from \"./types.d.ts\";\nimport { FETCH_ERROR_PREFIX, REQUEST_CANCELLED } from \"./constants.ts\";\n\n/**\n * Processes an HTTP fetch response from the RPC server.\n * On HTTP 499 or 408 (client cancellation), logs a warning and returns undefined.\n * On other error statuses, throws a Fetch error.\n * On success, parses JSON and returns `result.data` — or throws if `result.error` is set.\n * @param response - Fetch Response object from the RPC endpoint\n * @returns The response data, or void on cancellation\n */\nexport const handleResponse = async (\n response: Response,\n): Promise<JsonValue | void> => {\n if (!response.ok) {\n if (response.status === 499 || response.status === 408) {\n return console.warn(REQUEST_CANCELLED);\n }\n throw new Error(FETCH_ERROR_PREFIX + response.statusText);\n }\n const result = await response.json();\n if (result.error) throw new Error(result.error);\n return result.data;\n};\n\n/**\n * Creates an AbortController-bound fetch call for a single RPC function.\n * Used by the auto-generated client modules to issue HTTP requests with cancellation support.\n * GET requests carry arguments as an `?args=` JSON query parameter, since a fetch\n * request body is not allowed on GET.\n * @param body - Serialized request body (JSON string or raw text)\n * @param headers - HTTP headers (Content-Type, etc.)\n * @param credentials - Fetch credentials policy (\"same-origin\", \"include\", or \"omit\")\n * @param prefix - RPC endpoint prefix (e.g. \"__rpc\")\n * @param name - Registered server function name\n * @param method - HTTP method to use, \"POST\" by default\n * @returns An object with `data` (promise resolving to the server response) and `cancel` (abort function)\n */\nexport const innerModule = (\n body: BodyInit,\n headers: HeadersInit,\n credentials: Credentials,\n prefix: string,\n name: string,\n method?: \"GET\" | \"POST\",\n): InnerModReturn => {\n const controller = new AbortController();\n const cancel = (reason: string) => controller.abort(reason);\n\n const fetcher = async () => {\n try {\n const isGet = method === \"GET\";\n const url = isGet\n ? `/${prefix}/${name}?args=${encodeURIComponent(String(body))}`\n : `/${prefix}/${name}`;\n const response = await fetch(url, {\n method: isGet ? \"GET\" : \"POST\",\n headers,\n credentials,\n body: isGet ? undefined : body,\n signal: controller.signal,\n });\n return await handleResponse(response);\n } catch (err) {\n throw err;\n }\n };\n\n return {\n data: fetcher(),\n cancel,\n };\n};\n"],"mappings":";AAEA,MAAa,oBAAoB;AAEjC,MAAa,qBAAqB;;;;;;;;;;;ACQlC,MAAa,iBAAiB,OAC5B,aAC8B;CAC9B,IAAI,CAAC,SAAS,IAAI;EAChB,IAAI,SAAS,WAAW,OAAO,SAAS,WAAW,KACjD,OAAO,QAAQ,KAAK,iBAAiB;EAEvC,MAAM,IAAI,MAAM,qBAAqB,SAAS,UAAU;CAC1D;CACA,MAAM,SAAS,MAAM,SAAS,KAAK;CACnC,IAAI,OAAO,OAAO,MAAM,IAAI,MAAM,OAAO,KAAK;CAC9C,OAAO,OAAO;AAChB;;;;;;;;;;;;;;AAeA,MAAa,eACX,MACA,SACA,aACA,QACA,MACA,WACmB;CACnB,MAAM,aAAa,IAAI,gBAAgB;CACvC,MAAM,UAAU,WAAmB,WAAW,MAAM,MAAM;CAE1D,MAAM,UAAU,YAAY;EAC1B,IAAI;GACF,MAAM,QAAQ,WAAW;GACzB,MAAM,MAAM,QACR,IAAI,OAAO,GAAG,KAAK,QAAQ,mBAAmB,OAAO,IAAI,CAAC,MAC1D,IAAI,OAAO,GAAG;GAClB,MAAM,WAAW,MAAM,MAAM,KAAK;IAChC,QAAQ,QAAQ,QAAQ;IACxB;IACA;IACA,MAAM,QAAQ,KAAA,IAAY;IAC1B,QAAQ,WAAW;GACrB,CAAC;GACD,OAAO,MAAM,eAAe,QAAQ;EACtC,SAAS,KAAK;GACZ,MAAM;EACR;CACF;CAEA,OAAO;EACL,MAAM,QAAQ;EACd;CACF;AACF"}
|
package/dist/hono/hono.d.mts
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { createMiddleware as createMiddleware$1 } from "hono/factory";
|
|
2
2
|
import { Context, Hono, MiddlewareHandler } from "hono";
|
|
3
3
|
import { IncomingMessage } from "node:http";
|
|
4
|
-
import { MiddlewareOptions, RpcPluginOptions } from "@thednp/rpc";
|
|
4
|
+
import { BodyResult, MiddlewareOptions, RpcPluginOptions } from "@thednp/rpc";
|
|
5
5
|
import { HttpBindings } from "@hono/node-server";
|
|
6
6
|
import { ViteDevServer } from "vite";
|
|
7
|
-
import "
|
|
8
|
-
import "fastify";
|
|
9
|
-
import "fastify-plugin";
|
|
10
|
-
import "koa";
|
|
7
|
+
import { RedirectStatusCode } from "hono/utils/http-status";
|
|
11
8
|
//#region src/hono/types.d.ts
|
|
12
9
|
/**
|
|
13
10
|
* Node incoming message with an optional pre-parsed body.
|
|
@@ -50,40 +47,6 @@ declare const createMiddleware: HonoMiddlewareFn;
|
|
|
50
47
|
*/
|
|
51
48
|
declare const createRPCMiddleware: HonoMiddlewareFn;
|
|
52
49
|
//#endregion
|
|
53
|
-
//#region src/types.d.ts
|
|
54
|
-
/**
|
|
55
|
-
* Parsed request body result discriminated by content type.
|
|
56
|
-
*/
|
|
57
|
-
type BodyResult = {
|
|
58
|
-
contentType: "application/json";
|
|
59
|
-
data: JsonValue;
|
|
60
|
-
} | {
|
|
61
|
-
contentType: "text/plain";
|
|
62
|
-
data: string;
|
|
63
|
-
} | {
|
|
64
|
-
contentType: "multipart/form-data";
|
|
65
|
-
data: Record<string, unknown>;
|
|
66
|
-
};
|
|
67
|
-
// primitives and their compositions
|
|
68
|
-
/**
|
|
69
|
-
* Primitive JSON values, including `undefined` for optional parameters.
|
|
70
|
-
*/
|
|
71
|
-
type JsonPrimitive = string | number | boolean | null | undefined;
|
|
72
|
-
/**
|
|
73
|
-
* A JSON object whose values are JSON values or arrays.
|
|
74
|
-
*/
|
|
75
|
-
type JsonObject = {
|
|
76
|
-
[key: string]: JsonValue | JsonArray;
|
|
77
|
-
};
|
|
78
|
-
/**
|
|
79
|
-
* A JSON array of JSON values.
|
|
80
|
-
*/
|
|
81
|
-
type JsonArray = (FormData | JsonValue)[];
|
|
82
|
-
/**
|
|
83
|
-
* Any JSON-serializable value: primitive, array, or object.
|
|
84
|
-
*/
|
|
85
|
-
type JsonValue = JsonPrimitive | JsonArray | JsonObject;
|
|
86
|
-
//#endregion
|
|
87
50
|
//#region src/hono/helpers.d.ts
|
|
88
51
|
/**
|
|
89
52
|
* Convenience function to load RPC config and attach the RPC middleware to a Hono app.
|
|
@@ -116,6 +79,17 @@ declare const viteMiddleware: (vite: ViteDevServer) => ReturnType<typeof createM
|
|
|
116
79
|
* @returns A promise resolving to the parsed body with its content type
|
|
117
80
|
*/
|
|
118
81
|
declare const readBody: (c: Context) => Promise<BodyResult>;
|
|
82
|
+
/**
|
|
83
|
+
* Issues an HTTP redirect on a Hono context. Hono's `c.redirect(location,
|
|
84
|
+
* status)` returns a `Response` object that the handler must return (it never
|
|
85
|
+
* writes directly). Defaults to `303 See Other` for convention
|
|
86
|
+
* (Post/Redirect/Get).
|
|
87
|
+
* @param c - Hono context
|
|
88
|
+
* @param location - The URL to redirect to
|
|
89
|
+
* @param status - HTTP status code, defaults to 303
|
|
90
|
+
* @returns A Hono `Response` to return from the handler
|
|
91
|
+
*/
|
|
92
|
+
declare const redirect: (c: Context, location: string, status?: RedirectStatusCode) => Response;
|
|
119
93
|
//#endregion
|
|
120
|
-
export { type HonoMiddlewareFn, type HonoMiddlewareHooks, type HonoMiddlewareOptions, type IncomingWithBody, attachRPC, attachVite, createMiddleware, createRPCMiddleware, readBody, viteMiddleware };
|
|
94
|
+
export { type HonoMiddlewareFn, type HonoMiddlewareHooks, type HonoMiddlewareOptions, type IncomingWithBody, attachRPC, attachVite, createMiddleware, createRPCMiddleware, readBody, redirect, viteMiddleware };
|
|
121
95
|
//# sourceMappingURL=hono.d.mts.map
|
package/dist/hono/hono.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hono.d.mts","names":[],"sources":["../../src/hono/types.d.ts","../../src/hono/createMiddleware.ts","../../src/
|
|
1
|
+
{"version":3,"file":"hono.d.mts","names":[],"sources":["../../src/hono/types.d.ts","../../src/hono/createMiddleware.ts","../../src/hono/helpers.ts"],"mappings":";;;;;;;;;;;KAOY,mBAAmB;EAAoB;;;;;KAKvC,wBAAwB;;;;UAKnB;;EAEf,SAAS;;;;;;KAOC,oBAAoB,UAAU,sCACxC,iBAAiB,QAAQ,kBAAkB,QACxC;;;;;;;;;;cCaQ,kBAAkB;;;;;;;;cAuElB,qBAAqB;;;;;;;;iBC7FZ,UAAU,KAAK,OAAI;;;;;;;cAgB5B,aAAU,KAAS,MAAI,MAAQ;;;;;;;;;cAY/B,iBAAc,MACnB,kBACL,kBAAkB;EAAmB,UAAU;;;;;;;;cAgDrC,WAAQ,GAChB,YACF,QAAQ;;;;;;;;;;;cA4DE,WAAQ,GAChB,SAAO,kBACM,SACR,uBACP"}
|
package/dist/hono/hono.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createMiddleware as createMiddleware$1 } from "hono/factory";
|
|
2
|
-
import { scanForServerFiles, serverFunctionsMap } from "@thednp/rpc/server";
|
|
2
|
+
import { escapeRegExp, formatError, hasContentTypeMismatch, provideRequestContext, safeURL, scanForServerFiles, serverFunctionsMap } from "@thednp/rpc/server";
|
|
3
3
|
//#region src/options.ts
|
|
4
4
|
const defaultRPCOptions = {
|
|
5
5
|
rpcPrefix: "__rpc",
|
|
@@ -13,66 +13,16 @@ const defaultMiddlewareOptions = {
|
|
|
13
13
|
origin: void 0
|
|
14
14
|
};
|
|
15
15
|
//#endregion
|
|
16
|
-
//#region src/tools.ts
|
|
17
|
-
/**
|
|
18
|
-
* Escapes special regex metacharacters in a string.
|
|
19
|
-
* Used to safely embed user-configurable values (like rpcPrefix) into regular expressions,
|
|
20
|
-
* preventing ReDoS and regex injection attacks.
|
|
21
|
-
* @param s - The raw string to escape
|
|
22
|
-
* @returns The escaped string safe for use in new RegExp()
|
|
23
|
-
*/
|
|
24
|
-
function escapeRegExp(s) {
|
|
25
|
-
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
26
|
-
}
|
|
27
|
-
//#endregion
|
|
28
16
|
//#region src/constants.ts
|
|
29
17
|
const FUNCTION_NOT_FOUND = "Function not found";
|
|
30
18
|
const METHOD_NOT_ALLOWED = "Method Not Allowed";
|
|
31
19
|
const REQUEST_FORBIDDEN = "Forbidden";
|
|
32
|
-
const
|
|
20
|
+
const UNSUPPORTED_MEDIA_TYPE = "Unsupported Media Type";
|
|
21
|
+
const BAD_REQUEST = "Bad Request";
|
|
33
22
|
const CLIENT_DISCONNECTED = "client disconnected";
|
|
34
23
|
/** Returns a warning when a middleware name is reused, preventing registration conflicts. @param name - The duplicate middleware name */
|
|
35
24
|
const MIDDLEWARE_NAME_USED = (name) => `The middleware name "${name}" is already used.`;
|
|
36
25
|
//#endregion
|
|
37
|
-
//#region src/server-helpers.ts
|
|
38
|
-
/**
|
|
39
|
-
* A typed error thrown from server functions.
|
|
40
|
-
* The middleware serializes the `message` and `code` in the response,
|
|
41
|
-
* allowing clients to recognise and handle specific error conditions.
|
|
42
|
-
*/
|
|
43
|
-
var RPCError = class extends Error {
|
|
44
|
-
/** Machine-readable error code (e.g. "VALIDATION_FAILED", "UNAUTHORIZED") */
|
|
45
|
-
code;
|
|
46
|
-
/** Optional diagnostic payload */
|
|
47
|
-
data;
|
|
48
|
-
constructor(message, code = "INTERNAL", data) {
|
|
49
|
-
super(message);
|
|
50
|
-
this.name = "RPCError";
|
|
51
|
-
this.code = code;
|
|
52
|
-
this.data = data;
|
|
53
|
-
}
|
|
54
|
-
};
|
|
55
|
-
/**
|
|
56
|
-
* Formats an error for the RPC middleware response.
|
|
57
|
-
* In development the full `RPCError` payload is included so developers
|
|
58
|
-
* can quickly identify issues. Unexpected exceptions never expose their
|
|
59
|
-
* message — only the generic "Internal Server Error" is sent, preventing
|
|
60
|
-
* information disclosure; server-side diagnostics are preserved via the
|
|
61
|
-
* middleware's `console.error` logging.
|
|
62
|
-
*/
|
|
63
|
-
const formatError = (err, isProduction) => {
|
|
64
|
-
if (isProduction) return { error: INTERNAL_SERVER_ERROR };
|
|
65
|
-
if (err instanceof RPCError) {
|
|
66
|
-
const payload = {
|
|
67
|
-
error: err.message || "Internal Server Error",
|
|
68
|
-
code: err.code
|
|
69
|
-
};
|
|
70
|
-
if (err.data !== void 0) payload.data = err.data;
|
|
71
|
-
return payload;
|
|
72
|
-
}
|
|
73
|
-
return { error: INTERNAL_SERVER_ERROR };
|
|
74
|
-
};
|
|
75
|
-
//#endregion
|
|
76
26
|
//#region src/hono/helpers.ts
|
|
77
27
|
/**
|
|
78
28
|
* Convenience function to load RPC config and attach the RPC middleware to a Hono app.
|
|
@@ -139,12 +89,13 @@ const readBody = async (c) => {
|
|
|
139
89
|
const contentType = c.req.header("content-type")?.toLowerCase() || "";
|
|
140
90
|
const isJSON = contentType.includes("json");
|
|
141
91
|
const isMultipart = contentType.includes("multipart/form-data");
|
|
92
|
+
const isUrlEncoded = contentType.includes("urlencoded");
|
|
142
93
|
const incoming = c.env.incoming;
|
|
143
94
|
if (incoming?.body !== void 0) {
|
|
144
95
|
const reqBody = incoming.body;
|
|
145
96
|
return {
|
|
146
|
-
contentType: isMultipart ? "multipart/form-data" : isJSON ? "application/json" : "text/plain",
|
|
147
|
-
data: isMultipart ? reqBody : isJSON ? reqBody : String(reqBody)
|
|
97
|
+
contentType: isMultipart ? "multipart/form-data" : isJSON ? "application/json" : isUrlEncoded ? "application/x-www-form-urlencoded" : "text/plain",
|
|
98
|
+
data: isMultipart ? reqBody : isJSON ? reqBody : isUrlEncoded ? reqBody : String(reqBody)
|
|
148
99
|
};
|
|
149
100
|
}
|
|
150
101
|
if (isJSON) return {
|
|
@@ -153,10 +104,23 @@ const readBody = async (c) => {
|
|
|
153
104
|
};
|
|
154
105
|
const text = await c.req.text();
|
|
155
106
|
return {
|
|
156
|
-
contentType: isMultipart ? "multipart/form-data" : "text/plain",
|
|
157
|
-
data: isMultipart ? { raw: text } : String(text)
|
|
107
|
+
contentType: isMultipart ? "multipart/form-data" : isUrlEncoded ? "application/x-www-form-urlencoded" : "text/plain",
|
|
108
|
+
data: isMultipart ? { raw: text } : isUrlEncoded ? Object.fromEntries(new URLSearchParams(text)) : String(text)
|
|
158
109
|
};
|
|
159
110
|
};
|
|
111
|
+
/**
|
|
112
|
+
* Issues an HTTP redirect on a Hono context. Hono's `c.redirect(location,
|
|
113
|
+
* status)` returns a `Response` object that the handler must return (it never
|
|
114
|
+
* writes directly). Defaults to `303 See Other` for convention
|
|
115
|
+
* (Post/Redirect/Get).
|
|
116
|
+
* @param c - Hono context
|
|
117
|
+
* @param location - The URL to redirect to
|
|
118
|
+
* @param status - HTTP status code, defaults to 303
|
|
119
|
+
* @returns A Hono `Response` to return from the handler
|
|
120
|
+
*/
|
|
121
|
+
const redirect = (c, location, status = 303) => {
|
|
122
|
+
return c.redirect(location, status);
|
|
123
|
+
};
|
|
160
124
|
//#endregion
|
|
161
125
|
//#region src/hono/createMiddleware.ts
|
|
162
126
|
let middlewareCount = 0;
|
|
@@ -184,20 +148,11 @@ const createMiddleware = (initialOptions = {}) => {
|
|
|
184
148
|
const prefixRegex = rpcPrefix ? new RegExp(`^/${escapeRegExp(rpcPrefix)}/`) : null;
|
|
185
149
|
const pathMatcher = path ? typeof path === "string" ? new RegExp(path) : path : null;
|
|
186
150
|
const middlewareHandler = createMiddleware$1(async (c, next) => {
|
|
187
|
-
const url =
|
|
151
|
+
const url = safeURL(c.req.path).pathname;
|
|
188
152
|
if (serverFunctionsMap.size === 0) await scanForServerFiles();
|
|
189
|
-
if (!handler)
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
}
|
|
193
|
-
if (pathMatcher && !pathMatcher.test(url)) {
|
|
194
|
-
await next();
|
|
195
|
-
return;
|
|
196
|
-
}
|
|
197
|
-
if (prefixRegex && !prefixRegex.test(url)) {
|
|
198
|
-
await next();
|
|
199
|
-
return;
|
|
200
|
-
}
|
|
153
|
+
if (!handler) return next();
|
|
154
|
+
if (pathMatcher && !pathMatcher.test(url)) return next();
|
|
155
|
+
if (prefixRegex && !prefixRegex.test(url)) return next();
|
|
201
156
|
return await handler(c, next);
|
|
202
157
|
});
|
|
203
158
|
Object.defineProperty(middlewareHandler, "name", { value: name });
|
|
@@ -232,16 +187,49 @@ const createRPCMiddleware = (initialOptions = {}) => {
|
|
|
232
187
|
let args = [];
|
|
233
188
|
if (method === "GET") {
|
|
234
189
|
const raw = c.req.query("args");
|
|
235
|
-
if (raw)
|
|
190
|
+
if (raw) {
|
|
191
|
+
const parsed = JSON.parse(raw);
|
|
192
|
+
if (!Array.isArray(parsed)) return c.json({ error: BAD_REQUEST }, 400);
|
|
193
|
+
args = parsed;
|
|
194
|
+
}
|
|
236
195
|
} else {
|
|
196
|
+
if (hasContentTypeMismatch(serverFunction.options?.contentType ?? "application/json", c.req.header("content-type"))) return c.json({ error: UNSUPPORTED_MEDIA_TYPE }, 415);
|
|
237
197
|
const body = await readBody(c);
|
|
238
198
|
args = Array.isArray(body.data) ? body.data : [body.data];
|
|
239
199
|
}
|
|
240
|
-
const
|
|
200
|
+
const requestEvent = {
|
|
201
|
+
request: c.req,
|
|
202
|
+
response: c.res,
|
|
203
|
+
nativeEvent: c,
|
|
204
|
+
locals: {},
|
|
205
|
+
functionName,
|
|
206
|
+
redirect: (location, status = 303) => {
|
|
207
|
+
requestEvent.redirected = {
|
|
208
|
+
location,
|
|
209
|
+
status
|
|
210
|
+
};
|
|
211
|
+
},
|
|
212
|
+
send: (status, body, headers) => {
|
|
213
|
+
requestEvent.sent = {
|
|
214
|
+
status,
|
|
215
|
+
body,
|
|
216
|
+
headers
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
};
|
|
220
|
+
const fnResult = provideRequestContext(requestEvent, () => serverFunction.handler(...args));
|
|
241
221
|
const onAbort = () => fnResult.cancel(CLIENT_DISCONNECTED);
|
|
242
222
|
c.env.incoming?.on("close", onAbort);
|
|
243
223
|
const result = await fnResult.data;
|
|
244
224
|
c.env.incoming?.off("close", onAbort);
|
|
225
|
+
if (requestEvent.redirected) return c.redirect(requestEvent.redirected.location, requestEvent.redirected.status);
|
|
226
|
+
if (requestEvent.sent) {
|
|
227
|
+
const { status, body, headers } = requestEvent.sent;
|
|
228
|
+
return c.body(JSON.stringify(body), status, {
|
|
229
|
+
"content-type": "application/json",
|
|
230
|
+
...headers
|
|
231
|
+
});
|
|
232
|
+
}
|
|
245
233
|
return c.json({ data: result }, 200);
|
|
246
234
|
} catch (err) {
|
|
247
235
|
console.error(String(err));
|
|
@@ -252,6 +240,6 @@ const createRPCMiddleware = (initialOptions = {}) => {
|
|
|
252
240
|
});
|
|
253
241
|
};
|
|
254
242
|
//#endregion
|
|
255
|
-
export { attachRPC, attachVite, createMiddleware, createRPCMiddleware, readBody, viteMiddleware };
|
|
243
|
+
export { attachRPC, attachVite, createMiddleware, createRPCMiddleware, readBody, redirect, viteMiddleware };
|
|
256
244
|
|
|
257
245
|
//# sourceMappingURL=hono.mjs.map
|