@atomicsmash/cli 12.0.0-beta.1 → 12.0.0-beta.2

package/dist/commands/add-media-proxy-to-herd.d.ts

@@ -0,0 +1,4 @@
+export declare const command = "add-media-proxy-to-herd";
+export declare const describe = "Add the media proxy to the local NGINX config within Herd.";
+export declare function handler(): Promise<void>;
+//# sourceMappingURL=add-media-proxy-to-herd.d.ts.map

package/dist/commands/add-media-proxy-to-herd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-media-proxy-to-herd.d.ts","sourceRoot":"","sources":["../../src/commands/add-media-proxy-to-herd.ts"],"names":[],"mappings":"AA6FA,eAAO,MAAM,OAAO,4BAA4B,CAAC;AACjD,eAAO,MAAM,QAAQ,+DACwC,CAAC;AAE9D,wBAAsB,OAAO,kBAiD5B"}

package/dist/commands/{toggle-media-proxy.js → add-media-proxy-to-herd.js}

@@ -1,11 +1,10 @@
 import { exec } from "node:child_process";
-import { readFile, writeFile } from "node:fs/promises";
-import { homedir, type } from "node:os";
-import { join } from "node:path";
 import { promisify } from "node:util";
 import { getSmashConfig } from "@atomicsmash/smash-config";
+import { homedir, type } from "node:os";
+import { join } from "node:path";
+import { readFile, writeFile } from "node:fs/promises";
 const PROXY_MARKER = "location @uploadsproxy";
-const execute = promisify(exec);
 function buildProxyBlock(stagingURL, httpAuth) {
     const authHeader = httpAuth
         ? `\n        proxy_set_header Authorization "Basic ${httpAuth}";`
@@ -43,43 +42,52 @@ function addProxyBlock(config, stagingURL, httpAuth) {
         "\n" +
         config.slice(serverBlockEnd));
 }
-function removeProxyBlock(config) {
-    return config.replace(/\n\s*location \^~ \/wp-content\/uploads\/\s*\{[\s\S]*?location @uploadsproxy\s*\{[\s\S]*?\}/, "");
-}
-export const command = "toggle-media-proxy";
-export const describe = "Toggle the media proxy in the local NGINX config within Herd.";
-export async function handler() {
-    const smashConfig = await getSmashConfig(2);
-    const { projectName, staging: { url: stagingURL, httpAuth: stagingHttpAuth }, } = smashConfig;
+function getNginxConfigPath(projectName) {
     const isMacOS = type() === "Darwin";
-    const nginxConfigPath = join(homedir(), isMacOS
+    return join(homedir(), isMacOS
         ? "Library/Application Support/Herd/config/valet/Nginx"
         : ".config\\herd\\config\\nginx", `${projectName}.test`);
-    let config;
+}
+async function getNginxConfig(projectName) {
+    const nginxConfigPath = getNginxConfigPath(projectName);
     try {
-        config = await readFile(nginxConfigPath, "utf-8");
+        return await readFile(nginxConfigPath, "utf-8");
     }
     catch {
         throw new Error(`Could not read NGINX config at: ${nginxConfigPath}\nMake sure the site exists in Herd.`);
     }
+}
+async function updateNginxConfig(projectName, updatedConfig) {
+    const nginxConfigPath = getNginxConfigPath(projectName);
+    await writeFile(nginxConfigPath, updatedConfig, "utf-8");
+}
+const execute = promisify(exec);
+export const command = "add-media-proxy-to-herd";
+export const describe = "Add the media proxy to the local NGINX config within Herd.";
+export async function handler() {
+    const smashConfig = await getSmashConfig(2);
+    const { projectName, staging: { url: stagingURL, httpAuth: stagingHttpAuth }, } = smashConfig;
+    const nginxConfig = await getNginxConfig(projectName);
+    if (nginxConfig.includes(PROXY_MARKER)) {
+        console.log("Media proxy is already set up in your NGINX config. To remove please delete the site in Herd, remove your .env file and re-run setup.");
+        return;
+    }
     const httpAuth = stagingHttpAuth
         ? Buffer.from(`${stagingHttpAuth.username}:${stagingHttpAuth.password}`).toString("base64")
         : undefined;
-    let updatedConfig;
-    if (config.includes(PROXY_MARKER)) {
-        updatedConfig = removeProxyBlock(config);
-        console.log("Media proxy removed from NGINX config.");
-    }
-    else {
-        updatedConfig = addProxyBlock(config, stagingURL, httpAuth);
+    const updatedConfig = addProxyBlock(nginxConfig, stagingURL, httpAuth);
+    await updateNginxConfig(projectName, updatedConfig)
+        .then(() => {
         if (httpAuth) {
             console.log("Media proxy added to NGINX config (with HTTP auth).");
         }
         else {
-            console.log("Media proxy added to NGINX config (no HTTP auth — STAGING_HTTP_AUTH_USERNAME and STAGING_HTTP_AUTH_PASSWORD not set).");
+            console.log("Media proxy added to NGINX config (no HTTP auth — httpAuth not set in smash.config.ts).");
         }
-    }
-    await writeFile(nginxConfigPath, updatedConfig, "utf-8");
+    })
+        .catch(() => {
+        console.log("Failed to update your NGINX config. Please try running the command again.");
+    });
     console.log("Restarting Herd...");
     await execute("herd restart")
         .then(() => {

package/dist/commands/pull-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AAEnE,wBAAsB,OAAO,kBA4I5B"}
+{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AAEnE,wBAAsB,OAAO,kBAgJ5B"}

package/dist/commands/pull-database.js

@@ -9,7 +9,7 @@ export const describe = "Pull the database down from staging and replace local d
 export async function handler() {
     const execute = promisify(exec);
     const smashConfig = await getSmashConfig(2);
-    const { projectName, staging: { url: stagingURL, dbPrefix: stagingDBPrefix, webRoot: stagingWebRoot, ssh: { username: stagingSSHUsername, host: stagingSSHHost, port: stagingSSHPort, }, }, } = smashConfig;
+    const { projectName, staging: { url: stagingURL, dbPrefix: stagingDBPrefix, webRoot: stagingWebRoot, ssh: { username: stagingSSHUsername, host: stagingSSHHost, port: stagingSSHPort, }, }, cli: { pullMedia: { monthsToPull }, }, } = smashConfig;
     const stopRunningMessage = startRunningMessage("Pulling database from staging");
     performance.mark("Start");
     await (async () => {
@@ -92,7 +92,8 @@ export async function handler() {
                 await stopRunningMessage4();
             });
             console.log(`Database import complete! ${convertMeasureToPrettyString(performance.measure("everything", "Start"))}`);
-            console.log("If you want to download recent media you can use `npm run pull:media`, you can also change the number of months to download in your `.env` file.");
+            console.log(`If you're using Herd, you can now run the proxy-media command to avoid having to download images.
+	Otherwise, you can use pull:media for a slow download of ${monthsToPull === -1 ? "all the images" : `${monthsToPull.toString()} months worth of images`} from staging.`);
         })
             .catch(async (error) => {
             await stopRunningMessage();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "12.0.0-beta.1",
+	"version": "12.0.0-beta.2",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",

package/dist/commands/toggle-media-proxy.d.ts

@@ -1,4 +0,0 @@
-export declare const command = "toggle-media-proxy";
-export declare const describe = "Toggle the media proxy in the local NGINX config within Herd.";
-export declare function handler(): Promise<void>;
-//# sourceMappingURL=toggle-media-proxy.d.ts.map

package/dist/commands/toggle-media-proxy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"toggle-media-proxy.d.ts","sourceRoot":"","sources":["../../src/commands/toggle-media-proxy.ts"],"names":[],"mappings":"AAuEA,eAAO,MAAM,OAAO,uBAAuB,CAAC;AAC5C,eAAO,MAAM,QAAQ,kEAC2C,CAAC;AAEjE,wBAAsB,OAAO,kBA2D5B"}