refactor(simulator): generate certificate locations

Author: coderbyheart

cli/certificates.ts

@@ -0,0 +1,40 @@
+import { mkdirSync, statSync } from 'node:fs'
+import path from 'node:path'
+
+/**
+ * Provide the directory to store certificates
+ */
+export const ensureCertificateDir = (): string => {
+	const dirName = path.join(process.cwd(), 'certificates')
+	try {
+		statSync(dirName)
+	} catch {
+		mkdirSync(dirName)
+	}
+	return dirName
+}
+
+export const simulatorCALocations = (
+	certificatesDir: string,
+): {
+	privateKey: string
+	certificate: string
+} => ({
+	privateKey: path.join(certificatesDir, 'simulator.CA.key'),
+	certificate: path.join(certificatesDir, 'simulator.CA.pem'),
+})
+
+export const deviceCertificateLocations = (
+	certificatesDir: string,
+	deviceId: string,
+): {
+	privateKey: string
+	certificate: string
+	CSR: string
+	signedCert: string
+} => ({
+	privateKey: path.join(certificatesDir, `${deviceId}.key`),
+	certificate: path.join(certificatesDir, `${deviceId}.pem`),
+	CSR: path.join(certificatesDir, `${deviceId}.csr`),
+	signedCert: path.join(certificatesDir, `${deviceId}.signed.pem`),
+})

cli/commands/register-simulator-device.ts

@@ -8,6 +8,11 @@ import { apiClient } from '../../nrfcloud/apiClient.js'
 import { getAPISettings } from '../../nrfcloud/settings.js'
 import { run } from '../../util/run.js'
 import { ulid } from '../../util/ulid.js'
+import {
+	deviceCertificateLocations,
+	ensureCertificateDir,
+	simulatorCALocations,
+} from '../certificates.js'
 import type { CommandDefinition } from './CommandDefinition.js'
 
 export const registerSimulatorDeviceCommand = ({
@@ -33,17 +38,13 @@ export const registerSimulatorDeviceCommand = ({
 			apiKey,
 		})
 
+		const dir = ensureCertificateDir()
+
 		// CA certificate
-		const caPrivateKeyLocation = path.join(
-			process.cwd(),
-			'certificates',
-			'simulator.CA.key',
-		)
-		const caCertificateLocation = path.join(
-			process.cwd(),
-			'certificates',
-			'simulator.CA.pem',
-		)
+		const {
+			privateKey: caPrivateKeyLocation,
+			certificate: caCertificateLocation,
+		} = simulatorCALocations(dir)
 		try {
 			await stat(caCertificateLocation)
 		} catch {
@@ -80,11 +81,13 @@ export const registerSimulatorDeviceCommand = ({
 		console.log(chalk.yellow('Device ID:'), chalk.blue(deviceId))
 
 		// Device private key
-		const devicePrivateKeyLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.key`,
-		)
+		const {
+			privateKey: devicePrivateKeyLocation,
+			certificate: deviceCertificateLocation,
+			CSR: deviceCSRLocation,
+			signedCert: deviceSignedCertLocation,
+		} = deviceCertificateLocations(dir, deviceId)
+
 		await run({
 			command: 'openssl',
 			args: [
@@ -102,11 +105,6 @@ export const registerSimulatorDeviceCommand = ({
 		)
 
 		// Device certificate
-		const deviceCertificateLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.pem`,
-		)
 		await run({
 			command: 'openssl',
 			args: [
@@ -130,11 +128,6 @@ export const registerSimulatorDeviceCommand = ({
 		)
 
 		// Sign device cert
-		const deviceCSRLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.csr`,
-		)
 		await run({
 			command: 'openssl',
 			args: [
@@ -148,11 +141,6 @@ export const registerSimulatorDeviceCommand = ({
 				`/CN=${deviceId}`,
 			],
 		})
-		const deviceSignedCertLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.signed.pem`,
-		)
 		await run({
 			command: 'openssl',
 			args: [

cli/commands/simulate-device.ts

@@ -11,6 +11,10 @@ import { getDeviceFingerprint } from '../../devices/getDeviceFingerprint.js'
 import { apiClient } from '../../nrfcloud/apiClient.js'
 import { getAPISettings } from '../../nrfcloud/settings.js'
 import { version } from '../../package.json'
+import {
+	deviceCertificateLocations,
+	ensureCertificateDir,
+} from '../certificates.js'
 import type { CommandDefinition } from './CommandDefinition.js'
 
 export const simulateDeviceCommand = ({
@@ -59,22 +63,18 @@ export const simulateDeviceCommand = ({
 			chalk.blue(accountInfo.account.mqttEndpoint),
 		)
 
+		const dir = ensureCertificateDir()
+		const {
+			privateKey: devicePrivateKeyLocation,
+			signedCert: deviceCertificateLocation,
+		} = deviceCertificateLocations(dir, deviceId)
+
 		// Device private key
-		const devicePrivateKeyLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.key`,
-		)
 		console.log(
 			chalk.yellow('Private key:'),
 			chalk.blue(devicePrivateKeyLocation),
 		)
 		// Device certificate
-		const deviceCertificateLocation = path.join(
-			process.cwd(),
-			'certificates',
-			`${deviceId}.signed.pem`,
-		)
 		console.log(
 			chalk.yellow('Signed certificate:'),
 			chalk.blue(deviceCertificateLocation),