@factiii/stack 0.1.47 → 0.1.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-deploy.d.ts","sourceRoot":"","sources":["../../src/utils/ssh-deploy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,SAAS;IAClB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAuB;gBAE1B,MAAM,EAAE,eAAe;IAOnC;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;IACH,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"ssh-deploy.d.ts","sourceRoot":"","sources":["../../src/utils/ssh-deploy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,SAAS;IAClB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAuB;gBAE1B,MAAM,EAAE,eAAe;IAOnC;;OAEG;IACH,OAAO,CAAC,WAAW;IAcnB;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;IACH,OAAO,CAAC,OAAO;IAuBf;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAYxC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAwBxB;;OAEG;IACG,YAAY,CACd,KAAK,EAAE,SAAS,GAAG,MAAM,EACzB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,mBAAmB,CAAC;IA8B/B;;OAEG;IACG,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAqB3E;;OAEG;IACG,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBrE;;OAEG;IACG,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,IAAI,CAAA;KAAE,CAAC;CA2BjG;AAED,eAAe,SAAS,CAAC"}
|
package/dist/utils/ssh-deploy.js
CHANGED
|
@@ -93,27 +93,22 @@ class SSHDeploy {
|
|
|
93
93
|
*/
|
|
94
94
|
sshExec(command) {
|
|
95
95
|
const keyPath = this.keyPath ?? this.setupSSHKey();
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
'ssh',
|
|
99
|
-
'-i', `"${keyPath}"`,
|
|
96
|
+
const result = (0, child_process_1.spawnSync)('ssh', [
|
|
97
|
+
'-i', keyPath,
|
|
100
98
|
'-o', 'StrictHostKeyChecking=no',
|
|
101
99
|
'-o', 'UserKnownHostsFile=/dev/null',
|
|
102
100
|
'-o', 'BatchMode=yes',
|
|
103
101
|
'-o', 'ConnectTimeout=30',
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
]
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
catch (e) {
|
|
114
|
-
const error = e;
|
|
115
|
-
throw new Error(`SSH command failed: ${error.stderr || error.message}`);
|
|
102
|
+
this.user + '@' + this.host,
|
|
103
|
+
command,
|
|
104
|
+
], {
|
|
105
|
+
encoding: 'utf8',
|
|
106
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
107
|
+
});
|
|
108
|
+
if (result.status !== 0) {
|
|
109
|
+
throw new Error('SSH command failed: ' + (result.stderr || 'exit code ' + result.status));
|
|
116
110
|
}
|
|
111
|
+
return result.stdout ?? '';
|
|
117
112
|
}
|
|
118
113
|
/**
|
|
119
114
|
* Test SSH connection to server
|
|
@@ -164,16 +159,11 @@ class SSHDeploy {
|
|
|
164
159
|
this.setupSSHKey();
|
|
165
160
|
const envContent = this.envToFileContent(envVars);
|
|
166
161
|
const envFileName = `.env.${stage}`;
|
|
167
|
-
const factiiiDir =
|
|
162
|
+
const factiiiDir = `$HOME/.factiii/${this.repoName}`;
|
|
168
163
|
const envFilePath = `${factiiiDir}/${envFileName}`;
|
|
169
164
|
// Create directory if it doesn't exist, then write the file
|
|
170
|
-
//
|
|
171
|
-
const
|
|
172
|
-
.replace(/\\/g, '\\\\')
|
|
173
|
-
.replace(/'/g, "'\\''");
|
|
174
|
-
const command = `mkdir -p ${factiiiDir} && cat > ${envFilePath} << 'FACTIII_ENV_EOF'
|
|
175
|
-
${envContent}FACTIII_ENV_EOF
|
|
176
|
-
chmod 600 ${envFilePath}`;
|
|
165
|
+
// Quoted heredoc delimiter ('FACTIII_ENV_EOF') prevents shell expansion
|
|
166
|
+
const command = 'mkdir -p ' + factiiiDir + ' && cat > ' + envFilePath + " << 'FACTIII_ENV_EOF'\n" + envContent + 'FACTIII_ENV_EOF\nchmod 600 ' + envFilePath;
|
|
177
167
|
this.sshExec(command);
|
|
178
168
|
const keyCount = Object.keys(envVars).length;
|
|
179
169
|
return {
|
|
@@ -221,7 +211,7 @@ chmod 600 ${envFilePath}`;
|
|
|
221
211
|
try {
|
|
222
212
|
this.setupSSHKey();
|
|
223
213
|
const envFileName = `.env.${stage}`;
|
|
224
|
-
const factiiiDir =
|
|
214
|
+
const factiiiDir = `$HOME/.factiii/${this.repoName}`;
|
|
225
215
|
const envFilePath = `${factiiiDir}/${envFileName}`;
|
|
226
216
|
const command = `test -f ${envFilePath} && echo "exists" || echo "missing"`;
|
|
227
217
|
const result = this.sshExec(command).trim();
|
|
@@ -241,7 +231,7 @@ chmod 600 ${envFilePath}`;
|
|
|
241
231
|
try {
|
|
242
232
|
this.setupSSHKey();
|
|
243
233
|
const envFileName = `.env.${stage}`;
|
|
244
|
-
const factiiiDir =
|
|
234
|
+
const factiiiDir = `$HOME/.factiii/${this.repoName}`;
|
|
245
235
|
const envFilePath = `${factiiiDir}/${envFileName}`;
|
|
246
236
|
// Cross-platform: macOS uses `stat -f %m`, Linux uses `stat -c %Y`
|
|
247
237
|
const command = `stat -f %m ${envFilePath} 2>/dev/null || stat -c %Y ${envFilePath} 2>/dev/null || echo "missing"`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-deploy.js","sourceRoot":"","sources":["../../src/utils/ssh-deploy.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"ssh-deploy.js","sourceRoot":"","sources":["../../src/utils/ssh-deploy.ts"],"names":[],"mappings":"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"}
|