@expo/devcert 1.1.2 → 1.2.0

package/src/constants.ts

@@ -1,11 +1,23 @@
 import path from 'path';
-import { unlinkSync as rm, writeFileSync as writeFile, readFileSync as readFile } from 'fs';
-import { sync as mkdirp } from 'mkdirp';
-import { template as makeTemplate } from 'lodash';
-import applicationConfigPath = require('application-config-path');
-import eol from 'eol';
+import fs from 'fs';
 import { mktmp } from './utils';
 
+function applicationConfigPath(name: string): string {
+  switch (process.platform) {
+    case 'darwin':
+      return path.join(process.env.HOME, 'Library', 'Application Support', name);
+    case 'win32':
+      return process.env.LOCALAPPDATA
+        ? path.join(process.env.LOCALAPPDATA, name)
+        : path.join(process.env.USERPROFILE, 'Local Settings', 'Application Data', name);
+    case 'linux':
+    default:
+      return process.env.XDG_CONFIG_HOME
+        ? path.join(process.env.XDG_CONFIG_HOME, name)
+        : path.join(process.env.HOME, '.config', name);
+  }
+}
+
 export const VALID_IP = /(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}/;
 export const VALID_DOMAIN = /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.?)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/i;
 
@@ -26,34 +38,35 @@ export const opensslSerialFilePath = configPath('certificate-authority', 'serial
 export const opensslDatabaseFilePath = configPath('certificate-authority', 'index.txt');
 export const caSelfSignConfig = path.join(__dirname, '../openssl-configurations/certificate-authority-self-signing.conf');
 
+function eolAuto(str: string): string {
+  return str.replace(/\r?\n|\r/g, isWindows ? '\r\n' : '\n');
+}
+
 export function withDomainSigningRequestConfig(domain: string, cb: (filepath: string) => void) {
   let tmpFile = mktmp();
-  let source = readFile(path.join(__dirname, '../openssl-configurations/domain-certificate-signing-requests.conf'), 'utf-8');
-  let template = makeTemplate(source);
-  let result = template({ domain });
-  writeFile(tmpFile, eol.auto(result));
+  let source = fs.readFileSync(path.join(__dirname, '../openssl-configurations/domain-certificate-signing-requests.conf'), 'utf-8');
+  let result = source.replace(/%DOMAIN%/g, domain);
+  fs.writeFileSync(tmpFile, eolAuto(result));
   cb(tmpFile);
-  rm(tmpFile);
+  fs.rmSync(tmpFile);
 }
 
 export function withDomainCertificateConfig(domain: string, cb: (filepath: string) => void) {
   let tmpFile = mktmp();
-  let source = readFile(path.join(__dirname, '../openssl-configurations/domain-certificates.conf'), 'utf-8');
-  let template = makeTemplate(source);
-  let result = template({
-    domain,
-    serialFile: opensslSerialFilePath,
-    databaseFile: opensslDatabaseFilePath,
-    domainDir: pathForDomain(domain)
-  });
-  writeFile(tmpFile, eol.auto(result));
+  let source = fs.readFileSync(path.join(__dirname, '../openssl-configurations/domain-certificates.conf'), 'utf-8');
+  let result = source
+    .replace(/%DOMAIN%/g, domain)
+    .replace(/%SERIALFILE%/g, opensslSerialFilePath.replace(/\\/g, '\\\\'))
+    .replace(/%DATABASEFILE%/g, opensslDatabaseFilePath.replace(/\\/g, '\\\\'))
+    .replace(/%DOMAINDIR%/g, pathForDomain(domain).replace(/\\/g, '\\\\'))
+  fs.writeFileSync(tmpFile, eolAuto(result));
   cb(tmpFile);
-  rm(tmpFile);
+  fs.rmSync(tmpFile);
 }
 
   // confTemplate = confTemplate.replace(/DATABASE_PATH/, configPath('index.txt').replace(/\\/g, '\\\\'));
   // confTemplate = confTemplate.replace(/SERIAL_PATH/, configPath('serial').replace(/\\/g, '\\\\'));
-  // confTemplate = eol.auto(confTemplate);
+  // confTemplate = eolAuto(confTemplate);
 
 export const rootCADir = configPath('certificate-authority');
 export const rootCAKeyPath = configPath('certificate-authority', 'private-key.key');
@@ -73,9 +86,9 @@ export function getLegacyConfigDir(): string {
 }
 
 export function ensureConfigDirs() {
-  mkdirp(configDir);
-  mkdirp(domainsDir);
-  mkdirp(rootCADir);
+  fs.mkdirSync(configDir, { recursive: true });
+  fs.mkdirSync(domainsDir, { recursive: true });
+  fs.mkdirSync(rootCADir, { recursive: true });
 }
 
 ensureConfigDirs();

package/src/index.ts

@@ -1,7 +1,5 @@
-import { readFileSync as readFile, readdirSync as readdir, existsSync as exists } from 'fs';
+import { rmSync as rm, readFileSync as readFile, readdirSync as readdir, existsSync as exists } from 'fs';
 import createDebug from 'debug';
-import { sync as commandExists } from 'command-exists';
-import rimraf from 'rimraf';
 import {
   isMac,
   isLinux,
@@ -14,6 +12,7 @@ import {
   VALID_IP
 } from './constants';
 import currentPlatform from './platforms';
+import { commandExists } from './utils';
 import installCertificateAuthority, { ensureCACertReadable, uninstall } from './certificate-authority';
 import generateDomainCertificate from './certificates';
 import UI, { UserInterface } from './user-interface';
@@ -128,5 +127,5 @@ export function configuredDomains() {
 }
 
 export function removeDomain(domain: string) {
-  return rimraf.sync(pathForDomain(domain));
+  return rm(pathForDomain(domain), { force: true, recursive: true });
 }

package/src/platforms/darwin.ts

@@ -1,8 +1,7 @@
 import path from 'path';
 import { writeFileSync as writeFile, existsSync as exists, readFileSync as read } from 'fs';
 import createDebug from 'debug';
-import { sync as commandExists } from 'command-exists';
-import { run, sudoAppend } from '../utils';
+import { run, sudoAppend, commandExists } from '../utils';
 import { Options } from '../index';
 import { addCertificateToNSSCertDB, assertNotTouchingFiles, openCertificateInFirefox, closeFirefox, removeCertificateFromNSSCertDB } from './shared';
 import { Platform } from '.';

package/src/platforms/linux.ts

@@ -1,9 +1,8 @@
 import path from 'path';
 import { existsSync as exists, readFileSync as read, writeFileSync as writeFile } from 'fs';
 import createDebug from 'debug';
-import { sync as commandExists } from 'command-exists';
 import { addCertificateToNSSCertDB, assertNotTouchingFiles, openCertificateInFirefox, closeFirefox, removeCertificateFromNSSCertDB } from './shared';
-import { run, sudoAppend } from '../utils';
+import { run, sudoAppend, commandExists } from '../utils';
 import { Options } from '../index';
 import UI from '../user-interface';
 import { Platform } from '.';
@@ -121,4 +120,4 @@ export default class LinuxPlatform implements Platform {
     return exists(this.CHROME_BIN_PATH);
   }
 
-}
+}

package/src/platforms/shared.ts

@@ -1,8 +1,7 @@
 import path from 'path';
-import url from 'url';
 import createDebug from 'debug';
 import assert from 'assert';
-import getPort from 'get-port';
+import net from 'net';
 import http from 'http';
 import { sync as glob } from 'glob';
 import { readFileSync as readFile, existsSync as exists } from 'fs';
@@ -109,28 +108,37 @@ async function sleep(ms: number) {
  */
 export async function openCertificateInFirefox(firefoxPath: string, certPath: string): Promise<void> {
   debug('Adding devert to Firefox trust stores manually. Launching a webserver to host our certificate temporarily ...');
-  let port = await getPort();
-  let server = http.createServer(async (req, res) => {
-    let { pathname } = url.parse(req.url);
+  let port: number;
+  const server = http.createServer(async (req, res) => {
+    let { pathname } = new URL(req.url);
     if (pathname === '/certificate') {
       res.writeHead(200, { 'Content-type': 'application/x-x509-ca-cert' });
       res.write(readFile(certPath));
       res.end();
     } else {
       res.writeHead(200);
-      res.write(await UI.firefoxWizardPromptPage(`http://localhost:${ port }/certificate`));
+      res.write(await UI.firefoxWizardPromptPage(`http://localhost:${port}/certificate`));
       res.end();
     }
-  }).listen(port);
-  debug('Certificate server is up. Printing instructions for user and launching Firefox with hosted certificate URL');
-  await UI.startFirefoxWizard(`http://localhost:${ port }`);
-  run(firefoxPath, [`http://localhost:${ port }`]);
-  await UI.waitForFirefoxWizard();
-  server.close();
+  });
+  port = await new Promise((resolve, reject) => {
+    server.on('error', reject);
+    server.listen(() => {
+      resolve((server.address() as net.AddressInfo).port);
+    });
+  });
+  try {
+    debug('Certificate server is up. Printing instructions for user and launching Firefox with hosted certificate URL');
+    await UI.startFirefoxWizard(`http://localhost:${port}`);
+    run(firefoxPath, [`http://localhost:${ port }`]);
+    await UI.waitForFirefoxWizard();
+  } finally {
+    server.close();
+  }
 }
 
 export function assertNotTouchingFiles(filepath: string, operation: string): void {
     if (!filepath.startsWith(configDir) && !filepath.startsWith(getLegacyConfigDir())) {
       throw new Error(`Devcert cannot ${ operation } ${ filepath }; it is outside known devcert config directories!`);
     }
-}
+}

package/src/platforms/win32.ts

@@ -1,7 +1,6 @@
 import createDebug from 'debug';
 import crypto from 'crypto';
-import { writeFileSync as write, readFileSync as read } from 'fs';
-import { sync as rimraf } from 'rimraf';
+import { rmSync as rm, writeFileSync as write, readFileSync as read } from 'fs';
 import { Options } from '../index';
 import { assertNotTouchingFiles, openCertificateInFirefox } from './shared';
 import { Platform } from '.';
@@ -64,7 +63,7 @@ export default class WindowsPlatform implements Platform {
   
   deleteProtectedFiles(filepath: string) {
     assertNotTouchingFiles(filepath, 'delete');
-    rimraf(filepath);
+    rm(filepath, { force: true, recursive: true });
   }
 
   async readProtectedFile(filepath: string): Promise<string> {
@@ -104,4 +103,4 @@ export default class WindowsPlatform implements Platform {
     return decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8');
   }
 
-}
+}

package/src/user-interface.ts

@@ -1,4 +1,4 @@
-import passwordPrompt from 'password-prompt';
+import readline from 'node:readline';
 import { waitForUser } from './utils';
 
 export interface UserInterface {
@@ -10,6 +10,25 @@ export interface UserInterface {
   waitForFirefoxWizard(): Promise<void>;
 }
 
+async function passwordPrompt(prompt: string): Promise<string> {
+  const input = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+  return new Promise((resolve, reject) => {
+    input.on('SIGINT', () => {
+      reject(new Error('SIGINT'));
+    });
+    input.question(prompt, (answer) => {
+      readline.moveCursor(process.stdout, 0, -1);
+      readline.clearLine(process.stdout, 0);
+      input.write(prompt + answer.replace(/./g, '*') + '\n');
+      input.close();
+      resolve(answer);
+    });
+  });
+}
+
 const DefaultUI: UserInterface = {
   async getWindowsEncryptionPassword() {
     return await passwordPrompt('devcert password (http://bit.ly/devcert-what-password?):');
@@ -68,4 +87,4 @@ const DefaultUI: UserInterface = {
   }
 }
 
-export default DefaultUI;
+export default DefaultUI;

package/src/utils.ts

@@ -1,10 +1,12 @@
 import { execFileSync, ExecFileSyncOptions } from 'child_process';
-import tmp from 'tmp';
+import { randomBytes } from 'crypto';
+import fs from 'fs';
+import os from 'os';
 import createDebug from 'debug';
 import path from 'path';
-import sudoPrompt from 'sudo-prompt';
+import sudoPrompt from '@expo/sudo-prompt';
 
-import { configPath } from './constants';
+import { configPath, isWindows } from './constants';
 
 const debug = createDebug('devcert:util');
 
@@ -40,9 +42,10 @@ export function reportableError(message: string) {
 }
 
 export function mktmp() {
-  // discardDescriptor because windows complains the file is in use if we create a tmp file
-  // and then shell out to a process that tries to use it
-  return tmp.fileSync({ discardDescriptor: true }).name;
+  const random = randomBytes(6).toString('hex');
+  const tmppath = path.join(os.tmpdir(), `tmp-${process.pid}${random}`);
+  fs.closeSync(fs.openSync(tmppath, 'w'));
+  return tmppath;
 }
 
 export function sudo(cmd: string): Promise<string | null> {
@@ -53,3 +56,23 @@ export function sudo(cmd: string): Promise<string | null> {
     });
   });
 }
+
+const _commands: Record<string, string | null> = {};
+
+export function commandExists(command: string): string | null {
+  if (_commands[command] !== undefined) {
+    return _commands[command];
+  }
+  const paths = process.env[isWindows ? 'Path' : 'PATH'].split(path.delimiter);
+  const extensions = [...(process.env.PATHEXT || '').split(path.delimiter), ''];
+  for (const dir of paths) {
+    for (const extension of extensions) {
+      const filePath = path.join(dir, command + extension);
+      try {
+        fs.accessSync(filePath, fs.constants.X_OK);
+        return (_commands[command] = filePath);
+      } catch {}
+    }
+  }
+  return (_commands[command] = null);
+}

package/tsconfig.json

@@ -4,10 +4,10 @@
       "declaration": true,
       "module": "commonjs",
       "moduleResolution": "node",
-      "target": "ES2016",
+      "target": "ES2018",
       "noImplicitAny": true,
       "sourceMap": false,
-      "importHelpers": true,
+      "importHelpers": false,
       "inlineSourceMap": true,
       "inlineSources": true,
       "outDir": "dist",

package/src/types.d.ts

@@ -1,7 +0,0 @@
-declare module "command-exists";
-declare module "eol";
-declare module "sudo-prompt";
-declare module "password-prompt";
-declare module "application-config-path" {
-  export = (appName: string) => string;
-}