@trpc/server 10.0.0-proxy-alpha.54 → 10.0.0-proxy-alpha.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{TRPCError-e6e632a5.mjs → TRPCError-281ac25a.mjs} +18 -18
- package/dist/{TRPCError-bcb38a84.js → TRPCError-fe9113e5.js} +18 -18
- package/dist/adapters/aws-lambda/index.js +3 -3
- package/dist/adapters/aws-lambda/index.mjs +3 -3
- package/dist/adapters/express.js +3 -3
- package/dist/adapters/express.mjs +3 -3
- package/dist/adapters/fastify/index.js +2 -2
- package/dist/adapters/fastify/index.mjs +2 -2
- package/dist/adapters/fetch/index.js +2 -2
- package/dist/adapters/fetch/index.mjs +2 -2
- package/dist/adapters/next.js +3 -3
- package/dist/adapters/next.mjs +3 -3
- package/dist/adapters/node-http/index.js +3 -3
- package/dist/adapters/node-http/index.mjs +3 -3
- package/dist/adapters/standalone.js +3 -3
- package/dist/adapters/standalone.mjs +3 -3
- package/dist/adapters/ws.js +5 -5
- package/dist/adapters/ws.mjs +5 -5
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/deprecated/internals/procedure.d.ts.map +1 -1
- package/dist/error/TRPCError.d.ts +1 -1
- package/dist/error/TRPCError.d.ts.map +1 -1
- package/dist/error/utils.d.ts +2 -1
- package/dist/error/utils.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.mjs +4 -4
- package/dist/{nodeHTTPRequestHandler-6609461a.js → nodeHTTPRequestHandler-ea18179c.js} +2 -2
- package/dist/{nodeHTTPRequestHandler-2c467c02.mjs → nodeHTTPRequestHandler-eba995e5.mjs} +2 -2
- package/dist/{resolveHTTPResponse-11d52bd0.mjs → resolveHTTPResponse-87b3a1e6.mjs} +3 -3
- package/dist/{resolveHTTPResponse-29d4b64a.js → resolveHTTPResponse-b12c934f.js} +3 -3
- package/dist/{router-3ee4babe.js → router-36801fd1.js} +4 -4
- package/dist/{router-a2a75de3.mjs → router-dfb17a79.mjs} +4 -4
- package/dist/rpc/envelopes.d.ts +4 -0
- package/dist/rpc/envelopes.d.ts.map +1 -1
- package/dist/subscription.js +3 -3
- package/dist/subscription.mjs +3 -3
- package/package.json +2 -2
- package/src/adapters/ws.ts +5 -5
- package/src/core/internals/procedureBuilder.ts +5 -2
- package/src/deprecated/internals/procedure.ts +5 -2
- package/src/error/TRPCError.ts +5 -4
- package/src/error/utils.ts +17 -18
- package/src/http/resolveHTTPResponse.ts +3 -3
- package/src/rpc/envelopes.ts +6 -0
- package/src/subscription.ts +3 -3
|
@@ -8,27 +8,27 @@ function getMessageFromUnkownError(err, fallback) {
|
|
|
8
8
|
return fallback;
|
|
9
9
|
}
|
|
10
10
|
function getErrorFromUnknown(cause) {
|
|
11
|
+
if (cause instanceof Error) {
|
|
12
|
+
return cause;
|
|
13
|
+
}
|
|
14
|
+
const message = getMessageFromUnkownError(cause, 'Unknown error');
|
|
15
|
+
return new Error(message);
|
|
16
|
+
}
|
|
17
|
+
function getTRPCErrorFromUnknown(cause) {
|
|
18
|
+
const error = getErrorFromUnknown(cause);
|
|
11
19
|
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
12
20
|
// ref https://github.com/trpc/trpc/issues/331
|
|
13
|
-
if (
|
|
21
|
+
if (error.name === 'TRPCError') {
|
|
14
22
|
return cause;
|
|
15
23
|
}
|
|
16
|
-
|
|
17
|
-
let stack = undefined;
|
|
18
|
-
let message = undefined;
|
|
19
|
-
if (cause instanceof Error) {
|
|
20
|
-
errorCause = cause;
|
|
21
|
-
// take stack trace from cause
|
|
22
|
-
stack = cause.stack;
|
|
23
|
-
message = cause.message;
|
|
24
|
-
}
|
|
25
|
-
const err = new TRPCError({
|
|
24
|
+
const trpcError = new TRPCError({
|
|
26
25
|
code: 'INTERNAL_SERVER_ERROR',
|
|
27
|
-
cause:
|
|
28
|
-
message
|
|
26
|
+
cause: error,
|
|
27
|
+
message: error.message
|
|
29
28
|
});
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
// Inherit stack from error
|
|
30
|
+
trpcError.stack = error.stack;
|
|
31
|
+
return trpcError;
|
|
32
32
|
}
|
|
33
33
|
function getCauseFromUnknown(cause) {
|
|
34
34
|
if (cause instanceof Error) {
|
|
@@ -39,9 +39,9 @@ function getCauseFromUnknown(cause) {
|
|
|
39
39
|
|
|
40
40
|
class TRPCError extends Error {
|
|
41
41
|
constructor(opts){
|
|
42
|
-
const cause = opts.cause;
|
|
43
42
|
const code = opts.code;
|
|
44
|
-
const message = opts.message ?? getMessageFromUnkownError(cause, code);
|
|
43
|
+
const message = opts.message ?? getMessageFromUnkownError(opts.cause, code);
|
|
44
|
+
const cause = opts !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
|
|
45
45
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
46
46
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
47
47
|
super(message, {
|
|
@@ -54,4 +54,4 @@ class TRPCError extends Error {
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
export { TRPCError as T, getCauseFromUnknown as a,
|
|
57
|
+
export { TRPCError as T, getCauseFromUnknown as a, getTRPCErrorFromUnknown as g };
|
|
@@ -10,27 +10,27 @@ function getMessageFromUnkownError(err, fallback) {
|
|
|
10
10
|
return fallback;
|
|
11
11
|
}
|
|
12
12
|
function getErrorFromUnknown(cause) {
|
|
13
|
+
if (cause instanceof Error) {
|
|
14
|
+
return cause;
|
|
15
|
+
}
|
|
16
|
+
const message = getMessageFromUnkownError(cause, 'Unknown error');
|
|
17
|
+
return new Error(message);
|
|
18
|
+
}
|
|
19
|
+
function getTRPCErrorFromUnknown(cause) {
|
|
20
|
+
const error = getErrorFromUnknown(cause);
|
|
13
21
|
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
14
22
|
// ref https://github.com/trpc/trpc/issues/331
|
|
15
|
-
if (
|
|
23
|
+
if (error.name === 'TRPCError') {
|
|
16
24
|
return cause;
|
|
17
25
|
}
|
|
18
|
-
|
|
19
|
-
let stack = undefined;
|
|
20
|
-
let message = undefined;
|
|
21
|
-
if (cause instanceof Error) {
|
|
22
|
-
errorCause = cause;
|
|
23
|
-
// take stack trace from cause
|
|
24
|
-
stack = cause.stack;
|
|
25
|
-
message = cause.message;
|
|
26
|
-
}
|
|
27
|
-
const err = new TRPCError({
|
|
26
|
+
const trpcError = new TRPCError({
|
|
28
27
|
code: 'INTERNAL_SERVER_ERROR',
|
|
29
|
-
cause:
|
|
30
|
-
message
|
|
28
|
+
cause: error,
|
|
29
|
+
message: error.message
|
|
31
30
|
});
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
// Inherit stack from error
|
|
32
|
+
trpcError.stack = error.stack;
|
|
33
|
+
return trpcError;
|
|
34
34
|
}
|
|
35
35
|
function getCauseFromUnknown(cause) {
|
|
36
36
|
if (cause instanceof Error) {
|
|
@@ -41,9 +41,9 @@ function getCauseFromUnknown(cause) {
|
|
|
41
41
|
|
|
42
42
|
class TRPCError extends Error {
|
|
43
43
|
constructor(opts){
|
|
44
|
-
const cause = opts.cause;
|
|
45
44
|
const code = opts.code;
|
|
46
|
-
const message = opts.message ?? getMessageFromUnkownError(cause, code);
|
|
45
|
+
const message = opts.message ?? getMessageFromUnkownError(opts.cause, code);
|
|
46
|
+
const cause = opts !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
|
|
47
47
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
48
48
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
|
49
49
|
super(message, {
|
|
@@ -58,4 +58,4 @@ class TRPCError extends Error {
|
|
|
58
58
|
|
|
59
59
|
exports.TRPCError = TRPCError;
|
|
60
60
|
exports.getCauseFromUnknown = getCauseFromUnknown;
|
|
61
|
-
exports.
|
|
61
|
+
exports.getTRPCErrorFromUnknown = getTRPCErrorFromUnknown;
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
require('../../router-
|
|
6
|
-
var TRPCError = require('../../TRPCError-
|
|
7
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
5
|
+
require('../../router-36801fd1.js');
|
|
6
|
+
var TRPCError = require('../../TRPCError-fe9113e5.js');
|
|
7
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-b12c934f.js');
|
|
8
8
|
require('../../codes-1c24d919.js');
|
|
9
9
|
require('../../index-9d687d33.js');
|
|
10
10
|
require('../../transformTRPCResponse-11ac69cc.js');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import '../../router-
|
|
2
|
-
import { T as TRPCError } from '../../TRPCError-
|
|
3
|
-
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
1
|
+
import '../../router-dfb17a79.mjs';
|
|
2
|
+
import { T as TRPCError } from '../../TRPCError-281ac25a.mjs';
|
|
3
|
+
import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-87b3a1e6.mjs';
|
|
4
4
|
import '../../codes-aaa7d554.mjs';
|
|
5
5
|
import '../../index-47817162.mjs';
|
|
6
6
|
import '../../transformTRPCResponse-c8138d5f.mjs';
|
package/dist/adapters/express.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
6
|
-
require('../resolveHTTPResponse-
|
|
7
|
-
require('../TRPCError-
|
|
5
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-ea18179c.js');
|
|
6
|
+
require('../resolveHTTPResponse-b12c934f.js');
|
|
7
|
+
require('../TRPCError-fe9113e5.js');
|
|
8
8
|
require('../transformTRPCResponse-11ac69cc.js');
|
|
9
9
|
require('../codes-1c24d919.js');
|
|
10
10
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
2
|
-
import '../resolveHTTPResponse-
|
|
3
|
-
import '../TRPCError-
|
|
1
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-eba995e5.mjs';
|
|
2
|
+
import '../resolveHTTPResponse-87b3a1e6.mjs';
|
|
3
|
+
import '../TRPCError-281ac25a.mjs';
|
|
4
4
|
import '../transformTRPCResponse-c8138d5f.mjs';
|
|
5
5
|
import '../codes-aaa7d554.mjs';
|
|
6
6
|
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
5
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-b12c934f.js');
|
|
6
6
|
var adapters_ws = require('../ws.js');
|
|
7
|
-
require('../../TRPCError-
|
|
7
|
+
require('../../TRPCError-fe9113e5.js');
|
|
8
8
|
require('../../transformTRPCResponse-11ac69cc.js');
|
|
9
9
|
require('../../codes-1c24d919.js');
|
|
10
10
|
require('../../observable-b651bf11.js');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { a as assertNotBrowser, r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
1
|
+
import { a as assertNotBrowser, r as resolveHTTPResponse } from '../../resolveHTTPResponse-87b3a1e6.mjs';
|
|
2
2
|
import { applyWSSHandler } from '../ws.mjs';
|
|
3
|
-
import '../../TRPCError-
|
|
3
|
+
import '../../TRPCError-281ac25a.mjs';
|
|
4
4
|
import '../../transformTRPCResponse-c8138d5f.mjs';
|
|
5
5
|
import '../../codes-aaa7d554.mjs';
|
|
6
6
|
import '../../observable-e129ac9d.mjs';
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('../../resolveHTTPResponse-
|
|
6
|
-
require('../../TRPCError-
|
|
5
|
+
var resolveHTTPResponse = require('../../resolveHTTPResponse-b12c934f.js');
|
|
6
|
+
require('../../TRPCError-fe9113e5.js');
|
|
7
7
|
require('../../transformTRPCResponse-11ac69cc.js');
|
|
8
8
|
require('../../codes-1c24d919.js');
|
|
9
9
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { a as assertNotBrowser, r as resolveHTTPResponse } from '../../resolveHTTPResponse-
|
|
2
|
-
import '../../TRPCError-
|
|
1
|
+
import { a as assertNotBrowser, r as resolveHTTPResponse } from '../../resolveHTTPResponse-87b3a1e6.mjs';
|
|
2
|
+
import '../../TRPCError-281ac25a.mjs';
|
|
3
3
|
import '../../transformTRPCResponse-c8138d5f.mjs';
|
|
4
4
|
import '../../codes-aaa7d554.mjs';
|
|
5
5
|
|
package/dist/adapters/next.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var TRPCError = require('../TRPCError-
|
|
6
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
7
|
-
require('../resolveHTTPResponse-
|
|
5
|
+
var TRPCError = require('../TRPCError-fe9113e5.js');
|
|
6
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-ea18179c.js');
|
|
7
|
+
require('../resolveHTTPResponse-b12c934f.js');
|
|
8
8
|
require('../transformTRPCResponse-11ac69cc.js');
|
|
9
9
|
require('../codes-1c24d919.js');
|
|
10
10
|
|
package/dist/adapters/next.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { T as TRPCError } from '../TRPCError-
|
|
2
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
3
|
-
import '../resolveHTTPResponse-
|
|
1
|
+
import { T as TRPCError } from '../TRPCError-281ac25a.mjs';
|
|
2
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-eba995e5.mjs';
|
|
3
|
+
import '../resolveHTTPResponse-87b3a1e6.mjs';
|
|
4
4
|
import '../transformTRPCResponse-c8138d5f.mjs';
|
|
5
5
|
import '../codes-aaa7d554.mjs';
|
|
6
6
|
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-
|
|
6
|
-
require('../../resolveHTTPResponse-
|
|
7
|
-
require('../../TRPCError-
|
|
5
|
+
var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-ea18179c.js');
|
|
6
|
+
require('../../resolveHTTPResponse-b12c934f.js');
|
|
7
|
+
require('../../TRPCError-fe9113e5.js');
|
|
8
8
|
require('../../transformTRPCResponse-11ac69cc.js');
|
|
9
9
|
require('../../codes-1c24d919.js');
|
|
10
10
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-
|
|
2
|
-
import '../../resolveHTTPResponse-
|
|
3
|
-
import '../../TRPCError-
|
|
1
|
+
export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-eba995e5.mjs';
|
|
2
|
+
import '../../resolveHTTPResponse-87b3a1e6.mjs';
|
|
3
|
+
import '../../TRPCError-281ac25a.mjs';
|
|
4
4
|
import '../../transformTRPCResponse-c8138d5f.mjs';
|
|
5
5
|
import '../../codes-aaa7d554.mjs';
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var http = require('http');
|
|
6
|
-
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-
|
|
7
|
-
require('../resolveHTTPResponse-
|
|
8
|
-
require('../TRPCError-
|
|
6
|
+
var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-ea18179c.js');
|
|
7
|
+
require('../resolveHTTPResponse-b12c934f.js');
|
|
8
|
+
require('../TRPCError-fe9113e5.js');
|
|
9
9
|
require('../transformTRPCResponse-11ac69cc.js');
|
|
10
10
|
require('../codes-1c24d919.js');
|
|
11
11
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import http from 'http';
|
|
2
|
-
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-
|
|
3
|
-
import '../resolveHTTPResponse-
|
|
4
|
-
import '../TRPCError-
|
|
2
|
+
import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-eba995e5.mjs';
|
|
3
|
+
import '../resolveHTTPResponse-87b3a1e6.mjs';
|
|
4
|
+
import '../TRPCError-281ac25a.mjs';
|
|
5
5
|
import '../transformTRPCResponse-c8138d5f.mjs';
|
|
6
6
|
import '../codes-aaa7d554.mjs';
|
|
7
7
|
|
package/dist/adapters/ws.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var TRPCError = require('../TRPCError-
|
|
5
|
+
var TRPCError = require('../TRPCError-fe9113e5.js');
|
|
6
6
|
var transformTRPCResponse = require('../transformTRPCResponse-11ac69cc.js');
|
|
7
7
|
var observable = require('../observable-b651bf11.js');
|
|
8
8
|
|
|
@@ -138,7 +138,7 @@ function applyWSSHandler(opts) {
|
|
|
138
138
|
});
|
|
139
139
|
},
|
|
140
140
|
error (err) {
|
|
141
|
-
const error = TRPCError.
|
|
141
|
+
const error = TRPCError.getTRPCErrorFromUnknown(err);
|
|
142
142
|
opts.onError?.({
|
|
143
143
|
error,
|
|
144
144
|
path,
|
|
@@ -196,7 +196,7 @@ function applyWSSHandler(opts) {
|
|
|
196
196
|
});
|
|
197
197
|
} catch (cause) /* istanbul ignore next */ {
|
|
198
198
|
// procedure threw an error
|
|
199
|
-
const error = TRPCError.
|
|
199
|
+
const error = TRPCError.getTRPCErrorFromUnknown(cause);
|
|
200
200
|
opts.onError?.({
|
|
201
201
|
error,
|
|
202
202
|
path,
|
|
@@ -250,7 +250,7 @@ function applyWSSHandler(opts) {
|
|
|
250
250
|
client.on('error', (cause)=>{
|
|
251
251
|
opts.onError?.({
|
|
252
252
|
ctx,
|
|
253
|
-
error: TRPCError.
|
|
253
|
+
error: TRPCError.getTRPCErrorFromUnknown(cause),
|
|
254
254
|
input: undefined,
|
|
255
255
|
path: undefined,
|
|
256
256
|
type: 'unknown',
|
|
@@ -267,7 +267,7 @@ function applyWSSHandler(opts) {
|
|
|
267
267
|
try {
|
|
268
268
|
ctx = await ctxPromise;
|
|
269
269
|
} catch (cause) {
|
|
270
|
-
const error = TRPCError.
|
|
270
|
+
const error = TRPCError.getTRPCErrorFromUnknown(cause);
|
|
271
271
|
opts.onError?.({
|
|
272
272
|
error,
|
|
273
273
|
path: undefined,
|
package/dist/adapters/ws.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as TRPCError, a as getCauseFromUnknown, g as
|
|
1
|
+
import { T as TRPCError, a as getCauseFromUnknown, g as getTRPCErrorFromUnknown } from '../TRPCError-281ac25a.mjs';
|
|
2
2
|
import { t as transformTRPCResponse } from '../transformTRPCResponse-c8138d5f.mjs';
|
|
3
3
|
import { i as isObservable } from '../observable-e129ac9d.mjs';
|
|
4
4
|
|
|
@@ -134,7 +134,7 @@ function applyWSSHandler(opts) {
|
|
|
134
134
|
});
|
|
135
135
|
},
|
|
136
136
|
error (err) {
|
|
137
|
-
const error =
|
|
137
|
+
const error = getTRPCErrorFromUnknown(err);
|
|
138
138
|
opts.onError?.({
|
|
139
139
|
error,
|
|
140
140
|
path,
|
|
@@ -192,7 +192,7 @@ function applyWSSHandler(opts) {
|
|
|
192
192
|
});
|
|
193
193
|
} catch (cause) /* istanbul ignore next */ {
|
|
194
194
|
// procedure threw an error
|
|
195
|
-
const error =
|
|
195
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
196
196
|
opts.onError?.({
|
|
197
197
|
error,
|
|
198
198
|
path,
|
|
@@ -246,7 +246,7 @@ function applyWSSHandler(opts) {
|
|
|
246
246
|
client.on('error', (cause)=>{
|
|
247
247
|
opts.onError?.({
|
|
248
248
|
ctx,
|
|
249
|
-
error:
|
|
249
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
250
250
|
input: undefined,
|
|
251
251
|
path: undefined,
|
|
252
252
|
type: 'unknown',
|
|
@@ -263,7 +263,7 @@ function applyWSSHandler(opts) {
|
|
|
263
263
|
try {
|
|
264
264
|
ctx = await ctxPromise;
|
|
265
265
|
} catch (cause) {
|
|
266
|
-
const error =
|
|
266
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
267
267
|
opts.onError?.({
|
|
268
268
|
error,
|
|
269
269
|
path: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/deprecated/internals/procedure.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/deprecated/internals/procedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/error/TRPCError.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,oBAAC;IACvB,SAAgB,IAAI,iOAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/error/TRPCError.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,oBAAC;IACvB,SAAgB,IAAI,iOAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAgBF"}
|
package/dist/error/utils.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TRPCError } from './TRPCError';
|
|
2
2
|
export declare function getMessageFromUnkownError(err: unknown, fallback: string): string;
|
|
3
|
-
export declare function getErrorFromUnknown(cause: unknown):
|
|
3
|
+
export declare function getErrorFromUnknown(cause: unknown): Error;
|
|
4
|
+
export declare function getTRPCErrorFromUnknown(cause: unknown): TRPCError;
|
|
4
5
|
export declare function getCauseFromUnknown(cause: unknown): Error | undefined;
|
|
5
6
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/error/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/error/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAMzD;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAkBjE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,qBAMjD"}
|
package/dist/index.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
6
|
-
var router = require('./router-
|
|
7
|
-
var TRPCError = require('./TRPCError-
|
|
5
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-b12c934f.js');
|
|
6
|
+
var router = require('./router-36801fd1.js');
|
|
7
|
+
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
8
8
|
require('./transformTRPCResponse-11ac69cc.js');
|
|
9
9
|
require('./codes-1c24d919.js');
|
|
10
10
|
require('./index-9d687d33.js');
|
package/dist/index.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
2
|
-
import { m as mergeWithoutOverrides, d as defaultFormatter, a as defaultTransformer, c as createRouterFactory, g as getDataTransformer, b as createBuilder } from './router-
|
|
3
|
-
export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes, r as router } from './router-
|
|
4
|
-
export { T as TRPCError } from './TRPCError-
|
|
1
|
+
export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-87b3a1e6.mjs';
|
|
2
|
+
import { m as mergeWithoutOverrides, d as defaultFormatter, a as defaultTransformer, c as createRouterFactory, g as getDataTransformer, b as createBuilder } from './router-dfb17a79.mjs';
|
|
3
|
+
export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes, r as router } from './router-dfb17a79.mjs';
|
|
4
|
+
export { T as TRPCError } from './TRPCError-281ac25a.mjs';
|
|
5
5
|
import './transformTRPCResponse-c8138d5f.mjs';
|
|
6
6
|
import './codes-aaa7d554.mjs';
|
|
7
7
|
import './index-47817162.mjs';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
4
|
-
var TRPCError = require('./TRPCError-
|
|
3
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-b12c934f.js');
|
|
4
|
+
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
5
5
|
|
|
6
6
|
async function getPostBody({ req , maxBodySize }) {
|
|
7
7
|
return new Promise((resolve)=>{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
2
|
-
import { T as TRPCError } from './TRPCError-
|
|
1
|
+
import { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-87b3a1e6.mjs';
|
|
2
|
+
import { T as TRPCError } from './TRPCError-281ac25a.mjs';
|
|
3
3
|
|
|
4
4
|
async function getPostBody({ req , maxBodySize }) {
|
|
5
5
|
return new Promise((resolve)=>{
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { T as TRPCError, g as
|
|
1
|
+
import { T as TRPCError, g as getTRPCErrorFromUnknown, a as getCauseFromUnknown } from './TRPCError-281ac25a.mjs';
|
|
2
2
|
import { t as transformTRPCResponse } from './transformTRPCResponse-c8138d5f.mjs';
|
|
3
3
|
import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-aaa7d554.mjs';
|
|
4
4
|
|
|
@@ -182,7 +182,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
182
182
|
data: output
|
|
183
183
|
};
|
|
184
184
|
} catch (cause) {
|
|
185
|
-
const error =
|
|
185
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
186
186
|
onError?.({
|
|
187
187
|
error,
|
|
188
188
|
path,
|
|
@@ -229,7 +229,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
229
229
|
// - `createContext()` throws
|
|
230
230
|
// - post body is too large
|
|
231
231
|
// - input deserialization fails
|
|
232
|
-
const error =
|
|
232
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
233
233
|
onError?.({
|
|
234
234
|
error,
|
|
235
235
|
path: undefined,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var TRPCError = require('./TRPCError-
|
|
3
|
+
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
4
4
|
var transformTRPCResponse = require('./transformTRPCResponse-11ac69cc.js');
|
|
5
5
|
var codes = require('./codes-1c24d919.js');
|
|
6
6
|
|
|
@@ -184,7 +184,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
184
184
|
data: output
|
|
185
185
|
};
|
|
186
186
|
} catch (cause) {
|
|
187
|
-
const error = TRPCError.
|
|
187
|
+
const error = TRPCError.getTRPCErrorFromUnknown(cause);
|
|
188
188
|
onError?.({
|
|
189
189
|
error,
|
|
190
190
|
path,
|
|
@@ -231,7 +231,7 @@ async function resolveHTTPResponse(opts) {
|
|
|
231
231
|
// - `createContext()` throws
|
|
232
232
|
// - post body is too large
|
|
233
233
|
// - input deserialization fails
|
|
234
|
-
const error = TRPCError.
|
|
234
|
+
const error = TRPCError.getTRPCErrorFromUnknown(cause);
|
|
235
235
|
onError?.({
|
|
236
236
|
error,
|
|
237
237
|
path: undefined,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
4
|
-
var TRPCError = require('./TRPCError-
|
|
3
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-b12c934f.js');
|
|
4
|
+
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
5
5
|
var codes = require('./codes-1c24d919.js');
|
|
6
6
|
var index = require('./index-9d687d33.js');
|
|
7
7
|
|
|
@@ -147,7 +147,7 @@ function getParseFn$1(procedureParser) {
|
|
|
147
147
|
return {
|
|
148
148
|
ctx: callOpts.ctx,
|
|
149
149
|
ok: false,
|
|
150
|
-
error: TRPCError.
|
|
150
|
+
error: TRPCError.getTRPCErrorFromUnknown(cause),
|
|
151
151
|
marker: middlewareMarker$1
|
|
152
152
|
};
|
|
153
153
|
}
|
|
@@ -453,7 +453,7 @@ function createProcedureCaller(_def) {
|
|
|
453
453
|
} catch (cause) {
|
|
454
454
|
return {
|
|
455
455
|
ok: false,
|
|
456
|
-
error: TRPCError.
|
|
456
|
+
error: TRPCError.getTRPCErrorFromUnknown(cause),
|
|
457
457
|
marker: middlewareMarker
|
|
458
458
|
};
|
|
459
459
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-
|
|
2
|
-
import { T as TRPCError, a as getCauseFromUnknown, g as
|
|
1
|
+
import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-87b3a1e6.mjs';
|
|
2
|
+
import { T as TRPCError, a as getCauseFromUnknown, g as getTRPCErrorFromUnknown } from './TRPCError-281ac25a.mjs';
|
|
3
3
|
import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-aaa7d554.mjs';
|
|
4
4
|
import { c as createProxy } from './index-47817162.mjs';
|
|
5
5
|
|
|
@@ -145,7 +145,7 @@ function getParseFn$1(procedureParser) {
|
|
|
145
145
|
return {
|
|
146
146
|
ctx: callOpts.ctx,
|
|
147
147
|
ok: false,
|
|
148
|
-
error:
|
|
148
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
149
149
|
marker: middlewareMarker$1
|
|
150
150
|
};
|
|
151
151
|
}
|
|
@@ -451,7 +451,7 @@ function createProcedureCaller(_def) {
|
|
|
451
451
|
} catch (cause) {
|
|
452
452
|
return {
|
|
453
453
|
ok: false,
|
|
454
|
-
error:
|
|
454
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
455
455
|
marker: middlewareMarker
|
|
456
456
|
};
|
|
457
457
|
}
|
package/dist/rpc/envelopes.d.ts
CHANGED
|
@@ -45,6 +45,10 @@ export interface TRPCSuccessResponse<TData> extends JSONRPC2.ResultResponse<TRPC
|
|
|
45
45
|
type?: 'data';
|
|
46
46
|
}> {
|
|
47
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* @deprecated use `TRPCSuccessResponse` instead
|
|
50
|
+
*/
|
|
51
|
+
export declare type TRPCResultResponse<TData = unknown> = TRPCSuccessResponse<TData>;
|
|
48
52
|
export interface TRPCErrorResponse<TError extends TRPCErrorShape = TRPCErrorShape> extends JSONRPC2.ErrorResponse<TError> {
|
|
49
53
|
}
|
|
50
54
|
export declare type TRPCResponse<TData = unknown, TError extends TRPCErrorShape = TRPCErrorShape> = TRPCSuccessResponse<TData> | TRPCErrorResponse<TError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envelopes.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/rpc/envelopes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,cAAc,CAC7B,KAAK,SAAS,MAAM,GAAG,sBAAsB,EAC7C,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAE/D,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;GAEG;AACH,yBAAiB,QAAQ,CAAC;IACxB,KAAY,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAE/C;;OAEG;IACH,UAAiB,YAAY;QAC3B,EAAE,CAAC,EAAE,SAAS,CAAC;QACf,OAAO,CAAC,EAAE,KAAK,CAAC;KACjB;IAED,UAAiB,WAAW,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAC1D,SAAQ,YAAY;QACpB,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,OAAO,GAAG,OAAO,CACzE,SAAQ,WAAW,CAAC,OAAO,CAAC;QAC5B,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,cAAc,CAAC,OAAO,GAAG,OAAO,CAAE,SAAQ,YAAY;QACrE,MAAM,EAAE,OAAO,CAAC;KACjB;IAED,UAAiB,aAAa,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CAC3E,SAAQ,YAAY;QACpB,KAAK,EAAE,MAAM,CAAC;KACf;CACF;AAID,MAAM,WAAW,WACf,SAAQ,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;CAAG;AAE9E,MAAM,WAAW,UAAU,CAAC,KAAK,GAAG,OAAO;IACzC,IAAI,EAAE,KAAK,CAAC;CACb;AAED,MAAM,WAAW,mBAAmB,CAAC,KAAK,CACxC,SAAQ,QAAQ,CAAC,cAAc,CAC7B,UAAU,CAAC,KAAK,CAAC,GAAG;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CACF;CAAG;
|
|
1
|
+
{"version":3,"file":"envelopes.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/rpc/envelopes.ts"],"names":[],"mappings":"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"}
|
package/dist/subscription.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var TRPCError = require('./TRPCError-
|
|
5
|
+
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
6
6
|
var observable = require('./observable-b651bf11.js');
|
|
7
7
|
|
|
8
8
|
function subscriptionPullFactory(opts) {
|
|
@@ -16,14 +16,14 @@ function subscriptionPullFactory(opts) {
|
|
|
16
16
|
try {
|
|
17
17
|
await opts.pull(emit);
|
|
18
18
|
} catch (err /* istanbul ignore next */ ) {
|
|
19
|
-
emit.error(TRPCError.
|
|
19
|
+
emit.error(TRPCError.getTRPCErrorFromUnknown(err));
|
|
20
20
|
}
|
|
21
21
|
/* istanbul ignore else */ if (!stopped) {
|
|
22
22
|
timer = setTimeout(()=>_pull(emit), opts.intervalMs);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
return observable.observable((emit)=>{
|
|
26
|
-
_pull(emit).catch((err)=>emit.error(TRPCError.
|
|
26
|
+
_pull(emit).catch((err)=>emit.error(TRPCError.getTRPCErrorFromUnknown(err)));
|
|
27
27
|
return ()=>{
|
|
28
28
|
clearTimeout(timer);
|
|
29
29
|
stopped = true;
|
package/dist/subscription.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { g as
|
|
1
|
+
import { g as getTRPCErrorFromUnknown } from './TRPCError-281ac25a.mjs';
|
|
2
2
|
import { o as observable } from './observable-e129ac9d.mjs';
|
|
3
3
|
|
|
4
4
|
function subscriptionPullFactory(opts) {
|
|
@@ -12,14 +12,14 @@ function subscriptionPullFactory(opts) {
|
|
|
12
12
|
try {
|
|
13
13
|
await opts.pull(emit);
|
|
14
14
|
} catch (err /* istanbul ignore next */ ) {
|
|
15
|
-
emit.error(
|
|
15
|
+
emit.error(getTRPCErrorFromUnknown(err));
|
|
16
16
|
}
|
|
17
17
|
/* istanbul ignore else */ if (!stopped) {
|
|
18
18
|
timer = setTimeout(()=>_pull(emit), opts.intervalMs);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
return observable((emit)=>{
|
|
22
|
-
_pull(emit).catch((err)=>emit.error(
|
|
22
|
+
_pull(emit).catch((err)=>emit.error(getTRPCErrorFromUnknown(err)));
|
|
23
23
|
return ()=>{
|
|
24
24
|
clearTimeout(timer);
|
|
25
25
|
stopped = true;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "10.0.0-proxy-alpha.
|
|
3
|
+
"version": "10.0.0-proxy-alpha.57",
|
|
4
4
|
"description": "tRPC Server",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -136,5 +136,5 @@
|
|
|
136
136
|
"yup": "^0.32.8",
|
|
137
137
|
"zod": "^3.0.0"
|
|
138
138
|
},
|
|
139
|
-
"gitHead": "
|
|
139
|
+
"gitHead": "e664229c3ffcfb1d6bccb890cbddebf3630fdd45"
|
|
140
140
|
}
|
package/src/adapters/ws.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { IncomingMessage } from 'http';
|
|
|
2
2
|
import ws from 'ws';
|
|
3
3
|
import { AnyRouter, ProcedureType, inferRouterContext } from '../core';
|
|
4
4
|
import { TRPCError } from '../error/TRPCError';
|
|
5
|
-
import { getCauseFromUnknown,
|
|
5
|
+
import { getCauseFromUnknown, getTRPCErrorFromUnknown } from '../error/utils';
|
|
6
6
|
import { transformTRPCResponse } from '../internals/transformTRPCResponse';
|
|
7
7
|
import { BaseHandlerOptions } from '../internals/types';
|
|
8
8
|
import { Unsubscribable, isObservable } from '../observable';
|
|
@@ -196,7 +196,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
196
196
|
});
|
|
197
197
|
},
|
|
198
198
|
error(err) {
|
|
199
|
-
const error =
|
|
199
|
+
const error = getTRPCErrorFromUnknown(err);
|
|
200
200
|
opts.onError?.({ error, path, type, ctx, req, input });
|
|
201
201
|
respond({
|
|
202
202
|
id,
|
|
@@ -248,7 +248,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
248
248
|
});
|
|
249
249
|
} catch (cause) /* istanbul ignore next */ {
|
|
250
250
|
// procedure threw an error
|
|
251
|
-
const error =
|
|
251
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
252
252
|
opts.onError?.({ error, path, type, ctx, req, input });
|
|
253
253
|
respond({
|
|
254
254
|
id,
|
|
@@ -297,7 +297,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
297
297
|
client.on('error', (cause) => {
|
|
298
298
|
opts.onError?.({
|
|
299
299
|
ctx,
|
|
300
|
-
error:
|
|
300
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
301
301
|
input: undefined,
|
|
302
302
|
path: undefined,
|
|
303
303
|
type: 'unknown',
|
|
@@ -315,7 +315,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
315
315
|
try {
|
|
316
316
|
ctx = await ctxPromise;
|
|
317
317
|
} catch (cause) {
|
|
318
|
-
const error =
|
|
318
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
319
319
|
opts.onError?.({
|
|
320
320
|
error,
|
|
321
321
|
path: undefined,
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { TRPCError } from '../../error/TRPCError';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
getCauseFromUnknown,
|
|
4
|
+
getTRPCErrorFromUnknown,
|
|
5
|
+
} from '../../error/utils';
|
|
3
6
|
import { FlatOverwrite, MaybePromise } from '../../types';
|
|
4
7
|
import { MiddlewareFunction, MiddlewareResult } from '../middleware';
|
|
5
8
|
import { Parser, inferParser } from '../parser';
|
|
@@ -401,7 +404,7 @@ function createProcedureCaller(_def: ProcedureBuilderDef): Procedure<any> {
|
|
|
401
404
|
} catch (cause) {
|
|
402
405
|
return {
|
|
403
406
|
ok: false,
|
|
404
|
-
error:
|
|
407
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
405
408
|
marker: middlewareMarker,
|
|
406
409
|
};
|
|
407
410
|
}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { assertNotBrowser } from '../../assertNotBrowser';
|
|
3
3
|
import { TRPCError } from '../../error/TRPCError';
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
getCauseFromUnknown,
|
|
6
|
+
getTRPCErrorFromUnknown,
|
|
7
|
+
} from '../../error/utils';
|
|
5
8
|
import { InferLast } from '../../types';
|
|
6
9
|
import { ProcedureType } from '../router';
|
|
7
10
|
import {
|
|
@@ -225,7 +228,7 @@ export class Procedure<
|
|
|
225
228
|
return {
|
|
226
229
|
ctx: callOpts.ctx,
|
|
227
230
|
ok: false,
|
|
228
|
-
error:
|
|
231
|
+
error: getTRPCErrorFromUnknown(cause),
|
|
229
232
|
marker: middlewareMarker,
|
|
230
233
|
};
|
|
231
234
|
}
|
package/src/error/TRPCError.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getMessageFromUnkownError } from '../error/utils';
|
|
1
|
+
import { getErrorFromUnknown, getMessageFromUnkownError } from '../error/utils';
|
|
2
2
|
import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
|
|
3
3
|
|
|
4
4
|
export class TRPCError extends Error {
|
|
@@ -8,11 +8,12 @@ export class TRPCError extends Error {
|
|
|
8
8
|
constructor(opts: {
|
|
9
9
|
message?: string;
|
|
10
10
|
code: TRPC_ERROR_CODE_KEY;
|
|
11
|
-
cause?:
|
|
11
|
+
cause?: unknown;
|
|
12
12
|
}) {
|
|
13
|
-
const cause = opts.cause;
|
|
14
13
|
const code = opts.code;
|
|
15
|
-
const message = opts.message ?? getMessageFromUnkownError(cause, code);
|
|
14
|
+
const message = opts.message ?? getMessageFromUnkownError(opts.cause, code);
|
|
15
|
+
const cause: Error | undefined =
|
|
16
|
+
opts !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
|
|
16
17
|
|
|
17
18
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
18
19
|
// @ts-ignore https://github.com/tc39/proposal-error-cause
|
package/src/error/utils.ts
CHANGED
|
@@ -14,33 +14,32 @@ export function getMessageFromUnkownError(
|
|
|
14
14
|
return fallback;
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
export function getErrorFromUnknown(cause: unknown):
|
|
17
|
+
export function getErrorFromUnknown(cause: unknown): Error {
|
|
18
|
+
if (cause instanceof Error) {
|
|
19
|
+
return cause;
|
|
20
|
+
}
|
|
21
|
+
const message = getMessageFromUnkownError(cause, 'Unknown error');
|
|
22
|
+
return new Error(message);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
|
|
26
|
+
const error = getErrorFromUnknown(cause);
|
|
18
27
|
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
19
28
|
// ref https://github.com/trpc/trpc/issues/331
|
|
20
|
-
if (
|
|
29
|
+
if (error.name === 'TRPCError') {
|
|
21
30
|
return cause as TRPCError;
|
|
22
31
|
}
|
|
23
32
|
|
|
24
|
-
|
|
25
|
-
let stack: string | undefined = undefined;
|
|
26
|
-
let message: string | undefined = undefined;
|
|
27
|
-
|
|
28
|
-
if (cause instanceof Error) {
|
|
29
|
-
errorCause = cause;
|
|
30
|
-
// take stack trace from cause
|
|
31
|
-
stack = cause.stack;
|
|
32
|
-
message = cause.message;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
const err = new TRPCError({
|
|
33
|
+
const trpcError = new TRPCError({
|
|
36
34
|
code: 'INTERNAL_SERVER_ERROR',
|
|
37
|
-
cause:
|
|
38
|
-
message,
|
|
35
|
+
cause: error,
|
|
36
|
+
message: error.message,
|
|
39
37
|
});
|
|
40
38
|
|
|
41
|
-
|
|
39
|
+
// Inherit stack from error
|
|
40
|
+
trpcError.stack = error.stack;
|
|
42
41
|
|
|
43
|
-
return
|
|
42
|
+
return trpcError;
|
|
44
43
|
}
|
|
45
44
|
|
|
46
45
|
export function getCauseFromUnknown(cause: unknown) {
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
inferRouterError,
|
|
7
7
|
} from '../core';
|
|
8
8
|
import { TRPCError } from '../error/TRPCError';
|
|
9
|
-
import { getCauseFromUnknown,
|
|
9
|
+
import { getCauseFromUnknown, getTRPCErrorFromUnknown } from '../error/utils';
|
|
10
10
|
import { transformTRPCResponse } from '../internals/transformTRPCResponse';
|
|
11
11
|
import { TRPCResponse } from '../rpc';
|
|
12
12
|
import { Maybe } from '../types';
|
|
@@ -183,7 +183,7 @@ export async function resolveHTTPResponse<
|
|
|
183
183
|
data: output,
|
|
184
184
|
};
|
|
185
185
|
} catch (cause) {
|
|
186
|
-
const error =
|
|
186
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
187
187
|
|
|
188
188
|
onError?.({ error, path, input, ctx, type: type, req });
|
|
189
189
|
return {
|
|
@@ -225,7 +225,7 @@ export async function resolveHTTPResponse<
|
|
|
225
225
|
// - `createContext()` throws
|
|
226
226
|
// - post body is too large
|
|
227
227
|
// - input deserialization fails
|
|
228
|
-
const error =
|
|
228
|
+
const error = getTRPCErrorFromUnknown(cause);
|
|
229
229
|
|
|
230
230
|
onError?.({
|
|
231
231
|
error,
|
package/src/rpc/envelopes.ts
CHANGED
|
@@ -63,6 +63,12 @@ export interface TRPCSuccessResponse<TData>
|
|
|
63
63
|
type?: 'data';
|
|
64
64
|
}
|
|
65
65
|
> {}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* @deprecated use `TRPCSuccessResponse` instead
|
|
69
|
+
*/
|
|
70
|
+
export type TRPCResultResponse<TData = unknown> = TRPCSuccessResponse<TData>;
|
|
71
|
+
|
|
66
72
|
export interface TRPCErrorResponse<
|
|
67
73
|
TError extends TRPCErrorShape = TRPCErrorShape,
|
|
68
74
|
> extends JSONRPC2.ErrorResponse<TError> {}
|
package/src/subscription.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getTRPCErrorFromUnknown } from './error/utils';
|
|
2
2
|
import { Observable, Observer, observable } from './observable';
|
|
3
3
|
|
|
4
4
|
export function subscriptionPullFactory<TOutput>(opts: {
|
|
@@ -19,7 +19,7 @@ export function subscriptionPullFactory<TOutput>(opts: {
|
|
|
19
19
|
try {
|
|
20
20
|
await opts.pull(emit);
|
|
21
21
|
} catch (err /* istanbul ignore next */) {
|
|
22
|
-
emit.error(
|
|
22
|
+
emit.error(getTRPCErrorFromUnknown(err));
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
/* istanbul ignore else */
|
|
@@ -29,7 +29,7 @@ export function subscriptionPullFactory<TOutput>(opts: {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
return observable<TOutput>((emit) => {
|
|
32
|
-
_pull(emit).catch((err) => emit.error(
|
|
32
|
+
_pull(emit).catch((err) => emit.error(getTRPCErrorFromUnknown(err)));
|
|
33
33
|
return () => {
|
|
34
34
|
clearTimeout(timer);
|
|
35
35
|
stopped = true;
|