kirby-deploy 0.4.0 → 0.4.1

package/dist/cli.js

@@ -8,7 +8,7 @@ import { defineCommand as defineCommand4 } from "citty";
 import { consola as consola9 } from "consola";
 import { colors as colors6 } from "consola/utils";
 import { readFileSync } from "fs";
-import { join as join6, relative } from "path/posix";
+import { join as join7, relative } from "path/posix";
 import { cwd as cwd2 } from "process";
 
 // src/config.ts
@@ -150,15 +150,15 @@ ${info}`);
 // src/lftp/cat.ts
 import { spawnSync } from "child_process";
 import { consola as consola2 } from "consola";
+import { join } from "path";
 import { platform } from "os";
-var cat = (file, { host, user, password, lftpSettings }) => {
+var cat = (file, { host, user, password, remoteDir, lftpSettings }) => {
   const commands = [
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    `cat ${file}`,
+    `open -u ${user},${password} ${host}`,
+    `cat ${join(remoteDir, file)}`,
     "bye"
   ];
   const isWindows = platform() === "win32";
@@ -166,7 +166,8 @@ var cat = (file, { host, user, password, lftpSettings }) => {
     encoding: "utf-8"
   }) : spawnSync("lftp", ["-c", commands.join("; ")], { encoding: "utf-8" });
   if (child.stderr) {
-    if (child.stderr.includes("550")) return void 0;
+    if (child.stderr.includes("550") || child.stderr.includes("No such file"))
+      return void 0;
     consola2.error(child.stderr);
     return void 0;
   }
@@ -175,7 +176,7 @@ var cat = (file, { host, user, password, lftpSettings }) => {
 
 // src/sync.ts
 import { consola as consola5 } from "consola";
-import { join as join2 } from "path/posix";
+import { join as join3 } from "path/posix";
 
 // src/lftp/mirror.ts
 import { consola as consola3 } from "consola";
@@ -187,9 +188,7 @@ var mirror = (source, destination, flags, { lftpSettings, host, user, password,
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    // mask credentials
+    `open -u ${user},${password} ${host}`,
     `mirror ${flags.join(" ")} ${source} ${destination}`,
     "bye"
   ];
@@ -245,11 +244,11 @@ import { consola as consola4 } from "consola";
 import { colors as colors2 } from "consola/utils";
 import { spawnSync as spawnSync2 } from "child_process";
 import { existsSync } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 import { cwd, stdin as input, stdout as output } from "process";
 import * as readline from "readline";
 var upperFirst = (string2) => string2.charAt(0).toUpperCase() + string2.slice(1);
-var isGit = () => existsSync(join(cwd(), ".git"));
+var isGit = () => existsSync(join2(cwd(), ".git"));
 var getBranch = () => {
   if (!isGit()) return;
   const { stderr, stdout } = spawnSync2("git", ["branch", "--show-current"], {
@@ -291,7 +290,7 @@ var sync = async (source, mode, config) => {
   const targetName = mode === "push" ? "remote" : "local";
   const webhookBase = `${config.url}/plugin-kirby-deploy`;
   const shouldCallWebhooks = mode === "push" && config.callWebhooks;
-  const destination = source === "./" ? config.remoteDir : join2(config.remoteDir, source);
+  const destination = source === "./" ? config.remoteDir : join3(config.remoteDir, source);
   if (shouldCallWebhooks && !config.token) {
     consola5.error("token needed to call webhooks");
     return false;
@@ -370,7 +369,7 @@ var sync = async (source, mode, config) => {
 import { defineCommand } from "citty";
 import { consola as consola6 } from "consola";
 import { colors as colors3 } from "consola/utils";
-import { join as join3 } from "path/posix";
+import { join as join4 } from "path/posix";
 var syncAccounts = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
@@ -381,7 +380,7 @@ var syncAccounts = async (mode, force = false) => {
     `${source}${branch ? colors3.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors3.magenta(
-    join3(config.host, config.remoteDir, source)
+    join4(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola6.log(
@@ -418,7 +417,7 @@ var accountsPull = defineCommand({
 import { defineCommand as defineCommand2 } from "citty";
 import { consola as consola7 } from "consola";
 import { colors as colors4 } from "consola/utils";
-import { join as join4 } from "path/posix";
+import { join as join5 } from "path/posix";
 var syncContent = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
@@ -429,7 +428,7 @@ var syncContent = async (mode, force = false) => {
     `${source}${branch ? colors4.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors4.magenta(
-    join4(config.host, config.remoteDir, source)
+    join5(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola7.log(
@@ -465,7 +464,7 @@ var contentPull = defineCommand2({
 import { defineCommand as defineCommand3 } from "citty";
 import { consola as consola8 } from "consola";
 import { colors as colors5 } from "consola/utils";
-import { join as join5 } from "path/posix";
+import { join as join6 } from "path/posix";
 var syncLanguages = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
@@ -476,7 +475,7 @@ var syncLanguages = async (mode, force = false) => {
     `${source}${branch ? colors5.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors5.magenta(
-    join5(config.host, config.remoteDir, source)
+    join6(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola8.log(
@@ -534,7 +533,7 @@ var main = defineCommand4({
       `^${relative(cwd2(), folderStructure.sessions)}/.`,
       `^${relative(cwd2(), folderStructure.cache)}/.`,
       `^${relative(cwd2(), folderStructure.logs)}/.`,
-      `^${relative(cwd2(), join6(folderStructure.site, "languages"))}/.`
+      `^${relative(cwd2(), join7(folderStructure.site, "languages"))}/.`
     ];
     const excludeGlob = [...config.excludeGlob, ".*", ".*/"];
     const include = config.include;
@@ -542,7 +541,7 @@ var main = defineCommand4({
     const branch = getBranch();
     const displaySource = branch ? colors6.cyan(` ${branch} `) : " ";
     const displayDestination = colors6.magenta(
-      join6(config.host, config.remoteDir)
+      join7(config.host, config.remoteDir)
     );
     consola9.log(`\u{1F680} Deploy${displaySource}to ${displayDestination}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-deploy",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "./dist/index.js",
   "type": "module",
   "bin": {

package/src/lftp/cat.ts

@@ -1,19 +1,19 @@
 import { spawnSync } from 'child_process'
 import { consola } from 'consola'
+import { join } from 'path'
 import { platform } from 'os'
 import { ConfigResolved } from '../types'
 
 export const cat = (
   file: string,
-  { host, user, password, lftpSettings }: ConfigResolved,
+  { host, user, password, remoteDir, lftpSettings }: ConfigResolved,
 ) => {
   const commands = [
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`,
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    `cat ${file}`,
+    `open -u ${user},${password} ${host}`,
+    `cat ${join(remoteDir, file)}`,
     'bye',
   ]
 
@@ -25,8 +25,9 @@ export const cat = (
     : spawnSync('lftp', ['-c', commands.join('; ')], { encoding: 'utf-8' })
 
   if (child.stderr) {
-    // 550 means the file doesn't exist, silently return undefined
-    if (child.stderr.includes('550')) return undefined
+    // 550 or "No such file" means the file doesn't exist, silently return undefined
+    if (child.stderr.includes('550') || child.stderr.includes('No such file'))
+      return undefined
     consola.error(child.stderr)
     return undefined
   }

package/src/lftp/mirror.ts

@@ -19,8 +19,7 @@ export const mirror = (
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`,
     ),
-    `open ${host}`,
-    `user ${user} ${password}`, // mask credentials
+    `open -u ${user},${password} ${host}`,
     `mirror ${flags.join(' ')} ${source} ${destination}`,
     'bye',
   ]