@staff0rd/assist 0.824.2 → 0.824.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/commands/sessions/web/bundle.js +290 -290
- package/dist/index.js +123 -38
- package/package.json +3 -1
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Command } from "commander";
|
|
|
6
6
|
// package.json
|
|
7
7
|
var package_default = {
|
|
8
8
|
name: "@staff0rd/assist",
|
|
9
|
-
version: "0.824.
|
|
9
|
+
version: "0.824.4",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -46,7 +46,9 @@ var package_default = {
|
|
|
46
46
|
},
|
|
47
47
|
dependencies: {
|
|
48
48
|
"@xterm/addon-fit": "^0.11.0",
|
|
49
|
+
"@xterm/addon-serialize": "^0.14.0",
|
|
49
50
|
"@xterm/addon-webgl": "^0.19.0",
|
|
51
|
+
"@xterm/headless": "^6.0.0",
|
|
50
52
|
"@xterm/xterm": "^6.0.0",
|
|
51
53
|
"better-sqlite3": "^12.8.0",
|
|
52
54
|
blessed: "^0.1.81",
|
|
@@ -43142,6 +43144,40 @@ function nudgePty(session, resize) {
|
|
|
43142
43144
|
}, NUDGE_RESTORE_MS);
|
|
43143
43145
|
}
|
|
43144
43146
|
|
|
43147
|
+
// src/commands/sessions/daemon/resizePty.ts
|
|
43148
|
+
function resizePty(s, cols, rows) {
|
|
43149
|
+
s.screen?.resize(cols, rows);
|
|
43150
|
+
try {
|
|
43151
|
+
s.pty?.resize(cols, rows);
|
|
43152
|
+
} catch (error) {
|
|
43153
|
+
daemonLog(
|
|
43154
|
+
`session ${s.id} resize skipped (dead pty): ${error instanceof Error ? error.message : String(error)}`
|
|
43155
|
+
);
|
|
43156
|
+
}
|
|
43157
|
+
}
|
|
43158
|
+
|
|
43159
|
+
// src/commands/sessions/daemon/stripReplayQueries.ts
|
|
43160
|
+
var ESC2 = "\x1B";
|
|
43161
|
+
var REPLAY_QUERY = new RegExp(
|
|
43162
|
+
`${ESC2}\\[(?:\\??[0-9]*n|[>=?]?[0-9]*c|\\?1004[hl])`,
|
|
43163
|
+
"g"
|
|
43164
|
+
);
|
|
43165
|
+
function stripReplayQueries(data) {
|
|
43166
|
+
return data.replace(REPLAY_QUERY, "");
|
|
43167
|
+
}
|
|
43168
|
+
|
|
43169
|
+
// src/commands/sessions/daemon/sessionSnapshot.ts
|
|
43170
|
+
function sessionSnapshot(s) {
|
|
43171
|
+
return stripReplayQueries(s.screen?.snapshot() ?? s.scrollback);
|
|
43172
|
+
}
|
|
43173
|
+
|
|
43174
|
+
// src/commands/sessions/daemon/sendTakeoverSnapshot.ts
|
|
43175
|
+
function sendTakeoverSnapshot(s, send) {
|
|
43176
|
+
const data = sessionSnapshot(s);
|
|
43177
|
+
daemonLog(`session ${s.id} takeover snapshot ${data.length} chars`);
|
|
43178
|
+
send(data);
|
|
43179
|
+
}
|
|
43180
|
+
|
|
43145
43181
|
// src/commands/sessions/daemon/resizeSession.ts
|
|
43146
43182
|
function resizeSession(sessions, id, cols, rows, viewer = {}) {
|
|
43147
43183
|
const s = sessions.get(id);
|
|
@@ -43157,21 +43193,14 @@ function resizeSession(sessions, id, cols, rows, viewer = {}) {
|
|
|
43157
43193
|
s.rows = rows;
|
|
43158
43194
|
const resize = (c, r) => resizePty(s, c, r);
|
|
43159
43195
|
resize(cols, rows);
|
|
43160
|
-
if (viewer.claim
|
|
43196
|
+
if (!viewer.claim) return;
|
|
43197
|
+
if (viewer.sendSnapshot) sendTakeoverSnapshot(s, viewer.sendSnapshot);
|
|
43198
|
+
else if (unchanged) nudgePty(s, resize);
|
|
43161
43199
|
}
|
|
43162
43200
|
function isInactiveViewer(s, { viewerId, claim }) {
|
|
43163
43201
|
if (claim || !viewerId || !s.activeViewer) return false;
|
|
43164
43202
|
return s.activeViewer !== viewerId;
|
|
43165
43203
|
}
|
|
43166
|
-
function resizePty(s, cols, rows) {
|
|
43167
|
-
try {
|
|
43168
|
-
s.pty?.resize(cols, rows);
|
|
43169
|
-
} catch (error) {
|
|
43170
|
-
daemonLog(
|
|
43171
|
-
`session ${s.id} resize skipped (dead pty): ${error instanceof Error ? error.message : String(error)}`
|
|
43172
|
-
);
|
|
43173
|
-
}
|
|
43174
|
-
}
|
|
43175
43204
|
|
|
43176
43205
|
// src/commands/sessions/daemon/ViewerConnections.ts
|
|
43177
43206
|
var ViewerConnections = class {
|
|
@@ -43197,18 +43226,18 @@ var ViewerConnections = class {
|
|
|
43197
43226
|
};
|
|
43198
43227
|
|
|
43199
43228
|
// src/commands/sessions/daemon/isTerminalResponse.ts
|
|
43200
|
-
var
|
|
43201
|
-
var ST = String.raw`(?:\x07|${
|
|
43229
|
+
var ESC3 = String.raw`\x1b`;
|
|
43230
|
+
var ST = String.raw`(?:\x07|${ESC3}\\)`;
|
|
43202
43231
|
var RESPONSE = [
|
|
43203
|
-
String.raw`${
|
|
43204
|
-
String.raw`${
|
|
43205
|
-
String.raw`${
|
|
43206
|
-
String.raw`${
|
|
43207
|
-
String.raw`${
|
|
43208
|
-
String.raw`${
|
|
43209
|
-
String.raw`${
|
|
43210
|
-
String.raw`${
|
|
43211
|
-
String.raw`${
|
|
43232
|
+
String.raw`${ESC3}\[[?>=]?[\d;]*c`,
|
|
43233
|
+
String.raw`${ESC3}\[\??[\d;]*R`,
|
|
43234
|
+
String.raw`${ESC3}\[\??\d*n`,
|
|
43235
|
+
String.raw`${ESC3}\[\??[\d;]*\$y`,
|
|
43236
|
+
String.raw`${ESC3}\[[\d;]*t`,
|
|
43237
|
+
String.raw`${ESC3}\[\?\d*u`,
|
|
43238
|
+
String.raw`${ESC3}\[[IO]`,
|
|
43239
|
+
String.raw`${ESC3}\][^\x07\x1b]*${ST}`,
|
|
43240
|
+
String.raw`${ESC3}P[^\x1b]*${ESC3}\\`
|
|
43212
43241
|
].join("|");
|
|
43213
43242
|
var ONLY_RESPONSES = new RegExp(`^(?:${RESPONSE})+$`);
|
|
43214
43243
|
function isTerminalResponse(data) {
|
|
@@ -44664,16 +44693,6 @@ function flushPhaseActiveMs(session) {
|
|
|
44664
44693
|
return chain2;
|
|
44665
44694
|
}
|
|
44666
44695
|
|
|
44667
|
-
// src/commands/sessions/daemon/stripReplayQueries.ts
|
|
44668
|
-
var ESC3 = "\x1B";
|
|
44669
|
-
var REPLAY_QUERY = new RegExp(
|
|
44670
|
-
`${ESC3}\\[(?:\\??[0-9]*n|[>=?]?[0-9]*c|\\?1004[hl])`,
|
|
44671
|
-
"g"
|
|
44672
|
-
);
|
|
44673
|
-
function stripReplayQueries(data) {
|
|
44674
|
-
return data.replace(REPLAY_QUERY, "");
|
|
44675
|
-
}
|
|
44676
|
-
|
|
44677
44696
|
// src/commands/sessions/daemon/replayScrollback.ts
|
|
44678
44697
|
function replayScrollback(sessions, client) {
|
|
44679
44698
|
for (const s of sessions.values()) {
|
|
@@ -44681,7 +44700,7 @@ function replayScrollback(sessions, client) {
|
|
|
44681
44700
|
sendTo(client, {
|
|
44682
44701
|
type: "output",
|
|
44683
44702
|
sessionId: s.id,
|
|
44684
|
-
data:
|
|
44703
|
+
data: sessionSnapshot(s)
|
|
44685
44704
|
});
|
|
44686
44705
|
}
|
|
44687
44706
|
}
|
|
@@ -45008,9 +45027,54 @@ function startSessionTitleGeneration(session, notify2) {
|
|
|
45008
45027
|
runSessionTitleGeneration(session, prompt, notify2, singleLineTitle(prompt));
|
|
45009
45028
|
}
|
|
45010
45029
|
|
|
45030
|
+
// src/commands/sessions/daemon/createScreenMirror.ts
|
|
45031
|
+
import serialize from "@xterm/addon-serialize";
|
|
45032
|
+
import headless from "@xterm/headless";
|
|
45033
|
+
var { SerializeAddon } = serialize;
|
|
45034
|
+
var { Terminal } = headless;
|
|
45035
|
+
var SCROLLBACK_LINES = 5e3;
|
|
45036
|
+
function createScreenMirror(cols, rows) {
|
|
45037
|
+
const term = new Terminal({
|
|
45038
|
+
cols,
|
|
45039
|
+
rows,
|
|
45040
|
+
scrollback: SCROLLBACK_LINES,
|
|
45041
|
+
allowProposedApi: true
|
|
45042
|
+
});
|
|
45043
|
+
const serializer = new SerializeAddon();
|
|
45044
|
+
term.loadAddon(serializer);
|
|
45045
|
+
let notYetParsed = "";
|
|
45046
|
+
return {
|
|
45047
|
+
write: (data) => {
|
|
45048
|
+
notYetParsed += data;
|
|
45049
|
+
term.write(data, () => {
|
|
45050
|
+
notYetParsed = notYetParsed.slice(data.length);
|
|
45051
|
+
});
|
|
45052
|
+
},
|
|
45053
|
+
resize: (c, r) => {
|
|
45054
|
+
if (c > 0 && r > 0) term.resize(c, r);
|
|
45055
|
+
},
|
|
45056
|
+
snapshot: () => serializer.serialize({ scrollback: SCROLLBACK_LINES }) + notYetParsed
|
|
45057
|
+
};
|
|
45058
|
+
}
|
|
45059
|
+
|
|
45060
|
+
// src/commands/sessions/daemon/sessionScreen.ts
|
|
45061
|
+
var DEFAULT_COLS = 120;
|
|
45062
|
+
var DEFAULT_ROWS = 30;
|
|
45063
|
+
function sessionScreen(session) {
|
|
45064
|
+
if (!session.screen) {
|
|
45065
|
+
session.screen = createScreenMirror(
|
|
45066
|
+
session.cols ?? DEFAULT_COLS,
|
|
45067
|
+
session.rows ?? DEFAULT_ROWS
|
|
45068
|
+
);
|
|
45069
|
+
if (session.scrollback) session.screen.write(session.scrollback);
|
|
45070
|
+
}
|
|
45071
|
+
return session.screen;
|
|
45072
|
+
}
|
|
45073
|
+
|
|
45011
45074
|
// src/commands/sessions/daemon/emitSessionOutput.ts
|
|
45012
45075
|
var MAX_SCROLLBACK = 256 * 1024;
|
|
45013
45076
|
function emitSessionOutput(session, clients, data) {
|
|
45077
|
+
sessionScreen(session).write(data);
|
|
45014
45078
|
session.scrollback += data;
|
|
45015
45079
|
if (session.scrollback.length > MAX_SCROLLBACK) {
|
|
45016
45080
|
session.scrollback = session.scrollback.slice(-MAX_SCROLLBACK);
|
|
@@ -46226,6 +46290,7 @@ function respawnSession(session, respawn, status2, clients, onStatusChange) {
|
|
|
46226
46290
|
session.closeGrace?.cancel();
|
|
46227
46291
|
session.closing = void 0;
|
|
46228
46292
|
session.scrollback = "";
|
|
46293
|
+
session.screen = void 0;
|
|
46229
46294
|
session.startedAt = Date.now();
|
|
46230
46295
|
session.runningMs = 0;
|
|
46231
46296
|
session.runningSince = null;
|
|
@@ -48977,6 +49042,21 @@ var lifecycleHandlers = {
|
|
|
48977
49042
|
shutdown: handleShutdown
|
|
48978
49043
|
};
|
|
48979
49044
|
|
|
49045
|
+
// src/commands/sessions/daemon/handleSnapshotRequest.ts
|
|
49046
|
+
var handleSnapshotRequest = (client, m, d) => {
|
|
49047
|
+
const sessionId = d.sessionId;
|
|
49048
|
+
let data;
|
|
49049
|
+
m.update((sessions) => {
|
|
49050
|
+
const s = sessions.get(sessionId);
|
|
49051
|
+
if (s) data = sessionSnapshot(s);
|
|
49052
|
+
return false;
|
|
49053
|
+
});
|
|
49054
|
+
daemonLog(
|
|
49055
|
+
`snapshot requested: id=${sessionId} ${data === void 0 ? "not local" : `${data.length} chars`}`
|
|
49056
|
+
);
|
|
49057
|
+
if (data !== void 0) sendTo(client, { type: "snapshot", sessionId, data });
|
|
49058
|
+
};
|
|
49059
|
+
|
|
48980
49060
|
// src/commands/sessions/daemon/viewed.ts
|
|
48981
49061
|
function viewed(handler) {
|
|
48982
49062
|
return (client, m, d) => {
|
|
@@ -48997,13 +49077,18 @@ var viewerHandlers = {
|
|
|
48997
49077
|
)
|
|
48998
49078
|
),
|
|
48999
49079
|
resize: viewed(
|
|
49000
|
-
routed(
|
|
49001
|
-
|
|
49080
|
+
routed((client, m, d) => {
|
|
49081
|
+
const sessionId = d.sessionId;
|
|
49082
|
+
const claim = d.claim === true;
|
|
49083
|
+
const localViewer = d.viewerNode === m.links.localNode();
|
|
49084
|
+
m.io.resize(sessionId, d.cols, d.rows, {
|
|
49002
49085
|
...viewerOf(d),
|
|
49003
|
-
claim
|
|
49004
|
-
|
|
49005
|
-
|
|
49086
|
+
claim,
|
|
49087
|
+
sendSnapshot: claim && localViewer ? (data) => sendTo(client, { type: "snapshot", sessionId, data }) : void 0
|
|
49088
|
+
});
|
|
49089
|
+
})
|
|
49006
49090
|
),
|
|
49091
|
+
snapshot: handleSnapshotRequest,
|
|
49007
49092
|
"viewer-left": (client, m, d) => {
|
|
49008
49093
|
if (typeof d.viewerId === "string") m.io.viewerLeft(client, d.viewerId);
|
|
49009
49094
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@staff0rd/assist",
|
|
3
|
-
"version": "0.824.
|
|
3
|
+
"version": "0.824.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -40,7 +40,9 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@xterm/addon-fit": "^0.11.0",
|
|
43
|
+
"@xterm/addon-serialize": "^0.14.0",
|
|
43
44
|
"@xterm/addon-webgl": "^0.19.0",
|
|
45
|
+
"@xterm/headless": "^6.0.0",
|
|
44
46
|
"@xterm/xterm": "^6.0.0",
|
|
45
47
|
"better-sqlite3": "^12.8.0",
|
|
46
48
|
"blessed": "^0.1.81",
|