C4type

.eslintignore

@@ -28,5 +28,5 @@ plugins/*
 !plugins/talk-plugin-deep-reply-count
 !plugins/talk-plugin-subscriber
 !plugins/talk-plugin-flag-details
-
+public
 node_modules

.gitignore

@@ -13,6 +13,7 @@ client/coral-framework/graphql/introspection.json
 .idea/
 *.swp
 *.DS_STORE
+.prettierrc.json
 
 coverage/
 test/e2e/reports/
@@ -53,3 +54,4 @@ plugins/*
 !plugins/nymag-auth
 
 **/node_modules/*
+yarn-error.log

.nodemon.json

@@ -1,5 +1,11 @@
 {
+  "exec": "npm-run-all --parallel generate-introspection start:development",
   "verbose": true,
   "ignore": ["test/*", "client/*", "dist/*", "plugins/*/client"],
-  "ext": "js,json,graphql"
+  "ext": "js,json,graphql,yml",
+  "watch": [
+    ".",
+    "bin/cli",
+    "bin/cli-serve"
+  ]
 }

Dockerfile.onbuild

@@ -5,6 +5,7 @@ ONBUILD ARG TALK_THREADING_LEVEL=3
 ONBUILD ARG TALK_DEFAULT_STREAM_TAB=all
 ONBUILD ARG TALK_DEFAULT_LANG=en
 ONBUILD ARG TALK_PLUGINS_JSON
+ONBUILD ARG TALK_WEBPACK_SOURCE_MAP
 
 # Bundle app source
 ONBUILD COPY . /usr/src/app

app.js

@@ -6,10 +6,11 @@ const merge = require('lodash/merge');
 const helmet = require('helmet');
 const plugins = require('./services/plugins');
 const compression = require('compression');
-const {HELMET_CONFIGURATION} = require('./config');
-const {MOUNT_PATH} = require('./url');
+const { HELMET_CONFIGURATION } = require('./config');
+const { MOUNT_PATH } = require('./url');
 const routes = require('./routes');
 const debug = require('debug')('talk:app');
+const { ENABLE_TRACING, APOLLO_ENGINE_KEY, PORT } = require('./config');
 const healthCheck = require('@nymdev/health-check');
 
 const app = express();
@@ -26,7 +27,7 @@ app.use((req, res, next) => {
 //==============================================================================
 
 // Inject server route plugins.
-plugins.get('server', 'app').forEach(({plugin, app: callback}) => {
+plugins.get('server', 'app').forEach(({ plugin, app: callback }) => {
   debug(`added plugin '${plugin.name}'`);
 
   // Pass the app to the plugin to mount it's routes.
@@ -42,15 +43,35 @@ if (process.env.NODE_ENV !== 'test') {
   app.use(morgan('dev'));
 }
 
+if (ENABLE_TRACING && APOLLO_ENGINE_KEY) {
+  const { Engine } = require('apollo-engine');
+
+  const engine = new Engine({
+    engineConfig: {
+      apiKey: APOLLO_ENGINE_KEY,
+    },
+    graphqlPort: PORT,
+    endpoint: `${MOUNT_PATH}api/v1/graph/ql`,
+  });
+
+  engine.start();
+
+  app.use(engine.expressMiddleware());
+}
+
 // Trust the first proxy in front of us, this will enable us to trust the fact
 // that SSL was terminated correctly.
 app.set('trust proxy', 1);
 
 // Enable a suite of security good practices through helmet. We disable
 // frameguard to allow crossdomain injection of the embed.
-app.use(helmet(merge(HELMET_CONFIGURATION, {
-  frameguard: false,
-})));
+app.use(
+  helmet(
+    merge(HELMET_CONFIGURATION, {
+      frameguard: false,
+    })
+  )
+);
 
 // Compress the responses if appropriate.
 app.use(compression());
@@ -69,20 +90,17 @@ app.set('view engine', 'ejs');
 debug(`mounting routes on the ${MOUNT_PATH} path`);
 
 // add health check
-app.use(healthCheck({
-  env: [
-    'TALK_MONGO_URL',
-    'TALK_REDIS_URL',
-    'TALK_ROOT_URL',
-    'TALK_PORT'
-  ],
-  required: [
-    'TALK_MONGO_URL',
-    'TALK_REDIS_URL',
-    'TALK_ROOT_URL',
-    'TALK_PORT'
-  ]
-}));
+app.use(
+  healthCheck({
+    env: ['TALK_MONGO_URL', 'TALK_REDIS_URL', 'TALK_ROOT_URL', 'TALK_PORT'],
+    required: [
+      'TALK_MONGO_URL',
+      'TALK_REDIS_URL',
+      'TALK_ROOT_URL',
+      'TALK_PORT',
+    ],
+  })
+);
 
 // Actually apply the routes.
 app.use(MOUNT_PATH, routes);

appspec.yml

@@ -10,6 +10,6 @@ hooks:
     - location: ./scripts/aws/AfterInstall.sh
   ApplicationStart:
     - location: ./scripts/aws/ApplicationStart.sh
-  ValidateService:
-    - location: ./scripts/aws/ValidateService.sh
-      timeout: 300
+#  ValidateService:
+#    - location: ./scripts/aws/ValidateService.sh
+#      timeout: 300

bin/cli

@@ -4,8 +4,9 @@
  * Module dependencies.
  */
 
-const program = require('./commander');
-const {head, map} = require('lodash');
+require('./util');
+const program = require('commander');
+const { head, map } = require('lodash');
 const Matcher = require('did-you-mean');
 
 program
@@ -25,33 +26,35 @@ program
   .parse(process.argv);
 
 // If the command wasn't found, output help.
-const cmds = map(program.commands, '_name');
-const cmd = head(program.args);
-if (!cmds.includes(cmd)) {
-  const m = new Matcher(cmds);
-  const similarCMDs = m.list(cmd);
+const commands = map(program.commands, '_name');
+const command = head(program.args);
+if (!commands.includes(command)) {
+  const m = new Matcher(commands);
+  const similarCommands = m.list(command);
 
-  console.error(`cli '${cmd}' is not a talk cli command. See 'cli --help'.`);
-  if (similarCMDs.length > 0) {
-    const sc = similarCMDs.map(({value}) => `\t${value}\n`).join('');
+  console.error(
+    `cli '${command}' is not a talk cli command. See 'cli --help'.`
+  );
+  if (similarCommands.length > 0) {
+    const sc = similarCommands.map(({ value }) => `\t${value}\n`).join('');
     console.error(`\nThe most similar commands are\n${sc}`);
   }
   process.exit(1);
 }
 
-/**
- * When this provess exists, check to see if we have a running command, if we do
- * check to see if it is still running. If it is, then kill it with a SIGINT
- * signal. This is for the use case where we want to kill the process that is
- * labled with the PID written out by the parent process.
- */
-process.once('exit', () => {
-  if (
+// /**
+//  * When this process exists, check to see if we have a running command, if we do
+//  * check to see if it is still running. If it is, then kill it with a SIGINT
+//  * signal. This is for the use case where we want to kill the process that is
+//  * labeled with the PID written out by the parent process.
+//  */
+// process.once('exit', () => {
+//   if (
 
-    // program.runningCommand &&
-    program.runningCommand.killed === false &&
-    program.runningCommand.exitCode === null
-  ) {
-    program.runningCommand.kill('SIGINT');
-  }
-});
+//     // program.runningCommand &&
+//     program.runningCommand.killed === false &&
+//     program.runningCommand.exitCode === null
+//   ) {
+//     program.runningCommand.kill('SIGINT');
+//   }
+// });