@elliemae/pui-cli 8.42.0-alpha.1 → 8.42.0-alpha.2

package/dist/cjs/server/csp.js

@@ -80,7 +80,7 @@ const csp = (app) => {
         useDefaults: false,
         directives: {
           defaultSrc: import_helmet.default.contentSecurityPolicy.dangerouslyDisableDefaultSrc,
-          baseUri: ["'none'"],
+          baseUri: ["'self'"],
           frameAncestors: sources,
           objectSrc: ["'none'"],
           scriptSrc: getScriptSrc(),

package/dist/cjs/server/index.js

@@ -21,6 +21,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var import_node_https = __toESM(require("node:https"), 1);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
 var import_express = __toESM(require("express"), 1);
 var import_logger = require("./logger.js");
 var import_middlewares = require("./middlewares.js");
@@ -32,14 +35,21 @@ var import_wsServer = require("./wsServer.js");
   (0, import_middlewares.setupDefaultMiddlewares)(app);
   await (0, import_appRoutes.loadRoutes)(app);
   (0, import_middlewares.setupAdditionalMiddlewars)(app);
-  app.listen(import_utils.port, import_utils.host, () => {
+  const options = {
+    pfx: import_node_fs.default.readFileSync(import_node_path.default.join(__dirname, "./certs/uiplatform.p12")),
+    passPhrase: "uiplatform"
+  };
+  const server = import_node_https.default.createServer(options, app);
+  server.listen(import_utils.port, import_utils.host, () => {
+    (0, import_wsServer.createWSServer)({ server }).then((wsServer) => {
+      app.locals.wsServer = wsServer;
+    }).catch((err) => {
+      import_logger.logger.error(err);
+      process.exit(1);
+    });
     import_logger.logger.appStarted(import_utils.port.toString(), import_utils.host || "localhost");
   }).on("error", (err) => {
     import_logger.logger.error(err);
     process.exit(1);
   });
-  const { wsServer } = await (0, import_wsServer.createWSServer)({
-    port: import_utils.wsPort
-  });
-  app.locals.wsServer = wsServer;
 })();

package/dist/cjs/server/wsServer.js

@@ -31,10 +31,8 @@ __export(wsServer_exports, {
   createWSServer: () => createWSServer
 });
 module.exports = __toCommonJS(wsServer_exports);
-var import_node_http = __toESM(require("node:http"), 1);
 var wsLib = __toESM(require("ws"), 1);
 const PING_INTERVAL = 3e4;
-const DEFAULT_PORT = 5001;
 const onSocketError = (err) => {
   console.error(err);
 };
@@ -50,7 +48,7 @@ const getAuthToken = (protocols) => {
   return authProtocol.split("--")[1]?.trim?.();
 };
 const createWSServer = ({
-  port = DEFAULT_PORT,
+  server,
   pingInterval = PING_INTERVAL,
   onOpen
 }) => {
@@ -58,9 +56,8 @@ const createWSServer = ({
   const heartbeat = () => {
     isAlive = true;
   };
-  const httpServer = import_node_http.default.createServer();
-  const wsServer = new wsLib.WebSocketServer({ noServer: true });
-  httpServer.on("upgrade", (req, socket, head) => {
+  const wsServer = new wsLib.WebSocketServer({ server });
+  server.on("upgrade", (req, socket, head) => {
     socket.on("error", onSocketError);
     wsServer.handleUpgrade(req, socket, head, (ws) => {
       const protocols = req.headers["sec-websocket-protocol"]?.split(",");
@@ -116,10 +113,5 @@ const createWSServer = ({
   wsServer.on("close", function close() {
     clearInterval(interval);
   });
-  return new Promise((resolve) => {
-    httpServer.listen(port, () => {
-      console.log(`Websocket server listening on port ${port}`);
-      return resolve({ httpServer, wsServer });
-    });
-  });
+  return Promise.resolve(wsServer);
 };

package/dist/cjs/webpack/webpack.dev.babel.js

@@ -44,7 +44,6 @@ var import_middlewares = require("../server/middlewares.js");
 var import_appRoutes = require("../server/appRoutes.js");
 var import_helpers = require("./helpers.js");
 var import_webpack_base_babel = require("./webpack.base.babel.js");
-var import_utils = require("../server/utils.js");
 var import_wsServer = require("../server/wsServer.js");
 const import_meta = {};
 const __filename = (0, import_node_url.fileURLToPath)(import_meta.url);
@@ -112,7 +111,8 @@ const devConfig = {
         appLoaderScriptPath,
         diagnosticsScriptPath,
         encwLoaderScriptPath,
-        googleTagManager: (0, import_helpers.isGoogleTagManagerEnabled)()
+        googleTagManager: (0, import_helpers.isGoogleTagManagerEnabled)(),
+        csp: process.env.CSP === "true"
       }
     }),
     // new CspPlugin(HtmlWebpackPlugin, {
@@ -150,6 +150,13 @@ const devConfig = {
     hot: true,
     open: [basePath],
     port: process.env.PORT || "auto",
+    server: {
+      type: "https",
+      options: {
+        pfx: import_node_path.default.join(__dirname, "../server/certs/uiplatform.p12"),
+        passphrase: "uiplatform"
+      }
+    },
     setupMiddlewares: (middlewares, devServer) => {
       (0, import_interceptor_middleware.addCSPNonceMiddleware)(middlewares);
       if (devServer.app) {
@@ -168,8 +175,8 @@ const devConfig = {
           next();
         });
         (0, import_wsServer.createWSServer)({
-          port: import_utils.wsPort
-        }).then(({ wsServer }) => {
+          server: devServer.server
+        }).then((wsServer) => {
           if (devServer.app) devServer.app.locals.wsServer = wsServer;
         }).catch((err) => {
           console.error(err);

package/dist/cjs/webpack/webpack.prod.babel.js

@@ -137,7 +137,8 @@ const htmlWebpackPlugin = new import_html_webpack_plugin.default({
     appLoaderScriptPath,
     diagnosticsScriptPath,
     encwLoaderScriptPath,
-    googleTagManager: (0, import_helpers.isGoogleTagManagerEnabled)()
+    googleTagManager: (0, import_helpers.isGoogleTagManagerEnabled)(),
+    csp: process.env.CSP === "true"
   }
 });
 const config = (0, import_webpack_base_babel.baseConfig)(getProdConfig());

package/dist/esm/server/csp.js

@@ -46,7 +46,7 @@ const csp = (app) => {
         useDefaults: false,
         directives: {
           defaultSrc: helmet.contentSecurityPolicy.dangerouslyDisableDefaultSrc,
-          baseUri: ["'none'"],
+          baseUri: ["'self'"],
           frameAncestors: sources,
           objectSrc: ["'none'"],
           scriptSrc: getScriptSrc(),

package/dist/esm/server/index.js

@@ -1,10 +1,13 @@
+import https from "node:https";
+import fs from "node:fs";
+import path from "node:path";
 import express from "express";
 import { logger } from "./logger.js";
 import {
   setupDefaultMiddlewares,
   setupAdditionalMiddlewars
 } from "./middlewares.js";
-import { port, wsPort, host } from "./utils.js";
+import { port, host } from "./utils.js";
 import { loadRoutes } from "./appRoutes.js";
 import { createWSServer } from "./wsServer.js";
 (async function startServer() {
@@ -12,14 +15,21 @@ import { createWSServer } from "./wsServer.js";
   setupDefaultMiddlewares(app);
   await loadRoutes(app);
   setupAdditionalMiddlewars(app);
-  app.listen(port, host, () => {
+  const options = {
+    pfx: fs.readFileSync(path.join(__dirname, "./certs/uiplatform.p12")),
+    passPhrase: "uiplatform"
+  };
+  const server = https.createServer(options, app);
+  server.listen(port, host, () => {
+    createWSServer({ server }).then((wsServer) => {
+      app.locals.wsServer = wsServer;
+    }).catch((err) => {
+      logger.error(err);
+      process.exit(1);
+    });
     logger.appStarted(port.toString(), host || "localhost");
   }).on("error", (err) => {
     logger.error(err);
     process.exit(1);
   });
-  const { wsServer } = await createWSServer({
-    port: wsPort
-  });
-  app.locals.wsServer = wsServer;
 })();

package/dist/esm/server/wsServer.js

@@ -1,7 +1,5 @@
-import http from "node:http";
 import * as wsLib from "ws";
 const PING_INTERVAL = 3e4;
-const DEFAULT_PORT = 5001;
 const onSocketError = (err) => {
   console.error(err);
 };
@@ -17,7 +15,7 @@ const getAuthToken = (protocols) => {
   return authProtocol.split("--")[1]?.trim?.();
 };
 const createWSServer = ({
-  port = DEFAULT_PORT,
+  server,
   pingInterval = PING_INTERVAL,
   onOpen
 }) => {
@@ -25,9 +23,8 @@ const createWSServer = ({
   const heartbeat = () => {
     isAlive = true;
   };
-  const httpServer = http.createServer();
-  const wsServer = new wsLib.WebSocketServer({ noServer: true });
-  httpServer.on("upgrade", (req, socket, head) => {
+  const wsServer = new wsLib.WebSocketServer({ server });
+  server.on("upgrade", (req, socket, head) => {
     socket.on("error", onSocketError);
     wsServer.handleUpgrade(req, socket, head, (ws) => {
       const protocols = req.headers["sec-websocket-protocol"]?.split(",");
@@ -83,12 +80,7 @@ const createWSServer = ({
   wsServer.on("close", function close() {
     clearInterval(interval);
   });
-  return new Promise((resolve) => {
-    httpServer.listen(port, () => {
-      console.log(`Websocket server listening on port ${port}`);
-      return resolve({ httpServer, wsServer });
-    });
-  });
+  return Promise.resolve(wsServer);
 };
 export {
   createWSServer

package/dist/esm/webpack/webpack.dev.babel.js

@@ -15,7 +15,6 @@ import {
   isGoogleTagManagerEnabled
 } from "./helpers.js";
 import { baseConfig } from "./webpack.base.babel.js";
-import { wsPort } from "../server/utils.js";
 import { createWSServer } from "../server/wsServer.js";
 const __filename = fileURLToPath(import.meta.url);
 const {
@@ -82,7 +81,8 @@ const devConfig = {
         appLoaderScriptPath,
         diagnosticsScriptPath,
         encwLoaderScriptPath,
-        googleTagManager: isGoogleTagManagerEnabled()
+        googleTagManager: isGoogleTagManagerEnabled(),
+        csp: process.env.CSP === "true"
       }
     }),
     // new CspPlugin(HtmlWebpackPlugin, {
@@ -120,6 +120,13 @@ const devConfig = {
     hot: true,
     open: [basePath],
     port: process.env.PORT || "auto",
+    server: {
+      type: "https",
+      options: {
+        pfx: path.join(__dirname, "../server/certs/uiplatform.p12"),
+        passphrase: "uiplatform"
+      }
+    },
     setupMiddlewares: (middlewares, devServer) => {
       addCSPNonceMiddleware(middlewares);
       if (devServer.app) {
@@ -138,8 +145,8 @@ const devConfig = {
           next();
         });
         createWSServer({
-          port: wsPort
-        }).then(({ wsServer }) => {
+          server: devServer.server
+        }).then((wsServer) => {
           if (devServer.app) devServer.app.locals.wsServer = wsServer;
         }).catch((err) => {
           console.error(err);

package/dist/esm/webpack/webpack.prod.babel.js

@@ -109,7 +109,8 @@ const htmlWebpackPlugin = new HtmlWebpackPlugin({
     appLoaderScriptPath,
     diagnosticsScriptPath,
     encwLoaderScriptPath,
-    googleTagManager: isGoogleTagManagerEnabled()
+    googleTagManager: isGoogleTagManagerEnabled(),
+    csp: process.env.CSP === "true"
   }
 });
 const config = baseConfig(getProdConfig());

package/dist/types/lib/server/wsServer.d.ts

@@ -1,12 +1,8 @@
-import http from 'node:http';
+import https from 'node:https';
 import * as wsLib from 'ws';
-export interface Servers {
-    httpServer: http.Server;
-    wsServer: wsLib.WebSocketServer;
-}
 export interface WSServerOptions {
-    port?: number;
+    server: https.Server;
     pingInterval?: number;
     onOpen?: (webSocket: wsLib.WebSocket) => void;
 }
-export declare const createWSServer: ({ port, pingInterval, onOpen, }: WSServerOptions) => Promise<Servers>;
+export declare const createWSServer: ({ server, pingInterval, onOpen, }: WSServerOptions) => Promise<wsLib.WebSocketServer>;