@jacebenson/jsn 4.3.7-dev.24 → 4.3.7-dev.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacebenson/jsn",
-  "version": "4.3.7-dev.24",
+  "version": "4.3.7-dev.26",
   "description": "A command-line interface for ServiceNow that follows the Unix philosophy: simple, composable, and scriptable.",
   "type": "module",
   "bin": {

package/src/commands/midservers.js

@@ -3,7 +3,7 @@ import { confirmDelete, formatRecordForDisplay, getStringField, interactiveList,
 import { FormatAuto } from '../output.js';
 import { declareCapabilities } from '../capabilities.js';
 import { resolveRecord, unwrapSysId } from '../resolve-record.js';
-import { detectDocker, installDockerMidServer, validateMidCredentials } from '../midserver-install.js';
+import { detectDocker, defaultRun, installDockerMidServer, validateMidCredentials } from '../midserver-install.js';
 
 const AGENT_TABLE = 'ecc_agent';
 const QUEUE_TABLE = 'ecc_queue';
@@ -250,6 +250,7 @@ export function midserversCmd(wrap) {
               ]
               : dockerStatus.installed && dockerStatus.compose
                 ? [
+                  { name: 'Run with sudo', value: 'sudo' },
                   { name: 'Prepare files now, run Docker later', value: 'prepare' },
                   { name: 'Direct install (not available yet)', value: 'direct' },
                 ]
@@ -267,8 +268,13 @@ export function midserversCmd(wrap) {
             name,
             releaseName: credentials.releaseName,
             directory: argv.directory,
-            runNow: installMethod !== 'prepare',
+            runNow: false,
           });
+          if (installMethod === 'sudo') {
+            defaultRun('sudo', ['systemctl', 'start', 'docker']);
+            defaultRun('sudo', ['docker', 'compose', '-f', installation.composePath, 'up', '-d'], { cwd: installation.installDir });
+            installation.prepared = false;
+          }
           if (installation.prepared) {
             app.ok(installation, { summary: `Prepared MID Server files in ${installation.installDir}. Run: ${installation.runCommand}` });
             return;

package/src/midserver-install.js

@@ -28,7 +28,8 @@ export function normalizeMidName(name) {
 }
 
 export function buildMidRecipeUrl(releaseName) {
-  const match = String(releaseName).match(/(\d{4})-(\d{2})-(\d{2})|(\d{2})-(\d{2})-(\d{4})/);
+  const matches = [...String(releaseName).matchAll(/(\d{4})-(\d{2})-(\d{2})|(\d{2})-(\d{2})-(\d{4})/g)];
+  const match = matches.at(-1);
   if (!match) throw new Error(`MID release name has no build date: ${releaseName}`);
   const year = match[1] || match[6];
   const month = match[2] || match[4];
@@ -131,7 +132,10 @@ export async function installDockerMidServer({
     fs.rmSync(persistedRecipeDir, { recursive: true, force: true });
     fs.cpSync(recipeDir, persistedRecipeDir, { recursive: true });
     fs.writeFileSync(composePath, composeFile({ serviceName }), { mode: 0o600 });
-    fs.writeFileSync(path.join(installDir, '.env'), envFile({ instanceURL, username, password, displayName, releaseName }), { mode: 0o600 });
+    fs.chmodSync(composePath, 0o600);
+    const envPath = path.join(installDir, '.env');
+    fs.writeFileSync(envPath, envFile({ instanceURL, username, password, displayName, releaseName }), { mode: 0o600 });
+    fs.chmodSync(envPath, 0o600);
     if (!dockerAvailable || !runNow) {
       return {
         name: displayName,