Hello world

- - - diff --git a/server/src/responders/handlers.js b/server/src/responders/handlers.js index cb7a137d3..0ee0615e7 100644 --- a/server/src/responders/handlers.js +++ b/server/src/responders/handlers.js @@ -1,158 +1,153 @@ // @flow import type { $Response, $Request } from 'express'; import { ServerError } from 'lib/utils/errors'; import { deleteCookie } from '../deleters/cookie-deleters'; import { fetchViewerForJSONRequest, addCookieToJSONResponse, fetchViewerForHomeRequest, addCookieToHomeResponse, createNewAnonymousCookie, } from '../session/cookies'; import type { Viewer } from '../session/viewer'; +import { getMessageForException } from './utils'; export type JSONResponder = (viewer: Viewer, input: any) => Promise<*>; export type DownloadResponder = ( viewer: Viewer, req: $Request, res: $Response, ) => Promise; export type HTMLResponder = DownloadResponder; export type UploadResponder = (viewer: Viewer, req: $Request) => Promise<*>; function jsonHandler( responder: JSONResponder, expectCookieInvalidation: boolean, ) { return async (req: $Request, res: $Response) => { let viewer; try { if (!req.body || typeof req.body !== 'object') { throw new ServerError('invalid_parameters'); } const { input } = req.body; viewer = await fetchViewerForJSONRequest(req); const responderResult = await responder(viewer, input); if (res.headersSent) { return; } const result = { ...responderResult }; addCookieToJSONResponse(viewer, res, result, expectCookieInvalidation); res.json({ success: true, ...result }); } catch (e) { await handleException(e, res, viewer, expectCookieInvalidation); } }; } function downloadHandler(responder: DownloadResponder) { return async (req: $Request, res: $Response) => { try { const viewer = await fetchViewerForJSONRequest(req); await responder(viewer, req, res); } catch (e) { // Passing viewer in only makes sense if we want to handle failures as // JSON. We don't, and presume all download handlers avoid ServerError. await handleException(e, res); } }; } -function getMessageForException(error: Error & { sqlMessage?: string }) { - return error.sqlMessage !== null && error.sqlMessage !== undefined - ? 'database error' - : error.message; -} - async function handleException( error: Error, res: $Response, viewer?: ?Viewer, expectCookieInvalidation?: boolean, ) { console.warn(error); if (res.headersSent) { return; } if (!(error instanceof ServerError)) { res.status(500).send(getMessageForException(error)); return; } const result: Object = error.payload ? { error: error.message, payload: error.payload } : { error: error.message }; if (viewer) { if (error.message === 'client_version_unsupported' && viewer.loggedIn) { // If the client version is unsupported, log the user out const { platformDetails } = error; const [data] = await Promise.all([ createNewAnonymousCookie({ platformDetails, deviceToken: viewer.deviceToken, }), deleteCookie(viewer.cookieID), ]); viewer.setNewCookie(data); viewer.cookieInvalidated = true; } // This can mutate the result object addCookieToJSONResponse(viewer, res, result, !!expectCookieInvalidation); } res.json(result); } function htmlHandler(responder: HTMLResponder) { return async (req: $Request, res: $Response) => { try { const viewer = await fetchViewerForHomeRequest(req); addCookieToHomeResponse(viewer, res); res.type('html'); await responder(viewer, req, res); } catch (e) { console.warn(e); if (!res.headersSent) { res.status(500).send(getMessageForException(e)); } } }; } function uploadHandler(responder: UploadResponder) { return async (req: $Request, res: $Response) => { let viewer; try { if (!req.body || typeof req.body !== 'object') { throw new ServerError('invalid_parameters'); } viewer = await fetchViewerForJSONRequest(req); const responderResult = await responder(viewer, req); if (res.headersSent) { return; } const result = { ...responderResult }; addCookieToJSONResponse(viewer, res, result, false); res.json({ success: true, ...result }); } catch (e) { await handleException(e, res, viewer); } }; } async function handleAsyncPromise(promise: Promise) { try { await promise; } catch (error) { console.warn(error); } } export { jsonHandler, downloadHandler, htmlHandler, uploadHandler, handleAsyncPromise, }; diff --git a/server/src/responders/landing-handler.js b/server/src/responders/landing-handler.js new file mode 100644 index 000000000..8e7d59c9a --- /dev/null +++ b/server/src/responders/landing-handler.js @@ -0,0 +1,61 @@ +// @flow + +import html from 'common-tags/lib/html'; +import type { $Response, $Request } from 'express'; + +import { getLandingURLFacts } from '../utils/urls'; +import { getMessageForException } from './utils'; + +async function landingHandler(req: $Request, res: $Response) { + try { + await landingResponder(req, res); + } catch (e) { + console.warn(e); + if (!res.headersSent) { + res.status(500).send(getMessageForException(e)); + } + } +} + +type AssetInfo = {| +jsURL: string |}; +let assetInfo: ?AssetInfo = null; +async function getAssetInfo() { + if (assetInfo) { + return assetInfo; + } + if (process.env.NODE_ENV === 'dev') { + assetInfo = { + jsURL: 'http://localhost:8082/dev.build.js', + }; + return assetInfo; + } + // $FlowFixMe landing_compiled/assets.json doesn't always exist + const { default: assets } = await import('../../landing_compiled/assets'); + assetInfo = { + jsURL: `compiled/${assets.browser.js}`, + }; + return assetInfo; +} + +const { basePath } = getLandingURLFacts(); + +async function landingResponder(req: $Request, res: $Response) { + const { jsURL } = await getAssetInfo(); + // prettier-ignore + res.end(html` + + + + + Hello world + + + +

+ + + + `); +} + +export default landingHandler; diff --git a/server/src/responders/utils.js b/server/src/responders/utils.js new file mode 100644 index 000000000..11b9dec07 --- /dev/null +++ b/server/src/responders/utils.js @@ -0,0 +1,11 @@ +// @flow + +function getMessageForException( + error: Error & { sqlMessage?: string }, +): string { + return error.sqlMessage !== null && error.sqlMessage !== undefined + ? 'database error' + : error.message; +} + +export { getMessageForException }; diff --git a/server/src/server.js b/server/src/server.js index a6a845327..67fa536c3 100644 --- a/server/src/server.js +++ b/server/src/server.js @@ -1,102 +1,104 @@ // @flow import cluster from 'cluster'; import cookieParser from 'cookie-parser'; import express from 'express'; import expressWs from 'express-ws'; import os from 'os'; import './cron/cron'; import { jsonEndpoints } from './endpoints'; import { jsonHandler, downloadHandler, htmlHandler, uploadHandler, } from './responders/handlers'; +import landingHandler from './responders/landing-handler'; import { errorReportDownloadResponder } from './responders/report-responders'; import { websiteResponder } from './responders/website-responders'; import { onConnection } from './socket/socket'; import { multerProcessor, multimediaUploadResponder, uploadDownloadResponder, } from './uploads/uploads'; import { getGlobalURLFacts } from './utils/urls'; const { baseRoutePath } = getGlobalURLFacts(); if (cluster.isMaster) { const cpuCount = os.cpus().length; for (let i = 0; i < cpuCount; i++) { cluster.fork(); } cluster.on('exit', () => cluster.fork()); } else { const server = express(); expressWs(server); server.use(express.json({ limit: '50mb' })); server.use(cookieParser()); const router = express.Router(); router.use('/images', express.static('images')); if (process.env.NODE_ENV === 'dev') { router.use('/fonts', express.static('fonts')); } router.use('/misc', express.static('misc')); router.use( '/.well-known', express.static( '.well-known', // Necessary for apple-app-site-association file { setHeaders: (res) => res.setHeader('Content-Type', 'application/json'), }, ), ); const compiledFolderOptions = process.env.NODE_ENV === 'dev' ? undefined : { maxAge: '1y', immutable: true }; router.use( '/compiled', express.static('app_compiled', compiledFolderOptions), ); router.use( '/commlanding/compiled', express.static('landing_compiled', compiledFolderOptions), ); router.use('/', express.static('icons')); for (const endpoint in jsonEndpoints) { // $FlowFixMe Flow thinks endpoint is string const responder = jsonEndpoints[endpoint]; const expectCookieInvalidation = endpoint === 'log_out'; router.post( `/${endpoint}`, jsonHandler(responder, expectCookieInvalidation), ); } router.get( '/download_error_report/:reportID', downloadHandler(errorReportDownloadResponder), ); router.get( '/upload/:uploadID/:secret', downloadHandler(uploadDownloadResponder), ); // $FlowFixMe express-ws has side effects that can't be typed router.ws('/ws', onConnection); + router.get('/commlanding/*', landingHandler); router.get('*', htmlHandler(websiteResponder)); router.post( '/upload_multimedia', multerProcessor, uploadHandler(multimediaUploadResponder), ); server.use(baseRoutePath, router); server.listen(parseInt(process.env.PORT, 10) || 3000, 'localhost'); }