@viccy123/tapcli 1.0.3 → 1.0.4
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.
- package/dist/pty/session.d.ts.map +1 -1
- package/dist/pty/session.js +50 -2
- package/dist/pty/session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/pty/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/pty/session.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGtE,qBAAa,UAAU;IASnB,OAAO,CAAC,MAAM;IARhB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,iBAAiB,CAAK;gBAG5B,OAAO,EAAE,iBAAiB,EAClB,MAAM,EAAE,gBAAgB;IAqClC,OAAO,CAAC,WAAW;IAmBnB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIlC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,iBAAiB,IAAI,MAAM;IAI3B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAI3B,IAAI,GAAG,IAAI,MAAM,CAEhB;CACF"}
|
package/dist/pty/session.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as pty from 'node-pty';
|
|
2
|
+
import * as fs from 'fs';
|
|
3
|
+
import * as path from 'path';
|
|
2
4
|
import { v4 as uuidv4 } from 'uuid';
|
|
3
5
|
import { processTerminalOutput } from './terminal-query-interceptor.js';
|
|
4
6
|
export class PtySession {
|
|
@@ -11,7 +13,7 @@ export class PtySession {
|
|
|
11
13
|
constructor(options, events) {
|
|
12
14
|
this.events = events;
|
|
13
15
|
this.id = uuidv4();
|
|
14
|
-
const loginShell =
|
|
16
|
+
const loginShell = resolveLoginShell();
|
|
15
17
|
const command = options.args?.length
|
|
16
18
|
? `${options.command} ${options.args.join(' ')}`
|
|
17
19
|
: options.command;
|
|
@@ -19,9 +21,10 @@ export class PtySession {
|
|
|
19
21
|
name: 'xterm-256color',
|
|
20
22
|
cols: options.cols ?? 80,
|
|
21
23
|
rows: options.rows ?? 24,
|
|
22
|
-
cwd: options.cwd
|
|
24
|
+
cwd: resolveCwd(options.cwd),
|
|
23
25
|
env: {
|
|
24
26
|
...process.env,
|
|
27
|
+
PATH: resolvePathEnv(),
|
|
25
28
|
COLORTERM: 'truecolor',
|
|
26
29
|
...options.env,
|
|
27
30
|
},
|
|
@@ -70,4 +73,49 @@ export class PtySession {
|
|
|
70
73
|
return this.process.pid;
|
|
71
74
|
}
|
|
72
75
|
}
|
|
76
|
+
function resolveLoginShell() {
|
|
77
|
+
const candidates = [process.env['SHELL'], '/bin/zsh', '/bin/bash', '/bin/sh']
|
|
78
|
+
.filter(Boolean);
|
|
79
|
+
for (const candidate of candidates) {
|
|
80
|
+
try {
|
|
81
|
+
fs.accessSync(candidate, fs.constants.X_OK);
|
|
82
|
+
return candidate;
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
// try next candidate
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return '/bin/sh';
|
|
89
|
+
}
|
|
90
|
+
function resolveCwd(cwd) {
|
|
91
|
+
const candidates = [cwd, process.cwd(), process.env['HOME']]
|
|
92
|
+
.filter(Boolean);
|
|
93
|
+
for (const candidate of candidates) {
|
|
94
|
+
try {
|
|
95
|
+
const resolved = path.resolve(candidate);
|
|
96
|
+
if (fs.statSync(resolved).isDirectory()) {
|
|
97
|
+
return resolved;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
// try next candidate
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return '/';
|
|
105
|
+
}
|
|
106
|
+
function resolvePathEnv() {
|
|
107
|
+
const defaultPaths = [
|
|
108
|
+
'/opt/homebrew/bin',
|
|
109
|
+
'/usr/local/bin',
|
|
110
|
+
'/usr/bin',
|
|
111
|
+
'/bin',
|
|
112
|
+
'/usr/sbin',
|
|
113
|
+
'/sbin',
|
|
114
|
+
];
|
|
115
|
+
const current = process.env['PATH'] ?? '';
|
|
116
|
+
const combined = [...current.split(path.delimiter), ...defaultPaths]
|
|
117
|
+
.filter(Boolean);
|
|
118
|
+
const uniq = Array.from(new Set(combined));
|
|
119
|
+
return uniq.join(path.delimiter);
|
|
120
|
+
}
|
|
73
121
|
//# sourceMappingURL=session.js.map
|
package/dist/pty/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/pty/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,MAAM,OAAO,UAAU;IASX;IARD,EAAE,CAAS;IACZ,OAAO,CAAW;IAClB,YAAY,GAAa,EAAE,CAAC;IAC5B,aAAa,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,QAAQ;IACpC,iBAAiB,GAAG,CAAC,CAAC;IAE9B,YACE,OAA0B,EAClB,MAAwB;QAAxB,WAAM,GAAN,MAAM,CAAkB;QAEhC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;QAEnB,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/pty/session.ts"],"names":[],"mappings":"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"}
|