@floegence/floeterm-terminal-web 0.8.0 → 0.9.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.
- package/README.md +4 -1
- package/dist/core/TerminalCore.d.ts +3 -0
- package/dist/core/TerminalCore.d.ts.map +1 -1
- package/dist/core/TerminalCore.js +83 -33
- package/dist/core/TerminalCore.js.map +1 -1
- package/dist/internal/GhosttyScrollbackCompat.d.ts +16 -0
- package/dist/internal/GhosttyScrollbackCompat.d.ts.map +1 -0
- package/dist/internal/GhosttyScrollbackCompat.js +43 -0
- package/dist/internal/GhosttyScrollbackCompat.js.map +1 -0
- package/dist/internal/TerminalResourceLoader.d.ts +27 -2
- package/dist/internal/TerminalResourceLoader.d.ts.map +1 -1
- package/dist/internal/TerminalResourceLoader.js +112 -47
- package/dist/internal/TerminalResourceLoader.js.map +1 -1
- package/dist/types.d.ts +5 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +4 -3
package/README.md
CHANGED
|
@@ -129,7 +129,10 @@ the foreground revision that was active at that exact byte boundary.
|
|
|
129
129
|
## Notes
|
|
130
130
|
|
|
131
131
|
- You must provide a `TerminalTransport` and `TerminalEventSource` for the managed controller.
|
|
132
|
-
- `ghostty-web`
|
|
132
|
+
- Each `TerminalCore` owns an isolated `ghostty-web` WASM runtime; consumers must not provide or share a Ghostty runtime.
|
|
133
|
+
- `scrollback` is measured in terminal buffer rows, including separately wrapped rows, and accepts integers from 1 through 10,000. Within the supported geometry, Floeterm preserves at least the requested number of buffer rows; it does not trim to an exact physical row count. Floeterm maps that contract to a bounded byte budget for the exact pinned `ghostty-web@0.4.0-next.14.g6a1a50d` release, which currently interprets the value as bytes. The 81,920,000-byte cap limits Ghostty's scrollback arena, not the total memory of a WASM runtime. The mapping is temporary and must be reviewed and removed or updated with any Ghostty upgrade.
|
|
134
|
+
- Supported terminal geometry is limited to 500 columns. Explicit dimensions above that limit fail, while automatic fitting reports at most 500 columns.
|
|
135
|
+
- Consumer dependency overrides for `ghostty-web` are unsupported. Floeterm's compatibility guard requires the exact package pin so an upstream behavior change cannot silently apply the row-to-byte mapping twice.
|
|
133
136
|
- `TerminalCore` bridges the hidden textarea used by `ghostty-web`, so soft-keyboard and composition input continue to work on touch devices.
|
|
134
137
|
- The hidden terminal input is mounted in the document viewport plane and anchored from rendered cursor geometry, so native IME candidate windows stay aligned without expanding transformed terminal hosts.
|
|
135
138
|
- Programmatic terminal focus uses no-scroll focus by default, keeping embedded terminals stable inside scaled, projected, or otherwise transformed host surfaces.
|
|
@@ -4,6 +4,8 @@ export declare class TerminalCore {
|
|
|
4
4
|
private container;
|
|
5
5
|
private config;
|
|
6
6
|
private terminal;
|
|
7
|
+
private ownedRuntime;
|
|
8
|
+
private ownedRuntimeMemory;
|
|
7
9
|
private fitAddon;
|
|
8
10
|
private needsFullRenderOnNextWrite;
|
|
9
11
|
private demandRenderForceAll;
|
|
@@ -48,6 +50,7 @@ export declare class TerminalCore {
|
|
|
48
50
|
private pendingPresentationScale;
|
|
49
51
|
private suppressResizeNotifications;
|
|
50
52
|
private clearResizeSuppressionRaf;
|
|
53
|
+
private readonly scrollbackRows;
|
|
51
54
|
private hasFocus;
|
|
52
55
|
private resizeNotifySeq;
|
|
53
56
|
private lastNotifiedSize;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerminalCore.d.ts","sourceRoot":"","sources":["../../src/core/TerminalCore.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,aAAa,EACb,KAAK,MAAM,EAEX,KAAK,cAAc,EACnB,KAAK,2BAA2B,EAChC,KAAK,2BAA2B,EAChC,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAE1B,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAGzB,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAC/B,KAAK,iCAAiC,EACtC,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAClC,KAAK,2BAA2B,EAChC,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"TerminalCore.d.ts","sourceRoot":"","sources":["../../src/core/TerminalCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ import { cursorToFabricCursor, renderReasonFromForce, terminalLiveFabric, themeT
|
|
|
4
4
|
import { terminalFabricCoordinator } from '../fabric/TerminalFabricCoordinator.js';
|
|
5
5
|
import { TerminalState, } from '../types.js';
|
|
6
6
|
import { terminalInitializationScheduler, } from '../internal/TerminalInitializationScheduler.js';
|
|
7
|
-
import { getGhosttyFitAddonConstructor, getGhosttyLinkConstructors, getGhosttyTerminalConstructor, loadGhosttyModules, waitWithAbort, } from '../internal/TerminalResourceLoader.js';
|
|
7
|
+
import { acquireGhosttyRuntime, getGhosttyFitAddonConstructor, getGhosttyLinkConstructors, getGhosttyTerminalConstructor, inspectGhosttyRuntimeMemory, loadGhosttyModules, waitWithAbort, } from '../internal/TerminalResourceLoader.js';
|
|
8
|
+
import { capAutoFitTerminalColumns, mapGhosttyScrollbackRowsForPinnedVersion, validateTerminalColumns, validateTerminalScrollbackRows, } from '../internal/GhosttyScrollbackCompat.js';
|
|
8
9
|
import { createUnicodeSafeUrlProviderTerminal, } from '../internal/UnicodeSafeUrlProvider.js';
|
|
9
10
|
import { resolveTerminalInputElement, TerminalInputBridge } from './TerminalInputBridge.js';
|
|
10
11
|
import { terminalRenderScheduler } from './TerminalRenderScheduler.js';
|
|
@@ -12,7 +13,6 @@ import { scheduleUiTurn } from '../internal/scheduleUiTurn.js';
|
|
|
12
13
|
const TERMINAL_SNAPSHOT_VERSION = 1;
|
|
13
14
|
const DEFAULT_TERMINAL_SNAPSHOT_MAX_BYTES = 2 * 1024 * 1024;
|
|
14
15
|
const ESTIMATED_RENDERER_BYTES = 4 * 1024 * 1024;
|
|
15
|
-
const ESTIMATED_CELL_BYTES = 16;
|
|
16
16
|
const SNAPSHOT_RESET_PREFIX = '\x1bc\x1b[2J\x1b[H';
|
|
17
17
|
const encodedByteLength = (value) => new TextEncoder().encode(value).byteLength;
|
|
18
18
|
const TERMINAL_SEARCH_MAX_RESULTS = 5000;
|
|
@@ -255,14 +255,14 @@ function canSkipNativeCanvasRowRender(renderer, row, fabricActive) {
|
|
|
255
255
|
function samePresentationScale(left, right) {
|
|
256
256
|
return Math.abs(left - right) <= PRESENTATION_SCALE_EPSILON;
|
|
257
257
|
}
|
|
258
|
-
function normalizeTerminalDimensions(value) {
|
|
258
|
+
function normalizeTerminalDimensions(value, columnsLabel = 'fixedDimensions.cols') {
|
|
259
259
|
const raw = (typeof value === 'object' && value) ? value : null;
|
|
260
260
|
if (!raw) {
|
|
261
261
|
return null;
|
|
262
262
|
}
|
|
263
|
-
const cols =
|
|
263
|
+
const cols = validateTerminalColumns(raw.cols, columnsLabel);
|
|
264
264
|
const rows = Math.floor(Number(raw.rows));
|
|
265
|
-
if (!Number.isFinite(
|
|
265
|
+
if (!Number.isFinite(rows) || rows <= 0) {
|
|
266
266
|
return null;
|
|
267
267
|
}
|
|
268
268
|
return { cols, rows };
|
|
@@ -341,6 +341,8 @@ export class TerminalCore {
|
|
|
341
341
|
this.container = container;
|
|
342
342
|
this.config = config;
|
|
343
343
|
this.terminal = null;
|
|
344
|
+
this.ownedRuntime = null;
|
|
345
|
+
this.ownedRuntimeMemory = null;
|
|
344
346
|
this.fitAddon = null;
|
|
345
347
|
this.needsFullRenderOnNextWrite = false;
|
|
346
348
|
this.demandRenderForceAll = false;
|
|
@@ -406,6 +408,11 @@ export class TerminalCore {
|
|
|
406
408
|
pendingResizeReason: null,
|
|
407
409
|
pendingSearchOverlayRender: false,
|
|
408
410
|
};
|
|
411
|
+
const explicitCols = config?.cols;
|
|
412
|
+
if (explicitCols !== undefined) {
|
|
413
|
+
validateTerminalColumns(explicitCols);
|
|
414
|
+
}
|
|
415
|
+
this.scrollbackRows = validateTerminalScrollbackRows(config?.scrollback === undefined ? 1000 : config.scrollback);
|
|
409
416
|
this.eventHandlers = eventHandlers;
|
|
410
417
|
this.clipboard = TerminalCore.normalizeClipboardConfig(config?.clipboard);
|
|
411
418
|
this.fit = TerminalCore.normalizeFitConfig(config?.fit);
|
|
@@ -414,6 +421,12 @@ export class TerminalCore {
|
|
|
414
421
|
this.logicalFontSize = TerminalCore.normalizeFontSize(config?.fontSize);
|
|
415
422
|
this.presentationScale = TerminalCore.normalizePresentationScale(config?.presentationScale);
|
|
416
423
|
this.fixedDimensions = normalizeTerminalDimensions(config?.fixedDimensions);
|
|
424
|
+
this.config = {
|
|
425
|
+
...config,
|
|
426
|
+
...(explicitCols === undefined ? {} : { cols: explicitCols }),
|
|
427
|
+
fixedDimensions: this.fixedDimensions,
|
|
428
|
+
scrollback: this.scrollbackRows,
|
|
429
|
+
};
|
|
417
430
|
this.renderTask = {
|
|
418
431
|
id: TerminalCore.nextRenderTaskId,
|
|
419
432
|
run: forceAll => {
|
|
@@ -457,6 +470,11 @@ export class TerminalCore {
|
|
|
457
470
|
promise: Promise.resolve(),
|
|
458
471
|
};
|
|
459
472
|
operation.promise = (async () => {
|
|
473
|
+
const assertInitializationActive = () => {
|
|
474
|
+
if (this.isDisposed)
|
|
475
|
+
throw new Error('Cannot initialize a disposed TerminalCore');
|
|
476
|
+
lifecycleAbortController.signal.throwIfAborted();
|
|
477
|
+
};
|
|
460
478
|
const permit = await request.permit;
|
|
461
479
|
if (!permit) {
|
|
462
480
|
if (this.isDisposed)
|
|
@@ -467,20 +485,21 @@ export class TerminalCore {
|
|
|
467
485
|
}
|
|
468
486
|
operation.started = true;
|
|
469
487
|
try {
|
|
470
|
-
|
|
471
|
-
throw new Error('Cannot initialize a disposed TerminalCore');
|
|
488
|
+
assertInitializationActive();
|
|
472
489
|
await loadGhosttyModules(this.logger, lifecycleAbortController.signal);
|
|
473
|
-
|
|
474
|
-
|
|
490
|
+
assertInitializationActive();
|
|
491
|
+
const ownedRuntime = await acquireGhosttyRuntime(this.logger);
|
|
492
|
+
assertInitializationActive();
|
|
493
|
+
const ownedRuntimeMemory = inspectGhosttyRuntimeMemory(ownedRuntime);
|
|
494
|
+
assertInitializationActive();
|
|
495
|
+
this.ownedRuntime = ownedRuntime;
|
|
496
|
+
this.ownedRuntimeMemory = ownedRuntimeMemory;
|
|
475
497
|
await this.createTerminalInstance(lifecycleAbortController.signal);
|
|
476
|
-
|
|
477
|
-
throw new Error('Cannot initialize a disposed TerminalCore');
|
|
498
|
+
assertInitializationActive();
|
|
478
499
|
await this.loadAddons();
|
|
479
|
-
|
|
480
|
-
throw new Error('Cannot initialize a disposed TerminalCore');
|
|
500
|
+
assertInitializationActive();
|
|
481
501
|
await this.openTerminal(lifecycleAbortController.signal);
|
|
482
|
-
|
|
483
|
-
throw new Error('Cannot initialize a disposed TerminalCore');
|
|
502
|
+
assertInitializationActive();
|
|
484
503
|
this.setupEventListeners();
|
|
485
504
|
this.setupResponsiveListeners();
|
|
486
505
|
this.startSizeWatching();
|
|
@@ -517,14 +536,26 @@ export class TerminalCore {
|
|
|
517
536
|
return;
|
|
518
537
|
settled = true;
|
|
519
538
|
operation.waiters = Math.max(0, operation.waiters - 1);
|
|
520
|
-
if (operation.waiters
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
if (this.initializationOperation === operation
|
|
524
|
-
this.
|
|
525
|
-
|
|
526
|
-
|
|
539
|
+
if (operation.waiters !== 0 || operation.cancelled)
|
|
540
|
+
return;
|
|
541
|
+
if (operation.started) {
|
|
542
|
+
if (this.initializationOperation === operation
|
|
543
|
+
&& !this.isDisposed
|
|
544
|
+
&& this.state === TerminalState.INITIALIZING) {
|
|
545
|
+
operation.cancelled = true;
|
|
546
|
+
// Ghostty.load() cannot be cancelled. Abort the Core lifecycle so the
|
|
547
|
+
// owned runtime is discarded when that load settles, while the
|
|
548
|
+
// initialization permit remains held by the operation's finally path.
|
|
549
|
+
operation.lifecycleAbortController.abort();
|
|
527
550
|
}
|
|
551
|
+
return;
|
|
552
|
+
}
|
|
553
|
+
operation.cancelled = true;
|
|
554
|
+
operation.request.cancel();
|
|
555
|
+
if (this.initializationOperation === operation) {
|
|
556
|
+
this.initializationOperation = null;
|
|
557
|
+
if (!this.isDisposed)
|
|
558
|
+
this.setState(TerminalState.IDLE);
|
|
528
559
|
}
|
|
529
560
|
};
|
|
530
561
|
return waitWithAbort(operation.promise, signal).finally(releaseWaiter);
|
|
@@ -540,6 +571,8 @@ export class TerminalCore {
|
|
|
540
571
|
this.fabricView = null;
|
|
541
572
|
this.terminal?.dispose();
|
|
542
573
|
this.terminal = null;
|
|
574
|
+
this.ownedRuntimeMemory = null;
|
|
575
|
+
this.ownedRuntime = null;
|
|
543
576
|
this.inputElement?.remove();
|
|
544
577
|
this.inputElement = null;
|
|
545
578
|
this.fitAddon = null;
|
|
@@ -552,6 +585,9 @@ export class TerminalCore {
|
|
|
552
585
|
if (!TerminalCtor) {
|
|
553
586
|
throw new Error('ghostty-web module not loaded');
|
|
554
587
|
}
|
|
588
|
+
if (!this.ownedRuntime) {
|
|
589
|
+
throw new Error('ghostty-web runtime not acquired');
|
|
590
|
+
}
|
|
555
591
|
const defaultConfig = {
|
|
556
592
|
cols: 80,
|
|
557
593
|
rows: 24,
|
|
@@ -586,13 +622,14 @@ export class TerminalCore {
|
|
|
586
622
|
cursorBlink: typeof finalConfig.cursorBlink === 'boolean' ? finalConfig.cursorBlink : undefined,
|
|
587
623
|
cursorStyle: typeof finalConfig.cursorStyle === 'string' ? finalConfig.cursorStyle : undefined,
|
|
588
624
|
theme: initialTheme,
|
|
589
|
-
scrollback:
|
|
625
|
+
scrollback: mapGhosttyScrollbackRowsForPinnedVersion(this.scrollbackRows),
|
|
590
626
|
fontSize: this.resolveEffectiveFontSize(),
|
|
591
627
|
fontFamily: typeof finalConfig.fontFamily === 'string' ? finalConfig.fontFamily : undefined,
|
|
592
628
|
allowTransparency: typeof finalConfig.allowTransparency === 'boolean' ? finalConfig.allowTransparency : undefined,
|
|
593
629
|
convertEol: typeof finalConfig.convertEol === 'boolean' ? finalConfig.convertEol : undefined,
|
|
594
630
|
disableStdin: typeof finalConfig.disableStdin === 'boolean' ? finalConfig.disableStdin : undefined,
|
|
595
|
-
smoothScrollDuration: typeof finalConfig.smoothScrollDuration === 'number' ? finalConfig.smoothScrollDuration : undefined
|
|
631
|
+
smoothScrollDuration: typeof finalConfig.smoothScrollDuration === 'number' ? finalConfig.smoothScrollDuration : undefined,
|
|
632
|
+
ghostty: this.ownedRuntime,
|
|
596
633
|
});
|
|
597
634
|
}
|
|
598
635
|
async loadAddons() {
|
|
@@ -693,7 +730,7 @@ export class TerminalCore {
|
|
|
693
730
|
const availableWidth = Math.max(0, width - paddingLeft - paddingRight - this.fit.scrollbarReservePx);
|
|
694
731
|
const availableHeight = Math.max(0, height - paddingTop - paddingBottom);
|
|
695
732
|
return {
|
|
696
|
-
cols: Math.max(MIN_TERMINAL_COLS, Math.floor(availableWidth / cellWidth)),
|
|
733
|
+
cols: capAutoFitTerminalColumns(Math.max(MIN_TERMINAL_COLS, Math.floor(availableWidth / cellWidth))),
|
|
697
734
|
rows: Math.max(MIN_TERMINAL_ROWS, Math.floor(availableHeight / cellHeight)),
|
|
698
735
|
};
|
|
699
736
|
}
|
|
@@ -711,7 +748,7 @@ export class TerminalCore {
|
|
|
711
748
|
return null;
|
|
712
749
|
}
|
|
713
750
|
return {
|
|
714
|
-
cols: Math.max(MIN_TERMINAL_COLS, cols),
|
|
751
|
+
cols: capAutoFitTerminalColumns(Math.max(MIN_TERMINAL_COLS, cols)),
|
|
715
752
|
rows: Math.max(MIN_TERMINAL_ROWS, rows),
|
|
716
753
|
};
|
|
717
754
|
}
|
|
@@ -1915,6 +1952,16 @@ export class TerminalCore {
|
|
|
1915
1952
|
});
|
|
1916
1953
|
}
|
|
1917
1954
|
getResourceEstimate() {
|
|
1955
|
+
const wasmMemoryBytes = this.ownedRuntimeMemory?.buffer.byteLength ?? 0;
|
|
1956
|
+
if (wasmMemoryBytes <= 0) {
|
|
1957
|
+
return {
|
|
1958
|
+
bufferBytes: 0,
|
|
1959
|
+
cellCount: 0,
|
|
1960
|
+
wasmMemoryBytes: 0,
|
|
1961
|
+
estimatedBytes: 0,
|
|
1962
|
+
rendererType: this.config.rendererType ?? 'canvas',
|
|
1963
|
+
};
|
|
1964
|
+
}
|
|
1918
1965
|
const info = this.getTerminalInfo();
|
|
1919
1966
|
const cellCount = info ? Math.max(0, info.cols * info.bufferLength) : 0;
|
|
1920
1967
|
let bufferBytes = 0;
|
|
@@ -1926,7 +1973,8 @@ export class TerminalCore {
|
|
|
1926
1973
|
return {
|
|
1927
1974
|
bufferBytes,
|
|
1928
1975
|
cellCount,
|
|
1929
|
-
|
|
1976
|
+
wasmMemoryBytes,
|
|
1977
|
+
estimatedBytes: ESTIMATED_RENDERER_BYTES + wasmMemoryBytes,
|
|
1930
1978
|
rendererType: this.config.rendererType ?? 'canvas',
|
|
1931
1979
|
};
|
|
1932
1980
|
}
|
|
@@ -2895,10 +2943,14 @@ export class TerminalCore {
|
|
|
2895
2943
|
this.fabricView = null;
|
|
2896
2944
|
this.terminal?.dispose();
|
|
2897
2945
|
this.terminal = null;
|
|
2946
|
+
this.ownedRuntimeMemory = null;
|
|
2947
|
+
this.ownedRuntime = null;
|
|
2898
2948
|
this.inputElement?.remove();
|
|
2899
2949
|
this.inputElement = null;
|
|
2950
|
+
this.viewportHost?.remove();
|
|
2900
2951
|
this.viewportHost = null;
|
|
2901
2952
|
this.renderHost = null;
|
|
2953
|
+
this.fitAddon = null;
|
|
2902
2954
|
this.registeredLinkProviders.clear();
|
|
2903
2955
|
this.appliedLinkProviders.clear();
|
|
2904
2956
|
this.setState(TerminalState.DISPOSED);
|
|
@@ -3183,12 +3235,10 @@ export class TerminalCore {
|
|
|
3183
3235
|
presentationRequest.frameHandle = requestAnimationFrame(() => {
|
|
3184
3236
|
if (!this.presentationRequests.has(presentationRequest))
|
|
3185
3237
|
return;
|
|
3186
|
-
|
|
3187
|
-
|
|
3188
|
-
|
|
3189
|
-
|
|
3190
|
-
presentationRequest.resolve();
|
|
3191
|
-
});
|
|
3238
|
+
if (!this.presentationRequests.delete(presentationRequest))
|
|
3239
|
+
return;
|
|
3240
|
+
presentationRequest.frameHandle = null;
|
|
3241
|
+
presentationRequest.resolve();
|
|
3192
3242
|
});
|
|
3193
3243
|
}
|
|
3194
3244
|
}
|