@13w/miri 1.1.15 → 1.1.17

package/dist/cli.js

@@ -1,15 +1,14 @@
 import { readFileSync, realpathSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-Error.stackTraceLimit = Infinity;
 import { join } from 'node:path';
-/* eslint-disable no-console */
+Error.stackTraceLimit = Infinity;
+import colors from 'colors';
 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 { createTunnel } from 'tunnel-ssh';
 import Miri, { IndexStatus, PatchStatus } from './miri.js';
+import connection from './mongodb.js';
 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;
@@ -41,6 +40,7 @@ const askPassword = async (message = 'Password: ') => {
                     // Ctrl C
                     process.stdin.off('data', readPass);
                     reject(new Error('Cancelled'));
+                    return;
                 default:
                     // More passsword characters
                     password += str;
@@ -56,12 +56,13 @@ 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('--no-direct-connection', 'Disable direct connection', true);
 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');
-program.option('--ssh-ask-pass', 'Ask for the private key password', false);
+program.option('--ssh-ask-pass', 'Ask for the private key password');
 let configCache;
 const getConfig = (programOpts) => {
     if (configCache) {
@@ -84,19 +85,22 @@ const getConfig = (programOpts) => {
 };
 const createSSHTunnel = async (opts) => {
     const config = getConfig(opts);
-    let passphrase = '';
-    if (config.sshKey && config.sshAskPass) {
-        passphrase = await askPassword();
-    }
+    const passphrase = config.sshKey && config.sshAskPass ? await askPassword() : void 0;
     const sshOptions = {
         host: config.sshHost,
         port: Number(config.sshPort ?? 22),
         username: config.sshUser,
-        // agent: SSH_AUTH_SOCK,
-        privateKey: config.sshKey ? readFileSync(realpathSync(config.sshKey)) : void 0,
-        passphrase,
     };
-    console.dir([config, sshOptions]);
+    if (config.sshKey) {
+        sshOptions.privateKey = readFileSync(realpathSync(config.sshKey));
+        if (passphrase) {
+            sshOptions.passphrase = passphrase;
+        }
+    }
+    else if (SSH_AUTH_SOCK) {
+        sshOptions.agent = SSH_AUTH_SOCK;
+    }
+    // console.dir([config, sshOptions])
     const dst = new URL(config.db);
     const forwardOptions = {
         dstPort: Number(dst.port ?? 27017),
@@ -112,7 +116,7 @@ const getMiri = async () => {
     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('directConnection', String(config.directConnection ?? true));
     dbUri.searchParams.append('appName', `miri+v${pkg.version}`);
     const client = await connection(dbUri.toString());
     return new Miri(client, {

package/dist/evaluator.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { EventEmitter } from 'node:events';
 import { createContext, runInContext, SourceTextModule, SyntheticModule } from 'node:vm';
 import { inspect } from 'node:util';
@@ -46,7 +45,7 @@ export async function evaluateMongo(client, code, filename = '[no file]') {
         onLoad() {
             throw new Error('Load isn\'t supported');
         },
-        async onExit() {
+        onExit() {
             throw new Error('Exit isn\'t supported');
         },
     });

package/dist/miri.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { createHash } from 'node:crypto';
 import { readdir, readFile, realpath } from 'node:fs/promises';
 import { resolve, extname, basename } from 'node:path';

package/dist/mongodb.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { MongoClient } from 'mongodb';
 let client;
 export default async function connect(uri = 'mongodb://localhost:27017/test') {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "type": "module",
   "engines": {
-    "node": "v20"
+    "node": "v22"
   },
   "keywords": [
     "MongoDB",
@@ -24,30 +24,30 @@
   ],
   "main": "bin/miri",
   "types": "types/miri.d.ts",
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "lint": "eslint src/ --ext .ts --quiet",
-    "prepublish": "pnpm run build"
-  },
   "dependencies": {
-    "@mongosh/service-provider-server": "^2.2.12",
-    "@mongosh/shell-api": "^2.2.12",
-    "@mongosh/shell-evaluator": "^2.2.12",
+    "@mongosh/service-provider-server": "^2.3.1",
+    "@mongosh/shell-api": "^2.3.1",
+    "@mongosh/shell-evaluator": "^2.3.1",
     "colors": "^1.4.0",
     "commander": "^12.1.0",
     "console-table-printer": "^2.12.1",
-    "mongodb": "^6.8.0",
-    "ssh-config": "^4.4.4",
+    "mongodb": "^6.9.0",
+    "ssh-config": "^5.0.0",
     "tunnel-ssh": "^5.1.2"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-deprecation": "^2.0.0",
+    "@eslint/js": "^9.10.0",
+    "@types/node": "^22.5.5",
+    "eslint": "^9.10.0",
+    "mongodb-log-writer": "^1.4.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2",
+    "typescript-eslint": "^8.5.0"
   },
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "lint": "eslint --quiet src/",
+    "prepublish": "pnpm run build"
+  }
+}