feat: v1.2.1

Author: jvvan

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Jovan Jovanovic
+Copyright 2022 Jovan Jovanovic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -52,6 +52,14 @@ cd /etc/reverseproxy
 node dist/migrate/addMetadata.js
 ```
 
+## Rebuilding nginx configurations
+
+```sh
+node /etc/reverseproxy
+node dist/migrate/rebuild.js
+nginx -t && nginx -s reload
+```
+
 # How To Use
 
 ## Authorization
@@ -149,6 +157,13 @@ Responses
 }
 ```
 
+```json
+{
+  "error": "Nginx configuration failed",
+  "statusCode": 500
+}
+```
+
 ### DELETE /proxies/:domain
 
 Delete the proxy with the domain.
@@ -245,6 +260,13 @@ Responses
 }
 ```
 
+```json
+{
+  "error": "Nginx configuration failed",
+  "statusCode": 500
+}
+```
+
 ### DELETE /streams/:name
 
 Delete the stream with the name.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reverseproxy",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Reverse proxy API with nginx backend",
   "main": "dist/index.js",
   "scripts": {

src/index.ts

@@ -79,20 +79,25 @@ app.post("/proxies", async (req, res) => {
     });
   }
 
+  if (!(await Nginx.test())) {
+    Logger.error(
+      `Could not reload nginx, deleting proxy: ${Proxy.resolveURL(domain, ssl)}`
+    );
+    await Proxy.delete(domain);
+
+    return res.status(500).json({
+      error: "Nginx configuration failed",
+      statusCode: 500,
+    });
+  }
+
   Logger.info(`Proxy created: ${Proxy.resolveURL(domain, ssl)} -> ${target}`);
   res.json({
     message: "Proxy created",
     statusCode: 200,
   });
 
-  if (await Nginx.test()) {
-    return await Nginx.reload();
-  } else {
-    Logger.info(
-      `Could not reload nginx, deleting proxy: ${Proxy.resolveURL(domain, ssl)}`
-    );
-    return await Proxy.delete(domain);
-  }
+  return await Nginx.reload();
 });
 
 app.delete("/proxies/:domain", async (req, res) => {
@@ -174,18 +179,23 @@ app.post("/streams", async (req, res) => {
     });
   }
 
+  if (!(await Nginx.test())) {
+    Logger.error(`Could not reload nginx, deleting stream: ${name}`);
+    await Stream.delete(name);
+
+    return res.status(500).json({
+      error: "Nginx configuration failed",
+      statusCode: 500,
+    });
+  }
+
   Logger.info(`Stream created: ${name} - ${listen} -> ${target}`);
   res.json({
     message: "Stream created",
     statusCode: 200,
   });
 
-  if (await Nginx.test()) {
-    return await Nginx.reload();
-  } else {
-    Logger.info(`Could not reload nginx, deleting stream: ${name}`);
-    return await Stream.delete(name);
-  }
+  return await Nginx.reload();
 });
 
 app.delete("/streams/:name", async (req, res) => {

src/migrate/rebuild.ts

@@ -0,0 +1,58 @@
+import config from "../config";
+import fs from "fs";
+import path from "path";
+import Templates from "../templates";
+
+async function proxies() {
+  await Templates.load();
+
+  const files = await fs.promises
+    .readdir(config.nginxSitesEnabled)
+    .then((files) => files.filter((file) => file.startsWith("proxy-")));
+
+  for (const file of files) {
+    const filePath = path.resolve(config.nginxSitesEnabled, file);
+    const content = await fs.promises.readFile(filePath, "utf-8");
+
+    const existingMetadata = await Templates.getMetadata(filePath);
+    if (!existingMetadata) {
+      console.log(`${file} has no metadata`);
+      continue;
+    }
+
+    const templateName = content.includes("listen 443")
+      ? "proxy-ssl.conf"
+      : "proxy.conf";
+
+    const template = Templates.build(templateName, existingMetadata);
+
+    await fs.promises.writeFile(filePath, template);
+    console.log(`${file} updated`);
+  }
+}
+
+async function streams() {
+  await Templates.load();
+
+  const files = await fs.promises
+    .readdir(config.nginxStreams)
+    .then((files) => files.filter((file) => file.startsWith("stream-")));
+
+  for (const file of files) {
+    const filePath = path.resolve(config.nginxStreams, file);
+
+    const existingMetadata = await Templates.getMetadata(filePath);
+    if (!existingMetadata) {
+      console.log(`${file} has no metadata`);
+      continue;
+    }
+
+    const template = Templates.build("stream.conf", existingMetadata);
+
+    await fs.promises.writeFile(filePath, template);
+    console.log(`${file} updated`);
+  }
+}
+
+proxies();
+streams();

templates/proxy-ssl.conf

@@ -1,7 +1,7 @@
 server {
     listen 80;
     server_name <domain>;
-
+    
     # ACME-challenge
     location ^~ /.well-known/acme-challenge/ {
         root <letsencryptDir>;
@@ -39,6 +39,11 @@ server {
     add_header Permissions-Policy        "interest-cohort=()" always;
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
+    # ACME-challenge
+    location ^~ /.well-known/acme-challenge/ {
+        root <letsencryptDir>;
+    }
+
     location / {
       proxy_pass <target>;
       proxy_http_version                 1.1;