@vandenberghinc/volt 1.1.17 → 1.1.18

package/backend/dist/cjs/server.d.ts

@@ -206,11 +206,20 @@ export declare class Server {
     add_csp(key: string, value?: null | string | string[]): void;
     remove_csp(key: string, value?: null | string): void;
     del_csp(key: string): void;
-    generate_tls_key({ path, organization_unit, ec }: {
-        path: string;
-        organization_unit?: string;
+    generate_ssl_key({ output_path, ec, }: {
+        output_path: string;
         ec?: boolean;
     }): Promise<void>;
+    generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }: {
+        output_path: string;
+        key_path: string;
+        name: string;
+        domain: string;
+        organization_unit: string;
+        country_code: string;
+        province: string;
+        city: string;
+    }): Promise<void>;
     endpoint(...endpoints: (none | Endpoint | EndpointOptions | (none | EndpointOptions | Endpoint)[])[]): this;
     error_endpoint(status_code: number, endpoint: Endpoint | EndpointOptions): this;
     send_mail({ sender, recipients, subject, body, attachments, }: {

package/backend/dist/cjs/server.js

@@ -2501,27 +2501,16 @@ class Server {
     // ---------------------------------------------------------
     // TLS.
     // Generate a key and csr for tls.
-    async generate_tls_key({ path, organization_unit = "IT", ec = true }) {
+    async generate_ssl_key({ output_path, ec = true, }) {
         // Args.
-        if (path == null) {
+        if (output_path == null) {
             throw Error("Define parameter \"path\".");
         }
-        if (organization_unit == null) {
-            throw Error("Define parameter \"organization_unit\".");
-        }
         // Paths.
-        const vpath = new _vinc_1.vlib.Path(path);
-        const key = vpath.join("key.key");
-        const csr = vpath.join("csr.csr");
-        if (!vpath.exists()) {
-            vpath.mkdir_sync();
-        }
+        const key = new _vinc_1.vlib.Path(output_path);
         if (key.exists()) {
             throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
         }
-        if (csr.exists()) {
-            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
-        }
         // Generate the private key using the EC parameters file
         const proc = new _vinc_1.vlib.Proc();
         await proc.start({
@@ -2534,19 +2523,39 @@ class Server {
         if (proc.exit_status != 0) {
             throw Error(`Encountered an error while generating the private key [${proc.exit_status}]: ${proc.err}`);
         }
+    }
+    // Generate a csr for tls.
+    async generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }) {
+        // Args.
+        if (key_path == null) {
+            throw Error("Define parameter \"key_path\".");
+        }
+        if (organization_unit == null) {
+            throw Error("Define parameter \"organization_unit\".");
+        }
+        // Paths.
+        const key = new _vinc_1.vlib.Path(key_path);
+        if (!key.exists()) {
+            throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
+        }
+        const csr = new _vinc_1.vlib.Path(output_path);
+        if (csr.exists()) {
+            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
+        }
         // Generate the CSR using the generated private key
+        const proc = new _vinc_1.vlib.Proc();
         await proc.start({
             command: "openssl",
             args: [
                 "req", "-new", "-key", key.str(), "-out", csr.str(),
                 "-subj",
                 "\"" +
-                    "/C=" + this.company.country_code +
-                    "/ST=" + this.company.province +
-                    "/L=" + this.company.city +
-                    "/O=" + this.company.name +
+                    "/C=" + country_code +
+                    "/ST=" + province +
+                    "/L=" + city +
+                    "/O=" + name +
                     "/OU=" + organization_unit +
-                    "/CN=" + this.domain +
+                    "/CN=" + domain +
                     "\""
             ],
             opts: { stdio: "inherit" },

package/backend/dist/esm/server.d.ts

@@ -206,11 +206,20 @@ export declare class Server {
     add_csp(key: string, value?: null | string | string[]): void;
     remove_csp(key: string, value?: null | string): void;
     del_csp(key: string): void;
-    generate_tls_key({ path, organization_unit, ec }: {
-        path: string;
-        organization_unit?: string;
+    generate_ssl_key({ output_path, ec, }: {
+        output_path: string;
         ec?: boolean;
     }): Promise<void>;
+    generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }: {
+        output_path: string;
+        key_path: string;
+        name: string;
+        domain: string;
+        organization_unit: string;
+        country_code: string;
+        province: string;
+        city: string;
+    }): Promise<void>;
     endpoint(...endpoints: (none | Endpoint | EndpointOptions | (none | EndpointOptions | Endpoint)[])[]): this;
     error_endpoint(status_code: number, endpoint: Endpoint | EndpointOptions): this;
     send_mail({ sender, recipients, subject, body, attachments, }: {

package/backend/dist/esm/server.js

@@ -2462,27 +2462,16 @@ export class Server {
     // ---------------------------------------------------------
     // TLS.
     // Generate a key and csr for tls.
-    async generate_tls_key({ path, organization_unit = "IT", ec = true }) {
+    async generate_ssl_key({ output_path, ec = true, }) {
         // Args.
-        if (path == null) {
+        if (output_path == null) {
             throw Error("Define parameter \"path\".");
         }
-        if (organization_unit == null) {
-            throw Error("Define parameter \"organization_unit\".");
-        }
         // Paths.
-        const vpath = new vlib.Path(path);
-        const key = vpath.join("key.key");
-        const csr = vpath.join("csr.csr");
-        if (!vpath.exists()) {
-            vpath.mkdir_sync();
-        }
+        const key = new vlib.Path(output_path);
         if (key.exists()) {
             throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
         }
-        if (csr.exists()) {
-            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
-        }
         // Generate the private key using the EC parameters file
         const proc = new vlib.Proc();
         await proc.start({
@@ -2495,19 +2484,39 @@ export class Server {
         if (proc.exit_status != 0) {
             throw Error(`Encountered an error while generating the private key [${proc.exit_status}]: ${proc.err}`);
         }
+    }
+    // Generate a csr for tls.
+    async generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }) {
+        // Args.
+        if (key_path == null) {
+            throw Error("Define parameter \"key_path\".");
+        }
+        if (organization_unit == null) {
+            throw Error("Define parameter \"organization_unit\".");
+        }
+        // Paths.
+        const key = new vlib.Path(key_path);
+        if (!key.exists()) {
+            throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
+        }
+        const csr = new vlib.Path(output_path);
+        if (csr.exists()) {
+            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
+        }
         // Generate the CSR using the generated private key
+        const proc = new vlib.Proc();
         await proc.start({
             command: "openssl",
             args: [
                 "req", "-new", "-key", key.str(), "-out", csr.str(),
                 "-subj",
                 "\"" +
-                    "/C=" + this.company.country_code +
-                    "/ST=" + this.company.province +
-                    "/L=" + this.company.city +
-                    "/O=" + this.company.name +
+                    "/C=" + country_code +
+                    "/ST=" + province +
+                    "/L=" + city +
+                    "/O=" + name +
                     "/OU=" + organization_unit +
-                    "/CN=" + this.domain +
+                    "/CN=" + domain +
                     "\""
             ],
             opts: { stdio: "inherit" },

package/backend/dist/esm-dev/server.d.ts

@@ -206,11 +206,20 @@ export declare class Server {
     add_csp(key: string, value?: null | string | string[]): void;
     remove_csp(key: string, value?: null | string): void;
     del_csp(key: string): void;
-    generate_tls_key({ path, organization_unit, ec }: {
-        path: string;
-        organization_unit?: string;
+    generate_ssl_key({ output_path, ec, }: {
+        output_path: string;
         ec?: boolean;
     }): Promise<void>;
+    generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }: {
+        output_path: string;
+        key_path: string;
+        name: string;
+        domain: string;
+        organization_unit: string;
+        country_code: string;
+        province: string;
+        city: string;
+    }): Promise<void>;
     endpoint(...endpoints: (none | Endpoint | EndpointOptions | (none | EndpointOptions | Endpoint)[])[]): this;
     error_endpoint(status_code: number, endpoint: Endpoint | EndpointOptions): this;
     send_mail({ sender, recipients, subject, body, attachments, }: {

package/backend/dist/esm-dev/server.js

@@ -2462,27 +2462,16 @@ export class Server {
     // ---------------------------------------------------------
     // TLS.
     // Generate a key and csr for tls.
-    async generate_tls_key({ path, organization_unit = "IT", ec = true }) {
+    async generate_ssl_key({ output_path, ec = true, }) {
         // Args.
-        if (path == null) {
+        if (output_path == null) {
             throw Error("Define parameter \"path\".");
         }
-        if (organization_unit == null) {
-            throw Error("Define parameter \"organization_unit\".");
-        }
         // Paths.
-        const vpath = new vlib.Path(path);
-        const key = vpath.join("key.key");
-        const csr = vpath.join("csr.csr");
-        if (!vpath.exists()) {
-            vpath.mkdir_sync();
-        }
+        const key = new vlib.Path(output_path);
         if (key.exists()) {
             throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
         }
-        if (csr.exists()) {
-            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
-        }
         // Generate the private key using the EC parameters file
         const proc = new vlib.Proc();
         await proc.start({
@@ -2495,19 +2484,39 @@ export class Server {
         if (proc.exit_status != 0) {
             throw Error(`Encountered an error while generating the private key [${proc.exit_status}]: ${proc.err}`);
         }
+    }
+    // Generate a csr for tls.
+    async generate_csr({ output_path, key_path, name, domain, organization_unit, country_code, province, city, }) {
+        // Args.
+        if (key_path == null) {
+            throw Error("Define parameter \"key_path\".");
+        }
+        if (organization_unit == null) {
+            throw Error("Define parameter \"organization_unit\".");
+        }
+        // Paths.
+        const key = new vlib.Path(key_path);
+        if (!key.exists()) {
+            throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
+        }
+        const csr = new vlib.Path(output_path);
+        if (csr.exists()) {
+            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
+        }
         // Generate the CSR using the generated private key
+        const proc = new vlib.Proc();
         await proc.start({
             command: "openssl",
             args: [
                 "req", "-new", "-key", key.str(), "-out", csr.str(),
                 "-subj",
                 "\"" +
-                    "/C=" + this.company.country_code +
-                    "/ST=" + this.company.province +
-                    "/L=" + this.company.city +
-                    "/O=" + this.company.name +
+                    "/C=" + country_code +
+                    "/ST=" + province +
+                    "/L=" + city +
+                    "/O=" + name +
                     "/OU=" + organization_unit +
-                    "/CN=" + this.domain +
+                    "/CN=" + domain +
                     "\""
             ],
             opts: { stdio: "inherit" },

package/backend/src/server.ts

@@ -2829,28 +2829,23 @@ export class Server {
     // TLS.
 
     // Generate a key and csr for tls.
-    async generate_tls_key({path, organization_unit = "IT", ec = true}: {path: string; organization_unit?: string; ec?: boolean}): Promise<void> {
+    async generate_ssl_key({
+        output_path,
+        ec = true,
+    }: {
+        output_path: string;
+        ec?: boolean;
+    }): Promise<void> {
         // Args.
-        if (path == null) {
+        if (output_path == null) {
             throw Error("Define parameter \"path\".");
         }
-        if (organization_unit == null) {
-            throw Error("Define parameter \"organization_unit\".");
-        }
 
         // Paths.
-        const vpath: vlib.Path = new vlib.Path(path);
-        const key = vpath.join("key.key");
-        const csr = vpath.join("csr.csr");
-        if (!vpath.exists()) {
-            vpath.mkdir_sync();
-        }
+        const key = new vlib.Path(output_path);
         if (key.exists()) {
             throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
         }
-        if (csr.exists()) {
-            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
-        }
 
         // Generate the private key using the EC parameters file
         const proc = new vlib.Proc();
@@ -2865,20 +2860,61 @@ export class Server {
         if (proc.exit_status != 0) {
             throw Error(`Encountered an error while generating the private key [${proc.exit_status}]: ${proc.err}`);
         }
+    }
+
+    // Generate a csr for tls.
+    async generate_csr({
+        output_path,
+        key_path,
+        name,
+        domain,
+        organization_unit,
+        country_code,
+        province,
+        city,
+    }: {
+        output_path: string;
+        key_path: string;
+        name: string,
+        domain: string,
+        organization_unit: string,
+        country_code: string,
+        province: string,
+        city: string,
+    }): Promise<void> {
+        
+        // Args.
+        if (key_path == null) {
+            throw Error("Define parameter \"key_path\".");
+        }
+        if (organization_unit == null) {
+            throw Error("Define parameter \"organization_unit\".");
+        }
+
+        // Paths.
+        const key = new vlib.Path(key_path);
+        if (!key.exists()) {
+            throw Error(`Key path "${key.str()}" already exists, remove the file manually to continue.`);
+        }
+        const csr = new vlib.Path(output_path);
+        if (csr.exists()) {
+            throw Error(`CSR path "${csr.str()}" already exists, remove the file manually to continue.`);
+        }
 
         // Generate the CSR using the generated private key
+        const proc = new vlib.Proc();
         await proc.start({
             command: "openssl",
             args: [
                 "req", "-new", "-key", key.str(), "-out", csr.str(),
-                "-subj",  
+                "-subj",
                 "\"" +
-                "/C=" + this.company.country_code +
-                "/ST=" + this.company.province +
-                "/L=" + this.company.city +
-                "/O=" + this.company.name +
+                "/C=" + country_code +
+                "/ST=" + province +
+                "/L=" + city +
+                "/O=" + name +
                 "/OU=" + organization_unit +
-                "/CN=" + this.domain +
+                "/CN=" + domain +
                 "\""
             ],
             opts: { stdio: "inherit" },

package/package.json

@@ -1,7 +1,7 @@
 {
     "author": "Daan van den Bergh",
     "name": "@vandenberghinc/volt",
-    "version": "1.1.17",
+    "version": "1.1.18",
     "description": "",
     "type": "module",
     "types": "./backend/dist/esm/volt.d.ts",