src/config.ts

@@ -26,7 +26,6 @@ switch (os.platform()) {
 config.inject({
   "core.confdir": configDir,
   "core.port": 8080,
-  "core.apport": 80,
   "core.loglevel": "info",
   "core.plugindir": path.resolve(configDir, "..", "plugins"),
 });

src/modules/app.ts

@@ -3,7 +3,6 @@ import log from "../log.js";
 import fastify from "fastify";
 import type { FastifyInstance } from "fastify";
 import { getKeyPair } from "../lib/seed.js";
-import config from "../config";
 
 let app: FastifyInstance;
 
@@ -17,5 +16,5 @@ export async function start() {
     res.send(Buffer.from(keyPair.publicKey).toString("hex"));
   });
 
-  await app.listen({ port: config.uint("core.appport"), host: "0.0.0.0" });
+  await app.listen({ port: 80, host: "0.0.0.0" });
 }

src/modules/relay.ts

@@ -20,7 +20,7 @@ export async function start() {
   const dht = getSwarm();
   let sslOptions: boolean | http2.SecureServerOptions = false;
 
-  if (getSslManager().ready) {
+  if (getSslManager().enabled) {
     sslOptions = {
       SNICallback: () => getSslManager().context,
     } as http2.SecureServerOptions;

src/modules/ssl.ts

@@ -6,47 +6,37 @@ import config from "../config.js";
 export type SSLManagerRenewHandler = (domain: string) => Promise<boolean>;
 
 export class SSLManager {
+  private _context?: tls.SecureContext;
   private _key?: Buffer;
+  private _cert?: Buffer;
   private _domain: string;
+  private _renewHandler?: SSLManagerRenewHandler;
 
   constructor(domain: string) {
     this._domain = domain;
   }
 
-  private _context?: tls.SecureContext;
-
   get context(): tls.SecureContext {
     return this._context as tls.SecureContext;
   }
 
-  private _cert?: Buffer;
-
-  set cert(cert: Buffer) {
-    this._cert = cert;
-    this._maybeUpdateContext();
-  }
-
-  private _renewHandler?: SSLManagerRenewHandler;
-
-  get renewHandler(): SSLManagerRenewHandler {
-    return this._renewHandler as any;
-  }
-
-  set renewHandler(value: SSLManagerRenewHandler) {
-    this._renewHandler = value;
-  }
-
   set privateKey(key: Buffer) {
     this._key = key;
     this._maybeUpdateContext();
   }
 
-  get enabled() {
-    return config.bool("core.ssl");
+  set cert(cert: Buffer) {
+    this._cert = cert;
+    this._maybeUpdateContext();
   }
 
-  get ready() {
-    return this.enabled && this.renewHandler;
+  private _maybeUpdateContext() {
+    if (b4a.isBuffer(this._cert) && b4a.isBuffer(this._key)) {
+      this._context = tls.createSecureContext({
+        cert: this._cert,
+        key: this._key,
+      });
+    }
   }
 
   public async renew(): Promise<boolean> {
@@ -60,13 +50,8 @@ export class SSLManager {
     return result;
   }
 
-  private _maybeUpdateContext() {
-    if (b4a.isBuffer(this._cert) && b4a.isBuffer(this._key)) {
-      this._context = tls.createSecureContext({
-        cert: this._cert,
-        key: this._key,
-      });
-    }
+  get enabled() {
+    return config.bool("core.ssl") && this._renewHandler;
   }
 }