underpost 2.8.885 → 2.8.886

package/src/ws/IoServer.js

@@ -15,7 +15,7 @@ import http from 'http';
 const logger = loggerFactory(import.meta);
 
 /**
- * @class
+ * @class IoServerClass
  * @alias IoServerClass
  * @memberof SocketIoServer
  * @classdesc Provides a static factory method to create and configure a Socket.IO server,
@@ -37,6 +37,7 @@ class IoServerClass {
    * @returns {object} return.meta - The module's import meta object (`import.meta`).
    */
   static create(httpServer, options = {}, ConnectionHandler = () => {}) {
+    logger.info('origins', options.origins);
     const wsOptions = {
       cors: {
         origins: options.origins,

package/src/ws/core/core.ws.connection.js

@@ -13,7 +13,7 @@ import { Socket } from 'socket.io'; // Added for JSDoc type hinting
 const logger = loggerFactory(import.meta);
 
 /**
- * @class
+ * @class CoreWsConnectionManager
  * @alias CoreWsConnectionManager
  * @memberof CoreWsConnection
  * @classdesc Manages the lifecycle of a new WebSocket connection, setting up listeners for

package/src/ws/core/core.ws.emit.js

@@ -10,7 +10,7 @@ import { Socket } from 'socket.io';
 const logger = loggerFactory(import.meta);
 
 /**
- * @class
+ * @class CoreWsEmitter
  * @alias CoreWsEmitter
  * @memberof CoreWsEmitter
  * @classdesc Provides a static utility method for safely emitting messages over a WebSocket connection.

package/src/ws/core/core.ws.server.js

@@ -16,7 +16,7 @@ import http from 'http'; // Added for JSDoc type hinting
 // https://socket.io/docs/v3/
 
 /**
- * @class
+ * @class CoreWsServerClass
  * @alias CoreWsServerClass
  * @memberof CoreWsServer
  * @classdesc Manages the creation and initialization of the main WebSocket server,

package/manifests/maas/lxd-preseed.yaml

@@ -1,32 +0,0 @@
-config:
-  core.https_address: "[::]:8443"
-  # core.trust_password: password
-networks:
-  - config:
-      ipv4.address: 10.10.10.1/24
-      ipv6.address: none
-    description: ""
-    name: lxdbr0
-    type: ""
-    project: default
-storage_pools:
-  - config:
-      size: 500GB
-    description: ""
-    name: default
-    driver: zfs
-profiles:
-  - config: {}
-    description: ""
-    devices:
-      eth0:
-        name: eth0
-        network: lxdbr0
-        type: nic
-      root:
-        path: /
-        pool: default
-        type: disk
-    name: default
-projects: []
-cluster: null

package/src/server/ssl.js

@@ -1,108 +0,0 @@
-import fs from 'fs-extra';
-import dotenv from 'dotenv';
-import https from 'https';
-import { loggerFactory } from './logger.js';
-import { range } from '../client/components/core/CommonJs.js';
-
-dotenv.config();
-
-const logger = loggerFactory(import.meta);
-
-const buildSSL = async (host) => {
-  const sslPath = process.env.CERTBOT_LIVE_PATH;
-  host = host.replaceAll(`\\`, '/');
-  const [hostSSL, path] = host.split('/');
-  if (path || !fs.existsSync(sslPath)) return;
-  const files = await fs.readdir(sslPath);
-
-  for (const folderHost of files)
-    if (folderHost.match(host.split('/')[0]) && host.split('.')[0] === folderHost.split('.')[0]) {
-      for (const i of [''].concat(range(1, 10))) {
-        const privateKeyPath = `${sslPath}/${folderHost}/privkey${i}.pem`;
-        const certificatePath = `${sslPath}/${folderHost}/cert${i}.pem`;
-        const caPath = `${sslPath}/${folderHost}/chain${i}.pem`;
-        const caFullPath = `${sslPath}/${folderHost}/fullchain${i}.pem`;
-
-        if (
-          fs.existsSync(privateKeyPath) &&
-          fs.existsSync(certificatePath) &&
-          fs.existsSync(caPath) &&
-          fs.existsSync(caFullPath)
-        ) {
-          const privateKey = fs.readFileSync(privateKeyPath, 'utf8');
-          const certificate = fs.readFileSync(certificatePath, 'utf8');
-          const ca = fs.readFileSync(caPath, 'utf8');
-          const caFull = fs.readFileSync(caFullPath, 'utf8');
-
-          logger.info(`SSL files update`, {
-            privateKey,
-            certificate,
-            ca,
-            caFull,
-          });
-
-          if (!fs.existsSync(`./engine-private/ssl/${host}`))
-            fs.mkdirSync(`./engine-private/ssl/${host}`, { recursive: true });
-
-          fs.writeFileSync(`./engine-private/ssl/${host}/key.key`, privateKey, 'utf8');
-          fs.writeFileSync(`./engine-private/ssl/${host}/crt.crt`, certificate, 'utf8');
-          fs.writeFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, caFull, 'utf8');
-
-          fs.writeFileSync(`./engine-private/ssl/${host}/_ca_bundle.crt`, ca, 'utf8');
-          fs.writeFileSync(`./engine-private/ssl/${host}/_ca_full_bundle.crt`, caFull, 'utf8');
-
-          return true;
-        }
-      }
-    }
-  return false;
-};
-
-const validateSecureContext = (host) => {
-  return (
-    fs.existsSync(`./engine-private/ssl/${host}/key.key`) &&
-    fs.existsSync(`./engine-private/ssl/${host}/crt.crt`) &&
-    fs.existsSync(`./engine-private/ssl/${host}/ca_bundle.crt`)
-  );
-};
-
-const buildSecureContext = (host) => {
-  return {
-    key: fs.readFileSync(`./engine-private/ssl/${host}/key.key`, 'utf8'),
-    cert: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
-    ca: fs.readFileSync(`./engine-private/ssl/${host}/ca_bundle.crt`, 'utf8'),
-  };
-};
-
-const createSslServer = async (app, hosts) => {
-  let ServerSSL;
-  for (const host of Object.keys(hosts)) {
-    // const { redirect } = hosts[host];
-    const [hostSSL, path = ''] = host.split('/');
-    await buildSSL(host);
-    const validSSL = validateSecureContext(hostSSL);
-    if (validSSL) {
-      if (!ServerSSL) ServerSSL = https.createServer(buildSecureContext(hostSSL), app);
-      else ServerSSL.addContext(hostSSL, buildSecureContext(hostSSL));
-    } else logger.error('Invalid SSL context', { host, ...hosts[host] });
-  }
-  return { ServerSSL };
-};
-
-const sslRedirectMiddleware = (req, res, port, proxyRouter) => {
-  const sslRedirectUrl = `https://${req.headers.host}${req.url}`;
-  if (
-    process.env.NODE_ENV === 'production' &&
-    port !== 443 &&
-    !req.secure &&
-    !req.url.startsWith(`/.well-known/acme-challenge`) &&
-    proxyRouter[443] &&
-    Object.keys(proxyRouter[443]).find((host) => {
-      const [hostSSL, path = ''] = host.split('/');
-      return sslRedirectUrl.match(hostSSL) && validateSecureContext(hostSSL);
-    })
-  )
-    return res.status(302).redirect(sslRedirectUrl);
-};
-
-export { buildSSL, buildSecureContext, validateSecureContext, createSslServer, sslRedirectMiddleware };