@jacebenson/jsn 4.3.7-dev.23 → 4.3.7-dev.25

package/package.json

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

package/src/commands/midservers.js

@@ -250,17 +250,15 @@ export function midserversCmd(wrap) {
               ]
               : dockerStatus.installed && dockerStatus.compose
                 ? [
-                  { name: 'Fix Docker daemon access first', value: 'docker-unavailable' },
+                  { name: 'Prepare files now, run Docker later', value: 'prepare' },
                   { name: 'Direct install (not available yet)', value: 'direct' },
                 ]
               : [
-                { name: 'Install Docker first', value: 'install-docker' },
+                { name: 'Prepare files now, run Docker later', value: 'prepare' },
                 { name: 'Direct install (not available yet)', value: 'direct' },
               ],
           });
           if (installMethod === 'direct') throw new Error('Direct MID Server installation is not implemented yet. Choose Docker.');
-          if (installMethod === 'docker-unavailable') throw new Error('Docker is installed, but this user cannot access the Docker daemon. Start Docker and grant this user access to /var/run/docker.sock, then run this command again.');
-          if (installMethod === 'install-docker') throw new Error('Automatic Docker installation is not implemented yet. Install Docker and Compose, then run this command again.');
 
           const installation = await installDockerMidServer({
             instanceURL: app.getEffectiveInstance(),
@@ -269,7 +267,12 @@ export function midserversCmd(wrap) {
             name,
             releaseName: credentials.releaseName,
             directory: argv.directory,
+            runNow: installMethod !== 'prepare',
           });
+          if (installation.prepared) {
+            app.ok(installation, { summary: `Prepared MID Server files in ${installation.installDir}. Run: ${installation.runCommand}` });
+            return;
+          }
           let record;
           try {
             record = await waitForMidServerUp(app, installation.name, Math.max(1, argv['wait-timeout']), Math.max(500, argv['wait-interval']));

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];
@@ -77,7 +78,16 @@ export function dockerComposeAvailable(run = defaultRun) {
 }
 
 function composeFile({ serviceName }) {
-  return `services:\n  ${serviceName}:\n    container_name: ${serviceName}\n    image: ${serviceName}:\${MID_RELEASE}\n    restart: unless-stopped\n    volumes:\n      - ./export:/opt/snc_mid_server/agent/export\n    environment:\n      MID_INSTANCE_URL: \${MID_INSTANCE_URL}\n      MID_INSTANCE_USERNAME: \${MID_INSTANCE_USERNAME}\n      MID_INSTANCE_PASSWORD: \${MID_INSTANCE_PASSWORD}\n      MID_SERVER_NAME: \${MID_SERVER_NAME}\n`;
+  return `services:\n  ${serviceName}:\n    container_name: ${serviceName}\n    build: ./recipe\n    image: ${serviceName}:\${MID_RELEASE}\n    restart: unless-stopped\n    volumes:\n      - ./export:/opt/snc_mid_server/agent/export\n    environment:\n      MID_INSTANCE_URL: \${MID_INSTANCE_URL}\n      MID_INSTANCE_USERNAME: \${MID_INSTANCE_USERNAME}\n      MID_INSTANCE_PASSWORD: \${MID_INSTANCE_PASSWORD}\n      MID_SERVER_NAME: \${MID_SERVER_NAME}\n`;
+}
+
+function envFile({ instanceURL, username, password, displayName, releaseName }) {
+  return `MID_RELEASE=${releaseName}\nMID_INSTANCE_URL=${String(instanceURL).replace(/\/$/, '')}/\nMID_INSTANCE_USERNAME=${username}\nMID_INSTANCE_PASSWORD=${password}\nMID_SERVER_NAME=${displayName}\n`;
+}
+
+function instanceName(instanceURL) {
+  const hostname = new URL(instanceURL).hostname;
+  return hostname.replace(/\.service-now\.com$|\.servicenowservices\.com$/i, '').replace(/[^A-Za-z0-9._-]/g, '_');
 }
 
 export async function installDockerMidServer({
@@ -87,17 +97,17 @@ export async function installDockerMidServer({
   name,
   directory,
   releaseName: suppliedReleaseName,
+  runNow = true,
   fetchImpl = fetch,
   run = defaultRun,
 }) {
-  if (!dockerComposeAvailable(run)) {
-    throw new Error('Docker and Docker Compose are required for Docker MID Server installation');
-  }
+  const dockerAvailable = detectDocker(run).available;
   const shortName = normalizeMidName(name);
   const displayName = `mid.server.${shortName}`;
   const releaseName = suppliedReleaseName || (await validateMidCredentials(instanceURL, username, password, fetchImpl)).releaseName;
   const recipeURL = buildMidRecipeUrl(releaseName);
-  const installDir = directory || path.join(os.homedir(), '.local', 'share', 'jsn', 'midservers', shortName);
+  const serviceNowInstance = instanceName(instanceURL);
+  const installDir = directory || path.join(os.homedir(), '.servicenow', 'mids', serviceNowInstance, shortName);
   fs.mkdirSync(installDir, { recursive: true, mode: 0o700 });
   const exportDir = path.join(installDir, 'export');
   fs.mkdirSync(exportDir, { recursive: true, mode: 0o700 });
@@ -110,9 +120,8 @@ export async function installDockerMidServer({
     fs.mkdirSync(recipeDir, { recursive: true, mode: 0o700 });
     run('unzip', ['-q', archive, '-d', recipeDir]);
     const composePath = path.join(installDir, 'docker-compose.yaml');
+    const persistedRecipeDir = path.join(installDir, 'recipe');
     const serviceName = `jsn_mid_${shortName.replace(/[^A-Za-z0-9_.-]/g, '_')}`;
-    run('docker', ['build', '--tag', `${serviceName}:${releaseName}`, recipeDir]);
-    fs.writeFileSync(composePath, composeFile({ serviceName, instanceURL, displayName }), { mode: 0o600 });
     const env = {
       MID_RELEASE: releaseName,
       MID_INSTANCE_URL: `${String(instanceURL).replace(/\/$/, '')}/`,
@@ -120,6 +129,25 @@ export async function installDockerMidServer({
       MID_INSTANCE_PASSWORD: password,
       MID_SERVER_NAME: displayName,
     };
+    fs.rmSync(persistedRecipeDir, { recursive: true, force: true });
+    fs.cpSync(recipeDir, persistedRecipeDir, { recursive: true });
+    fs.writeFileSync(composePath, composeFile({ serviceName }), { 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,
+        releaseName,
+        installDir,
+        composePath,
+        serviceName,
+        prepared: true,
+        runCommand: `docker compose -f ${composePath} up -d`,
+      };
+    }
+    run('docker', ['build', '--tag', `${serviceName}:${releaseName}`, persistedRecipeDir]);
     run('docker', ['compose', '-f', composePath, 'up', '-d'], { cwd: installDir, env });
     return {
       name: displayName,