grafserv 0.0.1-alpha.1 → 0.0.1-alpha.10
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 +232 -0
- package/README.md +3 -5
- package/dist/core/base.d.ts.map +1 -1
- package/dist/core/base.js +17 -24
- package/dist/core/base.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +17 -0
- package/dist/interfaces.d.ts.map +1 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/middleware/graphiql.d.ts +1 -1
- package/dist/middleware/graphiql.d.ts.map +1 -1
- package/dist/middleware/graphiql.js +17 -6
- package/dist/middleware/graphiql.js.map +1 -1
- package/dist/middleware/graphql.d.ts +13 -2
- package/dist/middleware/graphql.d.ts.map +1 -1
- package/dist/middleware/graphql.js +49 -47
- package/dist/middleware/graphql.js.map +1 -1
- package/dist/options.d.ts +4 -4
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +7 -5
- package/dist/options.js.map +1 -1
- package/dist/servers/fastify/v4/index.d.ts +1 -1
- package/dist/utils.d.ts +6 -2
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +31 -6
- package/dist/utils.js.map +1 -1
- package/package.json +10 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,237 @@
|
|
|
1
1
|
# grafserv
|
|
2
2
|
|
|
3
|
+
## 0.0.1-alpha.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#399](https://github.com/benjie/postgraphile-private/pull/399)
|
|
8
|
+
[`409581534`](https://github.com/benjie/postgraphile-private/commit/409581534f41ac2cf0ff21c77c2bcd8eaa8218fd)
|
|
9
|
+
Thanks [@benjie](https://github.com/benjie)! - Change many of the dependencies
|
|
10
|
+
to be instead (or also) peerDependencies, to avoid duplicate modules.
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
[[`409581534`](https://github.com/benjie/postgraphile-private/commit/409581534f41ac2cf0ff21c77c2bcd8eaa8218fd),
|
|
13
|
+
[`b7533bd4d`](https://github.com/benjie/postgraphile-private/commit/b7533bd4dfc210cb8b113b8fa06f163a212aa5e4),
|
|
14
|
+
[`9feb769c2`](https://github.com/benjie/postgraphile-private/commit/9feb769c2df0c57971ed26a937be4a1bee7a7524),
|
|
15
|
+
[`7573bf374`](https://github.com/benjie/postgraphile-private/commit/7573bf374897228b613b19f37b4e076737db3279),
|
|
16
|
+
[`2c8586b36`](https://github.com/benjie/postgraphile-private/commit/2c8586b367b76af91d1785cc90455c70911fdec7),
|
|
17
|
+
[`c43802d74`](https://github.com/benjie/postgraphile-private/commit/c43802d7419f93d18964c654f16d0937a2e23ca0),
|
|
18
|
+
[`b118b8f6d`](https://github.com/benjie/postgraphile-private/commit/b118b8f6dc18196212cfb0a05486e1dd8d77ccf8),
|
|
19
|
+
[`9008c4f87`](https://github.com/benjie/postgraphile-private/commit/9008c4f87df53be4051c49f9836358dc2baa59df),
|
|
20
|
+
[`e8c81cd20`](https://github.com/benjie/postgraphile-private/commit/e8c81cd2046390ed5b6799aa7ff3d90b28a1861a)]:
|
|
21
|
+
- grafast@0.0.1-alpha.10
|
|
22
|
+
- ruru@2.0.0-alpha.7
|
|
23
|
+
|
|
24
|
+
## 0.0.1-alpha.9
|
|
25
|
+
|
|
26
|
+
### Patch Changes
|
|
27
|
+
|
|
28
|
+
- Updated dependencies
|
|
29
|
+
[[`56237691b`](https://github.com/benjie/postgraphile-private/commit/56237691bf3eed321b7159e17f36e3651356946f),
|
|
30
|
+
[`ed1982f31`](https://github.com/benjie/postgraphile-private/commit/ed1982f31a845ceb3aafd4b48d667649f06778f5),
|
|
31
|
+
[`1fe47a2b0`](https://github.com/benjie/postgraphile-private/commit/1fe47a2b08d6e7153a22dde3a99b7a9bf50c4f84),
|
|
32
|
+
[`198ac74d5`](https://github.com/benjie/postgraphile-private/commit/198ac74d52fe1e47d602fe2b7c52f216d5216b25),
|
|
33
|
+
[`6878c589c`](https://github.com/benjie/postgraphile-private/commit/6878c589cc9fc8f05a6efd377e1272ae24fbf256),
|
|
34
|
+
[`2ac706f18`](https://github.com/benjie/postgraphile-private/commit/2ac706f18660c855fe20f460b50694fdd04a7768)]:
|
|
35
|
+
- grafast@0.0.1-alpha.9
|
|
36
|
+
- graphile-config@0.0.1-alpha.4
|
|
37
|
+
- ruru@2.0.0-alpha.6
|
|
38
|
+
|
|
39
|
+
## 0.0.1-alpha.8
|
|
40
|
+
|
|
41
|
+
### Patch Changes
|
|
42
|
+
|
|
43
|
+
- Updated dependencies
|
|
44
|
+
[[`dd3ef599c`](https://github.com/benjie/postgraphile-private/commit/dd3ef599c7f2530fd1a19a852d334b7349e49e70)]:
|
|
45
|
+
- grafast@0.0.1-alpha.8
|
|
46
|
+
|
|
47
|
+
## 0.0.1-alpha.7
|
|
48
|
+
|
|
49
|
+
### Patch Changes
|
|
50
|
+
|
|
51
|
+
- [#346](https://github.com/benjie/postgraphile-private/pull/346)
|
|
52
|
+
[`9ddaaaa96`](https://github.com/benjie/postgraphile-private/commit/9ddaaaa9617874cb44946acfcd252517ae427446)
|
|
53
|
+
Thanks [@benjie](https://github.com/benjie)! - Fix a bug in subscriptions
|
|
54
|
+
where variables were not recognized
|
|
55
|
+
|
|
56
|
+
- Updated dependencies
|
|
57
|
+
[[`5c9d32264`](https://github.com/benjie/postgraphile-private/commit/5c9d322644028e33f5273fb9bcaaf6a80f1f7360),
|
|
58
|
+
[`2fcbe688c`](https://github.com/benjie/postgraphile-private/commit/2fcbe688c11b355f0688b96e99012a829cf8b7cb),
|
|
59
|
+
[`3a984718a`](https://github.com/benjie/postgraphile-private/commit/3a984718a322685304777dec7cd48a1efa15539d),
|
|
60
|
+
[`adc7ae5e0`](https://github.com/benjie/postgraphile-private/commit/adc7ae5e002961c8b8286500527752f21139ab9e)]:
|
|
61
|
+
- grafast@0.0.1-alpha.7
|
|
62
|
+
- graphile-config@0.0.1-alpha.3
|
|
63
|
+
- ruru@2.0.0-alpha.5
|
|
64
|
+
|
|
65
|
+
## 0.0.1-alpha.6
|
|
66
|
+
|
|
67
|
+
### Patch Changes
|
|
68
|
+
|
|
69
|
+
- Updated dependencies
|
|
70
|
+
[[`f75926f4b`](https://github.com/benjie/postgraphile-private/commit/f75926f4b9aee33adff8bdf6b1a4137582cb47ba)]:
|
|
71
|
+
- grafast@0.0.1-alpha.6
|
|
72
|
+
|
|
73
|
+
## 0.0.1-alpha.5
|
|
74
|
+
|
|
75
|
+
### Patch Changes
|
|
76
|
+
|
|
77
|
+
- Updated dependencies
|
|
78
|
+
[[`86e503d78`](https://github.com/benjie/postgraphile-private/commit/86e503d785626ad9a2e91ec2e70b272dd632d425),
|
|
79
|
+
[`24822d0dc`](https://github.com/benjie/postgraphile-private/commit/24822d0dc87d41f0b0737d6e00cf4022de4bab5e)]:
|
|
80
|
+
- grafast@0.0.1-alpha.5
|
|
81
|
+
|
|
82
|
+
## 0.0.1-alpha.4
|
|
83
|
+
|
|
84
|
+
### Patch Changes
|
|
85
|
+
|
|
86
|
+
- Updated dependencies
|
|
87
|
+
[[`45dcf3a8f`](https://github.com/benjie/postgraphile-private/commit/45dcf3a8fd8bad5c8b82a7cbff2db4dacb916950),
|
|
88
|
+
[`f34bd5a3c`](https://github.com/benjie/postgraphile-private/commit/f34bd5a3c353693b86a0307357a3620110700e1c)]:
|
|
89
|
+
- grafast@0.0.1-alpha.4
|
|
90
|
+
- ruru@2.0.0-alpha.4
|
|
91
|
+
|
|
92
|
+
## 0.0.1-alpha.3
|
|
93
|
+
|
|
94
|
+
### Patch Changes
|
|
95
|
+
|
|
96
|
+
- [`7f857950a`](https://github.com/benjie/postgraphile-private/commit/7f857950a7e4ec763c936eb6bd1fb77824041d71)
|
|
97
|
+
Thanks [@benjie](https://github.com/benjie)! - Upgrade to the latest
|
|
98
|
+
TypeScript/tslib
|
|
99
|
+
|
|
100
|
+
- Updated dependencies
|
|
101
|
+
[[`98ae00f59`](https://github.com/benjie/postgraphile-private/commit/98ae00f59a8ab3edc5718ad8437a0dab734a7d69),
|
|
102
|
+
[`2389f47ec`](https://github.com/benjie/postgraphile-private/commit/2389f47ecf3b708f1085fdeb818eacaaeb257a2d),
|
|
103
|
+
[`2fe247f75`](https://github.com/benjie/postgraphile-private/commit/2fe247f751377e18b3d6809cba39a01aa1602dbc),
|
|
104
|
+
[`e91ee201d`](https://github.com/benjie/postgraphile-private/commit/e91ee201d80d3b32e4e632b101f4c25362a1a05b),
|
|
105
|
+
[`865bec590`](https://github.com/benjie/postgraphile-private/commit/865bec5901f666e147f5d4088152d1f0d2584827),
|
|
106
|
+
[`7f857950a`](https://github.com/benjie/postgraphile-private/commit/7f857950a7e4ec763c936eb6bd1fb77824041d71),
|
|
107
|
+
[`d39a5d409`](https://github.com/benjie/postgraphile-private/commit/d39a5d409ffe1a5855740ecbff1ad11ec0bf6660)]:
|
|
108
|
+
- @graphile/lru@5.0.0-alpha.2
|
|
109
|
+
- grafast@0.0.1-alpha.3
|
|
110
|
+
- ruru@2.0.0-alpha.3
|
|
111
|
+
- graphile-config@0.0.1-alpha.2
|
|
112
|
+
|
|
113
|
+
## 0.0.1-alpha.2
|
|
114
|
+
|
|
115
|
+
### Patch Changes
|
|
116
|
+
|
|
117
|
+
- [#305](https://github.com/benjie/postgraphile-private/pull/305)
|
|
118
|
+
[`3cf35fdb4`](https://github.com/benjie/postgraphile-private/commit/3cf35fdb41d08762e9ff838a55dd7fc6004941f8)
|
|
119
|
+
Thanks [@benjie](https://github.com/benjie)! - 🚨 Ruru is now a CommonJS
|
|
120
|
+
module, no longer an ESM module.
|
|
121
|
+
|
|
122
|
+
Ruru CLI now reads options from a `graphile.config.ts` file if present.
|
|
123
|
+
|
|
124
|
+
It's now possible to customize the HTML that Ruru is served with (specifically
|
|
125
|
+
the meta, title, stylesheets, header JS, body content, body JS, and init
|
|
126
|
+
script), either via configuration:
|
|
127
|
+
|
|
128
|
+
```ts
|
|
129
|
+
import { defaultHTMLParts } from "ruru/server";
|
|
130
|
+
|
|
131
|
+
const preset: GraphileConfig.Preset = {
|
|
132
|
+
//...
|
|
133
|
+
ruru: {
|
|
134
|
+
htmlParts: {
|
|
135
|
+
titleTag: "<title>GraphiQL with Grafast support - Ruru!</title>",
|
|
136
|
+
metaTags:
|
|
137
|
+
defaultHTMLParts.metaTags +
|
|
138
|
+
`<meta name="viewport" content="width=device-width, initial-scale=1" />`,
|
|
139
|
+
},
|
|
140
|
+
},
|
|
141
|
+
};
|
|
142
|
+
```
|
|
143
|
+
|
|
144
|
+
or via a plugin, which allows you to change it on a per-request (per-user)
|
|
145
|
+
basis:
|
|
146
|
+
|
|
147
|
+
```ts
|
|
148
|
+
const RuruMetaPlugin: GraphileConfig.Plugin = {
|
|
149
|
+
name: "RuruMetaPlugin",
|
|
150
|
+
version: "0.0.0",
|
|
151
|
+
grafserv: {
|
|
152
|
+
hooks: {
|
|
153
|
+
ruruHTMLParts(_info, parts, extra) {
|
|
154
|
+
// extra.request gives you access to request details, so you can customize `parts` for the user
|
|
155
|
+
|
|
156
|
+
parts.metaTags += `<meta name="viewport" content="width=device-width, initial-scale=1" />`;
|
|
157
|
+
},
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
};
|
|
161
|
+
```
|
|
162
|
+
|
|
163
|
+
- [#307](https://github.com/benjie/postgraphile-private/pull/307)
|
|
164
|
+
[`7c45eaf4e`](https://github.com/benjie/postgraphile-private/commit/7c45eaf4ed6edf3b9e7bb17846d553f5504e0fb4)
|
|
165
|
+
Thanks [@benjie](https://github.com/benjie)! - 🚨
|
|
166
|
+
'application/x-www-form-urlencoded' is now opt-in (unless you're using the V4
|
|
167
|
+
preset).
|
|
168
|
+
|
|
169
|
+
CSRF and CORS are tricky topics. When you use PostGraphile as part of a larger
|
|
170
|
+
system, it's your responsibility to ensure that you don't open yourself up to
|
|
171
|
+
CSRF/etc issues (e.g. by using CSRF/XSRF tokens, by using `SameSite` cookie
|
|
172
|
+
policies, by checking the `Origin` of requests, or by using a combination of
|
|
173
|
+
these or other techniques).
|
|
174
|
+
|
|
175
|
+
Out of the box, PostGraphile does not use cookies, so any cross-origin
|
|
176
|
+
requests are harmless because an attacker without the actual user token in
|
|
177
|
+
hand can only execute unauthenticated requests.
|
|
178
|
+
|
|
179
|
+
However, once cookies (and sessions) enter the equation, suddenly CSRF becomes
|
|
180
|
+
a risk. Normally you cannot submit an `Content-Type: application/json` request
|
|
181
|
+
cross origins (unless you've enabled CORS), so this content type doesn't open
|
|
182
|
+
CSRF issues on its own, but `Content-Type: application/x-www-form-urlencoded`
|
|
183
|
+
can be submitted cross origins without CORS policies. The attacker won't be
|
|
184
|
+
able to view the response, but that doesn't mean they can't cause havoc by
|
|
185
|
+
triggering dangerous mutations using the user's credentials.
|
|
186
|
+
|
|
187
|
+
We've decided to take the stance of making `application/x-www-form-urlencoded`
|
|
188
|
+
opt-in; you can opt-in via your graphile.config.ts (or equivalent) like so:
|
|
189
|
+
|
|
190
|
+
```ts
|
|
191
|
+
import { DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES } from "grafserv";
|
|
192
|
+
|
|
193
|
+
const preset: GraphileConfig.Preset = {
|
|
194
|
+
//...
|
|
195
|
+
|
|
196
|
+
grafserv: {
|
|
197
|
+
//...
|
|
198
|
+
|
|
199
|
+
allowedRequestContentTypes: [
|
|
200
|
+
...DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES,
|
|
201
|
+
"application/x-www-form-urlencoded",
|
|
202
|
+
],
|
|
203
|
+
},
|
|
204
|
+
};
|
|
205
|
+
```
|
|
206
|
+
|
|
207
|
+
If you're using the V4 preset then we pull in the V4 behavior of enabling this
|
|
208
|
+
content type by default (since you presumably already have protections in
|
|
209
|
+
place); however we recommend disabling this media type if you're not using it:
|
|
210
|
+
|
|
211
|
+
```ts
|
|
212
|
+
import { DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES } from "grafserv";
|
|
213
|
+
|
|
214
|
+
const preset: GraphileConfig.Preset = {
|
|
215
|
+
//... extends V4 preset ...
|
|
216
|
+
|
|
217
|
+
grafserv: {
|
|
218
|
+
//...
|
|
219
|
+
|
|
220
|
+
allowedRequestContentTypes: DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES,
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
```
|
|
224
|
+
|
|
225
|
+
Note that this media type is not currently part of the
|
|
226
|
+
[GraphQL-over-HTTP specification](https://graphql.github.io/graphql-over-http/draft/#sec-Media-Types)
|
|
227
|
+
so disabling it does not make your server non-compliant.
|
|
228
|
+
|
|
229
|
+
- Updated dependencies
|
|
230
|
+
[[`3cf35fdb4`](https://github.com/benjie/postgraphile-private/commit/3cf35fdb41d08762e9ff838a55dd7fc6004941f8),
|
|
231
|
+
[`3df3f1726`](https://github.com/benjie/postgraphile-private/commit/3df3f17269bb896cdee90ed8c4ab46fb821a1509)]:
|
|
232
|
+
- ruru@2.0.0-alpha.2
|
|
233
|
+
- grafast@0.0.1-alpha.2
|
|
234
|
+
|
|
3
235
|
## 0.0.1-alpha.1
|
|
4
236
|
|
|
5
237
|
### Patch Changes
|
package/README.md
CHANGED
|
@@ -24,14 +24,12 @@ and development via sponsorship.
|
|
|
24
24
|
And please give some love to our featured sponsors 🤩:
|
|
25
25
|
|
|
26
26
|
<table><tr>
|
|
27
|
-
<td align="center"><a href="https://surge.io/"><img src="https://graphile.org/images/sponsors/surge.png" width="90" height="90" alt="Surge" /><br />Surge</a> *</td>
|
|
28
|
-
<td align="center"><a href="https://www.netflix.com/"><img src="https://graphile.org/images/sponsors/Netflix.png" width="90" height="90" alt="Netflix" /><br />Netflix</a> *</td>
|
|
29
27
|
<td align="center"><a href="https://www.the-guild.dev/"><img src="https://graphile.org/images/sponsors/theguild.png" width="90" height="90" alt="The Guild" /><br />The Guild</a> *</td>
|
|
28
|
+
<td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
|
|
30
29
|
<td align="center"><a href="https://qwick.com/"><img src="https://graphile.org/images/sponsors/qwick.png" width="90" height="90" alt="Qwick" /><br />Qwick</a> *</td>
|
|
30
|
+
<td align="center"><a href="https://www.netflix.com/"><img src="https://graphile.org/images/sponsors/Netflix.png" width="90" height="90" alt="Netflix" /><br />Netflix</a> *</td>
|
|
31
31
|
</tr><tr>
|
|
32
|
-
<td align="center"><a href="
|
|
33
|
-
<td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
|
|
34
|
-
<td align="center"><a href="https://www.enzuzo.com/"><img src="https://graphile.org/images/sponsors/enzuzo.png" width="90" height="90" alt="Enzuzo" /><br />Enzuzo</a> *</td>
|
|
32
|
+
<td align="center"><a href=""><img src="https://graphile.org/images/sponsors/chadf.png" width="90" height="90" alt="Chad Furman" /><br />Chad Furman</a> *</td>
|
|
35
33
|
<td align="center"><a href="https://stellate.co/"><img src="https://graphile.org/images/sponsors/Stellate.png" width="90" height="90" alt="Stellate" /><br />Stellate</a> *</td>
|
|
36
34
|
</tr></table>
|
|
37
35
|
|
package/dist/core/base.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/core/base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAG7C,OAAO,KAAK,EAEV,WAAW,EAEX,cAAc,EACd,aAAa,EAIb,aAAa,EACb,MAAM,EACN,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAoB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/core/base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAG7C,OAAO,KAAK,EAEV,WAAW,EAEX,cAAc,EACd,aAAa,EAIb,aAAa,EACb,MAAM,EACN,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAoB,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAiDvD,qBAAa,YAAY;IACvB,OAAO,CAAC,eAAe,CAA0C;IACjE,OAAO,CAAC,SAAS,CAAS;IAC1B,gBAAgB;IACT,cAAc,EAAG,iBAAiB,CAAC;IACnC,cAAc,EAAG,cAAc,CAAC,cAAc,CAAC;IACtD,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IACpE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IACzD,SAAS,CAAC,YAAY,EAAE,iBAAiB,CAAC;QACxC,cAAc,EAAE,aAAa,CAAC;QAC9B,cAAc,EAAE,GAAG,CAAC;KACrB,CAAC,CAAC;IACH,OAAO,CAAC,WAAW,CAAS;IACrB,cAAc,EAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;IACvD,eAAe,EAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;gBAEpD,MAAM,EAAE,cAAc;IAwBlC,OAAO,CAAC,eAAe;IAuDvB,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,aAAa,GACrB,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC;IAuB1B,SAAS,IAAI,cAAc,CAAC,cAAc;IAI1C,SAAS,IAAI,eAAe,CAAC,aAAa,CAAC;IAIrC,OAAO;IAeb,SAAS,CAAC,EAAE,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC;IASzC,SAAS,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM;IAS1C,SAAS,CAAC,SAAS,EAAE,aAAa;IAuBzC,OAAO,CAAC,eAAe;IAiBhB,UAAU,IAAI,qBAAqB,CAAC,iBAAiB,CAAC;CAyD9D;AAQD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,CAoLhC;AAED,eAAO,MAAM,WAAW,UACf,KAAK,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KACrC,WASF,CAAC"}
|
package/dist/core/base.js
CHANGED
|
@@ -5,12 +5,13 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const eventemitter3_1 = tslib_1.__importDefault(require("eventemitter3"));
|
|
6
6
|
const grafast_1 = require("grafast");
|
|
7
7
|
const graphile_config_1 = require("graphile-config");
|
|
8
|
-
const
|
|
8
|
+
const graphql = tslib_1.__importStar(require("graphql"));
|
|
9
9
|
const mapIterator_js_1 = require("../mapIterator.js");
|
|
10
10
|
const graphiql_js_1 = require("../middleware/graphiql.js");
|
|
11
11
|
const graphql_js_1 = require("../middleware/graphql.js");
|
|
12
12
|
const options_js_1 = require("../options.js");
|
|
13
13
|
const utils_js_1 = require("../utils.js");
|
|
14
|
+
const { GraphQLError, isSchema, validateSchema } = graphql;
|
|
14
15
|
function handleGraphQLHandlerError(request, dynamicOptions, e) {
|
|
15
16
|
if (e instanceof grafast_1.SafeError) {
|
|
16
17
|
return {
|
|
@@ -19,7 +20,7 @@ function handleGraphQLHandlerError(request, dynamicOptions, e) {
|
|
|
19
20
|
dynamicOptions,
|
|
20
21
|
payload: {
|
|
21
22
|
errors: [
|
|
22
|
-
new
|
|
23
|
+
new GraphQLError(e.message, null, null, null, null, e, e.extensions),
|
|
23
24
|
],
|
|
24
25
|
},
|
|
25
26
|
statusCode: e.extensions?.statusCode ?? 500,
|
|
@@ -28,9 +29,9 @@ function handleGraphQLHandlerError(request, dynamicOptions, e) {
|
|
|
28
29
|
};
|
|
29
30
|
}
|
|
30
31
|
// TODO: if a GraphQLError is thrown... WTF?
|
|
31
|
-
const graphqlError = e instanceof
|
|
32
|
+
const graphqlError = e instanceof GraphQLError
|
|
32
33
|
? e
|
|
33
|
-
: new
|
|
34
|
+
: new GraphQLError("Unknown error occurred", null, null, null, null, e);
|
|
34
35
|
// Special error handling for GraphQL route
|
|
35
36
|
console.error("An error occurred whilst attempting to handle the GraphQL request:");
|
|
36
37
|
console.dir(e);
|
|
@@ -46,18 +47,10 @@ function handleGraphQLHandlerError(request, dynamicOptions, e) {
|
|
|
46
47
|
};
|
|
47
48
|
}
|
|
48
49
|
class GrafservBase {
|
|
49
|
-
releaseHandlers = [];
|
|
50
|
-
releasing = false;
|
|
51
|
-
/** @internal */
|
|
52
|
-
dynamicOptions;
|
|
53
|
-
resolvedPreset;
|
|
54
|
-
schema;
|
|
55
|
-
schemaError;
|
|
56
|
-
eventEmitter;
|
|
57
|
-
initialized = false;
|
|
58
|
-
graphqlHandler;
|
|
59
|
-
graphiqlHandler;
|
|
60
50
|
constructor(config) {
|
|
51
|
+
this.releaseHandlers = [];
|
|
52
|
+
this.releasing = false;
|
|
53
|
+
this.initialized = false;
|
|
61
54
|
this.eventEmitter = new eventemitter3_1.default();
|
|
62
55
|
this.setPreset(config.preset ?? Object.create(null));
|
|
63
56
|
this.schemaError = null;
|
|
@@ -189,10 +182,10 @@ class GrafservBase {
|
|
|
189
182
|
if (!newSchema) {
|
|
190
183
|
throw new Error(`setSchema must be called with a GraphQL schema`);
|
|
191
184
|
}
|
|
192
|
-
if (!
|
|
185
|
+
if (!isSchema(newSchema)) {
|
|
193
186
|
throw new Error(`setParams called with invalid schema (is there more than one 'graphql' module loaded?)`);
|
|
194
187
|
}
|
|
195
|
-
const errors =
|
|
188
|
+
const errors = validateSchema(newSchema);
|
|
196
189
|
if (errors.length > 0) {
|
|
197
190
|
throw new Error(`setParams called with invalid schema; first error: ${errors[0]}`);
|
|
198
191
|
}
|
|
@@ -217,7 +210,7 @@ class GrafservBase {
|
|
|
217
210
|
let finished = false;
|
|
218
211
|
const bump = () => {
|
|
219
212
|
const next = queue.shift();
|
|
220
|
-
if (next) {
|
|
213
|
+
if (next !== undefined) {
|
|
221
214
|
next.resolve({
|
|
222
215
|
done: false,
|
|
223
216
|
value: { event: "change", data: "schema" },
|
|
@@ -227,7 +220,7 @@ class GrafservBase {
|
|
|
227
220
|
const flushQueue = (e) => {
|
|
228
221
|
const entries = queue.splice(0, queue.length);
|
|
229
222
|
for (const entry of entries) {
|
|
230
|
-
if (e) {
|
|
223
|
+
if (e != null) {
|
|
231
224
|
entry.reject(e);
|
|
232
225
|
}
|
|
233
226
|
else {
|
|
@@ -252,7 +245,7 @@ class GrafservBase {
|
|
|
252
245
|
},
|
|
253
246
|
return() {
|
|
254
247
|
finished = true;
|
|
255
|
-
if (queue.length) {
|
|
248
|
+
if (queue.length !== 0) {
|
|
256
249
|
flushQueue();
|
|
257
250
|
}
|
|
258
251
|
return Promise.resolve({
|
|
@@ -260,7 +253,7 @@ class GrafservBase {
|
|
|
260
253
|
});
|
|
261
254
|
},
|
|
262
255
|
throw(e) {
|
|
263
|
-
if (queue.length) {
|
|
256
|
+
if (queue.length !== 0) {
|
|
264
257
|
flushQueue(e);
|
|
265
258
|
}
|
|
266
259
|
return Promise.reject(e);
|
|
@@ -371,13 +364,13 @@ function convertHandlerResultToResult(handlerResult) {
|
|
|
371
364
|
// Creates a stream for the response
|
|
372
365
|
const event2buffer = (event) => {
|
|
373
366
|
let payload = "";
|
|
374
|
-
if (event.event) {
|
|
367
|
+
if (event.event !== undefined) {
|
|
375
368
|
payload += `event: ${event.event}\n`;
|
|
376
369
|
}
|
|
377
|
-
if (event.id) {
|
|
370
|
+
if (event.id !== undefined) {
|
|
378
371
|
payload += `id: ${event.id}\n`;
|
|
379
372
|
}
|
|
380
|
-
if (event.retry) {
|
|
373
|
+
if (event.retry !== undefined) {
|
|
381
374
|
payload += `retry: ${event.retry}\n`;
|
|
382
375
|
}
|
|
383
376
|
if (event.data != null) {
|
package/dist/core/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/core/base.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/core/base.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { GrafservBase } from "./core/base.js";
|
|
2
2
|
export { GrafservConfig, NormalizedRequestDigest, ParsedGraphQLBody, ProcessGraphQLRequestBodyEvent, ValidatedGraphQLBody, } from "./interfaces.js";
|
|
3
|
+
export { DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES } from "./middleware/graphql.js";
|
|
3
4
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,iBAAiB,EACjB,8BAA8B,EAC9B,oBAAoB,GACrB,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,uBAAuB,EACvB,iBAAiB,EACjB,8BAA8B,EAC9B,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qCAAqC,EAAE,MAAM,yBAAyB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GrafservBase = void 0;
|
|
3
|
+
exports.DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES = exports.GrafservBase = void 0;
|
|
4
4
|
var base_js_1 = require("./core/base.js");
|
|
5
5
|
Object.defineProperty(exports, "GrafservBase", { enumerable: true, get: function () { return base_js_1.GrafservBase; } });
|
|
6
|
+
var graphql_js_1 = require("./middleware/graphql.js");
|
|
7
|
+
Object.defineProperty(exports, "DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES", { enumerable: true, get: function () { return graphql_js_1.DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES; } });
|
|
6
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAArC,uGAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAArC,uGAAA,YAAY,OAAA;AAQrB,sDAAgF;AAAvE,mIAAA,qCAAqC,OAAA"}
|
package/dist/interfaces.d.ts
CHANGED
|
@@ -4,12 +4,14 @@ import type { PromiseOrDirect, SafeError } from "grafast";
|
|
|
4
4
|
import type { PluginHook } from "graphile-config";
|
|
5
5
|
import type { AsyncExecutionResult, ExecutionResult, GraphQLError, GraphQLSchema } from "graphql";
|
|
6
6
|
import type { Context } from "graphql-ws";
|
|
7
|
+
import type { RuruHTMLParts } from "ruru/server";
|
|
7
8
|
import type { OptionsFromConfig } from "./options";
|
|
8
9
|
export type ContextCallback = (requestContext: Grafast.RequestContext) => Grafast.Context;
|
|
9
10
|
export interface GrafservConfig {
|
|
10
11
|
schema: GraphQLSchema | PromiseLike<GraphQLSchema>;
|
|
11
12
|
preset?: GraphileConfig.Preset;
|
|
12
13
|
}
|
|
14
|
+
export type RequestContentType = "application/json" | "application/graphql" | "application/x-www-form-urlencoded";
|
|
13
15
|
/**
|
|
14
16
|
* Represents the core parameters from the GraphQL request, these may not yet
|
|
15
17
|
* be fully validated to allow for things such as persisted operations to kick
|
|
@@ -110,10 +112,25 @@ declare global {
|
|
|
110
112
|
* `defaultMaskError` from `grafserv`.
|
|
111
113
|
*/
|
|
112
114
|
maskError?: (error: GraphQLError) => GraphQLError;
|
|
115
|
+
/**
|
|
116
|
+
* By default `application/json` and `application/graphql` are supported
|
|
117
|
+
* (`DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES`). You may add
|
|
118
|
+
* `application/x-www-form-urlencoded` to the list, but be aware that
|
|
119
|
+
* doing so potentially opens you to CSRF issues even if you're not using
|
|
120
|
+
* CORS since this media type is handled specially by browsers - ensure
|
|
121
|
+
* that you have CSRF protections in place.
|
|
122
|
+
*
|
|
123
|
+
* Note further that if you're using CORS the other media types are not
|
|
124
|
+
* safe, and you should still use CSRF protection.
|
|
125
|
+
*/
|
|
126
|
+
allowedRequestContentTypes?: readonly RequestContentType[];
|
|
113
127
|
}
|
|
114
128
|
interface GrafservHooks {
|
|
115
129
|
init(event: Record<string, never>): PromiseOrDirect<void>;
|
|
116
130
|
processGraphQLRequestBody(event: ProcessGraphQLRequestBodyEvent): PromiseOrDirect<void>;
|
|
131
|
+
ruruHTMLParts(parts: RuruHTMLParts, extra: {
|
|
132
|
+
request: NormalizedRequestDigest;
|
|
133
|
+
}): PromiseOrDirect<void>;
|
|
117
134
|
}
|
|
118
135
|
}
|
|
119
136
|
}
|
package/dist/interfaces.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,aAAa,EACd,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"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"}
|
package/dist/interfaces.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AAoMZ,QAAA,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { HandlerResult, NormalizedRequestDigest } from "../interfaces.js";
|
|
2
2
|
import type { OptionsFromConfig } from "../options.js";
|
|
3
|
-
export declare function makeGraphiQLHandler(
|
|
3
|
+
export declare function makeGraphiQLHandler(resolvedPreset: GraphileConfig.ResolvedPreset, dynamicOptions: OptionsFromConfig): (request: NormalizedRequestDigest) => Promise<HandlerResult>;
|
|
4
4
|
//# sourceMappingURL=graphiql.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphiql.d.ts","sourceRoot":"","sources":["../../src/middleware/graphiql.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graphiql.d.ts","sourceRoot":"","sources":["../../src/middleware/graphiql.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGvD,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,cAAc,CAAC,cAAc,EAC7C,cAAc,EAAE,iBAAiB,aAQV,uBAAuB,KAAG,QAAQ,aAAa,CAAC,CA2BxE"}
|
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.makeGraphiQLHandler = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
4
|
+
const server_1 = require("ruru/server");
|
|
5
|
+
const hooks_js_1 = require("../hooks.js");
|
|
6
6
|
// TODO: use a specific version of mermaid
|
|
7
|
-
function makeGraphiQLHandler(
|
|
7
|
+
function makeGraphiQLHandler(resolvedPreset, dynamicOptions) {
|
|
8
|
+
const { htmlParts: htmlPartsFromConfig } = resolvedPreset?.ruru ?? {};
|
|
9
|
+
const hooks = (0, hooks_js_1.getGrafservHooks)(resolvedPreset);
|
|
10
|
+
const unhookedHTMLParts = {
|
|
11
|
+
...server_1.defaultHTMLParts,
|
|
12
|
+
...htmlPartsFromConfig,
|
|
13
|
+
};
|
|
8
14
|
return async (request) => {
|
|
9
|
-
|
|
10
|
-
|
|
15
|
+
let htmlParts = unhookedHTMLParts;
|
|
16
|
+
if (hooks.callbacks.ruruHTMLParts) {
|
|
17
|
+
htmlParts = {
|
|
18
|
+
...(0, server_1.makeHTMLParts)(),
|
|
19
|
+
...htmlPartsFromConfig,
|
|
20
|
+
};
|
|
21
|
+
await hooks.process("ruruHTMLParts", htmlParts, { request });
|
|
11
22
|
}
|
|
12
23
|
const config = {
|
|
13
24
|
endpoint: dynamicOptions.graphqlPath,
|
|
@@ -23,7 +34,7 @@ function makeGraphiQLHandler(_resolvedPreset, dynamicOptions) {
|
|
|
23
34
|
request,
|
|
24
35
|
dynamicOptions,
|
|
25
36
|
type: "html",
|
|
26
|
-
payload: Buffer.from(ruruHTML(config), "utf8"),
|
|
37
|
+
payload: Buffer.from((0, server_1.ruruHTML)(config, htmlParts), "utf8"),
|
|
27
38
|
};
|
|
28
39
|
};
|
|
29
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphiql.js","sourceRoot":"","sources":["../../src/middleware/graphiql.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"graphiql.js","sourceRoot":"","sources":["../../src/middleware/graphiql.ts"],"names":[],"mappings":";;;AACA,wCAAwE;AAExE,0CAA+C;AAI/C,0CAA0C;AAC1C,SAAgB,mBAAmB,CACjC,cAA6C,EAC7C,cAAiC;IAEjC,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,GAAG,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,IAAA,2BAAgB,EAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,iBAAiB,GAAkB;QACvC,GAAG,yBAAgB;QACnB,GAAG,mBAAmB;KACvB,CAAC;IACF,OAAO,KAAK,EAAE,OAAgC,EAA0B,EAAE;QACxE,IAAI,SAAS,GAAG,iBAAkB,CAAC;QACnC,IAAI,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE;YACjC,SAAS,GAAG;gBACV,GAAG,IAAA,sBAAa,GAAE;gBAClB,GAAG,mBAAmB;aACvB,CAAC;YACF,MAAM,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,MAAM,MAAM,GAAqB;YAC/B,QAAQ,EAAE,cAAc,CAAC,WAAW;YACpC,2BAA2B;YAC3B,UAAU,EACR,cAAc,CAAC,OAAO,KAAK,IAAI;gBAC7B,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC;gBACrB,CAAC,CAAC,cAAc,CAAC,OAAO,KAAK,KAAK;oBAClC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAE,cAAc,CAAC,OAAiB;SACxC,CAAC;QACF,OAAO;YACL,UAAU,EAAE,GAAG;YACf,OAAO;YACP,cAAc;YACd,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAA,iBAAQ,EAAC,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC;SAC1D,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AArCD,kDAqCC"}
|