@13w/miri 1.1.14 → 1.1.16

package/dist/cli.js

@@ -1,3 +1,4 @@
+import { readFileSync, realpathSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 Error.stackTraceLimit = Infinity;
 import { join } from 'node:path';
@@ -9,21 +10,59 @@ 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 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 askPassword = async (message = 'Password: ') => {
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+    process.stdin.setRawMode(true);
+    return new Promise((resolve, reject) => {
+        let password = '';
+        const readPass = function (chunk) {
+            const str = chunk.toString();
+            // backspace
+            if (str.charCodeAt(0) === 127) {
+                password = password.slice(0, -1);
+                return;
+            }
+            switch (str) {
+                case '\n':
+                case '\r':
+                case '\u0004':
+                    // They've finished typing their password
+                    process.stdin.setRawMode(false);
+                    process.stdin.pause();
+                    process.stdout.write('\n');
+                    process.stdin.off('data', readPass);
+                    resolve(password);
+                    return;
+                case '\u0003':
+                    // Ctrl C
+                    process.stdin.off('data', readPass);
+                    reject(new Error('Cancelled'));
+                default:
+                    // More passsword characters
+                    password += str;
+                    break;
+            }
+        };
+        process.stdout.write(message);
+        process.stdin.on('data', readPass);
+    });
+};
 const program = new Command();
 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');
 let configCache;
 const getConfig = (programOpts) => {
     if (configCache) {
@@ -42,18 +81,26 @@ const getConfig = (programOpts) => {
         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 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,
     };
+    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),
@@ -69,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, {
@@ -152,11 +199,19 @@ initProgram.command('apply')
     .argument('[patch]', 'patch name')
     .option('--no-exec', 'Don\' execute patch, just set as done')
     .option('--force', 'Force apply patch')
-    .action(async (opts, patch) => {
+    .action(async (patch, opts) => {
     const miri = await getMiri();
     await miri.init(opts, patch);
     await miri[Symbol.asyncDispose]();
 });
+initProgram.command('remove')
+    .argument('<patch>', 'patch name')
+    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .action(async (patch, opts) => {
+    const miri = await getMiri();
+    await miri.remove('init', patch, Boolean(opts?.exec));
+    await miri[Symbol.asyncDispose]();
+});
 initProgram.command('status')
     .action(() => status(false, 'init'));
 const indexesProgram = program.command('indexes')
@@ -215,5 +270,23 @@ patchProgram.command('sync')
     await miri.sync(opts);
     await miri[Symbol.asyncDispose]();
 });
+patchProgram.command('apply')
+    .argument('<group>', 'group name')
+    .argument('<patch>', 'patch name')
+    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .action(async (group, patch, opts) => {
+    const miri = await getMiri();
+    await miri.applySingle(group, patch, Boolean(opts.exec));
+    await miri[Symbol.asyncDispose]();
+});
+patchProgram.command('remove')
+    .argument('<group>', 'group name')
+    .argument('<patch>', 'patch name')
+    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .action(async (group, patch, opts) => {
+    const miri = await getMiri();
+    await miri.remove(group, patch, Boolean(opts.exec));
+    await miri[Symbol.asyncDispose]();
+});
 program.parse();
 //# sourceMappingURL=cli.js.map

package/dist/miri.js

@@ -276,7 +276,7 @@ export default class Migrator {
             }
         }
     }
-    async init({ noExec = false, force = false } = {}, patch) {
+    async init({ exec = false, force = false } = {}, patch) {
         const localInits = await this.getLocalPatches(true, 'init', patch);
         const remoteInits = await this.getRemotePatches('init', patch);
         if (!localInits.length) {
@@ -292,7 +292,7 @@ export default class Migrator {
                 console.groupEnd();
                 continue;
             }
-            if (force || !noExec) {
+            if (force || exec) {
                 console.log('applying');
                 await this.applyPatchContent({ body: patch.raw, hash: '' }, `${patch.group}/${patch.name}`, false);
             }
@@ -322,5 +322,51 @@ export default class Migrator {
         }
         return patches;
     }
+    async applySingle(group, name, exec = false) {
+        const [local] = await this.getLocalPatches(false, group, name);
+        const [remote] = await this.getRemotePatches(group, name);
+        if (!local) {
+            console.group(`Patch ${group}/${name} not found.`);
+            return;
+        }
+        console.group('Patch found');
+        if (exec && local.content.up) {
+            console.group(colors.cyan('applying migration...'));
+            await this.applyPatchContent(local.content.up, `${local.group}/${local.name}`);
+            console.log(colors.green('done'));
+            console.groupEnd();
+        }
+        else {
+            console.log('set as done');
+        }
+        const _id = remote?._id ?? local._id;
+        await this.#collection.updateOne({ _id }, {
+            $set: {
+                _id,
+                group: local.group,
+                name: local.name,
+                content: local.content,
+            },
+        }, { upsert: true });
+        console.groupEnd();
+    }
+    async remove(group, name, exec = false) {
+        const [patch] = await this.getRemotePatches(group, name);
+        if (!patch) {
+            console.group(`Patch ${group}/${name} not found.`);
+            return;
+        }
+        console.group('Patch found, start removing');
+        if (exec && patch.content.down) {
+            console.group('De-applying patch...');
+            await this.applyPatchContent(patch.content.down, `${patch.group}/${patch.name}`);
+            console.log('done');
+            console.groupEnd();
+        }
+        console.group('Removing patch from database');
+        await this.#collection.deleteOne({ group, name });
+        console.log('done');
+        console.groupEnd();
+    }
 }
 //# sourceMappingURL=miri.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "type": "module",
   "engines": {
     "node": "v20"
@@ -25,24 +25,24 @@
   "main": "bin/miri",
   "types": "types/miri.d.ts",
   "dependencies": {
-    "@mongosh/service-provider-server": "^2.2.5",
-    "@mongosh/shell-api": "^2.2.5",
-    "@mongosh/shell-evaluator": "^2.2.5",
+    "@mongosh/service-provider-server": "^2.2.15",
+    "@mongosh/shell-api": "^2.2.15",
+    "@mongosh/shell-evaluator": "^2.2.15",
     "colors": "^1.4.0",
-    "commander": "^12.0.0",
-    "console-table-printer": "^2.12.0",
-    "mongodb": "^6.5.0",
-    "ssh-config": "^4.4.3",
+    "commander": "^12.1.0",
+    "console-table-printer": "^2.12.1",
+    "mongodb": "^6.8.0",
+    "ssh-config": "^4.4.4",
     "tunnel-ssh": "^5.1.2"
   },
   "devDependencies": {
-    "@types/node": "^20.12.7",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
-    "eslint": "^9.1.1",
+    "@types/node": "^20.14.15",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-deprecation": "^2.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "license": "MIT",
   "scripts": {