@caoruhua/open-claude-remote 1.0.7 → 1.3.6
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 +54 -27
- package/dist/backend/src/api/file-routes.d.ts +0 -24
- package/dist/backend/src/api/file-routes.d.ts.map +1 -1
- package/dist/backend/src/api/file-routes.js +464 -68
- package/dist/backend/src/api/file-routes.js.map +1 -1
- package/dist/backend/src/api/instance-routes.d.ts +4 -0
- package/dist/backend/src/api/instance-routes.d.ts.map +1 -1
- package/dist/backend/src/api/instance-routes.js +27 -2
- package/dist/backend/src/api/instance-routes.js.map +1 -1
- package/dist/backend/src/api/router.d.ts +3 -1
- package/dist/backend/src/api/router.d.ts.map +1 -1
- package/dist/backend/src/api/router.js +3 -3
- package/dist/backend/src/api/router.js.map +1 -1
- package/dist/backend/src/cli-utils.d.ts +4 -0
- package/dist/backend/src/cli-utils.d.ts.map +1 -1
- package/dist/backend/src/cli-utils.js +17 -1
- package/dist/backend/src/cli-utils.js.map +1 -1
- package/dist/backend/src/cli.d.ts +6 -0
- package/dist/backend/src/cli.d.ts.map +1 -1
- package/dist/backend/src/cli.js +52 -7
- package/dist/backend/src/cli.js.map +1 -1
- package/dist/backend/src/config.d.ts +11 -0
- package/dist/backend/src/config.d.ts.map +1 -1
- package/dist/backend/src/config.js +43 -1
- package/dist/backend/src/config.js.map +1 -1
- package/dist/backend/src/daemon/daemon-client.d.ts +5 -0
- package/dist/backend/src/daemon/daemon-client.d.ts.map +1 -1
- package/dist/backend/src/daemon/daemon-client.js +42 -0
- package/dist/backend/src/daemon/daemon-client.js.map +1 -1
- package/dist/backend/src/daemon/daemon-launcher.d.ts.map +1 -1
- package/dist/backend/src/daemon/daemon-launcher.js +4 -1
- package/dist/backend/src/daemon/daemon-launcher.js.map +1 -1
- package/dist/backend/src/daemon/restart-state.d.ts +22 -0
- package/dist/backend/src/daemon/restart-state.d.ts.map +1 -0
- package/dist/backend/src/daemon/restart-state.js +85 -0
- package/dist/backend/src/daemon/restart-state.js.map +1 -0
- package/dist/backend/src/deps/detector.js +1 -1
- package/dist/backend/src/deps/index.d.ts +1 -1
- package/dist/backend/src/deps/index.js +22 -22
- package/dist/backend/src/deps/installer.js +6 -6
- package/dist/backend/src/deps/installer.js.map +1 -1
- package/dist/backend/src/deps/types.d.ts +1 -1
- package/dist/backend/src/deps/types.d.ts.map +1 -1
- package/dist/backend/src/deps/types.js +9 -11
- package/dist/backend/src/deps/types.js.map +1 -1
- package/dist/backend/src/hooks/hook-receiver.d.ts.map +1 -1
- package/dist/backend/src/hooks/hook-receiver.js +4 -0
- package/dist/backend/src/hooks/hook-receiver.js.map +1 -1
- package/dist/backend/src/index.d.ts.map +1 -1
- package/dist/backend/src/index.js +76 -9
- package/dist/backend/src/index.js.map +1 -1
- package/dist/backend/src/instance/instance-manager.d.ts +9 -0
- package/dist/backend/src/instance/instance-manager.d.ts.map +1 -1
- package/dist/backend/src/instance/instance-manager.js +46 -7
- package/dist/backend/src/instance/instance-manager.js.map +1 -1
- package/dist/backend/src/instance/instance-session.d.ts +12 -1
- package/dist/backend/src/instance/instance-session.d.ts.map +1 -1
- package/dist/backend/src/instance/instance-session.js +25 -3
- package/dist/backend/src/instance/instance-session.js.map +1 -1
- package/dist/backend/src/instance/types.d.ts +3 -0
- package/dist/backend/src/instance/types.d.ts.map +1 -1
- package/dist/backend/src/pty/fix-pty-permissions.d.ts +1 -1
- package/dist/backend/src/pty/fix-pty-permissions.js +1 -1
- package/dist/backend/src/pty/output-buffer.d.ts +6 -0
- package/dist/backend/src/pty/output-buffer.d.ts.map +1 -1
- package/dist/backend/src/pty/output-buffer.js +10 -0
- package/dist/backend/src/pty/output-buffer.js.map +1 -1
- package/dist/backend/src/registry/stop-instances.js +1 -1
- package/dist/backend/src/services/pptx-converter.d.ts +66 -0
- package/dist/backend/src/services/pptx-converter.d.ts.map +1 -0
- package/dist/backend/src/services/pptx-converter.js +282 -0
- package/dist/backend/src/services/pptx-converter.js.map +1 -0
- package/dist/backend/src/update.d.ts +2 -2
- package/dist/backend/src/update.d.ts.map +1 -1
- package/dist/backend/src/update.js +9 -9
- package/dist/backend/src/update.js.map +1 -1
- package/dist/backend/src/utils/banner.d.ts +2 -0
- package/dist/backend/src/utils/banner.d.ts.map +1 -1
- package/dist/backend/src/utils/banner.js +14 -10
- package/dist/backend/src/utils/banner.js.map +1 -1
- package/dist/backend/src/utils/network.d.ts +22 -0
- package/dist/backend/src/utils/network.d.ts.map +1 -1
- package/dist/backend/src/utils/network.js +54 -0
- package/dist/backend/src/utils/network.js.map +1 -1
- package/dist/backend/src/utils/string-display-width.d.ts +20 -0
- package/dist/backend/src/utils/string-display-width.d.ts.map +1 -0
- package/dist/backend/src/utils/string-display-width.js +79 -0
- package/dist/backend/src/utils/string-display-width.js.map +1 -0
- package/dist/shared/file-types.d.ts +176 -0
- package/dist/shared/file-types.d.ts.map +1 -0
- package/dist/shared/file-types.js +108 -0
- package/dist/shared/file-types.js.map +1 -0
- package/dist/shared/index.d.ts +1 -0
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +1 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/instance.d.ts +2 -0
- package/dist/shared/instance.d.ts.map +1 -1
- package/dist/shared/instance.js.map +1 -1
- package/frontend-dist/assets/{index-UXAwH56Q.css → index-BY0fnkbW.css} +1 -1
- package/frontend-dist/assets/index-qwSai8-t.js +211 -0
- package/frontend-dist/index.html +2 -2
- package/package.json +8 -4
- package/scripts/build.sh +3 -9
- package/scripts/dev.sh +1 -4
- package/scripts/git-hooks/pre-commit +0 -4
- package/scripts/publish-npm.sh +61 -0
- package/scripts/stop.sh +1 -1
- package/frontend-dist/assets/index-CVRtrLyp.js +0 -199
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../backend/src/deps/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,MAAM,EAAE,cAAc,EAAE,CAAC;CAC1B;AAED,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../backend/src/deps/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,cAAc,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,MAAM,EAAE,cAAc,EAAE,CAAC;CAC1B;AAED,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,CAwC/D,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGzD"}
|
|
@@ -11,22 +11,20 @@ export const DEPENDENCIES = {
|
|
|
11
11
|
minVersion: '20',
|
|
12
12
|
helpUrl: 'https://nodejs.org/',
|
|
13
13
|
},
|
|
14
|
-
|
|
15
|
-
name: '
|
|
16
|
-
displayName: '
|
|
17
|
-
checkCommand: '
|
|
14
|
+
tnpm: {
|
|
15
|
+
name: 'tnpm',
|
|
16
|
+
displayName: 'tnpm',
|
|
17
|
+
checkCommand: 'tnpm',
|
|
18
18
|
checkArgs: ['--version'],
|
|
19
19
|
versionRegex: /^(\d+\.\d+\.\d+)/m,
|
|
20
|
-
minVersion: '9', // required for node-linker=hoisted default
|
|
21
20
|
installCommands: [
|
|
22
|
-
{ command: 'corepack', args: ['enable'], timeout: 10000 },
|
|
23
21
|
{
|
|
24
|
-
command: '
|
|
25
|
-
args: ['
|
|
22
|
+
command: 'npm',
|
|
23
|
+
args: ['install', '-g', 'tnpm@latest'],
|
|
26
24
|
timeout: 60000,
|
|
27
25
|
},
|
|
28
26
|
],
|
|
29
|
-
helpUrl: 'https://
|
|
27
|
+
helpUrl: 'https://web.npm.alibaba-inc.com/package/tnpm',
|
|
30
28
|
},
|
|
31
29
|
claude: {
|
|
32
30
|
name: 'claude',
|
|
@@ -36,8 +34,8 @@ export const DEPENDENCIES = {
|
|
|
36
34
|
versionRegex: /^(\d+\.\d+\.\d+)/m,
|
|
37
35
|
installCommands: [
|
|
38
36
|
{
|
|
39
|
-
command: '
|
|
40
|
-
args: ['
|
|
37
|
+
command: 'tnpm',
|
|
38
|
+
args: ['install', '-g', '@anthropic-ai/claude-code'],
|
|
41
39
|
timeout: 180000,
|
|
42
40
|
},
|
|
43
41
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../backend/src/deps/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAuCH,MAAM,CAAC,MAAM,YAAY,GAA2C;IAClE,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,MAAM;QACpB,SAAS,EAAE,CAAC,WAAW,CAAC;QACxB,YAAY,EAAE,oBAAoB;QAClC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,qBAAqB;KAC/B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,SAAS,EAAE,CAAC,WAAW,CAAC;QACxB,YAAY,EAAE,mBAAmB;QACjC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../backend/src/deps/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAuCH,MAAM,CAAC,MAAM,YAAY,GAA2C;IAClE,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,MAAM;QACpB,SAAS,EAAE,CAAC,WAAW,CAAC;QACxB,YAAY,EAAE,oBAAoB;QAClC,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,qBAAqB;KAC/B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,SAAS,EAAE,CAAC,WAAW,CAAC;QACxB,YAAY,EAAE,mBAAmB;QACjC,eAAe,EAAE;YACf;gBACE,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC;gBACtC,OAAO,EAAE,KAAK;aACf;SACF;QACD,OAAO,EAAE,8CAA8C;KACxD;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,YAAY;QACzB,YAAY,EAAE,QAAQ;QACtB,SAAS,EAAE,CAAC,WAAW,CAAC;QACxB,YAAY,EAAE,mBAAmB;QACjC,eAAe,EAAE;YACf;gBACE,OAAO,EAAE,MAAM;gBACf,IAAI,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,2BAA2B,CAAC;gBACpD,OAAO,EAAE,MAAM;aAChB;SACF;QACD,OAAO,EAAE,gDAAgD;KAC1D;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-receiver.d.ts","sourceRoot":"","sources":["../../../../backend/src/hooks/hook-receiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAIvB,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC5C,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,gBAAgB,CAAC;QACvB,IAAI,EAAE,iBAAiB,CAAC;KACzB,CAAC;CACH;AAeD;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAC5C;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU;
|
|
1
|
+
{"version":3,"file":"hook-receiver.d.ts","sourceRoot":"","sources":["../../../../backend/src/hooks/hook-receiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAIvB,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC5C,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,gBAAgB,CAAC;QACvB,IAAI,EAAE,iBAAiB,CAAC;KACzB,CAAC;CACH;AAeD;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAC5C;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,UAAU;IA2B7C;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA+C1B;;;OAGG;IACH,OAAO,CAAC,UAAU;IAUlB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;CAK/B"}
|
|
@@ -22,6 +22,10 @@ export class HookReceiver extends EventEmitter {
|
|
|
22
22
|
*/
|
|
23
23
|
processHook(payload) {
|
|
24
24
|
logger.info({ eventName: payload.hook_event_name }, 'Hook received');
|
|
25
|
+
// 所有 hook 事件都可能包含 session_id,提取并通知上层
|
|
26
|
+
if (payload.session_id) {
|
|
27
|
+
this.emit('session_id', payload.session_id);
|
|
28
|
+
}
|
|
25
29
|
switch (payload.hook_event_name) {
|
|
26
30
|
case 'Notification':
|
|
27
31
|
return this.handleNotification(payload);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-receiver.js","sourceRoot":"","sources":["../../../../backend/src/hooks/hook-receiver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hook-receiver.js","sourceRoot":"","sources":["../../../../backend/src/hooks/hook-receiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuD,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuD,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAiCrG,wBAAsB,WAAW,CAAC,YAAY,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6ahF"}
|
|
@@ -17,10 +17,12 @@ import { createNotificationManager } from './notification/notification-manager.j
|
|
|
17
17
|
import { createNotificationServiceFactory } from './notification/notification-service-factory.js';
|
|
18
18
|
import { logger, setInstanceContext } from './logger/logger.js';
|
|
19
19
|
import { markGracefulShutdown } from './daemon/daemon-guard.js';
|
|
20
|
+
import { saveRestartState } from './daemon/restart-state.js';
|
|
20
21
|
import { getOrCreateSharedToken } from './registry/shared-token.js';
|
|
21
22
|
import { IpMonitor } from './utils/ip-monitor.js';
|
|
22
|
-
import { detectAllLocalIps, getAllNetworkInterfaces, isInCidrRange, detectPreferredInterface } from './utils/network.js';
|
|
23
|
+
import { detectAllLocalIps, detectLanIp, getAllNetworkInterfaces, isInCidrRange, detectPreferredInterface, checkVpnReachability } from './utils/network.js';
|
|
23
24
|
import { printBanner } from './utils/banner.js';
|
|
25
|
+
import { checkSofficeOnStartup } from './services/pptx-converter.js';
|
|
24
26
|
/**
|
|
25
27
|
* 根据网络接口信息推断接口类型。
|
|
26
28
|
* 注意:macOS en0 不一定是 WiFi(Mac Pro/iMac 上可能是以太网),
|
|
@@ -49,6 +51,8 @@ export async function startServer(cliOverrides = {}) {
|
|
|
49
51
|
const port = config.port; // DEFAULT_PORT
|
|
50
52
|
// 设置日志实例上下文
|
|
51
53
|
setInstanceContext(port);
|
|
54
|
+
// 检查 LibreOffice 可用性(PPTX 转换的可选依赖)
|
|
55
|
+
await checkSofficeOnStartup();
|
|
52
56
|
// 5. Create Express app
|
|
53
57
|
const app = express();
|
|
54
58
|
app.use(express.json());
|
|
@@ -123,7 +127,7 @@ export async function startServer(cliOverrides = {}) {
|
|
|
123
127
|
notificationServiceFactory,
|
|
124
128
|
port,
|
|
125
129
|
customPrivateRanges: customRanges,
|
|
126
|
-
onShutdown: () => shutdown(0),
|
|
130
|
+
onShutdown: (opts) => shutdown(0, opts),
|
|
127
131
|
}));
|
|
128
132
|
// 12. Serve frontend static files (if built)
|
|
129
133
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
@@ -147,6 +151,40 @@ export async function startServer(cliOverrides = {}) {
|
|
|
147
151
|
let firstSession;
|
|
148
152
|
let relay;
|
|
149
153
|
let ptyDataHandler;
|
|
154
|
+
// 13.5 Daemon 启动时检测 restart-state 并自动恢复实例
|
|
155
|
+
if (daemonMode) {
|
|
156
|
+
try {
|
|
157
|
+
const { loadAndConsumeRestartState } = await import('./daemon/restart-state.js');
|
|
158
|
+
const restartStates = loadAndConsumeRestartState();
|
|
159
|
+
if (restartStates && restartStates.length > 0) {
|
|
160
|
+
let restored = 0;
|
|
161
|
+
for (const state of restartStates) {
|
|
162
|
+
try {
|
|
163
|
+
if (!existsSync(state.cwd)) {
|
|
164
|
+
logger.warn({ cwd: state.cwd, name: state.name }, 'Skip restore: cwd not found');
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
instanceManager.createInstance({
|
|
168
|
+
cwd: state.cwd,
|
|
169
|
+
name: state.name,
|
|
170
|
+
claudeArgs: state.claudeArgs,
|
|
171
|
+
headless: state.headless,
|
|
172
|
+
resumeSessionId: state.sessionId,
|
|
173
|
+
claudeCommand: state.claudeCommand,
|
|
174
|
+
});
|
|
175
|
+
restored++;
|
|
176
|
+
}
|
|
177
|
+
catch (err) {
|
|
178
|
+
logger.error({ err, name: state.name }, 'Failed to restore instance');
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
logger.info({ restored, total: restartStates.length }, 'Instances restored from restart state');
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
catch (err) {
|
|
185
|
+
logger.error({ err }, 'Failed to load restart state');
|
|
186
|
+
}
|
|
187
|
+
}
|
|
150
188
|
if (!daemonMode) {
|
|
151
189
|
const noTerminal = process.env.NO_TERMINAL === 'true';
|
|
152
190
|
firstSession = instanceManager.createInstance({
|
|
@@ -230,12 +268,22 @@ export async function startServer(cliOverrides = {}) {
|
|
|
230
268
|
ipMonitor.start(effectiveInterface);
|
|
231
269
|
// 16. Unified graceful shutdown
|
|
232
270
|
let shuttingDown = false;
|
|
233
|
-
const shutdown = (exitCode = 0) => {
|
|
271
|
+
const shutdown = (exitCode = 0, options) => {
|
|
234
272
|
if (shuttingDown)
|
|
235
273
|
return;
|
|
236
274
|
shuttingDown = true;
|
|
237
275
|
markGracefulShutdown();
|
|
238
|
-
logger.info({ exitCode }, 'Shutting down...');
|
|
276
|
+
logger.info({ exitCode, restart: !!options?.restart }, 'Shutting down...');
|
|
277
|
+
// 在 destroy 之前保存 restart state
|
|
278
|
+
if (options?.restart) {
|
|
279
|
+
try {
|
|
280
|
+
const states = instanceManager.getRestartState();
|
|
281
|
+
saveRestartState(states);
|
|
282
|
+
}
|
|
283
|
+
catch (err) {
|
|
284
|
+
logger.error({ err }, 'Failed to save restart state');
|
|
285
|
+
}
|
|
286
|
+
}
|
|
239
287
|
if (relay) {
|
|
240
288
|
relay.stop();
|
|
241
289
|
}
|
|
@@ -283,7 +331,7 @@ export async function startServer(cliOverrides = {}) {
|
|
|
283
331
|
logger.info('SIGTERM received');
|
|
284
332
|
shutdown(0);
|
|
285
333
|
});
|
|
286
|
-
// When running via
|
|
334
|
+
// When running via tnpm dev (stdin is a pipe, not TTY) — skip in daemon mode
|
|
287
335
|
if (!daemonMode && !process.stdin.isTTY) {
|
|
288
336
|
process.stdin.resume();
|
|
289
337
|
const CTRL_C = '\x03';
|
|
@@ -315,18 +363,35 @@ export async function startServer(cliOverrides = {}) {
|
|
|
315
363
|
logger.error({ err }, 'HTTP server error');
|
|
316
364
|
reject(err);
|
|
317
365
|
});
|
|
318
|
-
httpServer.listen(port, config.host, () => {
|
|
366
|
+
httpServer.listen(port, config.host, async () => {
|
|
319
367
|
// Record daemon start time
|
|
320
368
|
setDaemonStartTime(new Date().toISOString());
|
|
321
|
-
const url = `http://${config.displayIp}:${port}`;
|
|
322
369
|
if (!daemonMode) {
|
|
323
|
-
// CLI 直接启动模式(
|
|
324
|
-
// 收集所有可用地址
|
|
370
|
+
// CLI 直接启动模式(tnpm dev 等):打印 banner
|
|
325
371
|
const allInterfaces = getAllNetworkInterfaces();
|
|
372
|
+
const vpnInterfaces = allInterfaces.filter(i => i.isVpn);
|
|
373
|
+
// VPN 可达性探测(最多 1.5s,并行执行)
|
|
374
|
+
const warnings = [];
|
|
375
|
+
let reachabilityMap = new Map();
|
|
376
|
+
if (vpnInterfaces.length > 0) {
|
|
377
|
+
reachabilityMap = await checkVpnReachability(allInterfaces, port);
|
|
378
|
+
// 如果当前 displayIp 是不可达的 VPN IP,回退到 LAN IP
|
|
379
|
+
const displayResult = reachabilityMap.get(config.displayIp);
|
|
380
|
+
if (displayResult && !displayResult.reachable) {
|
|
381
|
+
const lanIp = detectLanIp() ?? '127.0.0.1';
|
|
382
|
+
logger.warn({ vpnIp: config.displayIp, fallbackIp: lanIp }, 'VPN IP unreachable (hairpin routing not supported), falling back to LAN IP');
|
|
383
|
+
config.displayIp = lanIp;
|
|
384
|
+
warnings.push(`VPN address ${displayResult.address} is unreachable from other devices. Using LAN IP ${lanIp} instead.`);
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
const url = `http://${config.displayIp}:${port}`;
|
|
326
388
|
const addresses = allInterfaces.map(iface => ({
|
|
327
389
|
url: `http://${iface.address}:${port}`,
|
|
328
390
|
type: getInterfaceType(iface),
|
|
329
391
|
interface: iface.name,
|
|
392
|
+
reachable: reachabilityMap.has(iface.address)
|
|
393
|
+
? reachabilityMap.get(iface.address).reachable
|
|
394
|
+
: undefined,
|
|
330
395
|
}));
|
|
331
396
|
printBanner({
|
|
332
397
|
url,
|
|
@@ -335,8 +400,10 @@ export async function startServer(cliOverrides = {}) {
|
|
|
335
400
|
instanceName: config.instanceName,
|
|
336
401
|
logDir: config.logDir,
|
|
337
402
|
pid: process.pid,
|
|
403
|
+
warnings,
|
|
338
404
|
});
|
|
339
405
|
}
|
|
406
|
+
const url = `http://${config.displayIp}:${port}`;
|
|
340
407
|
logger.info({ url, host: config.host, port, instanceName: config.instanceName, tokenSource, daemonMode }, 'Server started');
|
|
341
408
|
resolve();
|
|
342
409
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../backend/src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
2
|
import { InstanceSession } from './instance-session.js';
|
|
3
3
|
import type { CreateInstanceOptions, InstanceInfo } from './types.js';
|
|
4
|
+
import type { RestartInstanceState } from '../daemon/restart-state.js';
|
|
4
5
|
import type { PushService } from '../push/push-service.js';
|
|
5
6
|
import type { NotificationManager } from '../notification/notification-manager.js';
|
|
6
7
|
import type { NotificationServiceFactory } from '../notification/notification-service-factory.js';
|
|
@@ -39,6 +40,10 @@ export declare class InstanceManager extends EventEmitter {
|
|
|
39
40
|
* 列出所有实例信息
|
|
40
41
|
*/
|
|
41
42
|
listInstances(): InstanceInfo[];
|
|
43
|
+
/**
|
|
44
|
+
* 重命名实例
|
|
45
|
+
*/
|
|
46
|
+
renameInstance(instanceId: string, newName: string): boolean;
|
|
42
47
|
/**
|
|
43
48
|
* 销毁特定实例
|
|
44
49
|
*/
|
|
@@ -47,6 +52,10 @@ export declare class InstanceManager extends EventEmitter {
|
|
|
47
52
|
* 销毁所有实例
|
|
48
53
|
*/
|
|
49
54
|
destroyAll(): void;
|
|
55
|
+
/**
|
|
56
|
+
* 获取所有实例的 restart 状态(用于 restart 时保存)
|
|
57
|
+
*/
|
|
58
|
+
getRestartState(): RestartInstanceState[];
|
|
50
59
|
/**
|
|
51
60
|
* Ping 所有实例的客户端(由全局心跳定时器调用)
|
|
52
61
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-manager.d.ts","sourceRoot":"","sources":["../../../../backend/src/instance/instance-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK3C,OAAO,EAAE,eAAe,EAA+B,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-manager.d.ts","sourceRoot":"","sources":["../../../../backend/src/instance/instance-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK3C,OAAO,EAAE,eAAe,EAA+B,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAElG;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,SAAS,CAAsC;IAEvD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,0BAA0B,CAA2C;IAC7E,OAAO,CAAC,SAAS,CAAuB;IAExC;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QACzB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;QACxD,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI;IAOR;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,eAAe;IA8F/D;;OAEG;IACH,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAI5D;;OAEG;IACH,eAAe,IAAI,eAAe,EAAE;IAIpC;;OAEG;IACH,aAAa,IAAI,YAAY,EAAE;IAQ/B;;OAEG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO;IAQ5D;;OAEG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAS5C;;OAEG;IACH,UAAU,IAAI,IAAI;IAQlB;;OAEG;IACH,eAAe,IAAI,oBAAoB,EAAE;IAWzC;;OAEG;IACH,cAAc,IAAI,IAAI;IAMtB;;OAEG;IACH,YAAY,CAAC,OAAO,EAAE,OAAO,SAAS,EAAE,aAAa,GAAG,IAAI;IAM5D;;OAEG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAepC,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,cAAc;CAMvB"}
|
|
@@ -53,6 +53,7 @@ export class InstanceManager extends EventEmitter {
|
|
|
53
53
|
cwd: options.cwd,
|
|
54
54
|
maxBufferLines,
|
|
55
55
|
headless: options.headless ?? false,
|
|
56
|
+
claudeCommand,
|
|
56
57
|
claudeArgs: finalClaudeArgs,
|
|
57
58
|
};
|
|
58
59
|
const session = new InstanceSession(sessionOptions);
|
|
@@ -71,16 +72,29 @@ export class InstanceManager extends EventEmitter {
|
|
|
71
72
|
this.removeInstance(instanceId, 'pty_exit');
|
|
72
73
|
});
|
|
73
74
|
// 生成 Claude settings 并 spawn PTY
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
const settingsPath = saveClaudeSettings(finalSettings, instanceId, sharedConfigDir);
|
|
75
|
+
// cfuse 有自己的内部配置体系(~/.codefuse/engine/cc/settings.json),
|
|
76
|
+
// 传递 --settings 会覆盖其默认配置导致模型和 API KEY 丢失,因此跳过
|
|
77
|
+
const isCfuse = claudeCommand === 'cfuse';
|
|
78
78
|
let spawnArgs;
|
|
79
|
-
if (
|
|
80
|
-
spawnArgs = [...
|
|
79
|
+
if (isCfuse) {
|
|
80
|
+
spawnArgs = [...finalClaudeArgs];
|
|
81
|
+
logger.info({ claudeCommand }, 'Skipping --settings injection for cfuse (uses internal config)');
|
|
81
82
|
}
|
|
82
83
|
else {
|
|
83
|
-
|
|
84
|
+
const sharedConfigDir = resolve(homedir(), CLAUDE_REMOTE_DIR);
|
|
85
|
+
const extracted = extractSettingsFromArgs(finalClaudeArgs);
|
|
86
|
+
const finalSettings = createClaudeSettings(instanceId, extracted?.settingsValue);
|
|
87
|
+
const settingsPath = saveClaudeSettings(finalSettings, instanceId, sharedConfigDir);
|
|
88
|
+
if (extracted) {
|
|
89
|
+
spawnArgs = [...extracted.otherArgs, '--settings', settingsPath];
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
spawnArgs = [...finalClaudeArgs, '--settings', settingsPath];
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
// 注入 --resume 用于恢复 Claude Code 会话
|
|
96
|
+
if (options.resumeSessionId) {
|
|
97
|
+
spawnArgs = ['--resume', options.resumeSessionId, ...spawnArgs];
|
|
84
98
|
}
|
|
85
99
|
session.ptyManager.spawn({
|
|
86
100
|
command: claudeCommand,
|
|
@@ -121,6 +135,17 @@ export class InstanceManager extends EventEmitter {
|
|
|
121
135
|
}
|
|
122
136
|
return result;
|
|
123
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* 重命名实例
|
|
140
|
+
*/
|
|
141
|
+
renameInstance(instanceId, newName) {
|
|
142
|
+
const session = this.instances.get(instanceId);
|
|
143
|
+
if (!session)
|
|
144
|
+
return false;
|
|
145
|
+
session.setName(newName);
|
|
146
|
+
logger.info({ instanceId, newName }, 'Instance renamed');
|
|
147
|
+
return true;
|
|
148
|
+
}
|
|
124
149
|
/**
|
|
125
150
|
* 销毁特定实例
|
|
126
151
|
*/
|
|
@@ -142,6 +167,19 @@ export class InstanceManager extends EventEmitter {
|
|
|
142
167
|
}
|
|
143
168
|
this.instances.clear();
|
|
144
169
|
}
|
|
170
|
+
/**
|
|
171
|
+
* 获取所有实例的 restart 状态(用于 restart 时保存)
|
|
172
|
+
*/
|
|
173
|
+
getRestartState() {
|
|
174
|
+
return this.getAllInstances().map(session => ({
|
|
175
|
+
name: session.name,
|
|
176
|
+
cwd: session.cwd,
|
|
177
|
+
claudeArgs: [...session.claudeArgs],
|
|
178
|
+
headless: session.headless,
|
|
179
|
+
sessionId: session.claudeSessionId ?? undefined,
|
|
180
|
+
claudeCommand: session.claudeCommand,
|
|
181
|
+
}));
|
|
182
|
+
}
|
|
145
183
|
/**
|
|
146
184
|
* Ping 所有实例的客户端(由全局心跳定时器调用)
|
|
147
185
|
*/
|
|
@@ -188,6 +226,7 @@ export class InstanceManager extends EventEmitter {
|
|
|
188
226
|
headless: session.headless,
|
|
189
227
|
clientCount: session.clientCount,
|
|
190
228
|
claudeArgs: session.claudeArgs.length > 0 ? session.claudeArgs : undefined,
|
|
229
|
+
claudeCommand: session.claudeCommand,
|
|
191
230
|
};
|
|
192
231
|
}
|
|
193
232
|
removeInstance(instanceId, reason) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-manager.js","sourceRoot":"","sources":["../../../../backend/src/instance/instance-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,eAAe,EAA+B,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-manager.js","sourceRoot":"","sources":["../../../../backend/src/instance/instance-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ export interface InstanceSessionOptions {
|
|
|
17
17
|
cwd: string;
|
|
18
18
|
maxBufferLines: number;
|
|
19
19
|
headless: boolean;
|
|
20
|
+
/** Claude CLI 命令名 */
|
|
21
|
+
claudeCommand?: string;
|
|
20
22
|
claudeArgs?: string[];
|
|
21
23
|
/** 可选:注入自定义 PtyManager(用于测试) */
|
|
22
24
|
ptyManager?: PtyManager;
|
|
@@ -34,9 +36,11 @@ export declare class InstanceSession extends EventEmitter {
|
|
|
34
36
|
*/
|
|
35
37
|
static readonly ACTIVE_SOURCE_FALLBACK_DELAY_MS = 3000;
|
|
36
38
|
readonly instanceId: string;
|
|
37
|
-
|
|
39
|
+
private _name;
|
|
40
|
+
get name(): string;
|
|
38
41
|
readonly cwd: string;
|
|
39
42
|
readonly headless: boolean;
|
|
43
|
+
readonly claudeCommand: string;
|
|
40
44
|
readonly claudeArgs: string[];
|
|
41
45
|
readonly startedAt: string;
|
|
42
46
|
readonly ptyManager: PtyManager;
|
|
@@ -52,17 +56,24 @@ export declare class InstanceSession extends EventEmitter {
|
|
|
52
56
|
private notificationServiceFactory;
|
|
53
57
|
private notificationManager;
|
|
54
58
|
private instanceUrl;
|
|
59
|
+
private _claudeSessionId;
|
|
55
60
|
private wsPendingChunks;
|
|
56
61
|
private wsPendingBytes;
|
|
57
62
|
private wsFlushTimer;
|
|
58
63
|
constructor(options: InstanceSessionOptions);
|
|
59
64
|
get status(): SessionStatus;
|
|
60
65
|
get clientCount(): number;
|
|
66
|
+
setName(name: string): void;
|
|
61
67
|
setStatus(status: SessionStatus): void;
|
|
62
68
|
setPushService(pushService: PushService): void;
|
|
63
69
|
setNotificationServiceFactory(factory: NotificationServiceFactory): void;
|
|
64
70
|
setNotificationManager(manager: NotificationManager): void;
|
|
65
71
|
setInstanceUrl(url: string): void;
|
|
72
|
+
get claudeSessionId(): string | null;
|
|
73
|
+
/**
|
|
74
|
+
* 设置 Claude Code session ID(仅首次设置有效,session_id 不变)
|
|
75
|
+
*/
|
|
76
|
+
setClaudeSessionId(id: string): void;
|
|
66
77
|
get activeSource(): ActiveSource;
|
|
67
78
|
/**
|
|
68
79
|
* 注入 TerminalRelay 引用,设初始 activeSource 为 'local',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-session.d.ts","sourceRoot":"","sources":["../../../../backend/src/instance/instance-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAKlG,qCAAqC;AACrC,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE7C,iDAAiD;AACjD,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;AAQhE,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,gCAAgC;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IAC/C;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,+BAA+B,QAAQ;IAEvD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,
|
|
1
|
+
{"version":3,"file":"instance-session.d.ts","sourceRoot":"","sources":["../../../../backend/src/instance/instance-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,9 +19,11 @@ export class InstanceSession extends EventEmitter {
|
|
|
19
19
|
*/
|
|
20
20
|
static ACTIVE_SOURCE_FALLBACK_DELAY_MS = 3000;
|
|
21
21
|
instanceId;
|
|
22
|
-
|
|
22
|
+
_name;
|
|
23
|
+
get name() { return this._name; }
|
|
23
24
|
cwd;
|
|
24
25
|
headless;
|
|
26
|
+
claudeCommand;
|
|
25
27
|
claudeArgs;
|
|
26
28
|
startedAt;
|
|
27
29
|
ptyManager;
|
|
@@ -37,15 +39,17 @@ export class InstanceSession extends EventEmitter {
|
|
|
37
39
|
notificationServiceFactory = null;
|
|
38
40
|
notificationManager = null;
|
|
39
41
|
instanceUrl = null;
|
|
42
|
+
_claudeSessionId = null;
|
|
40
43
|
wsPendingChunks = [];
|
|
41
44
|
wsPendingBytes = 0;
|
|
42
45
|
wsFlushTimer = null;
|
|
43
46
|
constructor(options) {
|
|
44
47
|
super();
|
|
45
48
|
this.instanceId = options.instanceId;
|
|
46
|
-
this.
|
|
49
|
+
this._name = options.name;
|
|
47
50
|
this.cwd = options.cwd;
|
|
48
51
|
this.headless = options.headless;
|
|
52
|
+
this.claudeCommand = options.claudeCommand ?? 'claude';
|
|
49
53
|
this.claudeArgs = options.claudeArgs ?? [];
|
|
50
54
|
this.startedAt = new Date().toISOString();
|
|
51
55
|
this.ptyManager = options.ptyManager ?? new PtyManager();
|
|
@@ -60,6 +64,9 @@ export class InstanceSession extends EventEmitter {
|
|
|
60
64
|
get clientCount() {
|
|
61
65
|
return this.clients.size;
|
|
62
66
|
}
|
|
67
|
+
setName(name) {
|
|
68
|
+
this._name = name;
|
|
69
|
+
}
|
|
63
70
|
setStatus(status) {
|
|
64
71
|
this._status = status;
|
|
65
72
|
this.broadcast({ type: 'status_update', status });
|
|
@@ -77,6 +84,18 @@ export class InstanceSession extends EventEmitter {
|
|
|
77
84
|
this.instanceUrl = url;
|
|
78
85
|
logger.info({ instanceId: this.instanceId, instanceUrl: url }, 'Instance URL updated');
|
|
79
86
|
}
|
|
87
|
+
get claudeSessionId() {
|
|
88
|
+
return this._claudeSessionId;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* 设置 Claude Code session ID(仅首次设置有效,session_id 不变)
|
|
92
|
+
*/
|
|
93
|
+
setClaudeSessionId(id) {
|
|
94
|
+
if (this._claudeSessionId === null) {
|
|
95
|
+
this._claudeSessionId = id;
|
|
96
|
+
logger.info({ instanceId: this.instanceId, claudeSessionId: id }, 'Claude session ID captured');
|
|
97
|
+
}
|
|
98
|
+
}
|
|
80
99
|
get activeSource() {
|
|
81
100
|
return this._activeSource;
|
|
82
101
|
}
|
|
@@ -188,7 +207,7 @@ export class InstanceSession extends EventEmitter {
|
|
|
188
207
|
// 发送历史数据
|
|
189
208
|
this.sendTo(ws, {
|
|
190
209
|
type: 'history_sync',
|
|
191
|
-
data: this.buffer.
|
|
210
|
+
data: this.buffer.getContentForSync(),
|
|
192
211
|
seq: this.buffer.sequenceNumber,
|
|
193
212
|
status: this._status,
|
|
194
213
|
cols: this.ptyManager.cols,
|
|
@@ -402,6 +421,9 @@ export class InstanceSession extends EventEmitter {
|
|
|
402
421
|
}
|
|
403
422
|
// ─── Hook Handlers ────────────────────────────────────────
|
|
404
423
|
setupHookHandlers() {
|
|
424
|
+
this.hookReceiver.on('session_id', (sessionId) => {
|
|
425
|
+
this.setClaudeSessionId(sessionId);
|
|
426
|
+
});
|
|
405
427
|
this.hookReceiver.on('notification', (notification) => {
|
|
406
428
|
this._status = 'waiting_input';
|
|
407
429
|
for (const channel of notification.channels) {
|