typeferry 0.15.3 → 0.16.0
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/README.md +42 -0
- package/dist/auth/server/device-info.js +3 -3
- package/dist/auth/server/device-info.js.map +1 -1
- package/dist/auth/server/session-manager.d.ts +3 -0
- package/dist/auth/server/session-manager.js +9 -6
- package/dist/auth/server/session-manager.js.map +1 -1
- package/dist/auth/types.d.ts +3 -1
- package/dist/client/client.d.ts +1 -2
- package/dist/client/client.js +5 -6
- package/dist/client/client.js.map +1 -1
- package/dist/client/href-query.d.ts +6 -0
- package/dist/client/href-query.js +32 -0
- package/dist/client/href-query.js.map +1 -0
- package/dist/react/hooks/use-caller.js +30 -6
- package/dist/react/hooks/use-caller.js.map +1 -1
- package/dist/server/client-node.d.ts +6 -0
- package/dist/server/client-node.js +19 -11
- package/dist/server/client-node.js.map +1 -1
- package/dist/server/server.d.ts +8 -2
- package/dist/server/server.js +2 -2
- package/dist/server/server.js.map +1 -1
- package/dist/server/transports/hono-rate-limit.d.ts +2 -2
- package/dist/server/transports/hono-rate-limit.js +10 -5
- package/dist/server/transports/hono-rate-limit.js.map +1 -1
- package/dist/server/transports/node-hono-transport.d.ts +1 -1
- package/dist/server/transports/node-hono-transport.js +28 -13
- package/dist/server/transports/node-hono-transport.js.map +1 -1
- package/dist/server/transports/origin-policy.d.ts +5 -0
- package/dist/server/transports/origin-policy.js +13 -0
- package/dist/server/transports/origin-policy.js.map +1 -0
- package/dist/server/transports/websocket-transport.d.ts +6 -1
- package/dist/server/transports/websocket-transport.js +4 -8
- package/dist/server/transports/websocket-transport.js.map +1 -1
- package/dist/server/transports/ws-shared.d.ts +7 -2
- package/dist/server/transports/ws-shared.js +36 -9
- package/dist/server/transports/ws-shared.js.map +1 -1
- package/package.json +4 -9
package/README.md
CHANGED
|
@@ -132,6 +132,48 @@ await server.isReady()
|
|
|
132
132
|
|
|
133
133
|
Clients can call the method as `client.m.greeting.hello({ name: 'Ada' })` when parameterized with `GreetingApi`. The decorators turn the class method into an HTTP and WebSocket RPC endpoint, while `@Schema()` validates network input at runtime. The `Server` constructor installs both transports; call `server.close()` during graceful shutdown.
|
|
134
134
|
|
|
135
|
+
### Origin admission
|
|
136
|
+
|
|
137
|
+
Omitting `origins` permits any origin. A configured list admits exact matches;
|
|
138
|
+
an empty list admits no named origins. Missing or mismatching origins receive
|
|
139
|
+
HTTP 403 before RPC decoding, authentication, or rate consumption. WebSocket
|
|
140
|
+
upgrades use the same policy.
|
|
141
|
+
|
|
142
|
+
Trusted non-browser integrations can explicitly admit missing headers for each
|
|
143
|
+
transport independently:
|
|
144
|
+
|
|
145
|
+
```ts
|
|
146
|
+
const server = new Server({
|
|
147
|
+
origins: ['https://app.example'],
|
|
148
|
+
allowOriginless: true, // HTTP RPC only
|
|
149
|
+
ws: { allowOriginless: true }, // WebSocket only
|
|
150
|
+
})
|
|
151
|
+
```
|
|
152
|
+
|
|
153
|
+
Both options default to false. Neither option admits a mismatching named origin.
|
|
154
|
+
Application health and static routes retain their own admission policies.
|
|
155
|
+
When HTTP rate limiting is enabled, RPC responses include `RateLimit-Limit`,
|
|
156
|
+
`RateLimit-Remaining`, and rounded-up relative `RateLimit-Reset` seconds.
|
|
157
|
+
|
|
158
|
+
### Authentication identities
|
|
159
|
+
|
|
160
|
+
Return `false` to reject an identity. Successful context objects may omit
|
|
161
|
+
`user._id`. Only contexts with a user ID enter the user delivery index.
|
|
162
|
+
Changing or clearing an identity retires its previous index membership,
|
|
163
|
+
including deauthentication and `rpc:logout`.
|
|
164
|
+
|
|
165
|
+
`InMemorySessionManager` generates session IDs, token-family IDs, and refresh
|
|
166
|
+
tokens with Node's cryptographic UUID generator. UUID shape and session APIs
|
|
167
|
+
remain unchanged. When upgrading an application that used the earlier generator,
|
|
168
|
+
restart its application instances with the fixed build to discard their in-memory
|
|
169
|
+
refresh sessions. Require users to sign in again. Access-token expiry alone does
|
|
170
|
+
not invalidate an existing refresh token.
|
|
171
|
+
|
|
172
|
+
HTTP quotas, request tracking, and device IPs use the connection peer. The Node
|
|
173
|
+
adapter does not promote `X-Forwarded-For` to an authenticated client address.
|
|
174
|
+
Clients behind one proxy share its peer quota. Configure client-specific limits
|
|
175
|
+
at the trusted proxy when that deployment needs them.
|
|
176
|
+
|
|
135
177
|
## Development
|
|
136
178
|
|
|
137
179
|
Run commands from `typeferry-ts/`:
|
|
@@ -31,11 +31,11 @@ export function parseDeviceInfo(req) {
|
|
|
31
31
|
}
|
|
32
32
|
/**
|
|
33
33
|
* Extract client IP address from request.
|
|
34
|
-
*
|
|
35
|
-
*
|
|
34
|
+
* Uses the socket address or adapter-provided IP. Forwarding headers are
|
|
35
|
+
* untrusted; proxy identity must be resolved by the host before this boundary.
|
|
36
36
|
*/
|
|
37
37
|
function getIpFromRequest(req) {
|
|
38
|
-
return req.
|
|
38
|
+
return req.socket?.remoteAddress ?? req.ip;
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
41
|
* Map UA parser device type to our DeviceInfo type.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-info.js","sourceRoot":"","sources":["../../../src/auth/server/device-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAgBvC;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,GAAgB;IAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,CAAA;IAC5C,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAEhC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAA;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IAEjC,OAAO;QACL,GAAG,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACnC,SAAS,EAAE,QAAQ;QACnB,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;YACrB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9E,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI;YAChB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/D,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;KAC9C,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,GAAgB;IACxC,OAAO,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"device-info.js","sourceRoot":"","sources":["../../../src/auth/server/device-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAgBvC;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,GAAgB;IAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,YAAY,CAAC,CAAA;IAC5C,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAEhC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAA;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IAEjC,OAAO;QACL,GAAG,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACnC,SAAS,EAAE,QAAQ;QACnB,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;YACrB,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9E,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI;YAChB,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/D,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;KAC9C,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,GAAgB;IACxC,OAAO,GAAG,CAAC,MAAM,EAAE,aAAa,IAAI,GAAG,CAAC,EAAE,CAAA;AAC5C,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CACpB,IAAa;IAEb,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAA;IACtC,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAA;IACtC,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
|
@@ -3,6 +3,9 @@ import type { AuthConfig, DeviceInfo, Session, SessionManager, TokenPair } from
|
|
|
3
3
|
* In-memory session manager implementation.
|
|
4
4
|
* Useful for testing, development, or single-instance deployments.
|
|
5
5
|
*
|
|
6
|
+
* Session identifiers and refresh credentials use independent cryptographic
|
|
7
|
+
* UUIDs so public identifiers cannot expose bearer-token randomness.
|
|
8
|
+
*
|
|
6
9
|
* For production multi-instance deployments, implement SessionManager
|
|
7
10
|
* with a shared storage backend (MongoDB, Redis, etc.)
|
|
8
11
|
*/
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { signAccessToken } from './jwt-utils.js';
|
|
3
3
|
/**
|
|
4
4
|
* In-memory session manager implementation.
|
|
5
5
|
* Useful for testing, development, or single-instance deployments.
|
|
6
6
|
*
|
|
7
|
+
* Session identifiers and refresh credentials use independent cryptographic
|
|
8
|
+
* UUIDs so public identifiers cannot expose bearer-token randomness.
|
|
9
|
+
*
|
|
7
10
|
* For production multi-instance deployments, implement SessionManager
|
|
8
11
|
* with a shared storage backend (MongoDB, Redis, etc.)
|
|
9
12
|
*/
|
|
@@ -17,9 +20,9 @@ export class InMemorySessionManager {
|
|
|
17
20
|
this.cleanupInterval = setInterval(() => this.cleanup(), 60_000);
|
|
18
21
|
}
|
|
19
22
|
async createSession(userId, deviceInfo) {
|
|
20
|
-
const familyId =
|
|
21
|
-
const token =
|
|
22
|
-
const sessionId =
|
|
23
|
+
const familyId = randomUUID();
|
|
24
|
+
const token = randomUUID();
|
|
25
|
+
const sessionId = randomUUID();
|
|
23
26
|
const expiryDays = this.config.refreshTokenExpiryDays ?? 14;
|
|
24
27
|
const expiration = Math.floor(Date.now() / 1000) + expiryDays * 24 * 60 * 60;
|
|
25
28
|
const session = {
|
|
@@ -110,8 +113,8 @@ export class InMemorySessionManager {
|
|
|
110
113
|
* Rotate a session by creating a new token and marking the old one as replaced.
|
|
111
114
|
*/
|
|
112
115
|
async rotateSession(session, deviceInfo) {
|
|
113
|
-
const newToken =
|
|
114
|
-
const newSessionId =
|
|
116
|
+
const newToken = randomUUID();
|
|
117
|
+
const newSessionId = randomUUID();
|
|
115
118
|
const expiryDays = this.config.refreshTokenExpiryDays ?? 14;
|
|
116
119
|
const expiration = Math.floor(Date.now() / 1000) + expiryDays * 24 * 60 * 60;
|
|
117
120
|
const newSession = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/auth/server/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/auth/server/session-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/types.d.ts
CHANGED
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
* Used for session tracking and security monitoring.
|
|
4
4
|
*/
|
|
5
5
|
export interface DeviceInfo {
|
|
6
|
-
/**
|
|
6
|
+
/**
|
|
7
|
+
* Client IP address supplied by the connection socket or HTTP adapter.
|
|
8
|
+
*/
|
|
7
9
|
ip?: string;
|
|
8
10
|
/** Raw user agent string */
|
|
9
11
|
userAgent?: string;
|
package/dist/client/client.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import qs from 'query-string';
|
|
2
1
|
import type { CallOptions, MethodParams, ServerMethods } from '../utils/index.js';
|
|
3
2
|
import { Presentation } from '../utils/index.js';
|
|
4
3
|
import { ClientChannel } from './client-channel.js';
|
|
@@ -175,7 +174,7 @@ export declare class Client<MethodsType extends ServerMethods = ServerMethods> e
|
|
|
175
174
|
* Generates a URL path from string parts. The last argument can be a query
|
|
176
175
|
* string object definition.
|
|
177
176
|
*/
|
|
178
|
-
href(...path: (string |
|
|
177
|
+
href(...path: (string | object)[]): string;
|
|
179
178
|
channel(name?: string | object): ClientChannel | null;
|
|
180
179
|
isConnected(): Promise<unknown>;
|
|
181
180
|
fetch(url: string, options?: RequestInit): Promise<Response>;
|
package/dist/client/client.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import isEqual from 'fast-deep-equal';
|
|
2
|
-
import qs from 'query-string';
|
|
3
2
|
import { isEmpty, isPlainObject, merge } from '../utils/lodash.js';
|
|
4
3
|
import { TypeFerryEvents, ClientEvents, Environment, Errors, Methods, NO_CHANNEL, PayloadType, Presentation, TOKEN_HEADER_KEY, } from '../utils/index.js';
|
|
5
4
|
import { callMethodProxy } from './call-method-proxy.js';
|
|
@@ -11,6 +10,7 @@ import { IdleTimer } from './idle-timer.js';
|
|
|
11
10
|
import { logger, LogLevel } from './logger.js';
|
|
12
11
|
import { VisibilityManager } from './visibility-manager.js';
|
|
13
12
|
import { DEFAULT_REQUEST_TIMEOUT_MS, RequestLifetime } from './request-lifetime.js';
|
|
13
|
+
import { stringifyHrefQuery } from './href-query.js';
|
|
14
14
|
/**
|
|
15
15
|
* When working with Next.js, it is probably a good idea to not run this in the
|
|
16
16
|
* server side by using it inside a `useEffect` hook.
|
|
@@ -456,11 +456,10 @@ export class Client extends ClientChannel {
|
|
|
456
456
|
*/
|
|
457
457
|
href(...path) {
|
|
458
458
|
let queryString = '';
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
}
|
|
459
|
+
const parameters = path.at(-1);
|
|
460
|
+
if (isPlainObject(parameters)) {
|
|
461
|
+
path.pop();
|
|
462
|
+
queryString = '?'.concat(stringifyHrefQuery(parameters));
|
|
464
463
|
}
|
|
465
464
|
if (path.some(isPlainObject))
|
|
466
465
|
throw new Error('Parameters are only allowed in the last argument.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Serializes Client.href parameters with its established query-string defaults.
|
|
3
|
+
* Array entries repeat the key, null entries omit the equals sign, and spaces
|
|
4
|
+
* use percent encoding rather than the form encoding used by URLSearchParams.
|
|
5
|
+
*/
|
|
6
|
+
export declare function stringifyHrefQuery(parameters: Record<string, unknown>): string;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Serializes Client.href parameters with its established query-string defaults.
|
|
3
|
+
* Array entries repeat the key, null entries omit the equals sign, and spaces
|
|
4
|
+
* use percent encoding rather than the form encoding used by URLSearchParams.
|
|
5
|
+
*/
|
|
6
|
+
export function stringifyHrefQuery(parameters) {
|
|
7
|
+
const groups = [];
|
|
8
|
+
for (const key of Object.keys(parameters).sort()) {
|
|
9
|
+
// The previous serializer omitted this key when copying into a plain object.
|
|
10
|
+
if (key === '__proto__')
|
|
11
|
+
continue;
|
|
12
|
+
const value = parameters[key];
|
|
13
|
+
const values = Array.isArray(value) ? value : [value];
|
|
14
|
+
const group = values
|
|
15
|
+
.filter((entry) => entry !== undefined)
|
|
16
|
+
.map((entry) => {
|
|
17
|
+
const encodedKey = encodeQueryComponent(key);
|
|
18
|
+
return entry === null
|
|
19
|
+
? encodedKey
|
|
20
|
+
: `${encodedKey}=${encodeQueryComponent(entry)}`;
|
|
21
|
+
})
|
|
22
|
+
.join('&');
|
|
23
|
+
if (group.length > 0)
|
|
24
|
+
groups.push(group);
|
|
25
|
+
}
|
|
26
|
+
return groups.join('&');
|
|
27
|
+
}
|
|
28
|
+
function encodeQueryComponent(value) {
|
|
29
|
+
// Implicit string conversion preserves TypeError for symbols.
|
|
30
|
+
return encodeURIComponent(`${value}`).replaceAll(/[!'()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=href-query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"href-query.js","sourceRoot":"","sources":["../../src/client/href-query.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,UAAmC;IACpE,MAAM,MAAM,GAAa,EAAE,CAAA;IAE3B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACjD,6EAA6E;QAC7E,IAAI,GAAG,KAAK,WAAW;YAAE,SAAQ;QAEjC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC7B,MAAM,MAAM,GAAuB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,KAAK,GAAG,MAAM;aACjB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;aACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAA;YAE5C,OAAO,KAAK,KAAK,IAAI;gBACnB,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,GAAG,UAAU,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAA;QACpD,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACzB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,8DAA8D;IAC9D,OAAO,kBAAkB,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,UAAU,CAC9C,UAAU,EACV,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CACxE,CAAA;AACH,CAAC"}
|
|
@@ -1,17 +1,41 @@
|
|
|
1
|
-
import memoizee from 'memoizee';
|
|
2
1
|
import { useMemo } from 'react';
|
|
3
2
|
import { EJSON } from '../../ejson/index.js';
|
|
3
|
+
const MAX_TIMEOUT_MS = 2 ** 31 - 1;
|
|
4
|
+
/**
|
|
5
|
+
* Share pending requests and retain successful results for a fulfillment-based
|
|
6
|
+
* lifetime. A failed request must leave the cache so the next call can retry.
|
|
7
|
+
*/
|
|
8
|
+
function createCachedCaller(call, maxAge) {
|
|
9
|
+
const lifetime = Math.max(0, Math.trunc(maxAge) || 0);
|
|
10
|
+
if (lifetime > MAX_TIMEOUT_MS) {
|
|
11
|
+
throw new TypeError(`${lifetime} exceeds maximum possible timeout`);
|
|
12
|
+
}
|
|
13
|
+
const entries = new Map();
|
|
14
|
+
return function (...parameters) {
|
|
15
|
+
// Serialize the arguments object so omitted and undefined properties share
|
|
16
|
+
// a key. An array would instead encode undefined values as nulls.
|
|
17
|
+
const key = EJSON.stringify(arguments);
|
|
18
|
+
const cached = entries.get(key);
|
|
19
|
+
if (cached)
|
|
20
|
+
return cached;
|
|
21
|
+
const promise = call.apply(this, parameters);
|
|
22
|
+
entries.set(key, promise);
|
|
23
|
+
void promise.then(() => {
|
|
24
|
+
if (!lifetime)
|
|
25
|
+
return;
|
|
26
|
+
const timeout = setTimeout(() => entries.delete(key), lifetime);
|
|
27
|
+
timeout.unref?.();
|
|
28
|
+
}, () => { entries.delete(key); });
|
|
29
|
+
return promise;
|
|
30
|
+
};
|
|
31
|
+
}
|
|
4
32
|
export function useCaller({ client, cache, maxAge, }) {
|
|
5
33
|
return useMemo(() => {
|
|
6
34
|
if (!client)
|
|
7
35
|
return undefined;
|
|
8
36
|
if (!cache)
|
|
9
37
|
return client.call;
|
|
10
|
-
return
|
|
11
|
-
maxAge,
|
|
12
|
-
promise: true,
|
|
13
|
-
normalizer: (parameters) => EJSON.stringify(parameters),
|
|
14
|
-
});
|
|
38
|
+
return createCachedCaller(client.call, maxAge);
|
|
15
39
|
}, [cache, client, maxAge]);
|
|
16
40
|
}
|
|
17
41
|
//# sourceMappingURL=use-caller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-caller.js","sourceRoot":"","sources":["../../../src/react/hooks/use-caller.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"use-caller.js","sourceRoot":"","sources":["../../../src/react/hooks/use-caller.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAenC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;AAElC;;;GAGG;AACH,SAAS,kBAAkB,CAAC,IAAkB,EAAE,MAAc;IAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAErD,IAAI,QAAQ,GAAG,cAAc,EAAE,CAAC;QAC9B,MAAM,IAAI,SAAS,CAAC,GAAG,QAAQ,mCAAmC,CAAC,CAAA;IACrE,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAA4B,CAAA;IAEnD,OAAO,UAAyB,GAAG,UAAoC;QACrE,2EAA2E;QAC3E,kEAAkE;QAClE,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE/B,IAAI,MAAM;YAAE,OAAO,MAAM,CAAA;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAE5C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAEzB,KAAK,OAAO,CAAC,IAAI,CACf,GAAG,EAAE;YACH,IAAI,CAAC,QAAQ;gBAAE,OAAM;YAErB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAA;YAE/D,OAAO,CAAC,KAAK,EAAE,EAAE,CAAA;QACnB,CAAC,EACD,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA,CAAC,CAAC,CAC9B,CAAA;QAED,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EACxB,MAAM,EACN,KAAK,EACL,MAAM,GACW;IACjB,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAA;QAE7B,IAAI,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC,IAAI,CAAA;QAE9B,OAAO,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAChD,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAC7B,CAAC"}
|
|
@@ -38,6 +38,7 @@ export declare class ClientNode extends EventEmitter2 {
|
|
|
38
38
|
/**
|
|
39
39
|
* Extracts tracking properties (headers, IP, user-agent) from a request.
|
|
40
40
|
* Accepts both Node `IncomingMessage` and the framework-agnostic `TypeFerryRequest`.
|
|
41
|
+
* Uses the transport peer without promoting untrusted forwarding headers.
|
|
41
42
|
*/
|
|
42
43
|
setTrackingProperties(source: {
|
|
43
44
|
headers?: Record<string, string | string[] | undefined>;
|
|
@@ -46,7 +47,12 @@ export declare class ClientNode extends EventEmitter2 {
|
|
|
46
47
|
remoteAddress?: string;
|
|
47
48
|
};
|
|
48
49
|
}): void;
|
|
50
|
+
/**
|
|
51
|
+
* Refreshes the optional identity used for user-scoped delivery.
|
|
52
|
+
* Authenticated contexts without a user ID remain valid and unindexed.
|
|
53
|
+
*/
|
|
49
54
|
setUserId(): void;
|
|
55
|
+
private clearUserIdentity;
|
|
50
56
|
/**
|
|
51
57
|
* Sends a push event to the client.
|
|
52
58
|
* Uses the wire protocol `{ t: "event", ... }` envelope.
|
|
@@ -43,6 +43,8 @@ export class ClientNode extends EventEmitter2 {
|
|
|
43
43
|
}
|
|
44
44
|
set authenticated(authenticated) {
|
|
45
45
|
this.isAuthenticated = authenticated;
|
|
46
|
+
if (!authenticated)
|
|
47
|
+
this.setContext(null);
|
|
46
48
|
}
|
|
47
49
|
get readyState() {
|
|
48
50
|
return this.socket?.readyState;
|
|
@@ -51,37 +53,43 @@ export class ClientNode extends EventEmitter2 {
|
|
|
51
53
|
this.uuid = uuid;
|
|
52
54
|
}
|
|
53
55
|
setContext(context) {
|
|
56
|
+
this.clearUserIdentity();
|
|
54
57
|
this.context = this.authenticated ? context : {};
|
|
55
58
|
this.setUserId();
|
|
56
59
|
}
|
|
57
60
|
/**
|
|
58
61
|
* Extracts tracking properties (headers, IP, user-agent) from a request.
|
|
59
62
|
* Accepts both Node `IncomingMessage` and the framework-agnostic `TypeFerryRequest`.
|
|
63
|
+
* Uses the transport peer without promoting untrusted forwarding headers.
|
|
60
64
|
*/
|
|
61
65
|
setTrackingProperties(source) {
|
|
62
66
|
this.headers = Object.fromEntries(Object.entries(source.headers ?? {}).flatMap(([name, value]) => typeof value === 'string' ? [[name, value]] : []));
|
|
63
67
|
const userAgent = source.headers?.['user-agent'];
|
|
64
68
|
this.userAgent = typeof userAgent === 'string' ? userAgent : '';
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
// The user ID is used for authorizing the user's channel.
|
|
69
|
+
this.remoteAddress = source.socket?.remoteAddress ?? source.ip ?? '';
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Refreshes the optional identity used for user-scoped delivery.
|
|
73
|
+
* Authenticated contexts without a user ID remain valid and unindexed.
|
|
74
|
+
*/
|
|
73
75
|
setUserId() {
|
|
76
|
+
this.clearUserIdentity();
|
|
74
77
|
if (!this.authenticated)
|
|
75
78
|
return;
|
|
76
79
|
const user = this.context?.user;
|
|
77
80
|
const userId = user?._id;
|
|
78
|
-
if (!userId)
|
|
79
|
-
|
|
80
|
-
}
|
|
81
|
+
if (!userId)
|
|
82
|
+
return;
|
|
81
83
|
this.userId = String(userId);
|
|
82
84
|
this.user = user;
|
|
83
85
|
this.server.indexClientByUserId(this);
|
|
84
86
|
}
|
|
87
|
+
clearUserIdentity() {
|
|
88
|
+
if (this.userId !== null)
|
|
89
|
+
this.server.removeClientFromUserIndex(this);
|
|
90
|
+
this.userId = null;
|
|
91
|
+
this.user = null;
|
|
92
|
+
}
|
|
85
93
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
86
94
|
// WebSocket Message Emitters
|
|
87
95
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-node.js","sourceRoot":"","sources":["../../src/server/client-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAC9E,OAAO,aAAa,MAAM,wBAAwB,CAAA;AAIlD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAYrC,MAAM,OAAO,UAAW,SAAQ,aAAa;IAC3C,IAAI,GAAG,EAAE,CAAA;IACT,eAAe,GAAG,KAAK,CAAA;IACvB,IAAI,GAA4B,EAAE,CAAA;IAClC,OAAO,GAA6B,EAAE,CAAA;IACtC,MAAM,GAAkB,IAAI,CAAA;IAC5B,IAAI,GAA0B,IAAI,CAAA;IAClC,MAAM,CAAoC;IAC1C,8DAA8D;IAC9D,GAAG,CAA8B;IACjC,+DAA+D;IAC/D,GAAG,CAA+B;IAClC,QAAQ,GAAG,KAAK,CAAA;IAChB,OAAO,CAAgC;IACvC,MAAM,CAAQ;IACd,OAAO,GAA2B,EAAE,CAAA;IACpC,aAAa,GAAsB,EAAE,CAAA;IACrC,SAAS,GAAG,EAAE,CAAA;IAEd,YACE,MAAc,EACd,MAA+B,EAC/B,GAAsB,EACtB,GAAuB,EACvB,KAAiB;QAEjB,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAC5B,KAAK,KAAK,IAAI;gBACZ,CAAC,CAAC;oBACE,iBAAiB,EAAE,EAAE;oBACrB,QAAQ,EAAE,EAAE,GAAG,IAAI;iBACpB;gBACH,CAAC,CAAC;oBACE,iBAAiB,EAAE,KAAK,CAAC,GAAG;oBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CACN,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED,IAAI,aAAa,CAAC,aAAsB;QACtC,IAAI,CAAC,eAAe,GAAG,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"client-node.js","sourceRoot":"","sources":["../../src/server/client-node.ts"],"names":[],"mappings":"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"}
|
package/dist/server/server.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ import { Method } from './method.js';
|
|
|
11
11
|
import { ServerChannel } from './server-channel.js';
|
|
12
12
|
import type { TypeFerrySocket } from './types.js';
|
|
13
13
|
import { NodeHonoTransport, RedisTransport, WebSocketTransport } from './transports/index.js';
|
|
14
|
+
import type { WebSocketTransportOptions } from './transports/websocket-transport.js';
|
|
14
15
|
declare global {
|
|
15
16
|
var TypeFerry: Server | undefined;
|
|
16
17
|
}
|
|
@@ -51,8 +52,13 @@ export type ServerOptions = {
|
|
|
51
52
|
port?: number;
|
|
52
53
|
auth?: AuthFunction;
|
|
53
54
|
origins?: string[];
|
|
55
|
+
/**
|
|
56
|
+
* Admits HTTP RPC calls without Origin when an allowlist is configured.
|
|
57
|
+
* WebSocket admission has its own `ws.allowOriginless` option.
|
|
58
|
+
*/
|
|
59
|
+
allowOriginless?: boolean;
|
|
54
60
|
debug?: boolean;
|
|
55
|
-
ws?: Record<string, unknown>;
|
|
61
|
+
ws?: WebSocketTransportOptions & Record<string, unknown>;
|
|
56
62
|
redis?: RedisClientOptions | boolean;
|
|
57
63
|
/**
|
|
58
64
|
* Observes Node request metadata and synchronous `data` events without owning
|
|
@@ -104,7 +110,7 @@ export declare class Server<Methods extends ServerMethods = ServerMethods> exten
|
|
|
104
110
|
private closePromise?;
|
|
105
111
|
private initializeGlobalInstance;
|
|
106
112
|
private setupHttpListening;
|
|
107
|
-
constructor({ host, port, debug, origins, ws, redis, requestListener, globalInstance, allowedContextKeys, rateLimit, maxRequestBodySize, requestBodySizeLimits, }?: ServerOptions);
|
|
113
|
+
constructor({ host, port, debug, origins, allowOriginless, ws, redis, requestListener, globalInstance, allowedContextKeys, rateLimit, maxRequestBodySize, requestBodySizeLimits, }?: ServerOptions);
|
|
108
114
|
/**
|
|
109
115
|
* Resolves when startup transports have emitted their readiness signals.
|
|
110
116
|
*
|
package/dist/server/server.js
CHANGED
|
@@ -52,7 +52,7 @@ export class Server extends ServerChannel {
|
|
|
52
52
|
setTimeout(() => this.emit(ServerEvents.HTTP_LISTENING), 0);
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
|
-
constructor({ host = 'localhost', port = 80, debug = false, origins, ws, redis, requestListener, globalInstance = true, allowedContextKeys = [], rateLimit = false, maxRequestBodySize = DEFAULT_MAX_REQUEST_BODY_SIZE_BYTES, requestBodySizeLimits = [], } = {}) {
|
|
55
|
+
constructor({ host = 'localhost', port = 80, debug = false, origins, allowOriginless = false, ws, redis, requestListener, globalInstance = true, allowedContextKeys = [], rateLimit = false, maxRequestBodySize = DEFAULT_MAX_REQUEST_BODY_SIZE_BYTES, requestBodySizeLimits = [], } = {}) {
|
|
56
56
|
super(NO_CHANNEL);
|
|
57
57
|
this.m = createMethodProxy(this);
|
|
58
58
|
this.setServer(this);
|
|
@@ -68,7 +68,7 @@ export class Server extends ServerChannel {
|
|
|
68
68
|
this.rateLimit = rateLimit;
|
|
69
69
|
this.maxRequestBodySize = maxRequestBodySize;
|
|
70
70
|
this.allowedContextKeys = allowedContextKeys;
|
|
71
|
-
this.httpTransport = new NodeHonoTransport(this, origins, this.rateLimit, this.maxRequestBodySize, requestBodySizeLimits);
|
|
71
|
+
this.httpTransport = new NodeHonoTransport(this, origins, this.rateLimit, this.maxRequestBodySize, requestBodySizeLimits, allowOriginless);
|
|
72
72
|
this.webSocketTransport = new WebSocketTransport(this, origins, ws);
|
|
73
73
|
this.redisTransport = redis ? new RedisTransport(this, redis) : null;
|
|
74
74
|
this.setupHttpListening();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAQhC,OAAO,EACL,eAAe,EACf,OAAO,EACP,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,UAAU,GACX,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,GACnB,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ export type DisposableRateLimiter = MiddlewareHandler & {
|
|
|
8
8
|
close(): void;
|
|
9
9
|
};
|
|
10
10
|
/**
|
|
11
|
-
*
|
|
12
|
-
*
|
|
11
|
+
* Fixed-window rate limiter keyed by the Node connection peer.
|
|
12
|
+
* Forwarded client identity remains the host's trust decision.
|
|
13
13
|
*/
|
|
14
14
|
export declare function rateLimiter(opts: RateLimitOptions): DisposableRateLimiter;
|
|
15
15
|
export {};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { getConnInfo } from '@hono/node-server/conninfo';
|
|
2
|
+
const MILLISECONDS_PER_SECOND = 1000;
|
|
1
3
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
+
* Fixed-window rate limiter keyed by the Node connection peer.
|
|
5
|
+
* Forwarded client identity remains the host's trust decision.
|
|
4
6
|
*/
|
|
5
7
|
export function rateLimiter(opts) {
|
|
6
8
|
const store = new Map();
|
|
@@ -14,14 +16,17 @@ export function rateLimiter(opts) {
|
|
|
14
16
|
// A limiter must never keep an otherwise-closed Node process alive.
|
|
15
17
|
cleanupTimer.unref();
|
|
16
18
|
const middleware = async (c, next) => {
|
|
17
|
-
const
|
|
19
|
+
const peerAddress = getConnInfo(c).remote.address;
|
|
18
20
|
const now = Date.now();
|
|
19
|
-
let entry = store.get(
|
|
21
|
+
let entry = store.get(peerAddress);
|
|
20
22
|
if (!entry || entry.resetAt <= now) {
|
|
21
23
|
entry = { count: 0, resetAt: now + opts.windowMs };
|
|
22
|
-
store.set(
|
|
24
|
+
store.set(peerAddress, entry);
|
|
23
25
|
}
|
|
24
26
|
entry.count++;
|
|
27
|
+
c.header('RateLimit-Limit', String(opts.max));
|
|
28
|
+
c.header('RateLimit-Remaining', String(Math.max(0, opts.max - entry.count)));
|
|
29
|
+
c.header('RateLimit-Reset', String(Math.ceil(Math.max(0, entry.resetAt - now) / MILLISECONDS_PER_SECOND)));
|
|
25
30
|
if (entry.count > opts.max) {
|
|
26
31
|
return c.text('Too Many Requests', 429);
|
|
27
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hono-rate-limit.js","sourceRoot":"","sources":["../../../src/server/transports/hono-rate-limit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hono-rate-limit.js","sourceRoot":"","sources":["../../../src/server/transports/hono-rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAaxD,MAAM,uBAAuB,GAAG,IAAI,CAAA;AAOpC;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,IAAsB;IAChD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAsC,CAAA;IAE3D,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG;gBAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IACjB,oEAAoE;IACpE,YAAY,CAAC,KAAK,EAAE,CAAA;IAEpB,MAAM,UAAU,GAA0B,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QAC1D,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAA;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAEtB,IAAI,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAClC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC;YACnC,KAAK,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;YAClD,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC/B,CAAC;QAED,KAAK,CAAC,KAAK,EAAE,CAAA;QAEb,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7C,CAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5E,CAAC,CAAC,MAAM,CACN,iBAAiB,EACjB,MAAM,CACJ,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,uBAAuB,CAAC,CACtE,CACF,CAAA;QAED,IAAI,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAA;QACzC,CAAC;QAED,MAAM,IAAI,EAAE,CAAA;IACd,CAAC,CAAA;IAED,UAAU,CAAC,KAAK,GAAG,GAAS,EAAE;QAC5B,aAAa,CAAC,YAAY,CAAC,CAAA;QAC3B,KAAK,CAAC,KAAK,EAAE,CAAA;IACf,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC"}
|
|
@@ -13,7 +13,7 @@ export declare class NodeHonoTransport {
|
|
|
13
13
|
app: Hono;
|
|
14
14
|
http: NodeHttpServer | undefined;
|
|
15
15
|
private httpRateLimiter;
|
|
16
|
-
constructor(server: Server, origins: string[] | undefined, limit: RateLimit, maxRequestBodySize: number, requestBodySizeLimits?: readonly RequestBodySizeLimit[]);
|
|
16
|
+
constructor(server: Server, origins: string[] | undefined, limit: RateLimit, maxRequestBodySize: number, requestBodySizeLimits?: readonly RequestBodySizeLimit[], allowOriginless?: boolean);
|
|
17
17
|
/**
|
|
18
18
|
* Tees a request without allowing an optional observer to control Hono's
|
|
19
19
|
* backpressure. Header-only observers receive metadata and completion without
|
|
@@ -12,6 +12,7 @@ import { ClientNode } from '../client-node.js';
|
|
|
12
12
|
import { redactMethodTelemetry } from '../method.js';
|
|
13
13
|
import { rateLimiter } from './hono-rate-limit.js';
|
|
14
14
|
import { streamingBodyLimit } from './hono-streaming-body-limit.js';
|
|
15
|
+
import { createOriginChecker } from './origin-policy.js';
|
|
15
16
|
import { HttpTransportEvents, SERVER_NOT_READY_RESPONSE, } from './node-hono-transport-contract.js';
|
|
16
17
|
/**
|
|
17
18
|
* Node.js HTTP transport backed by a Hono application.
|
|
@@ -24,10 +25,10 @@ export class NodeHonoTransport {
|
|
|
24
25
|
app;
|
|
25
26
|
http;
|
|
26
27
|
httpRateLimiter;
|
|
27
|
-
constructor(server, origins, limit, maxRequestBodySize, requestBodySizeLimits = []) {
|
|
28
|
+
constructor(server, origins, limit, maxRequestBodySize, requestBodySizeLimits = [], allowOriginless = false) {
|
|
28
29
|
this.server = server;
|
|
29
30
|
this.app = new Hono();
|
|
30
|
-
this.setupMiddleware(origins, limit, maxRequestBodySize, requestBodySizeLimits);
|
|
31
|
+
this.setupMiddleware(origins, limit, maxRequestBodySize, requestBodySizeLimits, allowOriginless);
|
|
31
32
|
const honoListener = getRequestListener((request, env) => this.handleFetch(request, env));
|
|
32
33
|
this.http = createServer((request, response) => {
|
|
33
34
|
if (!this.server.requestListener) {
|
|
@@ -94,23 +95,24 @@ export class NodeHonoTransport {
|
|
|
94
95
|
// ---------------------------------------------------------------------------
|
|
95
96
|
// Middleware setup
|
|
96
97
|
// ---------------------------------------------------------------------------
|
|
97
|
-
setupMiddleware(origins, limit, maxRequestBodySize, requestBodySizeLimits) {
|
|
98
|
+
setupMiddleware(origins, limit, maxRequestBodySize, requestBodySizeLimits, allowOriginless) {
|
|
98
99
|
validateRequestBodyLimits(maxRequestBodySize, requestBodySizeLimits);
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
100
|
+
const originAllowed = createOriginChecker(origins, allowOriginless);
|
|
101
|
+
// Application routes such as static assets and health checks are outside
|
|
102
|
+
// RPC origin admission. Browser navigation does not supply an Origin.
|
|
103
|
+
this.app.use('/__h', async (context, next) => {
|
|
104
|
+
if (!originAllowed(context.req.header('origin'))) {
|
|
105
|
+
return context.text('Forbidden', 403);
|
|
106
|
+
}
|
|
107
|
+
await next();
|
|
107
108
|
});
|
|
108
|
-
if (origins
|
|
109
|
+
if (origins !== undefined) {
|
|
109
110
|
this.app.use('*', cors({
|
|
110
111
|
origin: (origin) => origins.includes(origin) ? origin : null,
|
|
111
112
|
credentials: true,
|
|
112
113
|
}));
|
|
113
114
|
}
|
|
115
|
+
// Oversized RPC attempts consume quota after origin admission.
|
|
114
116
|
if (limit) {
|
|
115
117
|
const opts = limit === true
|
|
116
118
|
? { windowMs: 60_000, max: 120 }
|
|
@@ -118,6 +120,15 @@ export class NodeHonoTransport {
|
|
|
118
120
|
this.httpRateLimiter = rateLimiter(opts);
|
|
119
121
|
this.app.use('/__h', this.httpRateLimiter);
|
|
120
122
|
}
|
|
123
|
+
this.app.use('*', (c, next) => {
|
|
124
|
+
const policy = getRequestBodyPolicy(c.req.path, maxRequestBodySize, requestBodySizeLimits);
|
|
125
|
+
if (policy.streaming)
|
|
126
|
+
return streamingBodyLimit(policy.maxSize)(c, next);
|
|
127
|
+
return bodyLimit({
|
|
128
|
+
maxSize: policy.maxSize,
|
|
129
|
+
onError: (context) => context.text('Request Entity Too Large', 413),
|
|
130
|
+
})(c, next);
|
|
131
|
+
});
|
|
121
132
|
this.app.post('/__h', (c) => this.handleRpc(c));
|
|
122
133
|
}
|
|
123
134
|
// ---------------------------------------------------------------------------
|
|
@@ -164,12 +175,16 @@ export class NodeHonoTransport {
|
|
|
164
175
|
const { payload } = transport;
|
|
165
176
|
const method = this.server.getMethod(payload.method);
|
|
166
177
|
if (!method) {
|
|
178
|
+
if (payload.void === true)
|
|
179
|
+
return c.text('', 200);
|
|
167
180
|
return this.rpcError(c, Errors.METHOD_NOT_FOUND, {
|
|
168
181
|
method: payload.method,
|
|
169
182
|
});
|
|
170
183
|
}
|
|
171
184
|
const clientNode = await this.buildClientNode(c, transport.context);
|
|
172
185
|
if (method.isProtected && !clientNode.authenticated) {
|
|
186
|
+
if (payload.void === true)
|
|
187
|
+
return c.text('', 200);
|
|
173
188
|
return this.rpcError(c, Errors.METHOD_FORBIDDEN, {
|
|
174
189
|
method: payload.method,
|
|
175
190
|
});
|
|
@@ -205,7 +220,7 @@ export class NodeHonoTransport {
|
|
|
205
220
|
// Helpers
|
|
206
221
|
// ---------------------------------------------------------------------------
|
|
207
222
|
buildTypeFerryRequest(c) {
|
|
208
|
-
const ip =
|
|
223
|
+
const ip = getConnInfo(c).remote.address;
|
|
209
224
|
return {
|
|
210
225
|
headers: Object.fromEntries(c.req.raw.headers.entries()),
|
|
211
226
|
...(ip === undefined ? {} : { ip }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-hono-transport.js","sourceRoot":"","sources":["../../../src/server/transports/node-hono-transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"node-hono-transport.js","sourceRoot":"","sources":["../../../src/server/transports/node-hono-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Keeps HTTP admission and WebSocket upgrades on the same origin policy.
|
|
3
|
+
* An omitted allowlist is unrestricted; an explicit empty list fails closed.
|
|
4
|
+
*/
|
|
5
|
+
export declare function createOriginChecker(origins: readonly string[] | undefined, allowOriginless?: boolean): (origin: string | undefined) => boolean;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Keeps HTTP admission and WebSocket upgrades on the same origin policy.
|
|
3
|
+
* An omitted allowlist is unrestricted; an explicit empty list fails closed.
|
|
4
|
+
*/
|
|
5
|
+
export function createOriginChecker(origins, allowOriginless = false) {
|
|
6
|
+
if (origins === undefined)
|
|
7
|
+
return () => true;
|
|
8
|
+
const allowedOrigins = new Set(origins);
|
|
9
|
+
return (origin) => origin === undefined
|
|
10
|
+
? allowOriginless
|
|
11
|
+
: origin.length > 0 && allowedOrigins.has(origin);
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=origin-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"origin-policy.js","sourceRoot":"","sources":["../../../src/server/transports/origin-policy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAsC,EACtC,eAAe,GAAG,KAAK;IAEvB,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,GAAG,EAAE,CAAC,IAAI,CAAA;IAE5C,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;IAEvC,OAAO,CAAC,MAAM,EAAE,EAAE,CAChB,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AACvD,CAAC"}
|
|
@@ -8,6 +8,11 @@ export declare enum WebSocketTransportEvents {
|
|
|
8
8
|
}
|
|
9
9
|
export interface WebSocketTransportOptions {
|
|
10
10
|
path?: string;
|
|
11
|
+
/**
|
|
12
|
+
* Admits an absent Origin under a configured allowlist.
|
|
13
|
+
* This does not change HTTP RPC admission or permit mismatching origins.
|
|
14
|
+
*/
|
|
15
|
+
allowOriginless?: boolean;
|
|
11
16
|
/**
|
|
12
17
|
* Application-owned handshake auth; rejection never falls back to token auth.
|
|
13
18
|
*/
|
|
@@ -25,7 +30,7 @@ export declare class WebSocketTransport {
|
|
|
25
30
|
wss: WebSocketServer;
|
|
26
31
|
rooms: RoomRegistry;
|
|
27
32
|
private path;
|
|
28
|
-
private
|
|
33
|
+
private originAllowed;
|
|
29
34
|
private handshakeAuthenticator;
|
|
30
35
|
private pingTimers;
|
|
31
36
|
private pongReceived;
|
|
@@ -3,6 +3,7 @@ import { TYPEFERRY_WS_PATH, isPongMessage, isRpcMessage, isRpcVoidMessage, Prese
|
|
|
3
3
|
import { ClientNode } from '../client-node.js';
|
|
4
4
|
import { RoomRegistry } from '../room-registry.js';
|
|
5
5
|
import { SocketState } from '../types.js';
|
|
6
|
+
import { createOriginChecker } from './origin-policy.js';
|
|
6
7
|
import { PING_INTERVAL_MS, PING_PAYLOAD, authenticateNode, handleRpc, handleRpcVoid, parseMeta, validateUuid, } from './ws-shared.js';
|
|
7
8
|
export var WebSocketTransportEvents;
|
|
8
9
|
(function (WebSocketTransportEvents) {
|
|
@@ -18,14 +19,14 @@ export class WebSocketTransport {
|
|
|
18
19
|
wss;
|
|
19
20
|
rooms = new RoomRegistry();
|
|
20
21
|
path;
|
|
21
|
-
|
|
22
|
+
originAllowed;
|
|
22
23
|
handshakeAuthenticator;
|
|
23
24
|
pingTimers = new Map();
|
|
24
25
|
pongReceived = new Map();
|
|
25
26
|
constructor(server, origins, opts) {
|
|
26
27
|
this.server = server;
|
|
27
28
|
this.path = opts?.path ?? TYPEFERRY_WS_PATH;
|
|
28
|
-
this.
|
|
29
|
+
this.originAllowed = createOriginChecker(origins, opts?.allowOriginless);
|
|
29
30
|
this.handshakeAuthenticator = opts?.handshakeAuthenticator;
|
|
30
31
|
this.wss = new WebSocketServer({ noServer: true });
|
|
31
32
|
this.wss.on('error', (error) => server.emit(WebSocketTransportEvents.WEBSOCKET_SERVER_ERROR, error));
|
|
@@ -60,12 +61,7 @@ export class WebSocketTransport {
|
|
|
60
61
|
socket.end(response, () => socket.destroy());
|
|
61
62
|
}
|
|
62
63
|
validateOrigin(req) {
|
|
63
|
-
|
|
64
|
-
return true;
|
|
65
|
-
const origin = req.headers.origin;
|
|
66
|
-
if (!origin)
|
|
67
|
-
return true;
|
|
68
|
-
return this.origins.has(origin);
|
|
64
|
+
return this.originAllowed(req.headers.origin);
|
|
69
65
|
}
|
|
70
66
|
handleConnection(ws, req) {
|
|
71
67
|
const url = new URL(req.url ?? '', 'http://localhost');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-transport.js","sourceRoot":"","sources":["../../../src/server/transports/websocket-transport.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAA;AAEpC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,YAAY,GACb,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAG/C,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"websocket-transport.js","sourceRoot":"","sources":["../../../src/server/transports/websocket-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,9 +30,14 @@ export declare function sendResponse(node: ClientNode, id: string, result?: unkn
|
|
|
30
30
|
* disconnecting during the async auth call.
|
|
31
31
|
*/
|
|
32
32
|
export declare function authenticateNode(server: Server, node: ClientNode, token: string | undefined, handshakeAuthenticator?: WebSocketHandshakeAuthenticator, handshake?: WebSocketHandshake): Promise<void>;
|
|
33
|
-
/**
|
|
33
|
+
/**
|
|
34
|
+
* Preserves valid client identities and replaces invalid identities atomically.
|
|
35
|
+
* Removing characters could alias two distinct caller-supplied identities.
|
|
36
|
+
*/
|
|
34
37
|
export declare function validateUuid(uuid: unknown): string;
|
|
35
|
-
/**
|
|
38
|
+
/**
|
|
39
|
+
* Bounds metadata supplied as an object, where no raw JSON input is available.
|
|
40
|
+
*/
|
|
36
41
|
export declare function validateMeta(meta: unknown): Record<string, unknown>;
|
|
37
42
|
/** Parses meta from a query string value (JSON-encoded in the URL). */
|
|
38
43
|
export declare function parseMeta(raw: string | null): Record<string, unknown>;
|
|
@@ -124,6 +124,7 @@ export async function authenticateNode(server, node, token, handshakeAuthenticat
|
|
|
124
124
|
node.emitAuthResult(false);
|
|
125
125
|
return;
|
|
126
126
|
}
|
|
127
|
+
let authTimeout;
|
|
127
128
|
try {
|
|
128
129
|
const auth = server.auth;
|
|
129
130
|
const authPromise = handshakeAuthenticator
|
|
@@ -131,7 +132,9 @@ export async function authenticateNode(server, node, token, handshakeAuthenticat
|
|
|
131
132
|
: auth
|
|
132
133
|
? Promise.resolve(auth.call(node, token === undefined ? {} : { token }))
|
|
133
134
|
: Promise.resolve(false);
|
|
134
|
-
const timeoutPromise = new Promise((_, reject) =>
|
|
135
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
136
|
+
authTimeout = setTimeout(() => reject(new Error('Auth timeout')), AUTH_TIMEOUT_MS);
|
|
137
|
+
});
|
|
135
138
|
const result = await Promise.race([authPromise, timeoutPromise]);
|
|
136
139
|
if (!node.socket || node.socket.readyState !== SocketState.OPEN)
|
|
137
140
|
return;
|
|
@@ -143,31 +146,52 @@ export async function authenticateNode(server, node, token, handshakeAuthenticat
|
|
|
143
146
|
node.emitAuthResult(node.authenticated);
|
|
144
147
|
}
|
|
145
148
|
catch (error) {
|
|
149
|
+
// Context installation can reject an identity after the callback succeeds.
|
|
150
|
+
// Never report failure while leaving the node authorized for RPC dispatch.
|
|
151
|
+
if (node.userId)
|
|
152
|
+
server.removeClientFromUserIndex(node);
|
|
153
|
+
node.userId = null;
|
|
154
|
+
node.user = null;
|
|
155
|
+
node.authenticated = false;
|
|
156
|
+
node.setContext(null);
|
|
146
157
|
console.error('[TypeFerry] Auth error:', error);
|
|
147
158
|
if (node.socket?.readyState === SocketState.OPEN) {
|
|
148
159
|
node.emitAuthResult(false);
|
|
149
160
|
}
|
|
150
161
|
}
|
|
162
|
+
finally {
|
|
163
|
+
if (authTimeout !== undefined)
|
|
164
|
+
clearTimeout(authTimeout);
|
|
165
|
+
}
|
|
151
166
|
}
|
|
152
167
|
// ---------------------------------------------------------------------------
|
|
153
168
|
// Connection parameter validation
|
|
154
169
|
// ---------------------------------------------------------------------------
|
|
155
|
-
/**
|
|
170
|
+
/**
|
|
171
|
+
* Preserves valid client identities and replaces invalid identities atomically.
|
|
172
|
+
* Removing characters could alias two distinct caller-supplied identities.
|
|
173
|
+
*/
|
|
156
174
|
export function validateUuid(uuid) {
|
|
157
175
|
if (typeof uuid !== 'string' ||
|
|
158
176
|
uuid.length === 0 ||
|
|
159
|
-
uuid.length > MAX_UUID_LENGTH
|
|
177
|
+
uuid.length > MAX_UUID_LENGTH ||
|
|
178
|
+
!/^[a-zA-Z0-9-]+$/.test(uuid)) {
|
|
160
179
|
return (crypto.randomUUID?.() ??
|
|
161
180
|
`${Date.now()}-${Math.random().toString(36).slice(2)}`);
|
|
162
181
|
}
|
|
163
|
-
return uuid
|
|
182
|
+
return uuid;
|
|
164
183
|
}
|
|
165
|
-
|
|
184
|
+
function isMetaObject(meta) {
|
|
185
|
+
return meta !== null && typeof meta === 'object' && !Array.isArray(meta);
|
|
186
|
+
}
|
|
187
|
+
/**
|
|
188
|
+
* Bounds metadata supplied as an object, where no raw JSON input is available.
|
|
189
|
+
*/
|
|
166
190
|
export function validateMeta(meta) {
|
|
167
|
-
if (!
|
|
191
|
+
if (!isMetaObject(meta))
|
|
168
192
|
return {};
|
|
169
193
|
try {
|
|
170
|
-
if (JSON.stringify(meta)
|
|
194
|
+
if (Buffer.byteLength(JSON.stringify(meta), 'utf8') > MAX_META_SIZE) {
|
|
171
195
|
console.warn('[TypeFerry] Meta object too large, ignoring');
|
|
172
196
|
return {};
|
|
173
197
|
}
|
|
@@ -179,10 +203,13 @@ export function validateMeta(meta) {
|
|
|
179
203
|
}
|
|
180
204
|
/** Parses meta from a query string value (JSON-encoded in the URL). */
|
|
181
205
|
export function parseMeta(raw) {
|
|
182
|
-
if (!raw)
|
|
206
|
+
if (!raw || Buffer.byteLength(raw, 'utf8') > MAX_META_SIZE)
|
|
183
207
|
return {};
|
|
184
208
|
try {
|
|
185
|
-
|
|
209
|
+
const meta = JSON.parse(raw);
|
|
210
|
+
// The protocol bounds the original bytes, not JSON.stringify's potentially
|
|
211
|
+
// longer numeric spellings after decoding a valid object.
|
|
212
|
+
return isMetaObject(meta) ? meta : {};
|
|
186
213
|
}
|
|
187
214
|
catch {
|
|
188
215
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-shared.js","sourceRoot":"","sources":["../../../src/server/transports/ws-shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ws-shared.js","sourceRoot":"","sources":["../../../src/server/transports/ws-shared.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typeferry",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"description": "Type-safe real-time RPC framework for TypeScript",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -119,9 +119,7 @@
|
|
|
119
119
|
"jiti": "^2.6.1",
|
|
120
120
|
"jsonwebtoken": "^9.0.2",
|
|
121
121
|
"limiter": "^2.1.0",
|
|
122
|
-
"memoizee": "^0.4.15",
|
|
123
122
|
"playwright": "1.62.1",
|
|
124
|
-
"query-string": "^9.5.0",
|
|
125
123
|
"redis": "^4.6.7",
|
|
126
124
|
"tailwindcss": "^4.3.3",
|
|
127
125
|
"tree-kill": "^1.2.2",
|
|
@@ -159,14 +157,11 @@
|
|
|
159
157
|
"@eslint/js": "^10.0.1",
|
|
160
158
|
"@react-oauth/google": "^0.12.2",
|
|
161
159
|
"@testing-library/react": "^16.3.2",
|
|
162
|
-
"@types/json-stable-stringify": "^1",
|
|
163
160
|
"@types/jsonwebtoken": "^9.0.2",
|
|
164
|
-
"@types/memoizee": "^0",
|
|
165
161
|
"@types/node": "^24.13.3",
|
|
166
162
|
"@types/react": "^19.2.18",
|
|
167
163
|
"@types/react-dom": "^19.2.7",
|
|
168
164
|
"@types/sinon": "^10.0.16",
|
|
169
|
-
"@types/ua-parser-js": "^0.7.39",
|
|
170
165
|
"@types/ws": "^8",
|
|
171
166
|
"@vitest/coverage-v8": "4.1.12",
|
|
172
167
|
"eslint": "^10.9.0",
|
|
@@ -190,7 +185,8 @@
|
|
|
190
185
|
"postcss": "^8.5.26",
|
|
191
186
|
"qs": "^6.15.3",
|
|
192
187
|
"undici": "^7.29.0",
|
|
193
|
-
"uuid": "^11.1.1"
|
|
188
|
+
"uuid": "^11.1.1",
|
|
189
|
+
"minimatch@>=7 <11": "^11.0.1"
|
|
194
190
|
},
|
|
195
191
|
"engines": {
|
|
196
192
|
"node": ">=24.19.0 <27",
|
|
@@ -210,8 +206,7 @@
|
|
|
210
206
|
},
|
|
211
207
|
"packageManager": "npm@11.17.0",
|
|
212
208
|
"allowScripts": {
|
|
213
|
-
"esbuild": true
|
|
214
|
-
"es5-ext": true
|
|
209
|
+
"esbuild": true
|
|
215
210
|
},
|
|
216
211
|
"repository": {
|
|
217
212
|
"type": "git",
|