@agnostack/next-shopify 1.7.1-beta.32 → 1.7.1-beta.33
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.
|
@@ -8,6 +8,7 @@ exports.handleProxy = void 0;
|
|
|
8
8
|
const http_proxy_1 = __importDefault(require("http-proxy"));
|
|
9
9
|
const nextjs_cors_1 = __importDefault(require("nextjs-cors"));
|
|
10
10
|
const utils_1 = require("../../utils");
|
|
11
|
+
const PROXY_TIMEOUT = 6000; // NOTE: 6 seconds
|
|
11
12
|
const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
12
13
|
const proxy = http_proxy_1.default.createProxy();
|
|
13
14
|
const { TARGET_SAFELIST, ORIGIN_SAFELIST } = serverRuntimeConfig;
|
|
@@ -29,13 +30,11 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
29
30
|
optionsSuccessStatus: 200, // some legacy browsers (IE11, various SmartTVs) choke on 204
|
|
30
31
|
});
|
|
31
32
|
const { target: _target } = _params !== null && _params !== void 0 ? _params : {};
|
|
32
|
-
const { origin: target, pathname, search } = _target ? new URL(_target) : {};
|
|
33
|
+
const { origin: target, hostname, pathname, search } = _target ? new URL(_target) : {};
|
|
33
34
|
const targetUrl = [pathname, search].filter(utils_1.stringNotEmpty).join('');
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
// }
|
|
38
|
-
// const { query: _query, headers: _headers, body, method } = req
|
|
35
|
+
if (!targetUrl || utils_1.arrayEmpty(TARGET_SAFELIST) || !TARGET_SAFELIST.includes(hostname)) {
|
|
36
|
+
return res.status(407).json({ message: 'Unproxyable target.' });
|
|
37
|
+
}
|
|
39
38
|
const { query: _query, headers: _headers } = req;
|
|
40
39
|
const { shop: _shop, host: _host } = _query !== null && _query !== void 0 ? _query : {};
|
|
41
40
|
// TODO: explore moving this to sessionToken middleware??
|
|
@@ -52,17 +51,17 @@ const handleProxy = (serverRuntimeConfig) => async (req, res, _params) => {
|
|
|
52
51
|
}
|
|
53
52
|
// TODO: explore adding hmac check/middleware?
|
|
54
53
|
return new Promise((_resolve, reject) => {
|
|
55
|
-
|
|
56
|
-
req.url = new URL(_target);
|
|
57
|
-
console.log(`>>> > returnnewPromise2 > req.url after:`, { yep: req.url, targetUrl });
|
|
58
|
-
/**
|
|
59
|
-
* if an error occurs in the proxy, we will reject the promise.
|
|
60
|
-
* it is so important. if you don't reject the promise,
|
|
61
|
-
* you're facing the stalled requests issue.
|
|
62
|
-
*/
|
|
54
|
+
req.url = targetUrl;
|
|
63
55
|
proxy.once('error', reject);
|
|
64
56
|
// TODO: addd secure:true?? (and explore other params)
|
|
65
|
-
proxy.web(req, res, {
|
|
57
|
+
proxy.web(req, res, {
|
|
58
|
+
target,
|
|
59
|
+
timeout: PROXY_TIMEOUT,
|
|
60
|
+
proxyTimeout: PROXY_TIMEOUT,
|
|
61
|
+
followRedirects: false,
|
|
62
|
+
changeOrigin: true,
|
|
63
|
+
secure: true,
|
|
64
|
+
});
|
|
66
65
|
});
|
|
67
66
|
};
|
|
68
67
|
exports.handleProxy = handleProxy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":";;;;;;AAAA,gDAAgD;AAChD,4DAAkC;AAClC,8DAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/handlers/api/proxy.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agnostack/next-shopify",
|
|
3
|
-
"version": "1.7.1-beta.
|
|
3
|
+
"version": "1.7.1-beta.33",
|
|
4
4
|
"author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
|
|
5
5
|
"owner": "agnoStack",
|
|
6
6
|
"description": "Please contact agnoStack via info@agnostack.com for any questions",
|