eddev 2.0.0-beta.180 → 2.0.0-beta.182
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"server-context.d.ts","sourceRoot":"","sources":["../../../src/app/server/server-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAiC,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAqB,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAKxD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,eAAe,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAA;CACxC,CAAA;AAkBD;;GAEG;AACH,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,qBAAa,aAAa;IACxB,GAAG,EAAE,OAAO,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,MAAM,CAAA;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,MAAM,EAAE,QAAQ,CAAA;IAEhB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAA;gBAEd,IAAI,EAAE,iBAAiB;IAWnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAOzC,IAAI,OAAO,yBAEV;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,oBAAoB;IAI1C,YAAY,CAAC,GAAG,EAAE,MAAM;IAQlB,WAAW,CACf,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,WAAW,GAAG;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GACjE,OAAO,CAAC,QAAQ,CAAC;IAmCpB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE;IAoFvG,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE;IAwGtF,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAgC5C,qBAAqB,CAAC,GAAG,CAAC,EAAE,cAAc;IAYpC,eAAe,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAsE9E,aAAa,CAAC,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE;IAehF,IAAI,kBAAkB,aAcrB;IAED,aAAa,CAAC,YAAY,EAAE,MAAM;IAUlC,cAAc,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;CAiD9B"}
|
|
@@ -58,6 +58,10 @@ export class ServerContext {
|
|
|
58
58
|
}
|
|
59
59
|
async fetchOrigin(url, opts) {
|
|
60
60
|
url = this.getOriginUrl(url);
|
|
61
|
+
console.debug("fetching from WP", url, opts);
|
|
62
|
+
const fetchOps = { ...opts };
|
|
63
|
+
delete fetchOps.replaceUrls;
|
|
64
|
+
delete fetchOps.newOrigin;
|
|
61
65
|
const response = await fetchWP(url, {
|
|
62
66
|
...opts,
|
|
63
67
|
});
|
|
@@ -189,8 +193,8 @@ export class ServerContext {
|
|
|
189
193
|
replaceUrls: true,
|
|
190
194
|
newOrigin: req.newOrigin,
|
|
191
195
|
headers: {
|
|
192
|
-
"
|
|
193
|
-
|
|
196
|
+
"content-type": "application/json",
|
|
197
|
+
accept: "application/json",
|
|
194
198
|
},
|
|
195
199
|
redirect: "manual",
|
|
196
200
|
});
|
|
@@ -268,8 +272,8 @@ export class ServerContext {
|
|
|
268
272
|
cache: "no-cache",
|
|
269
273
|
replaceUrls: true,
|
|
270
274
|
headers: {
|
|
271
|
-
"
|
|
272
|
-
|
|
275
|
+
"content-type": "application/json",
|
|
276
|
+
accept: "application/json",
|
|
273
277
|
},
|
|
274
278
|
});
|
|
275
279
|
const result = await response.json();
|
|
@@ -308,8 +312,8 @@ export class ServerContext {
|
|
|
308
312
|
replaceUrls: true,
|
|
309
313
|
headers: {
|
|
310
314
|
...this.extractRequestHeaders(req.headers),
|
|
311
|
-
"
|
|
312
|
-
|
|
315
|
+
"content-type": "application/json",
|
|
316
|
+
accept: "application/json",
|
|
313
317
|
},
|
|
314
318
|
});
|
|
315
319
|
const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
|
|
@@ -363,8 +367,8 @@ export class ServerContext {
|
|
|
363
367
|
replaceUrls: true,
|
|
364
368
|
headers: {
|
|
365
369
|
...this.extractRequestHeaders(req.headers),
|
|
366
|
-
"
|
|
367
|
-
|
|
370
|
+
"content-type": "application/json",
|
|
371
|
+
accept: "application/json",
|
|
368
372
|
},
|
|
369
373
|
body: JSON.stringify(req.body),
|
|
370
374
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-wp.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fetch-wp.ts"],"names":[],"mappings":"AASA,
|
|
1
|
+
{"version":3,"file":"fetch-wp.d.ts","sourceRoot":"","sources":["../../../src/node/utils/fetch-wp.ts"],"names":[],"mappings":"AASA,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsB1F"}
|
|
@@ -5,7 +5,7 @@ const agent = new Agent({
|
|
|
5
5
|
rejectUnauthorized: false,
|
|
6
6
|
},
|
|
7
7
|
});
|
|
8
|
-
export function fetchWP(url, args = {}) {
|
|
8
|
+
export async function fetchWP(url, args = {}) {
|
|
9
9
|
const headers = new Headers(args.headers);
|
|
10
10
|
// If an API key has been set in the environment, use it
|
|
11
11
|
const accessKey = ProjectEnvUtils.getSafe("SITE_API_KEY");
|
|
@@ -14,11 +14,14 @@ export function fetchWP(url, args = {}) {
|
|
|
14
14
|
}
|
|
15
15
|
// Allow self-signed certificates when using a local development domain
|
|
16
16
|
let allowSelfSigned = isDevelopmentDomain(url);
|
|
17
|
-
|
|
17
|
+
console.debug("fetching from origin", { url, args, allowSelfSigned });
|
|
18
|
+
const response = (await fetch(url, {
|
|
18
19
|
...args,
|
|
19
20
|
dispatcher: allowSelfSigned ? agent : undefined,
|
|
20
21
|
headers,
|
|
21
|
-
});
|
|
22
|
+
}));
|
|
23
|
+
console.debug("fetch result", response.status, response.statusText, response.headers, response.ok);
|
|
24
|
+
return response;
|
|
22
25
|
}
|
|
23
26
|
setGlobalDispatcher(agent);
|
|
24
27
|
function isDevelopmentDomain(url) {
|