@13w/miri 1.1.10 → 1.1.11

package/dist/cli.js

@@ -1,3 +1,4 @@
+import { readFile } from 'node:fs/promises';
 Error.stackTraceLimit = Infinity;
 import { join } from 'node:path';
 /* eslint-disable no-console */
@@ -5,27 +6,55 @@ import { Command } from 'commander';
 import { Table } from 'console-table-printer';
 import colors from 'colors';
 import { createTunnel } from 'tunnel-ssh';
+import SSHConfig from 'ssh-config';
 import connection from './mongodb.js';
 import Miri, { IndexStatus, PatchStatus } from './miri.js';
 import { readFileSync } from 'fs';
 import { realpathSync } from 'node:fs';
-const { MIRI_MONGO_URI = 'mongodb://localhost:27017/test', SSH_AUTH_SOCK } = process.env;
+const pkg = await readFile(join(import.meta.dirname, '../package.json'), 'utf-8').then((content) => JSON.parse(content));
+const mirirc = await readFile(join(process.cwd(), '.mirirc'), 'utf-8').then((content) => JSON.parse(content), () => ({}));
+const { SSH_AUTH_SOCK, HOME } = process.env;
 const program = new Command();
-program.option('-m --migrations <folder>', 'Folder with migrations', join(process.cwd(), 'migrations'));
-program.option('-d --db <mongo-uri>', 'MongoDB Connection URI', MIRI_MONGO_URI);
+program.version(pkg.version);
+program.option('-e --env <environment>', 'Environment name from .mirirc', 'default');
+program.option('-m --migrations <folder>', `Folder with migrations (default: "${process.cwd(), join(process.cwd(), 'migrations')}")`);
+program.option('-d --db <mongo-uri>', 'MongoDB Connection URI (default: "mongodb://localhost:27017/test")');
+program.option('--ssh-profile <profile>', 'Connect via SSH using profile');
 program.option('--ssh-host <host>', 'Connect via SSH proxy Host');
 program.option('--ssh-port <port>', 'Connect via SSH proxy Port');
 program.option('--ssh-user <user>', 'Connect via SSH proxy User');
 program.option('--ssh-key <path/to/key>', 'Connect via SSH proxy IdentityKey');
+let configCache;
+const getConfig = (programOpts) => {
+    if (configCache) {
+        return configCache;
+    }
+    const envs = mirirc.environments ?? { default: mirirc };
+    const env = envs[programOpts.env ?? 'default'] ?? {};
+    const config = Object.assign({}, mirirc, env, programOpts);
+    if (config.sshProfile) {
+        const sshConfigPath = join(HOME ?? '', '.ssh/config');
+        const sshConfigContent = readFileSync(sshConfigPath, 'utf-8');
+        console.log(`Reading profile ${config.sshProfile} from SSH config ${sshConfigPath}`);
+        const parsed = SSHConfig.parse(sshConfigContent).compute(config.sshProfile);
+        config.sshHost = programOpts.sshHost ?? parsed.Hostname;
+        config.sshPort = programOpts.sshPort ?? parsed.Port;
+        config.sshKey = programOpts.sshKey ?? parsed.IdentityFile?.[0];
+        config.sshUser = programOpts.sshUser ?? parsed.User;
+    }
+    // console.dir(config)
+    return configCache = config;
+};
 const createSSHTunnel = async (opts) => {
+    const config = getConfig(opts);
     const sshOptions = {
-        host: opts.sshHost,
-        port: Number(opts.sshPort ?? 22),
-        username: opts.sshUser,
+        host: config.sshHost,
+        port: Number(config.sshPort ?? 22),
+        username: config.sshUser,
         agent: SSH_AUTH_SOCK,
-        privateKey: opts.sshKey ? readFileSync(realpathSync(opts.sshKey)) : void 0,
+        privateKey: config.sshKey ? readFileSync(realpathSync(config.sshKey)) : void 0,
     };
-    const dst = new URL(opts.db);
+    const dst = new URL(config.db);
     const forwardOptions = {
         dstPort: Number(dst.port ?? 27017),
         dstAddr: dst.hostname,
@@ -37,14 +66,14 @@ const createSSHTunnel = async (opts) => {
     return dst.toString();
 };
 const getMiri = async () => {
-    const opts = program.opts();
-    const db = opts.sshHost ? await createSSHTunnel(opts) : opts.db;
+    const config = getConfig(program.opts());
+    const db = config.sshHost ? await createSSHTunnel(config) : config.db;
     const dbUri = new URL(db);
     dbUri.searchParams.append('directConnection', 'true');
-    dbUri.searchParams.append('appName', 'miri+v1');
+    dbUri.searchParams.append('appName', `miri+v${pkg.version}`);
     const client = await connection(dbUri.toString());
     return new Miri(client, {
-        localMigrations: opts.migrations,
+        localMigrations: config.migrations,
     });
 };
 const status = async (remote = false, group) => {

package/dist/mongodb.js

@@ -1,7 +1,9 @@
+/* eslint-disable no-console */
 import { MongoClient } from 'mongodb';
 let client;
 export default async function connect(uri = 'mongodb://localhost:27017/test') {
     if (!client) {
+        console.log(`Connecting MongoDB to ${uri}`);
         client = await MongoClient.connect(uri);
         client?.topology?.socket?.unref();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "type": "module",
   "engines": {
     "node": "v20"
@@ -27,6 +27,7 @@
     "commander": "^12.0.0",
     "console-table-printer": "^2.12.0",
     "mongodb": "^6.5.0",
+    "ssh-config": "^4.4.2",
     "tunnel-ssh": "^5.1.2"
   },
   "devDependencies": {