@ultimabase/http 0.6.0-canary.20261108162311 → 0.7.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/CHANGELOG.md CHANGED
@@ -1,6 +1,32 @@
1
1
  # @ultimabase/http
2
2
 
3
- ## 0.6.0-canary.20261108162311
3
+ ## 0.7.0
4
+
5
+ ### Patch Changes
6
+
7
+ - 1f34e7a: An `X-Forwarded-For` entry with the port a proxy appended counts as its address: `203.0.113.7:5678` is `203.0.113.7`, `[2001:db8::1]:443` is `2001:db8::1`. Such an entry counted as the proxy's connection, so every client behind it shared one rate limit: 50 requests from one client over a limit of 2 were refused 0 times, now 48.
8
+ - 1f34e7a: A client that has not sent all its headers 10 s after it connected is disconnected, instead of 60 s: a slow client holds a socket for less time.
9
+ - 1f34e7a: Over the rate limit, an address that sent a wrong master key has its next master-key requests refused until the window ends, without checking or logging each key: 50 guesses past the limit wrote 51 warnings, now 4.
10
+ - 1f34e7a: A preflight's answer says `access-control-max-age: 600`: a browser keeps it 10 minutes instead of 5 seconds, its default, and stops sending a preflight before almost every call from another origin.
11
+ - 1f34e7a: A request and an upgrade through a proxy, with `proxies` unset, warn once in all, as D-116 says; each warned once.
12
+ - 1f34e7a: Over a GraphQL WebSocket, `signUp`, `signIn` and `changePassword` are refused with `BAD_REQUEST` before anything is written: a sign-up no longer creates its user, nor a password change its password, then fails at the cookie. `client.cookies.settable` says whether a cookie can be set, and auth's API gives `needsCookies(client)` to refuse the same way.
13
+ - 1f34e7a: An upgrade whose host holds credentials, as `Host: a@b`, is refused with a 400; it ended the server process.
14
+ - Updated dependencies [1f34e7a]
15
+ - Updated dependencies [1f34e7a]
16
+ - Updated dependencies [1f34e7a]
17
+ - Updated dependencies [1f34e7a]
18
+ - Updated dependencies [1f34e7a]
19
+ - Updated dependencies [1f34e7a]
20
+ - Updated dependencies [1f34e7a]
21
+ - Updated dependencies [1f34e7a]
22
+ - Updated dependencies [1f34e7a]
23
+ - Updated dependencies [1f34e7a]
24
+ - Updated dependencies [1f34e7a]
25
+ - Updated dependencies [1f34e7a]
26
+ - Updated dependencies [1f34e7a]
27
+ - ultimabase@0.7.0
28
+
29
+ ## 0.6.0
4
30
 
5
31
  ### Minor Changes
6
32
 
@@ -18,6 +44,7 @@
18
44
  - Updated dependencies [f808da8]
19
45
  - Updated dependencies [7c20553]
20
46
  - Updated dependencies [2f1baf1]
47
+ - Updated dependencies [945b1b3]
21
48
  - Updated dependencies [4ff9d42]
22
49
  - Updated dependencies [41b5dca]
23
50
  - Updated dependencies [703ed93]
@@ -36,7 +63,7 @@
36
63
  - Updated dependencies [e3d051f]
37
64
  - Updated dependencies [6140b2b]
38
65
  - Updated dependencies [0699e37]
39
- - ultimabase@0.6.0-canary.20261108162311
66
+ - ultimabase@0.6.0
40
67
 
41
68
  ## 0.5.0
42
69
 
@@ -1 +1 @@
1
- {"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../src/address.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAsBxC,qEAAqE;AACrE,eAAO,MAAM,QAAQ,YAAa,MAAM,KAAG,OACkB,CAAA;AAE7D;;;GAGG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,OAAO,MAAM,KAAG,OACS,CAAA;AAEnE,0DAA0D;AAC1D,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAM5D;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACZ,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CA4B1B"}
1
+ {"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../src/address.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAsBxC,qEAAqE;AACrE,eAAO,MAAM,QAAQ,YAAa,MAAM,KAAG,OACkB,CAAA;AAE7D;;;GAGG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,OAAO,MAAM,KAAG,OACS,CAAA;AAEnE,0DAA0D;AAC1D,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAM5D;AAKD;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACZ,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CA4B1B"}
package/dist/address.js CHANGED
@@ -35,6 +35,8 @@ export function proxiesOf(option) {
35
35
  return proxies;
36
36
  throw new Refused(`proxies is ${proxies}, not a whole number of proxies in front of the server.`);
37
37
  }
38
+ // An entry with the port a proxy may append: `1.2.3.4:5`, `[::1]:5` (D-348).
39
+ const withPort = /^\[(.+)\](?::\d+)?$|^([\d.]+):\d+$/;
38
40
  /**
39
41
  * Reads the address of the Node connection a request's `env` holds, `''`
40
42
  * without one, or the one `proxies` proxies forwarded.
@@ -62,7 +64,7 @@ export function addresses(proxies, logger) {
62
64
  // right. With fewer, the client went around a proxy and wrote them.
63
65
  const entries = forwarded
64
66
  .flatMap((header) => header.split(','))
65
- .map((entry) => entry.trim());
67
+ .map((entry) => entry.trim().replace(withPort, '$1$2'));
66
68
  const entry = entries.at(-proxies) ?? '';
67
69
  return entries.length < proxies || isIP(entry) === 0 ? connection : entry;
68
70
  };
package/dist/app.d.ts CHANGED
@@ -57,9 +57,10 @@ export declare function allowing(options: HttpOptions): (origin: string) => bool
57
57
  * Reads `NODE_ENV` once, when the application starts. The application's
58
58
  * routes come before those plugins mounted (D-107).
59
59
  */
60
- export declare function appOf(options: HttpOptions, mounted: readonly Mounted[], { probes, gates, rateLimit, }: {
60
+ export declare function appOf(options: HttpOptions, mounted: readonly Mounted[], { probes, gates, rateLimit, addressOf, }: {
61
61
  readonly probes: Probes;
62
62
  readonly gates: readonly Gate[];
63
63
  readonly rateLimit: Limiter;
64
+ readonly addressOf: (env: unknown) => string;
64
65
  }, identify: (request: Request) => Promise<Caller>, logger: Logger): Hono<HttpEnv>;
65
66
  //# sourceMappingURL=app.d.ts.map
package/dist/app.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAM3B,OAAO,KAAK,EAAE,MAAM,EAAa,MAAM,EAAE,MAAM,YAAY,CAAA;AAG3D,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAKzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAGxC;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG;IAAE,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAExE,uEAAuE;AACvE,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;AAElC,yFAAyF;AACzF,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAC3B;AAED,6CAA6C;AAC7C,MAAM,WAAW,WAAW;IAC3B,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,8BAA8B;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,iCAAiC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,kHAAkH;IAClH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IACzB;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAA;IACvB;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,KAAK,CAAA;CACtC;AAqED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAI1E;AA+BD;;;GAGG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,EACC,MAAM,EACN,KAAK,EACL,SAAS,GACT,EAAE;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAC3B,EACD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC/C,MAAM,EAAE,MAAM,GACZ,IAAI,CAAC,OAAO,CAAC,CA8If"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAM3B,OAAO,KAAK,EAAE,MAAM,EAAa,MAAM,EAAE,MAAM,YAAY,CAAA;AAG3D,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAKzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAGxC;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG;IAAE,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAA;AAExE,uEAAuE;AACvE,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;AAElC,yFAAyF;AACzF,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAC3B;AAED,6CAA6C;AAC7C,MAAM,WAAW,WAAW;IAC3B,2CAA2C;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,8BAA8B;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACtB,iCAAiC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,kHAAkH;IAClH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;IACzB;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAA;IACvB;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,KAAK,CAAA;CACtC;AAqED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAI1E;AA+BD;;;GAGG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,EACC,MAAM,EACN,KAAK,EACL,SAAS,EACT,SAAS,GACT,EAAE;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAA;IAC/B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAA;CAC5C,EACD,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC/C,MAAM,EAAE,MAAM,GACZ,IAAI,CAAC,OAAO,CAAC,CA6If"}
package/dist/app.js CHANGED
@@ -10,7 +10,7 @@ import { cors } from 'hono/cors';
10
10
  import { HTTPException } from 'hono/http-exception';
11
11
  import { getPath } from 'hono/utils/url';
12
12
  import { isLocalHost, PublicError } from 'ultimabase';
13
- import { addresses, isOwnOrigin, proxiesOf } from './address.js';
13
+ import { isOwnOrigin } from './address.js';
14
14
  import { tooMany } from './limit.js';
15
15
  import { probeRoutes } from './probes.js';
16
16
  import { hold } from './request.js';
@@ -114,11 +114,10 @@ function stamp(c, name, value, append = false) {
114
114
  * Reads `NODE_ENV` once, when the application starts. The application's
115
115
  * routes come before those plugins mounted (D-107).
116
116
  */
117
- export function appOf(options, mounted, { probes, gates, rateLimit, }, identify, logger) {
117
+ export function appOf(options, mounted, { probes, gates, rateLimit, addressOf, }, identify, logger) {
118
118
  const local = process.env['NODE_ENV'] !== 'production';
119
119
  const allows = allowing(options);
120
120
  const maxSize = bodyLimitOf(options.bodyLimit);
121
- const addressOf = addresses(proxiesOf(options.proxies), logger);
122
121
  const app = new Hono({ getPath: pathOf });
123
122
  // A response may hold the caller's data: no cache keeps one, errors
124
123
  // included, unless its route says otherwise (D-106).
@@ -149,8 +148,8 @@ export function appOf(options, mounted, { probes, gates, rateLimit, }, identify,
149
148
  // Before CORS and the caller: a probe reads neither (D-204).
150
149
  app.route('/', probeRoutes(probes, logger));
151
150
  const allowed = (origin) => (allows(origin) ? origin : null);
152
- // An allowed origin sends its cookies, as auth's session (D-112).
153
- const preflight = cors({ origin: allowed, credentials: true });
151
+ // Allowed origins send cookies (D-112); a browser keeps a preflight 10 min (D-348).
152
+ const preflight = cors({ origin: allowed, credentials: true, maxAge: 600 });
154
153
  app.use(async (c, next) => {
155
154
  // Hono's `cors` answers every OPTIONS: a route's own runs, unless the
156
155
  // request is a preflight.
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAEvC,uEAAuE;AACvE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG;IAC9C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAA;CAC/C,CA0BA"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAEvC,uEAAuE;AACvE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG;IAC9C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAA;CAC/C,CA2BA"}
package/dist/client.js CHANGED
@@ -6,6 +6,7 @@ export function clientOf(c) {
6
6
  client: {
7
7
  address: c.var.address,
8
8
  cookies: {
9
+ settable: true,
9
10
  get: (name) => getCookie(c, name),
10
11
  set: (name, value, options) => {
11
12
  cookies.push(generateCookie(name, value, options));
package/dist/index.js CHANGED
@@ -82,11 +82,11 @@ const http = definePlugin({
82
82
  const starting = startingGate(probes);
83
83
  const gates = gated.get(context) ?? [];
84
84
  const rateLimit = limiter(options.rateLimit, identify, logger);
85
- const app = appOf(options, mounted, { probes, gates: [starting, ...gates], rateLimit }, identify, logger);
85
+ const addressOf = addresses(proxiesOf(options.proxies), logger);
86
+ const app = appOf(options, mounted, { probes, gates: [starting, ...gates], rateLimit, addressOf }, identify, logger);
86
87
  mounts.delete(context);
87
88
  const server = serverOf(app.fetch);
88
89
  const takers = upgrades.get(context) ?? new Map();
89
- const addressOf = addresses(proxiesOf(options.proxies), logger);
90
90
  taken.set(context, upgrading(server, {
91
91
  takers,
92
92
  gates: [
@@ -1,6 +1,6 @@
1
- export type { Args, At, Change, Limits, Page, Pagination, Relay, } from './pages.ts';
1
+ export type { Args, At, Limits, Page, Relay } from './pages.ts';
2
2
  export { applied, endsOf, connection, countedPage, pageArgs, pageOf, readsNoRow, rowOf, rowsOf, } from './pages.ts';
3
3
  export { Backlog } from './backlog.ts';
4
- export type { Node, Served, ServedOneOf } from './transport.ts';
5
- export { badInput, backOf, declared, isNode, jsonSchemaOf, oneOfsOf, plural, readable, readableOneOfs, readableVirtuals, run, } from './transport.ts';
4
+ export type { Node, ServedOneOf } from './transport.ts';
5
+ export { badInput, backOf, declared, iso, isNode, jsonSchemaOf, oneOfsOf, plural, readable, readableOneOfs, readableVirtuals, run, sortDepth, } from './transport.ts';
6
6
  //# sourceMappingURL=internal.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAEA,YAAY,EACX,IAAI,EACJ,EAAE,EACF,MAAM,EACN,MAAM,EACN,IAAI,EACJ,UAAU,EACV,KAAK,GACL,MAAM,YAAY,CAAA;AACnB,OAAO,EACN,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,EACX,QAAQ,EACR,MAAM,EACN,UAAU,EACV,KAAK,EACL,MAAM,GACN,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EACN,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,GAAG,GACH,MAAM,gBAAgB,CAAA"}
1
+ {"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAEA,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EACN,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,EACX,QAAQ,EACR,MAAM,EACN,UAAU,EACV,KAAK,EACL,MAAM,GACN,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EACN,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,GAAG,EACH,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,SAAS,GACT,MAAM,gBAAgB,CAAA"}
package/dist/internal.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export { applied, endsOf, connection, countedPage, pageArgs, pageOf, readsNoRow, rowOf, rowsOf, } from './pages.js';
2
2
  export { Backlog } from './backlog.js';
3
- export { badInput, backOf, declared, isNode, jsonSchemaOf, oneOfsOf, plural, readable, readableOneOfs, readableVirtuals, run, } from './transport.js';
3
+ export { badInput, backOf, declared, iso, isNode, jsonSchemaOf, oneOfsOf, plural, readable, readableOneOfs, readableVirtuals, run, sortDepth, } from './transport.js';
package/dist/limit.d.ts CHANGED
@@ -13,8 +13,8 @@ export type Limiter = (request: Request, address: string) => Promise<number | un
13
13
  export declare const tooMany: (seconds: number) => Response;
14
14
  /**
15
15
  * Counts each address's requests in a window that every address shares, and
16
- * refuses those over the limit, Master's excepted. A private or local
17
- * address is never counted: a proxy or a load balancer connects from one.
16
+ * refuses those over the limit, but Master's until a wrong key. A private or
17
+ * local address is never counted: a proxy or load balancer connects from one.
18
18
  */
19
19
  export declare function limiter(option: RateLimit | false | undefined, identify: (request: Request) => Promise<Caller>, logger: Logger): Limiter;
20
20
  //# sourceMappingURL=limit.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"limit.d.ts","sourceRoot":"","sources":["../src/limit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAKhD,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CACrB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;AAEhC,6EAA6E;AAC7E,eAAO,MAAM,OAAO,YAAa,MAAM,KAAG,QAQxC,CAAA;AA4BF;;;;GAIG;AACH,wBAAgB,OAAO,CACtB,MAAM,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,EACrC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC/C,MAAM,EAAE,MAAM,GACZ,OAAO,CA6BT"}
1
+ {"version":3,"file":"limit.d.ts","sourceRoot":"","sources":["../src/limit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAKhD,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CACrB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;AAEhC,6EAA6E;AAC7E,eAAO,MAAM,OAAO,YAAa,MAAM,KAAG,QAQxC,CAAA;AA4BF;;;;GAIG;AACH,wBAAgB,OAAO,CACtB,MAAM,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,EACrC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC/C,MAAM,EAAE,MAAM,GACZ,OAAO,CAgCT"}
package/dist/limit.js CHANGED
@@ -37,12 +37,13 @@ function limitOf(option) {
37
37
  }
38
38
  /**
39
39
  * Counts each address's requests in a window that every address shares, and
40
- * refuses those over the limit, Master's excepted. A private or local
41
- * address is never counted: a proxy or a load balancer connects from one.
40
+ * refuses those over the limit, but Master's until a wrong key. A private or
41
+ * local address is never counted: a proxy or load balancer connects from one.
42
42
  */
43
43
  export function limiter(option, identify, logger) {
44
44
  const limit = limitOf(option);
45
45
  const counts = new Map();
46
+ const guessed = new Set();
46
47
  let ends = 0;
47
48
  return async (request, address) => {
48
49
  if (limit === false || address === '' || isNearby(address)) {
@@ -51,6 +52,7 @@ export function limiter(option, identify, logger) {
51
52
  const now = Date.now();
52
53
  if (now >= ends) {
53
54
  counts.clear();
55
+ guessed.clear();
54
56
  ends = now + limit.window;
55
57
  }
56
58
  const network = networkOf(address);
@@ -58,11 +60,12 @@ export function limiter(option, identify, logger) {
58
60
  counts.set(network, count);
59
61
  if (count <= limit.requests)
60
62
  return undefined;
61
- // The master key costs no database read, unlike a session.
62
- if (request.headers.has(masterKeyHeader)) {
63
+ // The master key costs no database read, unlike a session (D-348).
64
+ if (request.headers.has(masterKeyHeader) && !guessed.has(network)) {
63
65
  const caller = await identify(request).catch(() => undefined);
64
66
  if (caller?.kind === 'master')
65
67
  return undefined;
68
+ guessed.add(network);
66
69
  }
67
70
  if (count === limit.requests + 1) {
68
71
  logger.warn(`${network} sent over ${limit.requests} requests in ${limit.window} ms: refused until the window ends.`);
package/dist/pages.d.ts CHANGED
@@ -65,5 +65,5 @@ export type Change<R> = {
65
65
  /** `window` once a live read's `changes` are applied, in their order. */
66
66
  export declare function applied<T extends {
67
67
  readonly id: string;
68
- }, R>(window: readonly T[], changes: readonly Change<R>[], kept: (upsert: R) => T): T[];
68
+ }>(window: readonly T[], changes: readonly Change<T>[]): T[];
69
69
  //# sourceMappingURL=pages.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAIrC,oDAAoD;AACpD,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEtD,wEAAwE;AACxE,MAAM,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;AAEzC,iDAAiD;AACjD,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,MAAM,CAAA;AAE9C,yEAAyE;AACzE,MAAM,MAAM,MAAM,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CACzC,CAAA;AA+CD,0DAA0D;AAC1D,MAAM,MAAM,KAAK,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,4EAA4E;AAC5E,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;CAAE,CAAA;AA2C7E,2CAA2C;AAC3C,eAAO,MAAM,MAAM,eACN,UAAU,UACd,MAAM,QACR,IAAI,UACF,OAAO,OACX,EAAE,KACJ,IAGgC,CAAA;AAEnC,6CAA6C;AAC7C,eAAO,MAAM,QAAQ,eAAgB,UAAU,KAAG,SAAS,MAAM,EAGzB,CAAA;AAExC,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;KAAE,EAAE,CAAA;IACxE,QAAQ,CAAC,QAAQ,EAAE;QAClB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;QAC7B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;QACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;QACnC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;KACjC,CAAA;CACD,CAAA;AAED,oEAAoE;AACpE,wBAAgB,UAAU,CAAC,CAAC,EAC3B,IAAI,EAAE,SAAS,GAAG,EAAE,EACpB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GACnB,UAAU,CAAC,CAAC,CAAC,CAaf;AAED;;;GAGG;AACH,eAAO,MAAM,MAAM,QAAS,SAAS,MAAM,EAAE,KAAG,SAAS,GAAG,EAClC,CAAA;AAE1B,mFAAmF;AACnF,eAAO,MAAM,UAAU,SAAU,IAAI,KAAG,OACoB,CAAA;AAE5D,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAWzE;AAED,kDAAkD;AAClD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,EAAE,CAErD;AAED,eAAO,MAAM,KAAK,UAAW,OAAO,KAAG,GAAG,GAAG,SACZ,CAAA;AAEjC,kFAAkF;AAClF,MAAM,MAAM,MAAM,CAAC,CAAC,IACjB;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAExD,yEAAyE;AACzE,wBAAgB,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,EAC3D,MAAM,EAAE,SAAS,CAAC,EAAE,EACpB,OAAO,EAAE,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,EAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GACpB,CAAC,EAAE,CAgBL"}
1
+ {"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"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"}
package/dist/pages.js CHANGED
@@ -126,14 +126,14 @@ export function rowsOf(value) {
126
126
  }
127
127
  export const rowOf = (value) => isRow(value) ? value : undefined;
128
128
  /** `window` once a live read's `changes` are applied, in their order. */
129
- export function applied(window, changes, kept) {
129
+ export function applied(window, changes) {
130
130
  let rows = [...window];
131
131
  for (const change of changes) {
132
132
  if ('remove' in change) {
133
133
  rows = rows.filter(({ id }) => id !== change.remove);
134
134
  continue;
135
135
  }
136
- const row = kept(change.upsert);
136
+ const row = change.upsert;
137
137
  rows = rows.filter(({ id }) => id !== row.id);
138
138
  const at = change.after === null
139
139
  ? 0
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAGxC,iDAAiD;AACjD,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAWzD;AAED,gFAAgF;AAChF,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAM9D;AAED,4EAA4E;AAC5E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI1D;AAyDD,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB7E;AAED,iDAAiD;AACjD,wBAAgB,QAAQ,CACvB,KAAK,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAC7C,MAAM,CAWR;AAKD;;;GAGG;AACH,wBAAsB,MAAM,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAef"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAMvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAGxC,iDAAiD;AACjD,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAWzD;AAED,gFAAgF;AAChF,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAM9D;AAED,4EAA4E;AAC5E,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI1D;AAyDD,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB7E;AAQD,iDAAiD;AACjD,wBAAgB,QAAQ,CACvB,KAAK,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAC7C,MAAM,CAWR;AAKD;;;GAGG;AACH,wBAAsB,MAAM,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAef"}
package/dist/server.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // The port the server listens on, and its listening (D-106); the body
2
2
  // limit and the drain (D-223); its connection queue (D-276); its listeners
3
- // (D-292).
3
+ // (D-292); how long it waits for headers (D-348).
4
4
  import cluster from 'node:cluster';
5
5
  import { createServer } from 'node:http';
6
6
  import { createServer as createListener, } from 'node:net';
@@ -98,10 +98,15 @@ export async function listening(server, port) {
98
98
  await Promise.all(rest.map((listener) => bound(listener, at, true)));
99
99
  return at;
100
100
  }
101
+ /**
102
+ * A client that never ends its headers holds a socket 10 s, not Node's 60;
103
+ * checked every second, not every 30.
104
+ */
105
+ const waits = { headersTimeout: 10_000, connectionsCheckingInterval: 1000 };
101
106
  /** A Node server for `fetch`, Hono's handler. */
102
107
  export function serverOf(fetch) {
103
108
  const listener = getRequestListener(fetch);
104
- const server = createServer((request, response) => {
109
+ const server = createServer(waits, (request, response) => {
105
110
  // A request running when `stop` began leaves its connection idle after
106
111
  // its response: close it, rather than wait for the client to.
107
112
  response.once('finish', () => {
@@ -53,5 +53,9 @@ export type Node = {
53
53
  export declare const isNode: (value: unknown) => value is Node;
54
54
  /** A schema's JSON Schema, or startup stops naming `where` (D-45). */
55
55
  export declare function jsonSchemaOf(schema: object, side: 'input' | 'output', where: string): Node;
56
+ /** A DateTime as both transports read it: ISO 8601 text with its offset. */
57
+ export declare const iso: RegExp;
58
+ /** The relations an `orderBy` goes through, the deepest path's. */
59
+ export declare function sortDepth(orderBy: unknown): number;
56
60
  export {};
57
61
  //# sourceMappingURL=transport.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG1E,+EAA+E;AAC/E,eAAO,MAAM,QAAQ,YAAa,MAAM,UAAU,OAAO,KAAG,KACN,CAAA;AAEtD;;;GAGG;AACH,wBAAsB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAYhE;AAED,oEAAoE;AACpE,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI3C;AAED,+DAA+D;AAC/D,MAAM,MAAM,MAAM,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,SAAS,EAAE;YAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAA;SAAE,CAAA;QACpE,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;KAC5C,CAAA;CACD,CAAA;AAED,0EAA0E;AAC1E,eAAO,MAAM,QAAQ,WAAY,MAAM,KAAG,SAAS,WAAW,EAM5D,CAAA;AAEF,KAAK,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAEzD,yEAAyE;AACzE,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;CAC1C,CAAA;AACD,KAAK,IAAI,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAA;CAAE,CAAA;AAE1D,mEAAmE;AACnE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAWnE;AAED,kDAAkD;AAClD,eAAO,MAAM,cAAc,WAAY,MAAM,KAAG,SAAS,WAAW,EAGlE,CAAA;AAEF,6EAA6E;AAC7E,eAAO,MAAM,QAAQ,UAAW,WAAW,KAAG,MAC+B,CAAA;AAE7E;;;GAGG;AACH,eAAO,MAAM,MAAM,UACX,WAAW,UACV,WAAW,KACjB,MAAM,GAAG,SAKS,CAAA;AAErB,gEAAgE;AAChE,eAAO,MAAM,gBAAgB,WAAY,MAAM,KAAG,SAAS,cAAc,EAGvE,CAAA;AAEF,0CAA0C;AAC1C,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEtD,eAAO,MAAM,MAAM,UAAW,OAAO,KAAG,KAAK,IAAI,IACoB,CAAA;AAErE,sEAAsE;AACtE,wBAAgB,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,GAAG,QAAQ,EACxB,KAAK,EAAE,MAAM,GACX,IAAI,CAiBN"}
1
+ {"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAG1E,+EAA+E;AAC/E,eAAO,MAAM,QAAQ,YAAa,MAAM,UAAU,OAAO,KAAG,KACN,CAAA;AAEtD;;;GAGG;AACH,wBAAsB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAYhE;AAED,oEAAoE;AACpE,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI3C;AAED,+DAA+D;AAC/D,MAAM,MAAM,MAAM,GAAG;IACpB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,SAAS,EAAE;YAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAA;SAAE,CAAA;QACpE,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;KAC5C,CAAA;CACD,CAAA;AAED,0EAA0E;AAC1E,eAAO,MAAM,QAAQ,WAAY,MAAM,KAAG,SAAS,WAAW,EAM5D,CAAA;AAEF,KAAK,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAEzD,yEAAyE;AACzE,MAAM,MAAM,WAAW,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;CAC1C,CAAA;AACD,KAAK,IAAI,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAA;CAAE,CAAA;AAE1D,mEAAmE;AACnE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAWnE;AAED,kDAAkD;AAClD,eAAO,MAAM,cAAc,WAAY,MAAM,KAAG,SAAS,WAAW,EAGlE,CAAA;AAEF,6EAA6E;AAC7E,eAAO,MAAM,QAAQ,UAAW,WAAW,KAAG,MAC+B,CAAA;AAE7E;;;GAGG;AACH,eAAO,MAAM,MAAM,UACX,WAAW,UACV,WAAW,KACjB,MAAM,GAAG,SAKS,CAAA;AAErB,gEAAgE;AAChE,eAAO,MAAM,gBAAgB,WAAY,MAAM,KAAG,SAAS,cAAc,EAGvE,CAAA;AAEF,0CAA0C;AAC1C,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEtD,eAAO,MAAM,MAAM,UAAW,OAAO,KAAG,KAAK,IAAI,IACoB,CAAA;AAErE,sEAAsE;AACtE,wBAAgB,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,GAAG,QAAQ,EACxB,KAAK,EAAE,MAAM,GACX,IAAI,CAiBN;AAED,4EAA4E;AAC5E,eAAO,MAAM,GAAG,EAAE,MAC0D,CAAA;AAE5E,mEAAmE;AACnE,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CASlD"}
package/dist/transport.js CHANGED
@@ -84,3 +84,13 @@ export function jsonSchemaOf(schema, side, where) {
84
84
  }
85
85
  throw new Refused(`${where}'s JSON Schema is not an object.`);
86
86
  }
87
+ /** A DateTime as both transports read it: ISO 8601 text with its offset. */
88
+ export const iso = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:\d{2})$/;
89
+ /** The relations an `orderBy` goes through, the deepest path's. */
90
+ export function sortDepth(orderBy) {
91
+ if (Array.isArray(orderBy))
92
+ return Math.max(0, ...orderBy.map(sortDepth));
93
+ if (typeof orderBy !== 'object' || orderBy === null)
94
+ return 0;
95
+ return Math.max(0, ...Object.values(orderBy).map((value) => typeof value === 'object' && value !== null ? 1 + sortDepth(value) : 0));
96
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAGzC;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAA;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACjD;AAED,6EAA6E;AAC7E,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;AAE/C,qEAAqE;AACrE,MAAM,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAE1D;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG,CAClB,OAAO,EAAE,OAAO,KACZ,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;AAEzD,6EAA6E;AAC7E,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,uEAAuE;AACvE,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;CACjC;AAED,oEAAoE;AACpE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC3C,oEAAoE;IACpE,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAA;IAC/B,8DAA8D;IAC9D,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;IAC5C,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAA;KAAE,KAAK,MAAM,CAAA;IAC3E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB;AAED,qFAAqF;AACrF,wBAAsB,MAAM,CAC3B,KAAK,EAAE,SAAS,IAAI,EAAE,EACtB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAM/B;AA0CD;;;;GAIG;AACH,wBAAgB,SAAS,CACxB,MAAM,EAAE,MAAM,EACd,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,SAAS,GAChE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CA8C7B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC5B,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAClC,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC7C,EAAE,IAAI,EAAE,MAAW,EAAE,IAAI,EAAE,EAAE,OAAO,GAClC,IAAI,CAUN"}
1
+ {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAGzC;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAA;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;CACjD;AAED,6EAA6E;AAC7E,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;AAE/C,qEAAqE;AACrE,MAAM,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAE1D;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG,CAClB,OAAO,EAAE,OAAO,KACZ,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;AAEzD,6EAA6E;AAC7E,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,uEAAuE;AACvE,MAAM,WAAW,KAAK;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAA;CACjC;AAED,oEAAoE;AACpE,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC3C,oEAAoE;IACpE,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAA;IAC/B,8DAA8D;IAC9D,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;IAC5C,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAA;KAAE,KAAK,MAAM,CAAA;IAC3E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACvB;AAED,qFAAqF;AACrF,wBAAsB,MAAM,CAC3B,KAAK,EAAE,SAAS,IAAI,EAAE,EACtB,OAAO,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAM/B;AA6CD;;;;GAIG;AACH,wBAAgB,SAAS,CACxB,MAAM,EAAE,MAAM,EACd,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,SAAS,GAChE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CA8C7B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC5B,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAClC,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC7C,EAAE,IAAI,EAAE,MAAW,EAAE,IAAI,EAAE,EAAE,OAAO,GAClC,IAAI,CAUN"}
package/dist/upgrade.js CHANGED
@@ -33,15 +33,20 @@ function requestOf(incoming) {
33
33
  const { host } = incoming.headers;
34
34
  const target = incoming.url ?? '';
35
35
  const url = `http://${host ?? ''}${target}`;
36
- if (host === undefined || !target.startsWith('/') || !URL.canParse(url)) {
36
+ if (host === undefined || !target.startsWith('/'))
37
37
  return undefined;
38
- }
39
38
  const headers = new Headers();
40
39
  const raw = incoming.rawHeaders;
41
40
  for (let index = 0; index + 1 < raw.length; index += 2) {
42
41
  headers.append(raw[index] ?? '', raw[index + 1] ?? '');
43
42
  }
44
- return new Request(url, { headers });
43
+ // Outside any catch, a URL a request refuses would end the process.
44
+ try {
45
+ return new Request(url, { headers });
46
+ }
47
+ catch {
48
+ return undefined;
49
+ }
45
50
  }
46
51
  /**
47
52
  * Hands each upgrade to its path's plugin, past the origin check and the
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ultimabase/http",
3
- "version": "0.6.0-canary.20261108162311",
3
+ "version": "0.7.0",
4
4
  "description": "An HTTP server for UltimaBase: Hono routes that read the caller, CORS and a body limit.",
5
5
  "type": "module",
6
6
  "license": "Apache-2.0",
@@ -38,10 +38,10 @@
38
38
  "ipaddr.js": "2.5.0"
39
39
  },
40
40
  "peerDependencies": {
41
- "ultimabase": "0.6.0-canary.20261108162311"
41
+ "ultimabase": "^0.7.0"
42
42
  },
43
43
  "devDependencies": {
44
- "ultimabase": "0.6.0-canary.20261108162311",
44
+ "ultimabase": "0.7.0",
45
45
  "vite": "8.3.4",
46
46
  "vitest": "5.0.5"
47
47
  }
package/src/address.ts CHANGED
@@ -44,6 +44,9 @@ export function proxiesOf(option: number | undefined): number {
44
44
  )
45
45
  }
46
46
 
47
+ // An entry with the port a proxy may append: `1.2.3.4:5`, `[::1]:5` (D-348).
48
+ const withPort = /^\[(.+)\](?::\d+)?$|^([\d.]+):\d+$/
49
+
47
50
  /**
48
51
  * Reads the address of the Node connection a request's `env` holds, `''`
49
52
  * without one, or the one `proxies` proxies forwarded.
@@ -75,7 +78,7 @@ export function addresses(
75
78
  // right. With fewer, the client went around a proxy and wrote them.
76
79
  const entries = forwarded
77
80
  .flatMap((header) => header.split(','))
78
- .map((entry) => entry.trim())
81
+ .map((entry) => entry.trim().replace(withPort, '$1$2'))
79
82
  const entry = entries.at(-proxies) ?? ''
80
83
  return entries.length < proxies || isIP(entry) === 0 ? connection : entry
81
84
  }
package/src/app.ts CHANGED
@@ -13,7 +13,7 @@ import type { ContentfulStatusCode } from 'hono/utils/http-status'
13
13
  import { getPath } from 'hono/utils/url'
14
14
  import type { Caller, ErrorCode, Logger } from 'ultimabase'
15
15
  import { isLocalHost, PublicError } from 'ultimabase'
16
- import { addresses, isOwnOrigin, proxiesOf } from './address.ts'
16
+ import { isOwnOrigin } from './address.ts'
17
17
  import type { Limiter, RateLimit } from './limit.ts'
18
18
  import { tooMany } from './limit.ts'
19
19
  import type { Probes } from './probes.ts'
@@ -185,10 +185,12 @@ export function appOf(
185
185
  probes,
186
186
  gates,
187
187
  rateLimit,
188
+ addressOf,
188
189
  }: {
189
190
  readonly probes: Probes
190
191
  readonly gates: readonly Gate[]
191
192
  readonly rateLimit: Limiter
193
+ readonly addressOf: (env: unknown) => string
192
194
  },
193
195
  identify: (request: Request) => Promise<Caller>,
194
196
  logger: Logger,
@@ -196,7 +198,6 @@ export function appOf(
196
198
  const local = process.env['NODE_ENV'] !== 'production'
197
199
  const allows = allowing(options)
198
200
  const maxSize = bodyLimitOf(options.bodyLimit)
199
- const addressOf = addresses(proxiesOf(options.proxies), logger)
200
201
  const app = new Hono<HttpEnv>({ getPath: pathOf })
201
202
  // A response may hold the caller's data: no cache keeps one, errors
202
203
  // included, unless its route says otherwise (D-106).
@@ -226,8 +227,8 @@ export function appOf(
226
227
  // Before CORS and the caller: a probe reads neither (D-204).
227
228
  app.route('/', probeRoutes(probes, logger))
228
229
  const allowed = (origin: string) => (allows(origin) ? origin : null)
229
- // An allowed origin sends its cookies, as auth's session (D-112).
230
- const preflight = cors({ origin: allowed, credentials: true })
230
+ // Allowed origins send cookies (D-112); a browser keeps a preflight 10 min (D-348).
231
+ const preflight = cors({ origin: allowed, credentials: true, maxAge: 600 })
231
232
  app.use(async (c, next) => {
232
233
  // Hono's `cors` answers every OPTIONS: a route's own runs, unless the
233
234
  // request is a preflight.
package/src/client.ts CHANGED
@@ -15,6 +15,7 @@ export function clientOf(c: Context<HttpEnv>): {
15
15
  client: {
16
16
  address: c.var.address,
17
17
  cookies: {
18
+ settable: true,
18
19
  get: (name) => getCookie(c, name),
19
20
  set: (name, value, options) => {
20
21
  cookies.push(generateCookie(name, value, options))
package/src/index.ts CHANGED
@@ -150,17 +150,17 @@ const http = definePlugin<Http>({
150
150
  const starting = startingGate(probes)
151
151
  const gates = gated.get(context) ?? []
152
152
  const rateLimit = limiter(options.rateLimit, identify, logger)
153
+ const addressOf = addresses(proxiesOf(options.proxies), logger)
153
154
  const app = appOf(
154
155
  options,
155
156
  mounted,
156
- { probes, gates: [starting, ...gates], rateLimit },
157
+ { probes, gates: [starting, ...gates], rateLimit, addressOf },
157
158
  identify,
158
159
  logger,
159
160
  )
160
161
  mounts.delete(context)
161
162
  const server = serverOf(app.fetch)
162
163
  const takers = upgrades.get(context) ?? new Map<string, Taker>()
163
- const addressOf = addresses(proxiesOf(options.proxies), logger)
164
164
  taken.set(
165
165
  context,
166
166
  upgrading(server, {
package/src/internal.ts CHANGED
@@ -1,14 +1,6 @@
1
1
  // What the official transports share (D-139), kept off the documented
2
2
  // surface: their pages, errors, names and JSON Schema reading.
3
- export type {
4
- Args,
5
- At,
6
- Change,
7
- Limits,
8
- Page,
9
- Pagination,
10
- Relay,
11
- } from './pages.ts'
3
+ export type { Args, At, Limits, Page, Relay } from './pages.ts'
12
4
  export {
13
5
  applied,
14
6
  endsOf,
@@ -21,11 +13,12 @@ export {
21
13
  rowsOf,
22
14
  } from './pages.ts'
23
15
  export { Backlog } from './backlog.ts'
24
- export type { Node, Served, ServedOneOf } from './transport.ts'
16
+ export type { Node, ServedOneOf } from './transport.ts'
25
17
  export {
26
18
  badInput,
27
19
  backOf,
28
20
  declared,
21
+ iso,
29
22
  isNode,
30
23
  jsonSchemaOf,
31
24
  oneOfsOf,
@@ -34,4 +27,5 @@ export {
34
27
  readableOneOfs,
35
28
  readableVirtuals,
36
29
  run,
30
+ sortDepth,
37
31
  } from './transport.ts'
package/src/limit.ts CHANGED
@@ -60,8 +60,8 @@ function limitOf(option: RateLimit | false | undefined): RateLimit | false {
60
60
 
61
61
  /**
62
62
  * Counts each address's requests in a window that every address shares, and
63
- * refuses those over the limit, Master's excepted. A private or local
64
- * address is never counted: a proxy or a load balancer connects from one.
63
+ * refuses those over the limit, but Master's until a wrong key. A private or
64
+ * local address is never counted: a proxy or load balancer connects from one.
65
65
  */
66
66
  export function limiter(
67
67
  option: RateLimit | false | undefined,
@@ -70,6 +70,7 @@ export function limiter(
70
70
  ): Limiter {
71
71
  const limit = limitOf(option)
72
72
  const counts = new Map<string, number>()
73
+ const guessed = new Set<string>()
73
74
  let ends = 0
74
75
  return async (request, address) => {
75
76
  if (limit === false || address === '' || isNearby(address)) {
@@ -78,16 +79,18 @@ export function limiter(
78
79
  const now = Date.now()
79
80
  if (now >= ends) {
80
81
  counts.clear()
82
+ guessed.clear()
81
83
  ends = now + limit.window
82
84
  }
83
85
  const network = networkOf(address)
84
86
  const count = (counts.get(network) ?? 0) + 1
85
87
  counts.set(network, count)
86
88
  if (count <= limit.requests) return undefined
87
- // The master key costs no database read, unlike a session.
88
- if (request.headers.has(masterKeyHeader)) {
89
+ // The master key costs no database read, unlike a session (D-348).
90
+ if (request.headers.has(masterKeyHeader) && !guessed.has(network)) {
89
91
  const caller = await identify(request).catch(() => undefined)
90
92
  if (caller?.kind === 'master') return undefined
93
+ guessed.add(network)
91
94
  }
92
95
  if (count === limit.requests + 1) {
93
96
  logger.warn(
package/src/pages.ts CHANGED
@@ -202,10 +202,9 @@ export type Change<R> =
202
202
  | { readonly upsert: R; readonly after: string | null }
203
203
 
204
204
  /** `window` once a live read's `changes` are applied, in their order. */
205
- export function applied<T extends { readonly id: string }, R>(
205
+ export function applied<T extends { readonly id: string }>(
206
206
  window: readonly T[],
207
- changes: readonly Change<R>[],
208
- kept: (upsert: R) => T,
207
+ changes: readonly Change<T>[],
209
208
  ): T[] {
210
209
  let rows = [...window]
211
210
  for (const change of changes) {
@@ -213,7 +212,7 @@ export function applied<T extends { readonly id: string }, R>(
213
212
  rows = rows.filter(({ id }) => id !== change.remove)
214
213
  continue
215
214
  }
216
- const row = kept(change.upsert)
215
+ const row = change.upsert
217
216
  rows = rows.filter(({ id }) => id !== row.id)
218
217
  const at =
219
218
  change.after === null
package/src/server.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  // The port the server listens on, and its listening (D-106); the body
2
2
  // limit and the drain (D-223); its connection queue (D-276); its listeners
3
- // (D-292).
3
+ // (D-292); how long it waits for headers (D-348).
4
4
  import cluster from 'node:cluster'
5
5
  import type { Server } from 'node:http'
6
6
  import { createServer } from 'node:http'
@@ -122,12 +122,18 @@ export async function listening(server: Server, port: number): Promise<number> {
122
122
  return at
123
123
  }
124
124
 
125
+ /**
126
+ * A client that never ends its headers holds a socket 10 s, not Node's 60;
127
+ * checked every second, not every 30.
128
+ */
129
+ const waits = { headersTimeout: 10_000, connectionsCheckingInterval: 1000 }
130
+
125
131
  /** A Node server for `fetch`, Hono's handler. */
126
132
  export function serverOf(
127
133
  fetch: Parameters<typeof getRequestListener>[0],
128
134
  ): Server {
129
135
  const listener = getRequestListener(fetch)
130
- const server = createServer((request, response) => {
136
+ const server = createServer(waits, (request, response) => {
131
137
  // A request running when `stop` began leaves its connection idle after
132
138
  // its response: close it, rather than wait for the client to.
133
139
  response.once('finish', () => {
package/src/transport.ts CHANGED
@@ -133,3 +133,19 @@ export function jsonSchemaOf(
133
133
  }
134
134
  throw new Refused(`${where}'s JSON Schema is not an object.`)
135
135
  }
136
+
137
+ /** A DateTime as both transports read it: ISO 8601 text with its offset. */
138
+ export const iso: RegExp =
139
+ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:\d{2})$/
140
+
141
+ /** The relations an `orderBy` goes through, the deepest path's. */
142
+ export function sortDepth(orderBy: unknown): number {
143
+ if (Array.isArray(orderBy)) return Math.max(0, ...orderBy.map(sortDepth))
144
+ if (typeof orderBy !== 'object' || orderBy === null) return 0
145
+ return Math.max(
146
+ 0,
147
+ ...Object.values(orderBy).map((value: unknown) =>
148
+ typeof value === 'object' && value !== null ? 1 + sortDepth(value) : 0,
149
+ ),
150
+ )
151
+ }
package/src/upgrade.ts CHANGED
@@ -109,15 +109,18 @@ function requestOf(incoming: IncomingMessage): Request | undefined {
109
109
  const { host } = incoming.headers
110
110
  const target = incoming.url ?? ''
111
111
  const url = `http://${host ?? ''}${target}`
112
- if (host === undefined || !target.startsWith('/') || !URL.canParse(url)) {
113
- return undefined
114
- }
112
+ if (host === undefined || !target.startsWith('/')) return undefined
115
113
  const headers = new Headers()
116
114
  const raw = incoming.rawHeaders
117
115
  for (let index = 0; index + 1 < raw.length; index += 2) {
118
116
  headers.append(raw[index] ?? '', raw[index + 1] ?? '')
119
117
  }
120
- return new Request(url, { headers })
118
+ // Outside any catch, a URL a request refuses would end the process.
119
+ try {
120
+ return new Request(url, { headers })
121
+ } catch {
122
+ return undefined
123
+ }
121
124
  }
122
125
 
123
126
  /**