dsh-remote 0.8.72 → 0.8.73

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/lib/terminal.js CHANGED
@@ -1,205 +1,205 @@
1
- // dsh-remote — embedded interactive terminal sessions.
2
- //
3
- // Why polling and not a WebSocket: the plugin registers plain HTTP routes on
4
- // `webServer`, and the browser half is a DSH client UI that must not depend on a
5
- // socket upgrade path the host may or may not expose. A long-lived SSH channel
6
- // owned by the HOST, with the browser polling for output deltas, keeps the
7
- // transport boring (any HTTP stack works, no upgrade negotiation, no proxy
8
- // surprises) while the expensive part — the PTY session — stays open exactly
9
- // like a real ssh session.
10
- //
11
- // The trade is latency, and it is bounded by the poll interval the client
12
- // chooses (the UI uses ~120ms idle, which is below the threshold where typing
13
- // feels laggy). Keystrokes are written immediately on their own request, so
14
- // input never waits for the poll cadence; only OUTPUT is batched.
15
- //
16
- // Sessions are host-owned and per-MACHINE: closing the browser does not kill the
17
- // remote shell (a half-finished `vim` survives a page reload), but every session
18
- // is bounded by an idle timeout and by the plugin's own disposal, so nothing
19
- // leaks past an unload.
20
-
21
- import { randomUUID } from 'node:crypto'
22
-
23
- /** Output retained per session (bytes). A terminal is a stream, not a file:
24
- * past this the oldest bytes drop and the reader is told it went lossy. */
25
- export const TERMINAL_RING_BYTES = 256 * 1024
26
-
27
- /** A session with no attach/poll/write for this long is closed. */
28
- export const TERMINAL_IDLE_MS = 30 * 60 * 1000
29
-
30
- /** Hard cap on concurrent sessions per process (protects the remote host's
31
- * MaxSessions as much as our own memory). */
32
- export const TERMINAL_MAX_SESSIONS = 8
33
-
34
- /**
35
- * One PTY-backed remote shell plus its output ring.
36
- *
37
- * The ring keeps a monotonic byte counter (`total`) so a poller can ask for
38
- * "everything after offset N" without the server tracking per-client cursors —
39
- * that is what lets one session be observed by a reloaded page, or by two tabs.
40
- */
41
- class TerminalSession {
42
- constructor({ id, stream, machine, cols, rows }) {
43
- this.id = id
44
- this.stream = stream
45
- this.machine = machine
46
- this.cols = cols
47
- this.rows = rows
48
- this.createdAt = Date.now()
49
- this.lastSeen = Date.now()
50
- this.total = 0 // bytes ever produced
51
- this.chunks = [] // [{ at, text }] within the retained window
52
- this.retained = 0
53
- this.closed = false
54
- this.exitNote = ''
55
- stream.on('data', (d) => this._push(d.toString('utf8')))
56
- stream.stderr && stream.stderr.on('data', (d) => this._push(d.toString('utf8')))
57
- stream.on('close', () => this._close('session closed'))
58
- stream.on('error', (e) => this._close('session error: ' + ((e && e.message) || e)))
59
- }
60
-
61
- _push(text) {
62
- if (!text) return
63
- this.chunks.push({ at: this.total, text })
64
- this.total += Buffer.byteLength(text, 'utf8')
65
- this.retained += text.length
66
- // Drop from the head until back inside the budget. A single huge chunk is
67
- // kept whole (truncating a UTF-8 string mid-chunk would corrupt it); the
68
- // lossy flag already tells the reader bytes are missing.
69
- while (this.retained > TERMINAL_RING_BYTES && this.chunks.length > 1) {
70
- const dropped = this.chunks.shift()
71
- this.retained -= dropped.text.length
72
- }
73
- }
74
-
75
- _close(note) {
76
- if (this.closed) return
77
- this.closed = true
78
- this.exitNote = note || 'session closed'
79
- }
80
-
81
- /**
82
- * Everything produced after `from` (a byte offset from a previous read).
83
- * @param {number} from
84
- * @returns {{chunks: string[], next: number, lossy: boolean, closed: boolean, note: string}}
85
- */
86
- readFrom(from) {
87
- const start = Number(from) || 0
88
- const oldest = this.chunks.length ? this.chunks[0].at : this.total
89
- const lossy = start < oldest
90
- const chunks = this.chunks.filter((c) => c.at + Buffer.byteLength(c.text, 'utf8') > start).map((c) => c.text)
91
- return { chunks, next: this.total, lossy, closed: this.closed, note: this.exitNote }
92
- }
93
-
94
- write(data) {
95
- if (this.closed) return false
96
- try { this.stream.write(data) } catch { return false }
97
- return true
98
- }
99
-
100
- resize(cols, rows) {
101
- this.cols = Math.max(2, Math.min(Number(cols) || this.cols, 1000))
102
- this.rows = Math.max(2, Math.min(Number(rows) || this.rows, 1000))
103
- try { this.stream.setWindow(this.rows, this.cols, 0, 0) } catch { /* channel gone */ }
104
- }
105
-
106
- end() {
107
- this._close('closed by request')
108
- try { this.stream.end() } catch { /* already gone */ }
109
- try { this.stream.close() } catch { /* already gone */ }
110
- }
111
- }
112
-
113
- /**
114
- * Owns every terminal session in this process.
115
- *
116
- * Per-machine keying matters: a session belongs to a MACHINE identity, so a
117
- * session bound to one host can never be attached from a request that resolves
118
- * to a different one (the same isolation rule the file tools follow).
119
- */
120
- export function createTerminalManager() {
121
- /** @type {Map<string, TerminalSession>} */
122
- const sessions = new Map()
123
- let sweeper = null
124
-
125
- const startSweeper = () => {
126
- if (sweeper) return
127
- // One timer for the whole manager; unref'd so it never holds the process
128
- // open on its own.
129
- sweeper = setInterval(() => {
130
- const now = Date.now()
131
- for (const [id, s] of sessions) {
132
- if (now - s.lastSeen > TERMINAL_IDLE_MS) {
133
- try { s.end() } catch { /* already gone */ }
134
- sessions.delete(id)
135
- }
136
- }
137
- }, 60 * 1000)
138
- if (typeof sweeper.unref === 'function') sweeper.unref()
139
- }
140
-
141
- /**
142
- * Open a new terminal session on a machine.
143
- * @param {object} arg
144
- * @param {object} arg.pool - the machine's SshPool (must expose shell()).
145
- * @param {string} arg.machine - a stable identity string for the machine.
146
- * @param {number} [arg.cols]
147
- * @param {number} [arg.rows]
148
- * @returns {Promise<{ok: boolean, id?: string, error?: string}>}
149
- */
150
- const open = async ({ pool, machine, cols, rows }) => {
151
- if (sessions.size >= TERMINAL_MAX_SESSIONS) {
152
- return { ok: false, error: `too many terminal sessions (max ${TERMINAL_MAX_SESSIONS}) — close one first` }
153
- }
154
- if (!pool || typeof pool.shell !== 'function') {
155
- return { ok: false, error: 'this machine cannot open an interactive shell (no shell() on its pool)' }
156
- }
157
- let stream
158
- try {
159
- stream = await pool.shell({ cols, rows })
160
- } catch (err) {
161
- return { ok: false, error: String((err && err.message) || err) }
162
- }
163
- const id = randomUUID()
164
- sessions.set(id, new TerminalSession({ id, stream, machine: String(machine || ''), cols: Number(cols) || 80, rows: Number(rows) || 24 }))
165
- startSweeper()
166
- return { ok: true, id }
167
- }
168
-
169
- /**
170
- * Look up a session, enforcing the machine boundary.
171
- * @param {string} id
172
- * @param {string} machine
173
- * @returns {{session?: TerminalSession, error?: string}}
174
- */
175
- const owned = (id, machine) => {
176
- const s = sessions.get(String(id || ''))
177
- if (!s) return { error: 'no such terminal session (it may have exited or timed out)' }
178
- if (String(machine || '') !== s.machine) return { error: 'this terminal belongs to a different machine' }
179
- s.lastSeen = Date.now()
180
- return { session: s }
181
- }
182
-
183
- return {
184
- open,
185
- owned,
186
- has: (id) => sessions.has(String(id || '')),
187
- list: () => [...sessions.values()].map((s) => ({
188
- id: s.id, machine: s.machine, cols: s.cols, rows: s.rows, createdAt: s.createdAt, closed: s.closed,
189
- })),
190
- close: (id, machine) => {
191
- const { session, error } = owned(id, machine)
192
- if (error) return { ok: false, error }
193
- session.end()
194
- sessions.delete(session.id)
195
- return { ok: true }
196
- },
197
- /** Close everything (plugin unload). */
198
- dispose: () => {
199
- for (const s of sessions.values()) { try { s.end() } catch { /* already gone */ } }
200
- sessions.clear()
201
- if (sweeper) { try { clearInterval(sweeper) } catch { /* gone */ } sweeper = null }
202
- },
203
- size: () => sessions.size,
204
- }
205
- }
1
+ // dsh-remote — embedded interactive terminal sessions.
2
+ //
3
+ // Why polling and not a WebSocket: the plugin registers plain HTTP routes on
4
+ // `webServer`, and the browser half is a DSH client UI that must not depend on a
5
+ // socket upgrade path the host may or may not expose. A long-lived SSH channel
6
+ // owned by the HOST, with the browser polling for output deltas, keeps the
7
+ // transport boring (any HTTP stack works, no upgrade negotiation, no proxy
8
+ // surprises) while the expensive part — the PTY session — stays open exactly
9
+ // like a real ssh session.
10
+ //
11
+ // The trade is latency, and it is bounded by the poll interval the client
12
+ // chooses (the UI uses ~120ms idle, which is below the threshold where typing
13
+ // feels laggy). Keystrokes are written immediately on their own request, so
14
+ // input never waits for the poll cadence; only OUTPUT is batched.
15
+ //
16
+ // Sessions are host-owned and per-MACHINE: closing the browser does not kill the
17
+ // remote shell (a half-finished `vim` survives a page reload), but every session
18
+ // is bounded by an idle timeout and by the plugin's own disposal, so nothing
19
+ // leaks past an unload.
20
+
21
+ import { randomUUID } from 'node:crypto'
22
+
23
+ /** Output retained per session (bytes). A terminal is a stream, not a file:
24
+ * past this the oldest bytes drop and the reader is told it went lossy. */
25
+ export const TERMINAL_RING_BYTES = 256 * 1024
26
+
27
+ /** A session with no attach/poll/write for this long is closed. */
28
+ export const TERMINAL_IDLE_MS = 30 * 60 * 1000
29
+
30
+ /** Hard cap on concurrent sessions per process (protects the remote host's
31
+ * MaxSessions as much as our own memory). */
32
+ export const TERMINAL_MAX_SESSIONS = 8
33
+
34
+ /**
35
+ * One PTY-backed remote shell plus its output ring.
36
+ *
37
+ * The ring keeps a monotonic byte counter (`total`) so a poller can ask for
38
+ * "everything after offset N" without the server tracking per-client cursors —
39
+ * that is what lets one session be observed by a reloaded page, or by two tabs.
40
+ */
41
+ class TerminalSession {
42
+ constructor({ id, stream, machine, cols, rows }) {
43
+ this.id = id
44
+ this.stream = stream
45
+ this.machine = machine
46
+ this.cols = cols
47
+ this.rows = rows
48
+ this.createdAt = Date.now()
49
+ this.lastSeen = Date.now()
50
+ this.total = 0 // bytes ever produced
51
+ this.chunks = [] // [{ at, text }] within the retained window
52
+ this.retained = 0
53
+ this.closed = false
54
+ this.exitNote = ''
55
+ stream.on('data', (d) => this._push(d.toString('utf8')))
56
+ stream.stderr && stream.stderr.on('data', (d) => this._push(d.toString('utf8')))
57
+ stream.on('close', () => this._close('session closed'))
58
+ stream.on('error', (e) => this._close('session error: ' + ((e && e.message) || e)))
59
+ }
60
+
61
+ _push(text) {
62
+ if (!text) return
63
+ this.chunks.push({ at: this.total, text })
64
+ this.total += Buffer.byteLength(text, 'utf8')
65
+ this.retained += text.length
66
+ // Drop from the head until back inside the budget. A single huge chunk is
67
+ // kept whole (truncating a UTF-8 string mid-chunk would corrupt it); the
68
+ // lossy flag already tells the reader bytes are missing.
69
+ while (this.retained > TERMINAL_RING_BYTES && this.chunks.length > 1) {
70
+ const dropped = this.chunks.shift()
71
+ this.retained -= dropped.text.length
72
+ }
73
+ }
74
+
75
+ _close(note) {
76
+ if (this.closed) return
77
+ this.closed = true
78
+ this.exitNote = note || 'session closed'
79
+ }
80
+
81
+ /**
82
+ * Everything produced after `from` (a byte offset from a previous read).
83
+ * @param {number} from
84
+ * @returns {{chunks: string[], next: number, lossy: boolean, closed: boolean, note: string}}
85
+ */
86
+ readFrom(from) {
87
+ const start = Number(from) || 0
88
+ const oldest = this.chunks.length ? this.chunks[0].at : this.total
89
+ const lossy = start < oldest
90
+ const chunks = this.chunks.filter((c) => c.at + Buffer.byteLength(c.text, 'utf8') > start).map((c) => c.text)
91
+ return { chunks, next: this.total, lossy, closed: this.closed, note: this.exitNote }
92
+ }
93
+
94
+ write(data) {
95
+ if (this.closed) return false
96
+ try { this.stream.write(data) } catch { return false }
97
+ return true
98
+ }
99
+
100
+ resize(cols, rows) {
101
+ this.cols = Math.max(2, Math.min(Number(cols) || this.cols, 1000))
102
+ this.rows = Math.max(2, Math.min(Number(rows) || this.rows, 1000))
103
+ try { this.stream.setWindow(this.rows, this.cols, 0, 0) } catch { /* channel gone */ }
104
+ }
105
+
106
+ end() {
107
+ this._close('closed by request')
108
+ try { this.stream.end() } catch { /* already gone */ }
109
+ try { this.stream.close() } catch { /* already gone */ }
110
+ }
111
+ }
112
+
113
+ /**
114
+ * Owns every terminal session in this process.
115
+ *
116
+ * Per-machine keying matters: a session belongs to a MACHINE identity, so a
117
+ * session bound to one host can never be attached from a request that resolves
118
+ * to a different one (the same isolation rule the file tools follow).
119
+ */
120
+ export function createTerminalManager() {
121
+ /** @type {Map<string, TerminalSession>} */
122
+ const sessions = new Map()
123
+ let sweeper = null
124
+
125
+ const startSweeper = () => {
126
+ if (sweeper) return
127
+ // One timer for the whole manager; unref'd so it never holds the process
128
+ // open on its own.
129
+ sweeper = setInterval(() => {
130
+ const now = Date.now()
131
+ for (const [id, s] of sessions) {
132
+ if (now - s.lastSeen > TERMINAL_IDLE_MS) {
133
+ try { s.end() } catch { /* already gone */ }
134
+ sessions.delete(id)
135
+ }
136
+ }
137
+ }, 60 * 1000)
138
+ if (typeof sweeper.unref === 'function') sweeper.unref()
139
+ }
140
+
141
+ /**
142
+ * Open a new terminal session on a machine.
143
+ * @param {object} arg
144
+ * @param {object} arg.pool - the machine's SshPool (must expose shell()).
145
+ * @param {string} arg.machine - a stable identity string for the machine.
146
+ * @param {number} [arg.cols]
147
+ * @param {number} [arg.rows]
148
+ * @returns {Promise<{ok: boolean, id?: string, error?: string}>}
149
+ */
150
+ const open = async ({ pool, machine, cols, rows }) => {
151
+ if (sessions.size >= TERMINAL_MAX_SESSIONS) {
152
+ return { ok: false, error: `too many terminal sessions (max ${TERMINAL_MAX_SESSIONS}) — close one first` }
153
+ }
154
+ if (!pool || typeof pool.shell !== 'function') {
155
+ return { ok: false, error: 'this machine cannot open an interactive shell (no shell() on its pool)' }
156
+ }
157
+ let stream
158
+ try {
159
+ stream = await pool.shell({ cols, rows })
160
+ } catch (err) {
161
+ return { ok: false, error: String((err && err.message) || err) }
162
+ }
163
+ const id = randomUUID()
164
+ sessions.set(id, new TerminalSession({ id, stream, machine: String(machine || ''), cols: Number(cols) || 80, rows: Number(rows) || 24 }))
165
+ startSweeper()
166
+ return { ok: true, id }
167
+ }
168
+
169
+ /**
170
+ * Look up a session, enforcing the machine boundary.
171
+ * @param {string} id
172
+ * @param {string} machine
173
+ * @returns {{session?: TerminalSession, error?: string}}
174
+ */
175
+ const owned = (id, machine) => {
176
+ const s = sessions.get(String(id || ''))
177
+ if (!s) return { error: 'no such terminal session (it may have exited or timed out)' }
178
+ if (String(machine || '') !== s.machine) return { error: 'this terminal belongs to a different machine' }
179
+ s.lastSeen = Date.now()
180
+ return { session: s }
181
+ }
182
+
183
+ return {
184
+ open,
185
+ owned,
186
+ has: (id) => sessions.has(String(id || '')),
187
+ list: () => [...sessions.values()].map((s) => ({
188
+ id: s.id, machine: s.machine, cols: s.cols, rows: s.rows, createdAt: s.createdAt, closed: s.closed,
189
+ })),
190
+ close: (id, machine) => {
191
+ const { session, error } = owned(id, machine)
192
+ if (error) return { ok: false, error }
193
+ session.end()
194
+ sessions.delete(session.id)
195
+ return { ok: true }
196
+ },
197
+ /** Close everything (plugin unload). */
198
+ dispose: () => {
199
+ for (const s of sessions.values()) { try { s.end() } catch { /* already gone */ } }
200
+ sessions.clear()
201
+ if (sweeper) { try { clearInterval(sweeper) } catch { /* gone */ } sweeper = null }
202
+ },
203
+ size: () => sessions.size,
204
+ }
205
+ }