@thenewlabs/entangle-serve 2.2.1 → 2.4.0

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.
@@ -0,0 +1,311 @@
1
+ function blankCell() {
2
+ return { ch: ' ', sgr: '' };
3
+ }
4
+ export class VtGrid {
5
+ cols;
6
+ rows;
7
+ cursorX = 0;
8
+ cursorY = 0;
9
+ grid;
10
+ sgr = ''; // accumulated active SGR since the last reset
11
+ savedX = 0;
12
+ savedY = 0;
13
+ pending = ''; // incomplete escape sequence carried across writes
14
+ constructor(cols, rows) {
15
+ this.cols = Math.max(1, cols);
16
+ this.rows = Math.max(1, rows);
17
+ this.grid = this.blankGrid(this.cols, this.rows);
18
+ }
19
+ blankGrid(cols, rows) {
20
+ return Array.from({ length: rows }, () => Array.from({ length: cols }, blankCell));
21
+ }
22
+ /** Resize, preserving as much top-left content as fits. */
23
+ resize(cols, rows) {
24
+ cols = Math.max(1, cols);
25
+ rows = Math.max(1, rows);
26
+ const next = this.blankGrid(cols, rows);
27
+ for (let y = 0; y < Math.min(rows, this.rows); y++) {
28
+ for (let x = 0; x < Math.min(cols, this.cols); x++) {
29
+ next[y][x] = this.grid[y][x];
30
+ }
31
+ }
32
+ this.grid = next;
33
+ this.cols = cols;
34
+ this.rows = rows;
35
+ this.cursorX = Math.min(this.cursorX, cols - 1);
36
+ this.cursorY = Math.min(this.cursorY, rows - 1);
37
+ }
38
+ write(data) {
39
+ let s = this.pending + data;
40
+ this.pending = '';
41
+ let i = 0;
42
+ while (i < s.length) {
43
+ const ch = s[i];
44
+ if (ch === '\x1b') {
45
+ const consumed = this.handleEscape(s, i);
46
+ if (consumed === -1) {
47
+ // Incomplete sequence at end of chunk — carry it to the next write.
48
+ this.pending = s.slice(i);
49
+ return;
50
+ }
51
+ i += consumed;
52
+ continue;
53
+ }
54
+ this.handleControlOrPrintable(ch);
55
+ i++;
56
+ }
57
+ }
58
+ handleEscape(s, i) {
59
+ const next = s[i + 1];
60
+ if (next === undefined)
61
+ return -1; // need more
62
+ if (next === '[') {
63
+ // CSI: ESC [ params interm final
64
+ let j = i + 2;
65
+ let params = '';
66
+ while (j < s.length) {
67
+ const c = s[j];
68
+ if (c >= '\x40' && c <= '\x7e') {
69
+ this.handleCsi(params, c);
70
+ return j - i + 1;
71
+ }
72
+ params += c;
73
+ j++;
74
+ }
75
+ return -1; // incomplete
76
+ }
77
+ if (next === ']') {
78
+ // OSC: ESC ] ... (BEL | ESC \) — used for titles; consume and ignore.
79
+ let j = i + 2;
80
+ while (j < s.length) {
81
+ if (s[j] === '\x07')
82
+ return j - i + 1;
83
+ if (s[j] === '\x1b' && s[j + 1] === '\\')
84
+ return j - i + 2;
85
+ j++;
86
+ }
87
+ return -1;
88
+ }
89
+ // Simple two-byte escapes.
90
+ if (next === '7') {
91
+ this.savedX = this.cursorX;
92
+ this.savedY = this.cursorY;
93
+ return 2;
94
+ }
95
+ if (next === '8') {
96
+ this.cursorX = this.savedX;
97
+ this.cursorY = this.savedY;
98
+ return 2;
99
+ }
100
+ if (next === 'M') {
101
+ this.reverseLineFeed();
102
+ return 2;
103
+ }
104
+ if (next === '=' || next === '>')
105
+ return 2; // keypad modes
106
+ if (next === '(' || next === ')')
107
+ return s[i + 2] === undefined ? -1 : 3; // charset
108
+ return 2; // unknown ESC X — skip both
109
+ }
110
+ handleCsi(params, final) {
111
+ // Ignore private/DEC modes (e.g. ?25 cursor, ?2004 bracketed paste) and
112
+ // scroll-region set — the host owns the frame region.
113
+ if (params.startsWith('?'))
114
+ return;
115
+ const nums = params.split(';').map((p) => (p === '' ? undefined : parseInt(p, 10)));
116
+ const n = (idx, def) => {
117
+ const v = nums[idx];
118
+ return v === undefined || Number.isNaN(v) ? def : v;
119
+ };
120
+ switch (final) {
121
+ case 'H':
122
+ case 'f':
123
+ this.cursorY = this.clampY(n(0, 1) - 1);
124
+ this.cursorX = this.clampX(n(1, 1) - 1);
125
+ break;
126
+ case 'A':
127
+ this.cursorY = this.clampY(this.cursorY - n(0, 1));
128
+ break;
129
+ case 'B':
130
+ this.cursorY = this.clampY(this.cursorY + n(0, 1));
131
+ break;
132
+ case 'C':
133
+ this.cursorX = this.clampX(this.cursorX + n(0, 1));
134
+ break;
135
+ case 'D':
136
+ this.cursorX = this.clampX(this.cursorX - n(0, 1));
137
+ break;
138
+ case 'G':
139
+ this.cursorX = this.clampX(n(0, 1) - 1);
140
+ break;
141
+ case 'd':
142
+ this.cursorY = this.clampY(n(0, 1) - 1);
143
+ break;
144
+ case 'J':
145
+ this.eraseDisplay(n(0, 0));
146
+ break;
147
+ case 'K':
148
+ this.eraseLine(n(0, 0));
149
+ break;
150
+ case 'm':
151
+ this.applySgr(params);
152
+ break;
153
+ case 'L':
154
+ this.insertLines(n(0, 1));
155
+ break;
156
+ case 'M':
157
+ this.deleteLines(n(0, 1));
158
+ break;
159
+ case 'P':
160
+ this.deleteChars(n(0, 1));
161
+ break;
162
+ case '@':
163
+ this.insertBlanks(n(0, 1));
164
+ break;
165
+ case 's':
166
+ this.savedX = this.cursorX;
167
+ this.savedY = this.cursorY;
168
+ break;
169
+ case 'u':
170
+ this.cursorX = this.savedX;
171
+ this.cursorY = this.savedY;
172
+ break;
173
+ default: break; // unsupported CSI — ignore
174
+ }
175
+ }
176
+ applySgr(params) {
177
+ if (params === '' || params === '0') {
178
+ this.sgr = '';
179
+ return;
180
+ }
181
+ // Accumulate active attributes; a reset (0) anywhere clears first.
182
+ const parts = params.split(';');
183
+ if (parts.includes('0'))
184
+ this.sgr = '';
185
+ this.sgr += `\x1b[${params}m`;
186
+ }
187
+ handleControlOrPrintable(ch) {
188
+ const code = ch.charCodeAt(0);
189
+ if (code === 0x0a) {
190
+ this.lineFeed();
191
+ return;
192
+ } // LF
193
+ if (code === 0x0d) {
194
+ this.cursorX = 0;
195
+ return;
196
+ } // CR
197
+ if (code === 0x08) {
198
+ this.cursorX = this.clampX(this.cursorX - 1);
199
+ return;
200
+ } // BS
201
+ if (code === 0x09) { // TAB
202
+ this.cursorX = this.clampX((Math.floor(this.cursorX / 8) + 1) * 8);
203
+ return;
204
+ }
205
+ if (code === 0x07)
206
+ return; // BEL
207
+ if (code < 0x20)
208
+ return; // other control chars
209
+ // Printable
210
+ if (this.cursorX >= this.cols) {
211
+ this.cursorX = 0;
212
+ this.lineFeed();
213
+ }
214
+ this.grid[this.cursorY][this.cursorX] = { ch, sgr: this.sgr };
215
+ this.cursorX++;
216
+ }
217
+ lineFeed() {
218
+ if (this.cursorY >= this.rows - 1)
219
+ this.scrollUp();
220
+ else
221
+ this.cursorY++;
222
+ }
223
+ reverseLineFeed() {
224
+ if (this.cursorY <= 0)
225
+ this.scrollDown();
226
+ else
227
+ this.cursorY--;
228
+ }
229
+ scrollUp() {
230
+ this.grid.shift();
231
+ this.grid.push(Array.from({ length: this.cols }, blankCell));
232
+ }
233
+ scrollDown() {
234
+ this.grid.pop();
235
+ this.grid.unshift(Array.from({ length: this.cols }, blankCell));
236
+ }
237
+ insertLines(count) {
238
+ for (let k = 0; k < count; k++) {
239
+ this.grid.splice(this.rows - 1, 1);
240
+ this.grid.splice(this.cursorY, 0, Array.from({ length: this.cols }, blankCell));
241
+ }
242
+ }
243
+ deleteLines(count) {
244
+ for (let k = 0; k < count; k++) {
245
+ this.grid.splice(this.cursorY, 1);
246
+ this.grid.splice(this.rows - 1, 0, Array.from({ length: this.cols }, blankCell));
247
+ }
248
+ }
249
+ deleteChars(count) {
250
+ const row = this.grid[this.cursorY];
251
+ row.splice(this.cursorX, count);
252
+ while (row.length < this.cols)
253
+ row.push(blankCell());
254
+ }
255
+ insertBlanks(count) {
256
+ const row = this.grid[this.cursorY];
257
+ for (let k = 0; k < count; k++)
258
+ row.splice(this.cursorX, 0, blankCell());
259
+ row.length = this.cols;
260
+ }
261
+ eraseDisplay(mode) {
262
+ if (mode === 2 || mode === 3) {
263
+ this.grid = this.blankGrid(this.cols, this.rows);
264
+ return;
265
+ }
266
+ if (mode === 0) {
267
+ this.eraseLine(0);
268
+ for (let y = this.cursorY + 1; y < this.rows; y++)
269
+ this.grid[y] = Array.from({ length: this.cols }, blankCell);
270
+ }
271
+ else if (mode === 1) {
272
+ this.eraseLine(1);
273
+ for (let y = 0; y < this.cursorY; y++)
274
+ this.grid[y] = Array.from({ length: this.cols }, blankCell);
275
+ }
276
+ }
277
+ eraseLine(mode) {
278
+ const row = this.grid[this.cursorY];
279
+ const from = mode === 0 ? this.cursorX : 0;
280
+ const to = mode === 1 ? this.cursorX + 1 : this.cols;
281
+ for (let x = from; x < to && x < this.cols; x++)
282
+ row[x] = blankCell();
283
+ }
284
+ clampX(x) { return Math.max(0, Math.min(this.cols - 1, x)); }
285
+ clampY(y) { return Math.max(0, Math.min(this.rows - 1, y)); }
286
+ /**
287
+ * Render each row as a styled string exactly `cols` wide, with SGR runs
288
+ * reconstructed and a reset at both ends so a row never bleeds style into the
289
+ * box frame.
290
+ */
291
+ renderRows() {
292
+ return this.grid.map((row) => {
293
+ let out = '\x1b[0m';
294
+ let active = '';
295
+ for (const cell of row) {
296
+ if (cell.sgr !== active) {
297
+ out += '\x1b[0m' + cell.sgr;
298
+ active = cell.sgr;
299
+ }
300
+ out += cell.ch;
301
+ }
302
+ out += '\x1b[0m';
303
+ return out;
304
+ });
305
+ }
306
+ /** Plain-text rows (no SGR) — handy for assertions/tests. */
307
+ renderPlainRows() {
308
+ return this.grid.map((row) => row.map((c) => c.ch).join(''));
309
+ }
310
+ }
311
+ //# sourceMappingURL=vt-grid.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vt-grid.js","sourceRoot":"","sources":["../src/vt-grid.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thenewlabs/entangle-serve",
3
- "version": "2.2.1",
3
+ "version": "2.4.0",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "bin": {
@@ -17,9 +17,9 @@
17
17
  },
18
18
  "dependencies": {
19
19
  "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
20
- "@thenewlabs/entangle-crypto": "^2.2.1",
21
- "@thenewlabs/entangle-protocol": "^2.2.1",
22
- "@thenewlabs/entangle-utils": "^2.2.1",
20
+ "@thenewlabs/entangle-crypto": "^2.4.0",
21
+ "@thenewlabs/entangle-protocol": "^2.4.0",
22
+ "@thenewlabs/entangle-utils": "^2.4.0",
23
23
  "cborg": "^4.5.8",
24
24
  "commander": "^15.0.0",
25
25
  "ws": "^8.21.0"