@13w/miri 1.1.8 → 1.1.10

package/dist/cli.js

@@ -4,21 +4,52 @@ 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,
     });
 };
-const status = async (remote = false) => {
+const status = async (remote = false, group) => {
     const miri = await getMiri();
-    const patches = await miri.stat(remote);
+    const patches = await miri.stat(remote, group);
     await miri[Symbol.asyncDispose]();
     if (!patches.length) {
         return;
@@ -47,7 +78,8 @@ const status = async (remote = false) => {
 program.command('status')
     .description('Displays list of applied migrations')
     .action(() => status(true));
-const initProgram = program.command('init');
+const initProgram = program.command('init')
+    .description('Manage initial scripts');
 initProgram.command('apply')
     .action(async () => {
     const miri = await getMiri();
@@ -55,16 +87,13 @@ initProgram.command('apply')
     await miri[Symbol.asyncDispose]();
 });
 initProgram.command('status')
-    .action(() => {
-    console.log('There should be init status....');
-});
-const indexesProgram = program.command('indexes');
-const indexStatusProgram = indexesProgram.command('status')
+    .action(() => status(false, 'init'));
+const indexesProgram = program.command('indexes')
+    .description('Manage indexes');
+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...', indexSyncProgram.opts());
-    for await (const { collection, status, name, error } of miri.indexesSync()) {
+    console.group('Starting synchronisation...');
+    for await (const { collection, status, name, error } of miri.indexesSync(coll)) {
         if (group !== collection) {
             if (group) {
                 console.log('Done');
@@ -120,17 +149,19 @@ indexSyncProgram.option('<collection>', 'MongoDB Collection name', '')
     console.groupEnd();
     await miri[Symbol.asyncDispose]();
 });
-program.command('diff')
+const patchProgram = program.command('patch')
+    .description('Applies patch to database');
+patchProgram.command('diff')
     .description('Displays difference between local and applied migrations')
     .action(() => status());
-const programSync = program.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')
-    .description('Applies migrations')
-    .action(async () => {
+    .action(async (opts) => {
     const miri = await getMiri();
-    await miri.sync(programSync.opts());
+    await miri.sync(opts);
     await miri[Symbol.asyncDispose]();
 });
 program.parse();

package/dist/miri.js

@@ -22,9 +22,9 @@ export var IndexStatus;
 })(IndexStatus || (IndexStatus = {}));
 const sortPatches = (a, b) => {
     if (a.group === b.group) {
-        return a.name < b.name ? -1 : 1;
+        return a.name.localeCompare(b.name);
     }
-    return a.group < b.group ? 1 : -1;
+    return a.group.localeCompare(b.group);
 };
 export default class Migrator {
     client;
@@ -42,9 +42,9 @@ export default class Migrator {
     async [Symbol.asyncDispose]() {
         await this.#client.close();
     }
-    async diff() {
-        const localPatches = await this.getLocalPatches();
-        const remotePatches = await this.getRemotePatches();
+    async diff(group) {
+        const localPatches = await this.getLocalPatches(false, group);
+        const remotePatches = await this.getRemotePatches(group);
         for (const localPatch of localPatches) {
             const remotePatch = remotePatches.find(({ group, name }) => localPatch.group === group && localPatch.name === name);
             if (remotePatch) {
@@ -93,29 +93,29 @@ export default class Migrator {
             const filename = `${patch.group}/${patch.name}`;
             console.group(`Patch ${patch.group} / ${patch.name}...`);
             if (patch.status === PatchStatus.Removed) {
-                console.group('Reverting changes');
-                const result = await this.applyPatchContent(patch.remoteContent?.down, filename);
-                console.log(result === -1 ? 'Revert script not found' : 'done');
+                console.group(colors.cyan('reverting changes'));
+                const result = await this.applyPatchContent((patch.remoteContent ?? patch.content)?.down, filename);
+                console.log(result === -1 ? colors.white('revert script not found') : colors.green('done'));
                 console.groupEnd();
                 await this.#collection.deleteOne({ _id: patch._id });
                 console.groupEnd();
                 continue;
             }
             if (patch.status === PatchStatus.Changed) {
-                console.group('Reverting changes');
-                const result = await this.applyPatchContent(patch.remoteContent?.down, filename);
-                console.log(result === -1 ? 'Revert script not found' : 'done');
+                console.group(colors.cyan('reverting changes'));
+                const result = await this.applyPatchContent((patch.remoteContent ?? patch.content)?.down, filename);
+                console.log(result === -1 ? colors.white('revert script not found') : colors.green('done'));
                 console.groupEnd();
                 patch.status = PatchStatus.New;
             }
             if (all || degraded || patch.status === PatchStatus.New) {
-                console.group(colors.white('Testing migration'));
+                console.group(colors.white('resting migration'));
                 const test = await this.applyPatchContent(patch.content.test, filename);
                 console.log(colors.white(`degradation level: ${test}`));
                 if (all || test !== 0) {
-                    console.group(colors.cyan('Applying migration...'));
+                    console.group(colors.cyan('applying migration...'));
                     await this.applyPatchContent(patch.content.up, filename);
-                    console.log(colors.green('Done'));
+                    console.log(colors.green('done'));
                     console.groupEnd();
                 }
                 else {
@@ -166,7 +166,8 @@ export default class Migrator {
                 patchObject.raw = patchContent.toString('base64');
                 continue;
             }
-            const patchExports = await evaluateJs(patchContent.toString());
+            const patchExports = await evaluateJs(patchContent.toString())
+                .catch(() => ({}));
             for (const key of ['test', 'up', 'down']) {
                 const func = patchExports[key];
                 if (typeof func !== 'function') {
@@ -302,8 +303,8 @@ export default class Migrator {
         }
         console.groupEnd();
     }
-    async stat(remote = false) {
-        const patches = await (remote ? this.getRemotePatches() : this.diff());
+    async stat(remote = false, group) {
+        const patches = await (remote ? this.getRemotePatches(group) : this.diff(group));
         for (const patch of patches) {
             patch.status = patch.status ?? PatchStatus.Ok;
             const degradation = await this.applyPatchContent(patch.content.test, `${patch.group}/${patch.name}`);

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.8",
+  "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": {