eddev 2.0.0-beta.182 → 2.0.0-beta.185

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.
Files changed (4) hide show
  1. package/dist/app/server/server-context.d.ts.map +1 -1
  2. package/dist/app/server/server-context.js +28 -35
  3. package/dist/node/utils/fetch-wp.js +1 -1
  4. package/package.json +1 -1
package/dist/app/server/server-context.d.ts.map CHANGED
@@ -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;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"}
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;IA4D9E,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"}
package/dist/app/server/server-context.js CHANGED
@@ -2,7 +2,7 @@ import { parseURL, stringifyParsedURL, withQuery, withTrailingSlash } from "ufo"
2
2
  import { fetchWP } from "../../node/utils/fetch-wp.js";
3
3
  import { filterHeader } from "./utils/headers.js";
4
4
  import { createUrlReplacer } from "./utils/replace-host.js";
5
- import { pageCache, swr } from "./utils/swr-cache.js";
5
+ import { pageCache, queryCache, swr } from "./utils/swr-cache.js";
6
6
  import { QueryMonitor } from "../utils/query-monitor.js";
7
7
  import chalk from "chalk";
8
8
  import { inspect } from "node:util";
@@ -63,7 +63,7 @@ export class ServerContext {
63
63
  delete fetchOps.replaceUrls;
64
64
  delete fetchOps.newOrigin;
65
65
  const response = await fetchWP(url, {
66
- ...opts,
66
+ ...fetchOps,
67
67
  });
68
68
  if (!response.ok) {
69
69
  console.debug("fetchOrigin NOT OK", response.status, response.statusText);
@@ -193,8 +193,8 @@ export class ServerContext {
193
193
  replaceUrls: true,
194
194
  newOrigin: req.newOrigin,
195
195
  headers: {
196
- "content-type": "application/json",
197
- accept: "application/json",
196
+ "Content-Type": "application/json",
197
+ Accept: "application/json",
198
198
  },
199
199
  redirect: "manual",
200
200
  });
@@ -272,8 +272,8 @@ export class ServerContext {
272
272
  cache: "no-cache",
273
273
  replaceUrls: true,
274
274
  headers: {
275
- "content-type": "application/json",
276
- accept: "application/json",
275
+ "Content-Type": "application/json",
276
+ Accept: "application/json",
277
277
  },
278
278
  });
279
279
  const result = await response.json();
@@ -306,30 +306,25 @@ export class ServerContext {
306
306
  const url = `/wp-json/ed/v1/query/${req.name}?params=${encodeURIComponent(JSON.stringify(req.params))}`;
307
307
  const key = `fetchNamedQuery:${req.name}:${JSON.stringify(req.params)}`;
308
308
  const fetch = async () => {
309
- console.debug("fetching");
310
309
  const result = await this.fetchOrigin(url, {
311
310
  cache: "no-cache",
312
311
  replaceUrls: true,
313
312
  headers: {
314
313
  ...this.extractRequestHeaders(req.headers),
315
- "content-type": "application/json",
316
- accept: "application/json",
314
+ "Content-Type": "application/json",
315
+ Accept: "application/json",
317
316
  },
318
317
  });
319
318
  const preferredCacheDuration = parseInt(result.headers.get("x-ed-cache-duration") ?? "");
320
- console.debug("fetched", result.status, result.headers);
321
319
  let resultStatus = result.status;
322
320
  let resultHeaders = result.headers;
323
- console.debug("fetchNamedQuery Text" + (await result.text()));
324
321
  let resultData = await result.json();
325
- console.debug("fetchNamedQuery" + JSON.stringify(resultData, null, 2));
326
- // if (resultData && typeof resultData === "object") {
327
- // resultData.__generated = new Date().toISOString()
328
- // }
329
- // if (resultData.queryMonitor) {
330
- // this.debugLogQueryMonitor("query", req.name, resultData.queryMonitor)
331
- // }
332
- console.debug("Parsed? " + JSON.stringify(resultData, null, 2));
322
+ if (resultData && typeof resultData === "object") {
323
+ resultData.__generated = new Date().toISOString();
324
+ }
325
+ if (resultData.queryMonitor) {
326
+ this.debugLogQueryMonitor("query", req.name, resultData.queryMonitor);
327
+ }
333
328
  return {
334
329
  status: resultStatus,
335
330
  headers: resultHeaders,
@@ -340,20 +335,18 @@ export class ServerContext {
340
335
  // If headers like 'Authorization' are set, then we shouldn't cache.
341
336
  const hasVariedHeaders = VARIES_HEADERS.some((key) => !!req.headers[key]);
342
337
  // Get the result, either from cache or by fetching.
343
- // const result = hasVariedHeaders
344
- // ? await fetch()
345
- // : await swr({
346
- // key,
347
- // cache: queryCache,
348
- // forceFresh: this.dev,
349
- // getFreshValue: async (ctx) => {
350
- // const result = await fetch()
351
- // ctx.metadata.ttl = result.cacheTime
352
- // return result
353
- // },
354
- // })
355
- const result = await fetch();
356
- console.debug("Returning " + JSON.stringify(result, null, 2));
338
+ const result = hasVariedHeaders
339
+ ? await fetch()
340
+ : await swr({
341
+ key,
342
+ cache: queryCache,
343
+ forceFresh: this.dev,
344
+ getFreshValue: async (ctx) => {
345
+ const result = await fetch();
346
+ ctx.metadata.ttl = result.cacheTime;
347
+ return result;
348
+ },
349
+ });
357
350
  return new Response(result.data, {
358
351
  status: result.status,
359
352
  headers: result.headers,
@@ -367,8 +360,8 @@ export class ServerContext {
367
360
  replaceUrls: true,
368
361
  headers: {
369
362
  ...this.extractRequestHeaders(req.headers),
370
- "content-type": "application/json",
371
- accept: "application/json",
363
+ "Content-Type": "application/json",
364
+ Accept: "application/json",
372
365
  },
373
366
  body: JSON.stringify(req.body),
374
367
  });
package/dist/node/utils/fetch-wp.js CHANGED
@@ -14,7 +14,7 @@ export async 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
- console.debug("fetching from origin", { url, args, allowSelfSigned });
17
+ console.debug("fetching from origin", { url, args, allowSelfSigned, headers });
18
18
  const response = (await fetch(url, {
19
19
  ...args,
20
20
  dispatcher: allowSelfSigned ? agent : undefined,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eddev",
3
- "version": "2.0.0-beta.182",
3
+ "version": "2.0.0-beta.185",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "type": "module",