@sitecore-jss/sitecore-jss-proxy 16.0.0-canary.8 → 16.0.1

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/LICENSE.txt CHANGED
@@ -1,202 +1,202 @@
1
-
2
- Apache License
3
- Version 2.0, January 2004
4
- http://www.apache.org/licenses/
5
-
6
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
-
8
- 1. Definitions.
9
-
10
- "License" shall mean the terms and conditions for use, reproduction,
11
- and distribution as defined by Sections 1 through 9 of this document.
12
-
13
- "Licensor" shall mean the copyright owner or entity authorized by
14
- the copyright owner that is granting the License.
15
-
16
- "Legal Entity" shall mean the union of the acting entity and all
17
- other entities that control, are controlled by, or are under common
18
- control with that entity. For the purposes of this definition,
19
- "control" means (i) the power, direct or indirect, to cause the
20
- direction or management of such entity, whether by contract or
21
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
- outstanding shares, or (iii) beneficial ownership of such entity.
23
-
24
- "You" (or "Your") shall mean an individual or Legal Entity
25
- exercising permissions granted by this License.
26
-
27
- "Source" form shall mean the preferred form for making modifications,
28
- including but not limited to software source code, documentation
29
- source, and configuration files.
30
-
31
- "Object" form shall mean any form resulting from mechanical
32
- transformation or translation of a Source form, including but
33
- not limited to compiled object code, generated documentation,
34
- and conversions to other media types.
35
-
36
- "Work" shall mean the work of authorship, whether in Source or
37
- Object form, made available under the License, as indicated by a
38
- copyright notice that is included in or attached to the work
39
- (an example is provided in the Appendix below).
40
-
41
- "Derivative Works" shall mean any work, whether in Source or Object
42
- form, that is based on (or derived from) the Work and for which the
43
- editorial revisions, annotations, elaborations, or other modifications
44
- represent, as a whole, an original work of authorship. For the purposes
45
- of this License, Derivative Works shall not include works that remain
46
- separable from, or merely link (or bind by name) to the interfaces of,
47
- the Work and Derivative Works thereof.
48
-
49
- "Contribution" shall mean any work of authorship, including
50
- the original version of the Work and any modifications or additions
51
- to that Work or Derivative Works thereof, that is intentionally
52
- submitted to Licensor for inclusion in the Work by the copyright owner
53
- or by an individual or Legal Entity authorized to submit on behalf of
54
- the copyright owner. For the purposes of this definition, "submitted"
55
- means any form of electronic, verbal, or written communication sent
56
- to the Licensor or its representatives, including but not limited to
57
- communication on electronic mailing lists, source code control systems,
58
- and issue tracking systems that are managed by, or on behalf of, the
59
- Licensor for the purpose of discussing and improving the Work, but
60
- excluding communication that is conspicuously marked or otherwise
61
- designated in writing by the copyright owner as "Not a Contribution."
62
-
63
- "Contributor" shall mean Licensor and any individual or Legal Entity
64
- on behalf of whom a Contribution has been received by Licensor and
65
- subsequently incorporated within the Work.
66
-
67
- 2. Grant of Copyright License. Subject to the terms and conditions of
68
- this License, each Contributor hereby grants to You a perpetual,
69
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
- copyright license to reproduce, prepare Derivative Works of,
71
- publicly display, publicly perform, sublicense, and distribute the
72
- Work and such Derivative Works in Source or Object form.
73
-
74
- 3. Grant of Patent License. Subject to the terms and conditions of
75
- this License, each Contributor hereby grants to You a perpetual,
76
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
- (except as stated in this section) patent license to make, have made,
78
- use, offer to sell, sell, import, and otherwise transfer the Work,
79
- where such license applies only to those patent claims licensable
80
- by such Contributor that are necessarily infringed by their
81
- Contribution(s) alone or by combination of their Contribution(s)
82
- with the Work to which such Contribution(s) was submitted. If You
83
- institute patent litigation against any entity (including a
84
- cross-claim or counterclaim in a lawsuit) alleging that the Work
85
- or a Contribution incorporated within the Work constitutes direct
86
- or contributory patent infringement, then any patent licenses
87
- granted to You under this License for that Work shall terminate
88
- as of the date such litigation is filed.
89
-
90
- 4. Redistribution. You may reproduce and distribute copies of the
91
- Work or Derivative Works thereof in any medium, with or without
92
- modifications, and in Source or Object form, provided that You
93
- meet the following conditions:
94
-
95
- (a) You must give any other recipients of the Work or
96
- Derivative Works a copy of this License; and
97
-
98
- (b) You must cause any modified files to carry prominent notices
99
- stating that You changed the files; and
100
-
101
- (c) You must retain, in the Source form of any Derivative Works
102
- that You distribute, all copyright, patent, trademark, and
103
- attribution notices from the Source form of the Work,
104
- excluding those notices that do not pertain to any part of
105
- the Derivative Works; and
106
-
107
- (d) If the Work includes a "NOTICE" text file as part of its
108
- distribution, then any Derivative Works that You distribute must
109
- include a readable copy of the attribution notices contained
110
- within such NOTICE file, excluding those notices that do not
111
- pertain to any part of the Derivative Works, in at least one
112
- of the following places: within a NOTICE text file distributed
113
- as part of the Derivative Works; within the Source form or
114
- documentation, if provided along with the Derivative Works; or,
115
- within a display generated by the Derivative Works, if and
116
- wherever such third-party notices normally appear. The contents
117
- of the NOTICE file are for informational purposes only and
118
- do not modify the License. You may add Your own attribution
119
- notices within Derivative Works that You distribute, alongside
120
- or as an addendum to the NOTICE text from the Work, provided
121
- that such additional attribution notices cannot be construed
122
- as modifying the License.
123
-
124
- You may add Your own copyright statement to Your modifications and
125
- may provide additional or different license terms and conditions
126
- for use, reproduction, or distribution of Your modifications, or
127
- for any such Derivative Works as a whole, provided Your use,
128
- reproduction, and distribution of the Work otherwise complies with
129
- the conditions stated in this License.
130
-
131
- 5. Submission of Contributions. Unless You explicitly state otherwise,
132
- any Contribution intentionally submitted for inclusion in the Work
133
- by You to the Licensor shall be under the terms and conditions of
134
- this License, without any additional terms or conditions.
135
- Notwithstanding the above, nothing herein shall supersede or modify
136
- the terms of any separate license agreement you may have executed
137
- with Licensor regarding such Contributions.
138
-
139
- 6. Trademarks. This License does not grant permission to use the trade
140
- names, trademarks, service marks, or product names of the Licensor,
141
- except as required for reasonable and customary use in describing the
142
- origin of the Work and reproducing the content of the NOTICE file.
143
-
144
- 7. Disclaimer of Warranty. Unless required by applicable law or
145
- agreed to in writing, Licensor provides the Work (and each
146
- Contributor provides its Contributions) on an "AS IS" BASIS,
147
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
- implied, including, without limitation, any warranties or conditions
149
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
- PARTICULAR PURPOSE. You are solely responsible for determining the
151
- appropriateness of using or redistributing the Work and assume any
152
- risks associated with Your exercise of permissions under this License.
153
-
154
- 8. Limitation of Liability. In no event and under no legal theory,
155
- whether in tort (including negligence), contract, or otherwise,
156
- unless required by applicable law (such as deliberate and grossly
157
- negligent acts) or agreed to in writing, shall any Contributor be
158
- liable to You for damages, including any direct, indirect, special,
159
- incidental, or consequential damages of any character arising as a
160
- result of this License or out of the use or inability to use the
161
- Work (including but not limited to damages for loss of goodwill,
162
- work stoppage, computer failure or malfunction, or any and all
163
- other commercial damages or losses), even if such Contributor
164
- has been advised of the possibility of such damages.
165
-
166
- 9. Accepting Warranty or Additional Liability. While redistributing
167
- the Work or Derivative Works thereof, You may choose to offer,
168
- and charge a fee for, acceptance of support, warranty, indemnity,
169
- or other liability obligations and/or rights consistent with this
170
- License. However, in accepting such obligations, You may act only
171
- on Your own behalf and on Your sole responsibility, not on behalf
172
- of any other Contributor, and only if You agree to indemnify,
173
- defend, and hold each Contributor harmless for any liability
174
- incurred by, or claims asserted against, such Contributor by reason
175
- of your accepting any such warranty or additional liability.
176
-
177
- END OF TERMS AND CONDITIONS
178
-
179
- APPENDIX: How to apply the Apache License to your work.
180
-
181
- To apply the Apache License to your work, attach the following
182
- boilerplate notice, with the fields enclosed by brackets "[]"
183
- replaced with your own identifying information. (Don't include
184
- the brackets!) The text should be enclosed in the appropriate
185
- comment syntax for the file format. We also recommend that a
186
- file or class name and description of purpose be included on the
187
- same "printed page" as the copyright notice for easier
188
- identification within third-party archives.
189
-
190
- Copyright [yyyy] [name of copyright owner]
191
-
192
- Licensed under the Apache License, Version 2.0 (the "License");
193
- you may not use this file except in compliance with the License.
194
- You may obtain a copy of the License at
195
-
196
- http://www.apache.org/licenses/LICENSE-2.0
197
-
198
- Unless required by applicable law or agreed to in writing, software
199
- distributed under the License is distributed on an "AS IS" BASIS,
200
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
- See the License for the specific language governing permissions and
202
- limitations under the License.
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright [yyyy] [name of copyright owner]
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
- # Sitecore JavaScript Services Proxy
2
-
3
- This module is provided as a part of Sitecore JavaScript Services. It contains the headless-mode SSR proxy implementation.
4
-
5
- Consult the [Sitecore JSS documentation](https://jss.sitecore.net) for further details.
6
-
1
+ # Sitecore JavaScript Services Proxy
2
+
3
+ This module is provided as a part of Sitecore JavaScript Services. It contains the headless-mode SSR proxy implementation.
4
+
5
+ Consult the [Sitecore JSS documentation](https://jss.sitecore.net) for further details.
6
+
package/dist/index.js CHANGED
@@ -56,7 +56,6 @@ var http_status_codes_1 = __importDefault(require("http-status-codes"));
56
56
  var set_cookie_parser_1 = __importDefault(require("set-cookie-parser"));
57
57
  var zlib_1 = __importDefault(require("zlib")); // node.js standard lib
58
58
  var util_1 = require("./util");
59
- // tslint:disable:max-line-length
60
59
  // For some reason, every other response returned by Sitecore contains the 'set-cookie' header with the SC_ANALYTICS_GLOBAL_COOKIE value as an empty string.
61
60
  // This effectively sets the cookie to empty on the client as well, so if a user were to close their browser
62
61
  // after one of these 'empty value' responses, they would not be tracked as a returning visitor after re-opening their browser.
@@ -78,8 +77,18 @@ exports.removeEmptyAnalyticsCookie = function (proxyResponse) {
78
77
  }
79
78
  };
80
79
  // inspired by: http://stackoverflow.com/a/22487927/9324
80
+ /**
81
+ * @param {IncomingMessage} proxyResponse
82
+ * @param {IncomingMessage} request
83
+ * @param {ServerResponse} serverResponse
84
+ * @param {AppRenderer} renderer
85
+ * @param {ProxyConfig} config
86
+ */
81
87
  function renderAppToResponse(proxyResponse, request, serverResponse, renderer, config) {
82
88
  return __awaiter(this, void 0, void 0, function () {
89
+ /**
90
+ * Extract layout service data from proxy response
91
+ */
83
92
  function extractLayoutServiceDataFromProxyResponse() {
84
93
  return __awaiter(this, void 0, void 0, function () {
85
94
  var responseString;
@@ -112,7 +121,10 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
112
121
  });
113
122
  });
114
123
  }
115
- // function replies with HTTP 500 when an error occurs
124
+ /**
125
+ * function replies with HTTP 500 when an error occurs
126
+ * @param {Error} error
127
+ */
116
128
  function replyWithError(error) {
117
129
  return __awaiter(this, void 0, void 0, function () {
118
130
  var errorResponse, onError;
@@ -138,6 +150,10 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
138
150
  });
139
151
  }
140
152
  // callback handles the result of server-side rendering
153
+ /**
154
+ * @param {Error | null} error
155
+ * @param {RenderResponse} result
156
+ */
141
157
  function handleRenderingResult(error, result) {
142
158
  return __awaiter(this, void 0, void 0, function () {
143
159
  var _a, content, finalStatusCode;
@@ -178,7 +194,7 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
178
194
  if (!result.status) {
179
195
  result.status = 302;
180
196
  }
181
- proxyResponse.headers['location'] = result.redirect;
197
+ proxyResponse.headers.location = result.redirect;
182
198
  }
183
199
  finalStatusCode = result.status || proxyResponse.statusCode || http_status_codes_1.default.OK;
184
200
  if (config.debug) {
@@ -191,6 +207,11 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
191
207
  });
192
208
  });
193
209
  }
210
+ /**
211
+ * @param {Buffer | null} content
212
+ * @param {number} statusCode
213
+ * @param {any} [headers]
214
+ */
194
215
  function completeProxyResponse(content, statusCode, headers) {
195
216
  if (!headers) {
196
217
  headers = proxyResponse.headers;
@@ -200,6 +221,9 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
200
221
  originalWrite.call(serverResponse, content);
201
222
  originalEnd.call(serverResponse);
202
223
  }
224
+ /**
225
+ * @param {any} layoutServiceData
226
+ */
203
227
  function createViewBag(layoutServiceData) {
204
228
  return __awaiter(this, void 0, void 0, function () {
205
229
  var viewBag, customViewBag;
@@ -232,7 +256,7 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
232
256
  delete proxyResponse.headers['content-length'];
233
257
  proxyResponse.headers['content-type'] = 'text/html; charset=utf-8';
234
258
  // remove IIS server header for security
235
- delete proxyResponse.headers['server'];
259
+ delete proxyResponse.headers.server;
236
260
  if (config.setHeaders) {
237
261
  config.setHeaders(request, serverResponse, proxyResponse);
238
262
  }
@@ -287,6 +311,13 @@ function renderAppToResponse(proxyResponse, request, serverResponse, renderer, c
287
311
  });
288
312
  });
289
313
  }
314
+ /**
315
+ * @param {IncomingMessage} proxyResponse
316
+ * @param {any} request
317
+ * @param {ServerResponse} serverResponse
318
+ * @param {AppRenderer} renderer
319
+ * @param {ProxyConfig} config
320
+ */
290
321
  function handleProxyResponse(proxyResponse, request, serverResponse, renderer, config) {
291
322
  exports.removeEmptyAnalyticsCookie(proxyResponse);
292
323
  if (config.debug) {
@@ -306,6 +337,12 @@ function handleProxyResponse(proxyResponse, request, serverResponse, renderer, c
306
337
  // the answer: the proxy middleware ends the response and does not "chain"
307
338
  return renderAppToResponse(proxyResponse, request, serverResponse, renderer, config);
308
339
  }
340
+ /**
341
+ * @param {string} reqPath
342
+ * @param {any} req
343
+ * @param {ProxyConfig} config
344
+ * @param {RouteUrlParser} parseRouteUrl
345
+ */
309
346
  function rewriteRequestPath(reqPath, req, config, parseRouteUrl) {
310
347
  // the path comes in URL-encoded by default,
311
348
  // but we don't want that because...
@@ -356,7 +393,7 @@ function rewriteRequestPath(reqPath, req, config, parseRouteUrl) {
356
393
  qs += "&" + routeParams.qsParams;
357
394
  }
358
395
  if (config.debug) {
359
- console.log("DEBUG: parseRouteUrl() result", routeParams);
396
+ console.log('DEBUG: parseRouteUrl() result', routeParams);
360
397
  }
361
398
  }
362
399
  }
@@ -370,6 +407,11 @@ function rewriteRequestPath(reqPath, req, config, parseRouteUrl) {
370
407
  return path;
371
408
  }
372
409
  exports.rewriteRequestPath = rewriteRequestPath;
410
+ /**
411
+ * @param {string} originalUrl
412
+ * @param {ProxyConfig} config
413
+ * @param {boolean} noDebug
414
+ */
373
415
  function isUrlIgnored(originalUrl, config, noDebug) {
374
416
  if (noDebug === void 0) { noDebug = false; }
375
417
  if (config.pathRewriteExcludePredicate && config.pathRewriteExcludeRoutes) {
@@ -404,6 +446,13 @@ function isUrlIgnored(originalUrl, config, noDebug) {
404
446
  }
405
447
  return false;
406
448
  }
449
+ /**
450
+ * @param {any} proxyReq
451
+ * @param {any} req
452
+ * @param {ServerResponse} res
453
+ * @param {ProxyConfig} config
454
+ * @param {Function} customOnProxyReq
455
+ */
407
456
  function handleProxyRequest(proxyReq, req, res, config, customOnProxyReq) {
408
457
  // if a HEAD request, we still need to issue a GET so we can return accurate headers
409
458
  // proxyReq defined as 'any' to allow us to mutate this
@@ -418,6 +467,11 @@ function handleProxyRequest(proxyReq, req, res, config, customOnProxyReq) {
418
467
  customOnProxyReq(proxyReq, req, res);
419
468
  }
420
469
  }
470
+ /**
471
+ * @param {AppRenderer} renderer
472
+ * @param {ProxyConfig} config
473
+ * @param {RouteUrlParser} parseRouteUrl
474
+ */
421
475
  function createOptions(renderer, config, parseRouteUrl) {
422
476
  var _a;
423
477
  if (!config.maxResponseSizeBytes) {
@@ -433,8 +487,15 @@ function createOptions(renderer, config, parseRouteUrl) {
433
487
  console.log('DEBUG: Final proxy config', config);
434
488
  }
435
489
  var customOnProxyReq = (_a = config.proxyOptions) === null || _a === void 0 ? void 0 : _a.onProxyReq;
436
- return __assign(__assign({}, config.proxyOptions), { target: config.apiHost, changeOrigin: true, ws: true, pathRewrite: function (reqPath, req) { return rewriteRequestPath(reqPath, req, config, parseRouteUrl); }, logLevel: config.debug ? 'debug' : 'info', onProxyReq: function (proxyReq, req, res) { return handleProxyRequest(proxyReq, req, res, config, customOnProxyReq); }, onProxyRes: function (proxyRes, req, res) { return handleProxyResponse(proxyRes, req, res, renderer, config); } });
490
+ return __assign(__assign({}, config.proxyOptions), { target: config.apiHost, changeOrigin: true, ws: true, pathRewrite: function (reqPath, req) { return rewriteRequestPath(reqPath, req, config, parseRouteUrl); }, logLevel: config.debug ? 'debug' : 'info', onProxyReq: function (proxyReq, req, res) {
491
+ return handleProxyRequest(proxyReq, req, res, config, customOnProxyReq);
492
+ }, onProxyRes: function (proxyRes, req, res) { return handleProxyResponse(proxyRes, req, res, renderer, config); } });
437
493
  }
494
+ /**
495
+ * @param {AppRenderer} renderer
496
+ * @param {ProxyConfig} config
497
+ * @param {RouteUrlParser} parseRouteUrl
498
+ */
438
499
  function scProxy(renderer, config, parseRouteUrl) {
439
500
  var options = createOptions(renderer, config, parseRouteUrl);
440
501
  return http_proxy_middleware_1.default(options);
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@sitecore-jss/sitecore-jss-proxy",
3
- "version": "16.0.0-canary.8",
3
+ "version": "16.0.1",
4
4
  "description": "Proxy middleware for express.js server.",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
7
7
  "build": "npm run clean && tsc",
8
8
  "clean": "del-cli dist types",
9
- "lint": "tslint -p . -c ../../tslint.json \"src/**/*.ts\"",
9
+ "lint": "eslint ./src/**/*.ts",
10
10
  "test": "mocha --require ts-node/register \"./src/**/*.test.ts\"",
11
11
  "prepublishOnly": "npm run build",
12
12
  "coverage": "nyc --require ts-node/register npm test"
@@ -36,11 +36,12 @@
36
36
  "@types/set-cookie-parser": "^0.0.5",
37
37
  "chai": "^4.2.0",
38
38
  "del-cli": "^3.0.1",
39
+ "eslint": "^7.15.0",
39
40
  "mocha": "^8.1.3",
40
41
  "sinon": "^7.0.0",
41
42
  "ts-node": "^8.4.1",
42
43
  "typescript": "^3.9.6"
43
44
  },
44
45
  "types": "types/index.d.ts",
45
- "gitHead": "be22a453049c318e28e73343974f371cc0300c7d"
46
+ "gitHead": "29ff3559b0c3d263ba4c84a3cfab4f1b980d9272"
46
47
  }
package/types/index.d.ts CHANGED
@@ -3,5 +3,16 @@ import { AppRenderer } from './AppRenderer';
3
3
  import { ProxyConfig } from './ProxyConfig';
4
4
  import { RouteUrlParser } from './RouteUrlParser';
5
5
  export declare const removeEmptyAnalyticsCookie: (proxyResponse: any) => void;
6
+ /**
7
+ * @param {string} reqPath
8
+ * @param {any} req
9
+ * @param {ProxyConfig} config
10
+ * @param {RouteUrlParser} parseRouteUrl
11
+ */
6
12
  export declare function rewriteRequestPath(reqPath: string, req: any, config: ProxyConfig, parseRouteUrl?: RouteUrlParser): string;
13
+ /**
14
+ * @param {AppRenderer} renderer
15
+ * @param {ProxyConfig} config
16
+ * @param {RouteUrlParser} parseRouteUrl
17
+ */
7
18
  export default function scProxy(renderer: AppRenderer, config: ProxyConfig, parseRouteUrl: RouteUrlParser): import("connect").NextHandleFunction;