@trpc/server 10.0.0-alpha.45 → 10.0.0-alpha.48
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/adapters/aws-lambda/index.js +1 -1
- package/adapters/fastify/index.js +1 -1
- package/adapters/fetch/index.js +1 -1
- package/adapters/node-http/index.js +1 -1
- package/dist/TRPCError-6f61762c.mjs +54 -0
- package/dist/TRPCError-9c7830b4.js +58 -0
- package/dist/adapters/aws-lambda/index.d.ts.map +1 -1
- package/dist/adapters/aws-lambda/index.js +119 -156
- package/dist/adapters/aws-lambda/index.mjs +119 -156
- package/dist/adapters/aws-lambda/utils.d.ts.map +1 -1
- package/dist/adapters/express.d.ts.map +1 -1
- package/dist/adapters/express.js +14 -14
- package/dist/adapters/express.mjs +14 -14
- package/dist/adapters/fastify/fastifyRequestHandler.d.ts.map +1 -1
- package/dist/adapters/fastify/fastifyTRPCPlugin.d.ts.map +1 -1
- package/dist/adapters/fastify/index.d.ts.map +1 -1
- package/dist/adapters/fastify/index.js +68 -89
- package/dist/adapters/fastify/index.mjs +68 -89
- package/dist/adapters/fetch/fetchRequestHandler.d.ts.map +1 -1
- package/dist/adapters/fetch/index.d.ts.map +1 -1
- package/dist/adapters/fetch/index.js +45 -57
- package/dist/adapters/fetch/index.mjs +45 -57
- package/dist/adapters/fetch/types.d.ts.map +1 -1
- package/dist/adapters/lambda/index.d.ts.map +1 -1
- package/dist/adapters/next.d.ts.map +1 -1
- package/dist/adapters/next.js +42 -46
- package/dist/adapters/next.mjs +42 -46
- package/dist/adapters/node-http/index.d.ts.map +1 -1
- package/dist/adapters/node-http/index.js +5 -5
- package/dist/adapters/node-http/index.mjs +5 -5
- package/dist/adapters/node-http/internals/getPostBody.d.ts.map +1 -1
- package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts.map +1 -1
- package/dist/adapters/node-http/types.d.ts.map +1 -1
- package/dist/adapters/standalone.d.ts.map +1 -1
- package/dist/adapters/standalone.js +30 -32
- package/dist/adapters/standalone.mjs +30 -32
- package/dist/adapters/ws.d.ts.map +1 -1
- package/dist/adapters/ws.js +272 -352
- package/dist/adapters/ws.mjs +272 -352
- package/dist/codes-1c24d919.js +47 -0
- package/dist/codes-aaa7d554.mjs +44 -0
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/initTRPC.d.ts.map +1 -1
- package/dist/core/internals/__generated__/mergeRoutersGeneric.d.ts.map +1 -1
- package/dist/core/internals/config.d.ts.map +1 -1
- package/dist/core/internals/getParseFn.d.ts.map +1 -1
- package/dist/core/internals/mergeRouters.d.ts.map +1 -1
- package/dist/core/internals/mergeWithoutOverrides.d.ts.map +1 -1
- package/dist/core/internals/omitPrototype.d.ts.map +1 -1
- package/dist/core/internals/prefixObjectKeys.d.ts.map +1 -1
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/core/internals/utils.d.ts.map +1 -1
- package/dist/core/middleware.d.ts.map +1 -1
- package/dist/core/parser.d.ts.map +1 -1
- package/dist/core/procedure.d.ts.map +1 -1
- package/dist/core/router.d.ts.map +1 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/deprecated/internals/callProcedure.d.ts.map +1 -1
- package/dist/deprecated/internals/middlewares.d.ts.map +1 -1
- package/dist/deprecated/internals/procedure.d.ts.map +1 -1
- package/dist/deprecated/interop.d.ts.map +1 -1
- package/dist/deprecated/router.d.ts.map +1 -1
- package/dist/error/TRPCError.d.ts.map +1 -1
- package/dist/error/formatter.d.ts.map +1 -1
- package/dist/error/utils.d.ts.map +1 -1
- package/dist/http/index.d.ts.map +1 -1
- package/dist/http/internals/getHTTPStatusCode.d.ts.map +1 -1
- package/dist/http/internals/types.d.ts.map +1 -1
- package/dist/http/resolveHTTPResponse.d.ts.map +1 -1
- package/dist/http/types.d.ts.map +1 -1
- package/dist/index-47817162.mjs +26 -0
- package/dist/index-9d687d33.js +28 -0
- package/dist/index.js +59 -95
- package/dist/index.mjs +60 -96
- package/dist/internals/invert.d.ts.map +1 -1
- package/dist/internals/transformTRPCResponse.d.ts.map +1 -1
- package/dist/internals/types.d.ts.map +1 -1
- package/dist/nodeHTTPRequestHandler-7c2a3037.js +82 -0
- package/dist/nodeHTTPRequestHandler-b37609f7.mjs +80 -0
- package/dist/observable/index.d.ts.map +1 -1
- package/dist/observable/index.js +125 -172
- package/dist/observable/index.mjs +125 -172
- package/dist/observable/internals/identity.d.ts.map +1 -1
- package/dist/observable/internals/observableToPromise.d.ts.map +1 -1
- package/dist/observable/internals/pipe.d.ts.map +1 -1
- package/dist/observable/observable.d.ts.map +1 -1
- package/dist/observable/operators/index.d.ts.map +1 -1
- package/dist/observable/operators/map.d.ts.map +1 -1
- package/dist/observable/operators/share.d.ts.map +1 -1
- package/dist/observable/operators/tap.d.ts.map +1 -1
- package/dist/observable/types.d.ts.map +1 -1
- package/dist/observable-b651bf11.js +84 -0
- package/dist/observable-e129ac9d.mjs +81 -0
- package/dist/resolveHTTPResponse-83703ee8.mjs +251 -0
- package/dist/resolveHTTPResponse-b486996d.js +255 -0
- package/dist/router-8372703e.js +886 -0
- package/dist/router-f21b6d06.mjs +876 -0
- package/dist/rpc/codes.d.ts.map +1 -1
- package/dist/rpc/envelopes.d.ts.map +1 -1
- package/dist/rpc/index.d.ts.map +1 -1
- package/dist/rpc/index.js +3 -7
- package/dist/rpc/index.mjs +1 -1
- package/dist/rpc/internals/invert.d.ts.map +1 -1
- package/dist/shared/createProxy/index.d.ts.map +1 -1
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +1 -1
- package/dist/shared/index.mjs +1 -1
- package/dist/subscription.js +24 -34
- package/dist/subscription.mjs +24 -34
- package/dist/transformTRPCResponse-11ac69cc.js +27 -0
- package/dist/transformTRPCResponse-c8138d5f.mjs +25 -0
- package/observable/index.js +1 -1
- package/package.json +12 -16
- package/rpc/index.js +1 -1
- package/shared/index.js +1 -1
- package/subscription/index.d.ts +1 -0
- package/subscription/index.js +1 -0
- package/dist/TRPCError-9050a68d.js +0 -69
- package/dist/TRPCError-97212592.mjs +0 -65
- package/dist/adapters/aws-lambda/index.ts.js +0 -1
- package/dist/adapters/express.ts.js +0 -1
- package/dist/adapters/fastify/index.ts.js +0 -1
- package/dist/adapters/fetch/index.ts.js +0 -1
- package/dist/adapters/next.ts.js +0 -1
- package/dist/adapters/node-http/index.ts.js +0 -1
- package/dist/adapters/standalone.ts.js +0 -1
- package/dist/adapters/ws.ts.js +0 -1
- package/dist/envelopes-2ae27c9f.js +0 -85
- package/dist/envelopes-b9f49d4d.mjs +0 -82
- package/dist/index-1a25ccbd.js +0 -33
- package/dist/index-a3bd54c7.mjs +0 -31
- package/dist/index.ts.js +0 -1
- package/dist/nodeHTTPRequestHandler-bee7aacc.js +0 -107
- package/dist/nodeHTTPRequestHandler-f1656eba.mjs +0 -105
- package/dist/observable/index.ts.js +0 -1
- package/dist/observable-341a0506.js +0 -109
- package/dist/observable-cfedfa30.mjs +0 -106
- package/dist/resolveHTTPResponse-455f1e51.mjs +0 -293
- package/dist/resolveHTTPResponse-5d90abc5.js +0 -297
- package/dist/router-4e50a6ac.js +0 -1104
- package/dist/router-a3db8f3a.mjs +0 -1094
- package/dist/rpc/index.ts.js +0 -1
- package/dist/shared/index.ts.js +0 -1
- package/dist/subscription.ts.js +0 -1
- package/dist/transformTRPCResponse-0c261655.js +0 -29
- package/dist/transformTRPCResponse-747b9a68.mjs +0 -27
|
@@ -1,186 +1,149 @@
|
|
|
1
|
-
import '../../router-
|
|
2
|
-
import { T as TRPCError } from '../../TRPCError-
|
|
3
|
-
import '../../
|
|
4
|
-
import
|
|
5
|
-
import '../../index-
|
|
6
|
-
import '../../transformTRPCResponse-
|
|
1
|
+
import '../../router-f21b6d06.mjs';
|
|
2
|
+
import { T as TRPCError } from '../../TRPCError-6f61762c.mjs';
|
|
3
|
+
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-83703ee8.mjs';
|
|
4
|
+
import '../../codes-aaa7d554.mjs';
|
|
5
|
+
import '../../index-47817162.mjs';
|
|
6
|
+
import '../../transformTRPCResponse-c8138d5f.mjs';
|
|
7
7
|
|
|
8
8
|
function isPayloadV1(event) {
|
|
9
|
-
|
|
9
|
+
return determinePayloadFormat(event) == '1.0';
|
|
10
10
|
}
|
|
11
11
|
function isPayloadV2(event) {
|
|
12
|
-
|
|
12
|
+
return determinePayloadFormat(event) == '2.0';
|
|
13
13
|
}
|
|
14
|
-
|
|
15
14
|
function determinePayloadFormat(event) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
return '1.0';
|
|
23
|
-
} else {
|
|
24
|
-
if (['1.0', '2.0'].includes(unknownEvent.version)) {
|
|
25
|
-
return unknownEvent.version;
|
|
15
|
+
// https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
|
|
16
|
+
// According to AWS support, version is is extracted from the version property in the event.
|
|
17
|
+
// If there is no version property, then the version is implied as 1.0
|
|
18
|
+
const unknownEvent = event;
|
|
19
|
+
if (typeof unknownEvent.version === 'undefined') {
|
|
20
|
+
return '1.0';
|
|
26
21
|
} else {
|
|
27
|
-
|
|
22
|
+
if ([
|
|
23
|
+
'1.0',
|
|
24
|
+
'2.0'
|
|
25
|
+
].includes(unknownEvent.version)) {
|
|
26
|
+
return unknownEvent.version;
|
|
27
|
+
} else {
|
|
28
|
+
return 'custom';
|
|
29
|
+
}
|
|
28
30
|
}
|
|
29
|
-
}
|
|
30
31
|
}
|
|
31
|
-
|
|
32
32
|
const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
|
|
33
33
|
|
|
34
34
|
function lambdaEventToHTTPRequest(event) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
if (typeof value !== 'undefined') {
|
|
41
|
-
query.append(key, value);
|
|
35
|
+
const query = new URLSearchParams();
|
|
36
|
+
for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
|
|
37
|
+
if (typeof value !== 'undefined') {
|
|
38
|
+
query.append(key, value);
|
|
39
|
+
}
|
|
42
40
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
body: event.body
|
|
50
|
-
};
|
|
41
|
+
return {
|
|
42
|
+
method: getHTTPMethod(event),
|
|
43
|
+
query: query,
|
|
44
|
+
headers: event.headers,
|
|
45
|
+
body: event.body
|
|
46
|
+
};
|
|
51
47
|
}
|
|
52
|
-
|
|
53
48
|
function getHTTPMethod(event) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
65
|
-
});
|
|
49
|
+
if (isPayloadV1(event)) {
|
|
50
|
+
return event.httpMethod;
|
|
51
|
+
}
|
|
52
|
+
if (isPayloadV2(event)) {
|
|
53
|
+
return event.requestContext.http.method;
|
|
54
|
+
}
|
|
55
|
+
throw new TRPCError({
|
|
56
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
57
|
+
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
58
|
+
});
|
|
66
59
|
}
|
|
67
|
-
|
|
68
60
|
function getPath(event) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
61
|
+
if (isPayloadV1(event)) {
|
|
62
|
+
const matches = event.resource.matchAll(/\{(.*?)\}/g);
|
|
63
|
+
for (const match of matches){
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
65
|
+
const group = match[1];
|
|
66
|
+
if (group.includes('+') && event.pathParameters) {
|
|
67
|
+
return event.pathParameters[group.replace('+', '')] || '';
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return event.path.slice(1);
|
|
79
71
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
if (group.includes('+') && event.pathParameters) {
|
|
92
|
-
return event.pathParameters[group.replace('+', '')] || '';
|
|
93
|
-
}
|
|
72
|
+
if (isPayloadV2(event)) {
|
|
73
|
+
const matches1 = event.routeKey.matchAll(/\{(.*?)\}/g);
|
|
74
|
+
for (const match1 of matches1){
|
|
75
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
76
|
+
const group1 = match1[1];
|
|
77
|
+
if (group1.includes('+') && event.pathParameters) {
|
|
78
|
+
return event.pathParameters[group1.replace('+', '')] || '';
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return event.rawPath.slice(1);
|
|
94
82
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
throw new TRPCError({
|
|
100
|
-
code: 'INTERNAL_SERVER_ERROR',
|
|
101
|
-
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
102
|
-
});
|
|
83
|
+
throw new TRPCError({
|
|
84
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
85
|
+
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
86
|
+
});
|
|
103
87
|
}
|
|
104
|
-
|
|
105
88
|
function transformHeaders(headers) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
89
|
+
const obj = {};
|
|
90
|
+
for (const [key, value] of Object.entries(headers)){
|
|
91
|
+
if (typeof value === 'undefined') {
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
obj[key] = Array.isArray(value) ? value.join(',') : value;
|
|
111
95
|
}
|
|
112
|
-
|
|
113
|
-
obj[key] = Array.isArray(value) ? value.join(',') : value;
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
return obj;
|
|
96
|
+
return obj;
|
|
117
97
|
}
|
|
118
|
-
|
|
119
98
|
function tRPCOutputToAPIGatewayOutput(event, response) {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
code: 'INTERNAL_SERVER_ERROR',
|
|
141
|
-
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
142
|
-
});
|
|
143
|
-
}
|
|
99
|
+
if (isPayloadV1(event)) {
|
|
100
|
+
const resp = {
|
|
101
|
+
statusCode: response.status,
|
|
102
|
+
body: response.body ?? '',
|
|
103
|
+
headers: transformHeaders(response.headers ?? {})
|
|
104
|
+
};
|
|
105
|
+
return resp;
|
|
106
|
+
} else if (isPayloadV2(event)) {
|
|
107
|
+
const resp1 = {
|
|
108
|
+
statusCode: response.status,
|
|
109
|
+
body: response.body ?? undefined,
|
|
110
|
+
headers: transformHeaders(response.headers ?? {})
|
|
111
|
+
};
|
|
112
|
+
return resp1;
|
|
113
|
+
} else {
|
|
114
|
+
throw new TRPCError({
|
|
115
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
116
|
+
message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
|
|
117
|
+
});
|
|
118
|
+
}
|
|
144
119
|
}
|
|
145
|
-
/** Will check the createContext of the TRouter and get the parameter of event.
|
|
146
|
-
* @internal
|
|
147
|
-
**/
|
|
148
|
-
|
|
149
|
-
|
|
150
120
|
function awsLambdaRequestHandler(opts) {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
var _opts$onError;
|
|
175
|
-
|
|
176
|
-
opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
|
|
177
|
-
req: event
|
|
121
|
+
return async (event, context)=>{
|
|
122
|
+
const req = lambdaEventToHTTPRequest(event);
|
|
123
|
+
const path = getPath(event);
|
|
124
|
+
const createContext = async function _createContext() {
|
|
125
|
+
return await opts.createContext?.({
|
|
126
|
+
event,
|
|
127
|
+
context
|
|
128
|
+
});
|
|
129
|
+
};
|
|
130
|
+
const response = await resolveHTTPResponse({
|
|
131
|
+
router: opts.router,
|
|
132
|
+
batching: opts.batching,
|
|
133
|
+
responseMeta: opts?.responseMeta,
|
|
134
|
+
createContext,
|
|
135
|
+
req,
|
|
136
|
+
path,
|
|
137
|
+
error: null,
|
|
138
|
+
onError (o) {
|
|
139
|
+
opts?.onError?.({
|
|
140
|
+
...o,
|
|
141
|
+
req: event
|
|
142
|
+
});
|
|
143
|
+
}
|
|
178
144
|
});
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
});
|
|
182
|
-
return tRPCOutputToAPIGatewayOutput(event, response);
|
|
183
|
-
};
|
|
145
|
+
return tRPCOutputToAPIGatewayOutput(event, response);
|
|
146
|
+
};
|
|
184
147
|
}
|
|
185
148
|
|
|
186
149
|
export { awsLambdaRequestHandler };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/adapters/aws-lambda/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,oBAAY,eAAe,GAAG,oBAAoB,GAAG,sBAAsB,CAAC;AAC5E,oBAAY,gBAAgB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AAEtC,oBAAY,6BAA6B,CAAC,CAAC,SAAS,eAAe,IAAI;IACrE,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF,oBAAY,wBAAwB,CAClC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,CAAC,EACH,KAAK,EACL,OAAO,GACR,EAAE,6BAA6B,CAAC,MAAM,CAAC,KACpC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzC,oBAAY,gBAAgB,CAC1B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAE5B;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC,GAAG,CACA;IACE;;QAEI;IACJ,aAAa,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC1D,GACD;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC3D,CACJ,CAAC;AAEN,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,oBAAoB,CAE/B;AACD,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,sBAAsB,CAEjC;AAmBD,oBAAY,+BAA+B,GAAG,KAAK,GAAG,KAAK,CAAC;AAC5D,oBAAY,8BAA8B,GACtC,+BAA+B,GAC/B,QAAQ,CAAC;AAEb,eAAO,MAAM,4CAA4C,QAEiD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/adapters/express.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,oBAAY,2BAA2B,GAAG,8BAA8B,CACtE,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,QAAQ,CACjB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAC/D,IAAI,EAAE,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvE,OAAO,CAAC,OAAO,CAWjB"}
|
package/dist/adapters/express.js
CHANGED
|
@@ -2,22 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
6
|
-
require('../resolveHTTPResponse-
|
|
7
|
-
require('../TRPCError-
|
|
8
|
-
require('../transformTRPCResponse-
|
|
9
|
-
require('../
|
|
5
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-7c2a3037.js');
|
|
6
|
+
require('../resolveHTTPResponse-b486996d.js');
|
|
7
|
+
require('../TRPCError-9c7830b4.js');
|
|
8
|
+
require('../transformTRPCResponse-11ac69cc.js');
|
|
9
|
+
require('../codes-1c24d919.js');
|
|
10
10
|
|
|
11
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
12
11
|
function createExpressMiddleware(opts) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
return async (req, res)=>{
|
|
13
|
+
const endpoint = req.path.slice(1);
|
|
14
|
+
await nodeHTTPRequestHandler.nodeHTTPRequestHandler({
|
|
15
|
+
...opts,
|
|
16
|
+
req,
|
|
17
|
+
res,
|
|
18
|
+
path: endpoint
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
exports.createExpressMiddleware = createExpressMiddleware;
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
2
|
-
import '../resolveHTTPResponse-
|
|
3
|
-
import '../TRPCError-
|
|
4
|
-
import '../transformTRPCResponse-
|
|
5
|
-
import '../
|
|
1
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-b37609f7.mjs';
|
|
2
|
+
import '../resolveHTTPResponse-83703ee8.mjs';
|
|
3
|
+
import '../TRPCError-6f61762c.mjs';
|
|
4
|
+
import '../transformTRPCResponse-c8138d5f.mjs';
|
|
5
|
+
import '../codes-aaa7d554.mjs';
|
|
6
6
|
|
|
7
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
8
7
|
function createExpressMiddleware(opts) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
8
|
+
return async (req, res)=>{
|
|
9
|
+
const endpoint = req.path.slice(1);
|
|
10
|
+
await nodeHTTPRequestHandler({
|
|
11
|
+
...opts,
|
|
12
|
+
req,
|
|
13
|
+
res,
|
|
14
|
+
path: endpoint
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
export { createExpressMiddleware };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAsB,MAAM,YAAY,CAAC;AAC3D,OAAO,EACL,sBAAsB,EAEvB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAI3D,oBAAY,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,aAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAExD,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA2CjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/adapters/fastify/fastifyTRPCPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAI9D,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,SAAS;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;CAC3E;AAED,oBAAY,2BAA2B,GAAG,8BAA8B,CACtE,cAAc,EACd,YAAY,CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,EACvC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,QAiC5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/adapters/fastify/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
|
@@ -2,106 +2,85 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
5
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-b486996d.js');
|
|
6
6
|
var adapters_ws = require('../ws.js');
|
|
7
|
-
require('../../TRPCError-
|
|
8
|
-
require('../../transformTRPCResponse-
|
|
9
|
-
require('../../
|
|
10
|
-
require('../../observable-
|
|
7
|
+
require('../../TRPCError-9c7830b4.js');
|
|
8
|
+
require('../../transformTRPCResponse-11ac69cc.js');
|
|
9
|
+
require('../../codes-1c24d919.js');
|
|
10
|
+
require('../../observable-b651bf11.js');
|
|
11
11
|
|
|
12
12
|
resolveHTTPResponse.assertNotBrowser();
|
|
13
13
|
async function fastifyRequestHandler(opts) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
req: opts.req
|
|
42
|
-
});
|
|
14
|
+
const createContext = async function _createContext() {
|
|
15
|
+
return opts.createContext?.(opts);
|
|
16
|
+
};
|
|
17
|
+
const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
|
|
18
|
+
const req = {
|
|
19
|
+
query,
|
|
20
|
+
method: opts.req.method,
|
|
21
|
+
headers: opts.req.headers,
|
|
22
|
+
body: opts.req.body ?? 'null'
|
|
23
|
+
};
|
|
24
|
+
const result = await resolveHTTPResponse.resolveHTTPResponse({
|
|
25
|
+
req,
|
|
26
|
+
createContext,
|
|
27
|
+
path: opts.path,
|
|
28
|
+
router: opts.router,
|
|
29
|
+
batching: opts.batching,
|
|
30
|
+
responseMeta: opts.responseMeta,
|
|
31
|
+
onError (o) {
|
|
32
|
+
opts?.onError?.({
|
|
33
|
+
...o,
|
|
34
|
+
req: opts.req
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
const { res } = opts;
|
|
39
|
+
if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
|
|
40
|
+
res.statusCode = result.status;
|
|
43
41
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
|
|
51
|
-
res.statusCode = result.status;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
for (const [key, value] of Object.entries((_result$headers = result.headers) !== null && _result$headers !== void 0 ? _result$headers : {})) {
|
|
55
|
-
var _result$headers;
|
|
56
|
-
|
|
57
|
-
if (typeof value === 'undefined') {
|
|
58
|
-
continue;
|
|
42
|
+
for (const [key, value] of Object.entries(result.headers ?? {})){
|
|
43
|
+
if (typeof value === 'undefined') {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
void res.header(key, value);
|
|
59
47
|
}
|
|
60
|
-
|
|
61
|
-
void res.header(key, value);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
await res.send(result.body);
|
|
48
|
+
await res.send(result.body);
|
|
65
49
|
}
|
|
66
50
|
|
|
67
51
|
/// <reference types="@fastify/websocket" />
|
|
68
52
|
function fastifyTRPCPlugin(fastify, opts, done) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}, function (_, body, _done) {
|
|
74
|
-
_done(null, body);
|
|
75
|
-
});
|
|
76
|
-
let prefix = (_opts$prefix = opts.prefix) !== null && _opts$prefix !== void 0 ? _opts$prefix : ''; // https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
|
|
77
|
-
// @ts-expect-error property 'default' does not exists on type ...
|
|
78
|
-
|
|
79
|
-
if (typeof fastifyTRPCPlugin.default !== 'function') {
|
|
80
|
-
prefix = ''; // handled by fastify internally
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
fastify.all(`${prefix}/:path`, async (req, res) => {
|
|
84
|
-
const path = req.params.path;
|
|
85
|
-
await fastifyRequestHandler({ ...opts.trpcOptions,
|
|
86
|
-
req,
|
|
87
|
-
res,
|
|
88
|
-
path
|
|
53
|
+
fastify.addContentTypeParser('application/json', {
|
|
54
|
+
parseAs: 'string'
|
|
55
|
+
}, function(_, body, _done) {
|
|
56
|
+
_done(null, body);
|
|
89
57
|
});
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
58
|
+
let prefix = opts.prefix ?? '';
|
|
59
|
+
// https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
|
|
60
|
+
// @ts-expect-error property 'default' does not exists on type ...
|
|
61
|
+
if (typeof fastifyTRPCPlugin.default !== 'function') {
|
|
62
|
+
prefix = ''; // handled by fastify internally
|
|
63
|
+
}
|
|
64
|
+
fastify.all(`${prefix}/:path`, async (req, res)=>{
|
|
65
|
+
const path = req.params.path;
|
|
66
|
+
await fastifyRequestHandler({
|
|
67
|
+
...opts.trpcOptions,
|
|
68
|
+
req,
|
|
69
|
+
res,
|
|
70
|
+
path
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
if (opts.useWSS) {
|
|
74
|
+
adapters_ws.applyWSSHandler({
|
|
75
|
+
...opts.trpcOptions,
|
|
76
|
+
wss: fastify.websocketServer
|
|
77
|
+
});
|
|
78
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
79
|
+
fastify.get(prefix ?? '/', {
|
|
80
|
+
websocket: true
|
|
81
|
+
}, ()=>{});
|
|
82
|
+
}
|
|
83
|
+
done();
|
|
105
84
|
}
|
|
106
85
|
|
|
107
86
|
exports.fastifyRequestHandler = fastifyRequestHandler;
|