@quintype/framework 7.31.0 → 7.31.9-host-to-api.2

package/.vscode/settings.json

@@ -8,6 +8,6 @@
   "files.insertFinalNewline": true,
   "files.trimTrailingWhitespace": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   }
 }

package/bin-dev-scripts/standard-version-release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-npm install
+npm install --legacy-peer-deps
 git diff --quiet
 npm run docs
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.31.0",
+  "version": "7.31.9-host-to-api.2",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -32,7 +32,7 @@
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
     "@quintype/amp": "^2.20.0",
-    "@quintype/backend": "^2.6.0",
+    "@quintype/backend": "2.6.0-host-to-api.2",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",
     "@quintype/seo": "^1.46.1",

package/server/api-client.js

@@ -11,7 +11,6 @@
  */
 // istanbul ignore file
 
-const config = require("./publisher-config");
 const {
   getClientImpl,
   Client,
@@ -26,19 +25,35 @@ const {
   AmpConfig,
 } = require("./impl/api-client-impl");
 
+let config = require("./publisher-config");
+
 const defaultClient = new Client(config.sketches_host);
 const cachedSecondaryClients = {};
 
+const xHostAPIToken = config["x_host_mapping_token"];
+const hostInternalDomain = config["x_host_internal_domain"];
+const enableSketchesHostResolution = config["x_enable_sketches_host_resolution"];
+
+async function mappingHost() {
+  if (enableSketchesHostResolution && xHostAPIToken && hostInternalDomain) {
+    const hostMapping = {};
+    const sketchesHostMapping = await defaultClient.getHostToAPIMappingCache(xHostAPIToken);
+
+    for (const [key, value] of Object.entries(sketchesHostMapping)) {
+      hostMapping[key] = `http://${value}${hostInternalDomain}`;
+    }
+    config.host_to_api_host = { ...hostMapping, ...config["host_to_api_host"] };
+  }
+}
+
 function getClient(hostname) {
-  return (
-    getClientImpl(config, cachedSecondaryClients, hostname) || defaultClient
-  );
+  return getClientImpl(config, cachedSecondaryClients, hostname) || defaultClient;
 }
 
 function initializeAllClients() {
   const promises = [defaultClient.getConfig()];
   if (!config.skip_warm_config) {
-    Object.entries(config.host_to_api_host || []).forEach(([host, apiHost]) => {
+    Object.entries(config["host_to_api_host"] || []).forEach(([host, apiHost]) => {
       const client = new Client(apiHost);
       cachedSecondaryClients[host] = client;
       promises.push(client.getConfig());
@@ -57,8 +72,8 @@ module.exports = {
   MenuGroups,
   Config,
   AmpConfig,
-
   client: defaultClient,
   getClient,
   initializeAllClients,
+  mappingHost
 };

package/server/publisher-config.js

@@ -10,6 +10,7 @@
  */
 // istanbul ignore file
 
+
 const fs = require("fs");
 const yaml = require("js-yaml");
 

package/server/start.js

@@ -10,10 +10,10 @@
 // istanbul ignore file
 // This is the start file, to be called from your start.js
 
-const chalk = require('chalk');
+const chalk = require("chalk");
 const cluster = require("cluster");
 const process = require("process");
-const { initializeAllClients } = require("./api-client");
+const { initializeAllClients, mappingHost } = require("./api-client");
 const logger = require("./logger");
 const logSuccess = chalk.bold.cyanBright;
 
@@ -48,9 +48,7 @@ function startMaster({ workers = 4 }) {
 
   cluster.on("exit", (worker, code, signal) => {
     logger.error(`worker ${worker.process.pid} died`);
-    const aliveWorkers = Object.values(cluster.workers).filter(
-      (worker) => worker.state !== "dead"
-    );
+    const aliveWorkers = Object.values(cluster.workers).filter((worker) => worker.state !== "dead");
 
     if (terminating) {
       if (aliveWorkers.length == 0) {
@@ -64,6 +62,8 @@ function startMaster({ workers = 4 }) {
 }
 
 async function startWorker(appThunk, opts) {
+  let setIntervalIndex = null;
+  const { hostToApiInterval } = opts;
   if (process.env.NODE_ENV !== "production") {
     require("@quintype/build")(opts);
   }
@@ -72,10 +72,11 @@ async function startWorker(appThunk, opts) {
   try {
     const app = appThunk();
 
+    await mappingHost();
     await initializeAllClients();
     const server = app.listen(opts.port || 3000, () => {
       console.log(logSuccess(`||=============================||`));
-      console.log(logSuccess(`|| App listening on port ${opts.port || 3000}! ||`))
+      console.log(logSuccess(`|| App listening on port ${opts.port || 3000}! ||`));
       console.log(logSuccess(`||=============================||`));
     });
 
@@ -86,7 +87,14 @@ async function startWorker(appThunk, opts) {
       });
     });
     process.on("SIGHUP", () => {});
+
+    if (hostToApiInterval) {
+      setIntervalIndex = setInterval(() => {
+        mappingHost();
+      }, hostToApiInterval);
+    }
   } catch (e) {
+    clearInterval(setIntervalIndex);
     if (process.env.NODE_ENV !== "production") {
       console.log(e.stack);
     }