@13w/miri 1.1.9 → 1.1.10

package/dist/cli.js

@@ -4,14 +4,45 @@ import { join } from 'node:path';
 import { Command } from 'commander';
 import { Table } from 'console-table-printer';
 import colors from 'colors';
+import { createTunnel } from 'tunnel-ssh';
 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 program = new Command();
 program.option('-m --migrations <folder>', 'Folder with migrations', join(process.cwd(), 'migrations'));
-program.option('-d --db <mongo-uri>', 'MongoDB Connection URI', 'mongodb://localhost:27017/test');
+program.option('-d --db <mongo-uri>', 'MongoDB Connection URI', MIRI_MONGO_URI);
+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');
+const createSSHTunnel = async (opts) => {
+    const sshOptions = {
+        host: opts.sshHost,
+        port: Number(opts.sshPort ?? 22),
+        username: opts.sshUser,
+        agent: SSH_AUTH_SOCK,
+        privateKey: opts.sshKey ? readFileSync(realpathSync(opts.sshKey)) : void 0,
+    };
+    const dst = new URL(opts.db);
+    const forwardOptions = {
+        dstPort: Number(dst.port ?? 27017),
+        dstAddr: dst.hostname,
+    };
+    const [server] = await createTunnel({ autoClose: true }, {}, sshOptions, forwardOptions);
+    const addressInfo = server.address();
+    dst.host = addressInfo.family === 'IPv6' ? `[${String(addressInfo.address)}]` : String(addressInfo.address);
+    dst.port = String(addressInfo.port);
+    return dst.toString();
+};
 const getMiri = async () => {
     const opts = program.opts();
-    const client = await connection(opts.db);
+    const db = opts.sshHost ? await createSSHTunnel(opts) : opts.db;
+    const dbUri = new URL(db);
+    dbUri.searchParams.append('directConnection', 'true');
+    dbUri.searchParams.append('appName', 'miri+v1');
+    const client = await connection(dbUri.toString());
     return new Miri(client, {
         localMigrations: opts.migrations,
     });
@@ -59,12 +90,10 @@ initProgram.command('status')
     .action(() => status(false, 'init'));
 const indexesProgram = program.command('indexes')
     .description('Manage indexes');
-const indexStatusProgram = indexesProgram.command('status')
+indexesProgram.command('status')
     .argument('[collection]', 'MongoDB Collection name')
     .option('-q --quiet', 'Show only changes', false)
-    .action(async () => {
-    const collection = indexStatusProgram.args[0];
-    const { quiet } = indexStatusProgram.opts();
+    .action(async (collection, { quiet }) => {
     const miri = await getMiri();
     const structure = await miri.indexesDiff(collection);
     await miri[Symbol.asyncDispose]();
@@ -94,12 +123,12 @@ const indexStatusProgram = indexesProgram.command('status')
     }
 });
 const indexSyncProgram = indexesProgram.command('sync');
-indexSyncProgram.option('<collection>', 'MongoDB Collection name', '')
-    .action(async () => {
+indexSyncProgram.argument('[collection]', 'MongoDB Collection name', '')
+    .action(async (coll) => {
     const miri = await getMiri();
     let group = '';
     console.group('Starting synchronisation...');
-    for await (const { collection, status, name, error } of miri.indexesSync(...indexSyncProgram.args)) {
+    for await (const { collection, status, name, error } of miri.indexesSync(coll)) {
         if (group !== collection) {
             if (group) {
                 console.log('Done');
@@ -122,17 +151,17 @@ indexSyncProgram.option('<collection>', 'MongoDB Collection name', '')
 });
 const patchProgram = program.command('patch')
     .description('Applies patch to database');
-const patchDiffProgram = patchProgram.command('diff')
+patchProgram.command('diff')
     .description('Displays difference between local and applied migrations')
     .action(() => status());
-const patchSyncProgram = patchProgram.command('sync')
+patchProgram.command('sync')
     .description('Applies migrations')
     .option('--remote', 'Remote only')
     .option('--degraded', 'Re-apply patches on degraded migrations')
     .option('--all', 'Re-apply all patches')
-    .action(async () => {
+    .action(async (opts) => {
     const miri = await getMiri();
-    await miri.sync(patchSyncProgram.opts());
+    await miri.sync(opts);
     await miri[Symbol.asyncDispose]();
 });
 program.parse();

package/dist/mongodb.js

@@ -2,7 +2,7 @@ import { MongoClient } from 'mongodb';
 let client;
 export default async function connect(uri = 'mongodb://localhost:27017/test') {
     if (!client) {
-        client = await new MongoClient(uri).connect();
+        client = await MongoClient.connect(uri);
         client?.topology?.socket?.unref();
     }
     return client;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "type": "module",
   "engines": {
     "node": "v20"
@@ -26,16 +26,17 @@
     "colors": "^1.4.0",
     "commander": "^12.0.0",
     "console-table-printer": "^2.12.0",
-    "mongodb": "^6.3.0"
+    "mongodb": "^6.5.0",
+    "tunnel-ssh": "^5.1.2"
   },
   "devDependencies": {
-    "@types/node": "^20.11.21",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@types/node": "^20.11.27",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "eslint": "^8.57.0",
     "eslint-plugin-deprecation": "^2.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "license": "MIT",
   "scripts": {