@cocreate/server 1.0.2 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.1.1](https://github.com/CoCreate-app/CoCreate-server/compare/v1.1.0...v1.1.1) (2024-01-08)
+
+
+### Bug Fixes
+
+* return if ssl false ([500e7c7](https://github.com/CoCreate-app/CoCreate-server/commit/500e7c7898f3a3a5ecc676ca68cd105cc1f29a6f))
+
+# [1.1.0](https://github.com/CoCreate-app/CoCreate-server/compare/v1.0.2...v1.1.0) (2024-01-08)
+
+
+### Bug Fixes
+
+* update server object properties ([762b209](https://github.com/CoCreate-app/CoCreate-server/commit/762b209ffbb22ebf9bb992d14f96eeeac2391bda))
+
+
+### Features
+
+* bumped CoCreate dependencies to their latest versions ([e6f76a5](https://github.com/CoCreate-app/CoCreate-server/commit/e6f76a57be9e4581c82fcf3e8e57768df35dfcd8))
+
 ## [1.0.2](https://github.com/CoCreate-app/CoCreate-server/compare/v1.0.1...v1.0.2) (2024-01-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/server",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "An intergration with Server and CoCreateJS.",
   "keywords": [
     "server",
@@ -45,6 +45,6 @@
   },
   "main": "./src/index.js",
   "dependencies": {
-    "@cocreate/acme": "^1.0.0"
+    "@cocreate/acme": "^1.1.3"
   }
 }

package/src/index.js

@@ -1,42 +1,38 @@
-const Https = require('https');
 const Http = require('http');
-const fs = require('fs');
+const Https = require('https');
 const tls = require('tls');
 const acme = require('@cocreate/acme')
+const fs = require('fs');
 
 let server = {
-    acme: new acme(),  // Initially an empty object or some placeholder functionality
-
-    loadCertificates(domain) {
-        try {
-            return {
-                key: fs.readFileSync(`/etc/certificates/${domain}/private-key.pem`),
-                cert: fs.readFileSync(`/etc/certificates/${domain}/fullchain.pem`),
-            };
-        } catch (error) {
-            console.error("Error loading certificates for domain:", domain);
-            throw error;  // Or handle it by returning default certificates
-        }
-    },
+    acme: new acme(),
+    http: Http.createServer(),
+    https: Https.createServer({ SNICallback: sniCallback })
+};
 
-    async sniCallback(domain, cb) {
-        try {
-            console.log('sni')
-            await server.acme.checkCertificate(domain);  // Referencing `this.acme` 
+function loadCertificates(domain) {
+    try {
+        return {
+            key: fs.readFileSync(`/etc/certificates/${domain}/private-key.pem`),
+            cert: fs.readFileSync(`/etc/certificates/${domain}/fullchain.pem`),
+        };
+    } catch (error) {
+        console.error("Error loading certificates for domain:", domain);
+        throw error;  // Or handle it by returning default certificates
+    }
+}
 
-            const sslContext = tls.createSecureContext(server.loadCertificates(domain));
+async function sniCallback(domain, cb) {
+    try {
+        console.log('sni')
+        if (await server.acme.checkCertificate(domain)) {
+            const sslContext = tls.createSecureContext(loadCertificates(domain));
             cb(null, sslContext);
-        } catch (error) {
-            console.error("Error in SNI callback for domain:", domain, error);
-            cb(error);  // handle error or use default context
-        }
-    },
-
-    https: null,  // Will be set after defining `sniCallback`
-    http: Http.createServer()
-};
-
-// Creating the HTTPS server with the SNI callback
-server.https = Https.createServer({ SNICallback: server.sniCallback });
+        } else return
+    } catch (error) {
+        console.error("Error in SNI callback for domain:", domain, error);
+        cb(error);  // handle error or use default context
+    }
+}
 
 module.exports = server;