@caoruhua/open-claude-remote 0.2.4 → 0.3.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/README.md +52 -2
- package/dist/backend/src/api/config-routes.d.ts.map +1 -1
- package/dist/backend/src/api/config-routes.js +120 -57
- package/dist/backend/src/api/config-routes.js.map +1 -1
- package/dist/backend/src/api/router.d.ts +4 -0
- package/dist/backend/src/api/router.d.ts.map +1 -1
- package/dist/backend/src/api/router.js +6 -1
- package/dist/backend/src/api/router.js.map +1 -1
- package/dist/backend/src/api/status-routes.d.ts +7 -1
- package/dist/backend/src/api/status-routes.d.ts.map +1 -1
- package/dist/backend/src/api/status-routes.js +22 -1
- package/dist/backend/src/api/status-routes.js.map +1 -1
- package/dist/backend/src/cli.d.ts.map +1 -1
- package/dist/backend/src/cli.js +3 -17
- package/dist/backend/src/cli.js.map +1 -1
- package/dist/backend/src/config.d.ts +20 -0
- package/dist/backend/src/config.d.ts.map +1 -1
- package/dist/backend/src/config.js +45 -0
- package/dist/backend/src/config.js.map +1 -1
- package/dist/backend/src/daemon/daemon-entry.d.ts +1 -0
- package/dist/backend/src/daemon/daemon-entry.js +2 -1
- package/dist/backend/src/daemon/daemon-entry.js.map +1 -1
- package/dist/backend/src/daemon/daemon-guard.d.ts +17 -0
- package/dist/backend/src/daemon/daemon-guard.d.ts.map +1 -0
- package/dist/backend/src/daemon/daemon-guard.js +78 -0
- package/dist/backend/src/daemon/daemon-guard.js.map +1 -0
- package/dist/backend/src/index.d.ts.map +1 -1
- package/dist/backend/src/index.js +70 -4
- package/dist/backend/src/index.js.map +1 -1
- package/dist/backend/src/instance/instance-session.d.ts +26 -0
- package/dist/backend/src/instance/instance-session.d.ts.map +1 -1
- package/dist/backend/src/instance/instance-session.js +118 -13
- package/dist/backend/src/instance/instance-session.js.map +1 -1
- package/dist/backend/src/skills/skill-command-merger.d.ts.map +1 -1
- package/dist/backend/src/skills/skill-command-merger.js +6 -0
- package/dist/backend/src/skills/skill-command-merger.js.map +1 -1
- package/dist/backend/src/terminal/terminal-relay.d.ts +2 -1
- package/dist/backend/src/terminal/terminal-relay.d.ts.map +1 -1
- package/dist/backend/src/terminal/terminal-relay.js +9 -4
- package/dist/backend/src/terminal/terminal-relay.js.map +1 -1
- package/dist/backend/src/utils/banner.d.ts +9 -0
- package/dist/backend/src/utils/banner.d.ts.map +1 -1
- package/dist/backend/src/utils/banner.js +26 -2
- package/dist/backend/src/utils/banner.js.map +1 -1
- package/dist/backend/src/utils/file-lock.d.ts.map +1 -1
- package/dist/backend/src/utils/file-lock.js +21 -2
- package/dist/backend/src/utils/file-lock.js.map +1 -1
- package/dist/backend/src/utils/ip-monitor.d.ts +17 -1
- package/dist/backend/src/utils/ip-monitor.d.ts.map +1 -1
- package/dist/backend/src/utils/ip-monitor.js +78 -3
- package/dist/backend/src/utils/ip-monitor.js.map +1 -1
- package/dist/backend/src/utils/network.d.ts +36 -0
- package/dist/backend/src/utils/network.d.ts.map +1 -1
- package/dist/backend/src/utils/network.js +125 -0
- package/dist/backend/src/utils/network.js.map +1 -1
- package/dist/shared/defaults.d.ts.map +1 -1
- package/dist/shared/defaults.js +0 -1
- package/dist/shared/defaults.js.map +1 -1
- package/dist/shared/ws-protocol.d.ts +17 -2
- package/dist/shared/ws-protocol.d.ts.map +1 -1
- package/frontend-dist/assets/index-DlG_4fGj.css +32 -0
- package/frontend-dist/assets/index-FfUR0j1j.js +152 -0
- package/frontend-dist/index.html +2 -2
- package/package.json +1 -1
- package/frontend-dist/assets/index-BKudo1Dw.css +0 -32
- package/frontend-dist/assets/index-CM2xfmS8.js +0 -152
|
@@ -3,11 +3,14 @@ import { WebSocket } from 'ws';
|
|
|
3
3
|
import type { SessionStatus, ServerMessage } from '../../../shared/index.js';
|
|
4
4
|
import { PtyManager } from '../pty/pty-manager.js';
|
|
5
5
|
import { HookReceiver } from '../hooks/hook-receiver.js';
|
|
6
|
+
import type { TerminalRelay } from '../terminal/terminal-relay.js';
|
|
6
7
|
import type { PushService } from '../push/push-service.js';
|
|
7
8
|
import type { NotificationManager } from '../notification/notification-manager.js';
|
|
8
9
|
import type { NotificationServiceFactory } from '../notification/notification-service-factory.js';
|
|
9
10
|
/** 客户端类型:attach(从控端)或 webapp(主控端) */
|
|
10
11
|
export type ClientType = 'attach' | 'webapp';
|
|
12
|
+
/** 活跃端来源:local(PC终端)、webapp、attach、null(无活跃端) */
|
|
13
|
+
export type ActiveSource = 'local' | 'webapp' | 'attach' | null;
|
|
11
14
|
export interface InstanceSessionOptions {
|
|
12
15
|
instanceId: string;
|
|
13
16
|
name: string;
|
|
@@ -35,6 +38,9 @@ export declare class InstanceSession extends EventEmitter {
|
|
|
35
38
|
private _status;
|
|
36
39
|
private buffer;
|
|
37
40
|
private clients;
|
|
41
|
+
private _activeSource;
|
|
42
|
+
private _lastKnownSizes;
|
|
43
|
+
private _relay;
|
|
38
44
|
private pushService;
|
|
39
45
|
private notificationServiceFactory;
|
|
40
46
|
private notificationManager;
|
|
@@ -50,10 +56,30 @@ export declare class InstanceSession extends EventEmitter {
|
|
|
50
56
|
setNotificationServiceFactory(factory: NotificationServiceFactory): void;
|
|
51
57
|
setNotificationManager(manager: NotificationManager): void;
|
|
52
58
|
setInstanceUrl(url: string): void;
|
|
59
|
+
get activeSource(): ActiveSource;
|
|
60
|
+
/**
|
|
61
|
+
* 注入 TerminalRelay 引用,设初始 activeSource 为 'local',
|
|
62
|
+
* 监听 local_input / local_resize 事件
|
|
63
|
+
*/
|
|
64
|
+
setRelay(relay: TerminalRelay): void;
|
|
65
|
+
/**
|
|
66
|
+
* 切换活跃端 + 同步 size + 控制 relay pause/resume
|
|
67
|
+
* 仅在来源变化时执行切换
|
|
68
|
+
*/
|
|
69
|
+
private onUserInput;
|
|
70
|
+
/**
|
|
71
|
+
* 从 lastKnownSizes 取 size 调 ptyManager.resize
|
|
72
|
+
*/
|
|
73
|
+
private syncActiveSourceSize;
|
|
53
74
|
/**
|
|
54
75
|
* 注册一个 WS 客户端到此实例
|
|
55
76
|
*/
|
|
56
77
|
addClient(ws: WebSocket, clientType: ClientType): void;
|
|
78
|
+
/**
|
|
79
|
+
* 统一处理客户端移除(close / error 共用)
|
|
80
|
+
* 重入保护:若 clientInfo 已被移除则跳过
|
|
81
|
+
*/
|
|
82
|
+
private handleClientRemoval;
|
|
57
83
|
/**
|
|
58
84
|
* 向所有客户端广播消息
|
|
59
85
|
*/
|
|
@@ -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,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;
|
|
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,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,OAAO,CAA8B;IAE7C,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,eAAe,CAA0D;IACjF,OAAO,CAAC,MAAM,CAA8B;IAE5C,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,0BAA0B,CAA2C;IAC7E,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,WAAW,CAAuB;IAE1C,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,YAAY,CAA+B;gBAEvC,OAAO,EAAE,sBAAsB;IAiB3C,IAAI,MAAM,IAAI,aAAa,CAE1B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAKtC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAI9C,6BAA6B,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIxE,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAI1D,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAKjC,IAAI,YAAY,IAAI,YAAY,CAE/B;IAED;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAepC;;;OAGG;IACH,OAAO,CAAC,WAAW;IAuBnB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;OAEG;IACH,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAwDtD;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAkC3B;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASvC;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI;IAMnD;;OAEG;IACH,eAAe,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAUrD;;OAEG;IACH,WAAW,IAAI,IAAI;IAcnB,OAAO,CAAC,gBAAgB;IA6CxB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,oBAAoB;IAqB5B,OAAO,CAAC,eAAe;IAqCvB,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,yBAAyB;IA+DjC;;OAEG;IACH,OAAO,IAAI,IAAI;CAiBhB"}
|
|
@@ -23,6 +23,9 @@ export class InstanceSession extends EventEmitter {
|
|
|
23
23
|
_status = 'idle';
|
|
24
24
|
buffer;
|
|
25
25
|
clients = new Set();
|
|
26
|
+
_activeSource = null;
|
|
27
|
+
_lastKnownSizes = new Map();
|
|
28
|
+
_relay = null;
|
|
26
29
|
pushService = null;
|
|
27
30
|
notificationServiceFactory = null;
|
|
28
31
|
notificationManager = null;
|
|
@@ -67,6 +70,60 @@ export class InstanceSession extends EventEmitter {
|
|
|
67
70
|
this.instanceUrl = url;
|
|
68
71
|
logger.info({ instanceId: this.instanceId, instanceUrl: url }, 'Instance URL updated');
|
|
69
72
|
}
|
|
73
|
+
get activeSource() {
|
|
74
|
+
return this._activeSource;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* 注入 TerminalRelay 引用,设初始 activeSource 为 'local',
|
|
78
|
+
* 监听 local_input / local_resize 事件
|
|
79
|
+
*/
|
|
80
|
+
setRelay(relay) {
|
|
81
|
+
this._relay = relay;
|
|
82
|
+
this._activeSource = 'local';
|
|
83
|
+
relay.on('local_input', () => {
|
|
84
|
+
this.onUserInput('local');
|
|
85
|
+
});
|
|
86
|
+
relay.on('local_resize', (cols, rows) => {
|
|
87
|
+
this._lastKnownSizes.set('local', { cols, rows });
|
|
88
|
+
});
|
|
89
|
+
logger.info({ instanceId: this.instanceId }, 'Relay connected, activeSource set to local');
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* 切换活跃端 + 同步 size + 控制 relay pause/resume
|
|
93
|
+
* 仅在来源变化时执行切换
|
|
94
|
+
*/
|
|
95
|
+
onUserInput(source) {
|
|
96
|
+
if (source === this._activeSource)
|
|
97
|
+
return;
|
|
98
|
+
const prev = this._activeSource;
|
|
99
|
+
this._activeSource = source;
|
|
100
|
+
if (source === 'local') {
|
|
101
|
+
// resumeResize 内部已同步当前 PC 终端尺寸到 PTY,无需再调 syncActiveSourceSize
|
|
102
|
+
this._relay?.resumeResize();
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
if (prev === 'local' && this._relay) {
|
|
106
|
+
this._relay.pauseResize();
|
|
107
|
+
}
|
|
108
|
+
this.syncActiveSourceSize(source);
|
|
109
|
+
}
|
|
110
|
+
logger.info({
|
|
111
|
+
instanceId: this.instanceId,
|
|
112
|
+
prev,
|
|
113
|
+
next: source,
|
|
114
|
+
}, 'Active source switched');
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* 从 lastKnownSizes 取 size 调 ptyManager.resize
|
|
118
|
+
*/
|
|
119
|
+
syncActiveSourceSize(source) {
|
|
120
|
+
if (!source)
|
|
121
|
+
return;
|
|
122
|
+
const size = this._lastKnownSizes.get(source);
|
|
123
|
+
if (size) {
|
|
124
|
+
this.ptyManager.resize(size.cols, size.rows);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
70
127
|
// ─── Client Management ────────────────────────────────────
|
|
71
128
|
/**
|
|
72
129
|
* 注册一个 WS 客户端到此实例
|
|
@@ -87,16 +144,26 @@ export class InstanceSession extends EventEmitter {
|
|
|
87
144
|
this.handleWsMessage(ws, data, clientType);
|
|
88
145
|
});
|
|
89
146
|
ws.on('close', () => {
|
|
90
|
-
this.
|
|
91
|
-
logger.info({
|
|
92
|
-
instanceId: this.instanceId,
|
|
93
|
-
clientCount: this.clients.size,
|
|
94
|
-
}, 'Client disconnected from instance');
|
|
147
|
+
this.handleClientRemoval(clientInfo, 'disconnect');
|
|
95
148
|
});
|
|
96
149
|
ws.on('error', (err) => {
|
|
97
|
-
logger.error({ err, instanceId: this.instanceId, clientType }, 'Client error');
|
|
98
|
-
this.
|
|
150
|
+
logger.error({ err, instanceId: this.instanceId, clientType: clientInfo.clientType }, 'Client error');
|
|
151
|
+
this.handleClientRemoval(clientInfo, 'error');
|
|
99
152
|
});
|
|
153
|
+
// Attach 客户端连接时立即设为活跃端
|
|
154
|
+
if (clientType === 'attach') {
|
|
155
|
+
const prev = this._activeSource;
|
|
156
|
+
this._activeSource = 'attach';
|
|
157
|
+
// 暂停 local relay 的 resize
|
|
158
|
+
if (prev === 'local' && this._relay) {
|
|
159
|
+
this._relay.pauseResize();
|
|
160
|
+
}
|
|
161
|
+
logger.info({
|
|
162
|
+
instanceId: this.instanceId,
|
|
163
|
+
prev,
|
|
164
|
+
next: 'attach',
|
|
165
|
+
}, 'Active source switched on attach connect');
|
|
166
|
+
}
|
|
100
167
|
// 发送历史数据
|
|
101
168
|
this.sendTo(ws, {
|
|
102
169
|
type: 'history_sync',
|
|
@@ -107,6 +174,41 @@ export class InstanceSession extends EventEmitter {
|
|
|
107
174
|
rows: this.ptyManager.rows,
|
|
108
175
|
});
|
|
109
176
|
}
|
|
177
|
+
/**
|
|
178
|
+
* 统一处理客户端移除(close / error 共用)
|
|
179
|
+
* 重入保护:若 clientInfo 已被移除则跳过
|
|
180
|
+
*/
|
|
181
|
+
handleClientRemoval(clientInfo, reason) {
|
|
182
|
+
if (!this.clients.has(clientInfo))
|
|
183
|
+
return;
|
|
184
|
+
this.clients.delete(clientInfo);
|
|
185
|
+
const { clientType } = clientInfo;
|
|
186
|
+
// 活跃端断开回退逻辑
|
|
187
|
+
if (clientType === this._activeSource) {
|
|
188
|
+
const hasRemaining = [...this.clients].some(c => c.clientType === clientType);
|
|
189
|
+
if (!hasRemaining) {
|
|
190
|
+
const prev = this._activeSource;
|
|
191
|
+
this._activeSource = this._relay ? 'local' : null;
|
|
192
|
+
if (this._relay && this._activeSource === 'local') {
|
|
193
|
+
this._relay.resumeResize();
|
|
194
|
+
}
|
|
195
|
+
// 清理已无在线客户端的 size 记录,避免后续新客户端继承旧值
|
|
196
|
+
this._lastKnownSizes.delete(clientType);
|
|
197
|
+
logger.info({
|
|
198
|
+
instanceId: this.instanceId,
|
|
199
|
+
prev,
|
|
200
|
+
next: this._activeSource,
|
|
201
|
+
reason,
|
|
202
|
+
}, 'Active source fallback on disconnect');
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
logger.info({
|
|
206
|
+
instanceId: this.instanceId,
|
|
207
|
+
clientCount: this.clients.size,
|
|
208
|
+
clientType,
|
|
209
|
+
reason,
|
|
210
|
+
}, 'Client removed from instance');
|
|
211
|
+
}
|
|
110
212
|
/**
|
|
111
213
|
* 向所有客户端广播消息
|
|
112
214
|
*/
|
|
@@ -230,20 +332,23 @@ export class InstanceSession extends EventEmitter {
|
|
|
230
332
|
switch (msg.type) {
|
|
231
333
|
case 'user_input':
|
|
232
334
|
if (typeof msg.data === 'string') {
|
|
335
|
+
this.onUserInput(clientType);
|
|
233
336
|
this.ptyManager.write(msg.data);
|
|
234
337
|
}
|
|
235
338
|
break;
|
|
236
339
|
case 'resize':
|
|
237
340
|
if (typeof msg.cols === 'number' && typeof msg.rows === 'number') {
|
|
238
|
-
//
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
341
|
+
// 始终记录来源的最新 size
|
|
342
|
+
this._lastKnownSizes.set(clientType, { cols: msg.cols, rows: msg.rows });
|
|
343
|
+
// 仅活跃端(或无活跃端时任何来源)的 resize 应用到 PTY
|
|
344
|
+
if (this._activeSource === null || clientType === this._activeSource) {
|
|
345
|
+
this.ptyManager.resize(msg.cols, msg.rows);
|
|
243
346
|
}
|
|
244
|
-
this.ptyManager.resize(msg.cols, msg.rows);
|
|
245
347
|
}
|
|
246
348
|
break;
|
|
349
|
+
case 'activate':
|
|
350
|
+
this.onUserInput(clientType);
|
|
351
|
+
break;
|
|
247
352
|
case 'heartbeat':
|
|
248
353
|
// Reply with server heartbeat
|
|
249
354
|
this.sendTo(ws, { type: 'heartbeat', timestamp: Date.now() });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-session.js","sourceRoot":"","sources":["../../../../backend/src/instance/instance-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"instance-session.js","sourceRoot":"","sources":["../../../../backend/src/instance/instance-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-command-merger.d.ts","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,iBAAiB;IACjB,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,mBAAmB;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,gBAAgB,EAAE,mBAAmB,EAAE,EACvC,gBAAgB,EAAE,mBAAmB,EAAE,GACtC,WAAW,
|
|
1
|
+
{"version":3,"file":"skill-command-merger.d.ts","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnD;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,iBAAiB;IACjB,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,mBAAmB;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,mBAAmB;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,gBAAgB,EAAE,mBAAmB,EAAE,EACvC,gBAAgB,EAAE,mBAAmB,EAAE,GACtC,WAAW,CAwEb"}
|
|
@@ -17,10 +17,16 @@ export function mergeSkillCommands(existingCommands, newSkillCommands) {
|
|
|
17
17
|
// 1. 分离现有命令:非 Skill commands 和 Skill commands
|
|
18
18
|
const nonSkillCommands = [];
|
|
19
19
|
const existingSkillCommands = new Map();
|
|
20
|
+
// 构建新 skill label 集合,用于 orphan 检测
|
|
21
|
+
const newSkillLabels = new Set(newSkillCommands.map((c) => c.label));
|
|
20
22
|
for (const cmd of existingCommands) {
|
|
21
23
|
if (isSkillCommand(cmd)) {
|
|
22
24
|
existingSkillCommands.set(cmd.label, cmd);
|
|
23
25
|
}
|
|
26
|
+
else if (newSkillLabels.has(cmd.label)) {
|
|
27
|
+
// Orphan: 丢失 fromSkill 标记但与新 skill 同名 → 回收为 skill command
|
|
28
|
+
existingSkillCommands.set(cmd.label, cmd);
|
|
29
|
+
}
|
|
24
30
|
else {
|
|
25
31
|
nonSkillCommands.push(cmd);
|
|
26
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-command-merger.js","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkBrD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAChC,gBAAuC,EACvC,gBAAuC;IAEvC,8CAA8C;IAC9C,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IACnD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;IAErE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB;IACvB,MAAM,mBAAmB,GAA0B,EAAE,CAAC;IACtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,YAAY;IACZ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,WAAW,EAAE,CAAC;YAChB,wCAAwC;YACxC,mBAAmB,CAAC,IAAI,CAAC;gBACvB,GAAG,MAAM;gBACT,mBAAmB;gBACnB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,oBAAoB;gBACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;aAClD,CAAC,CAAC;YACH,SAAS,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,eAAe;YACf,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,cAAc;IACd,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,qBAAqB,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,mDAAmD;IACnD,4BAA4B;IAC5B,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,mBAAmB,CAAC,CAAC;IAEpE,OAAO;QACL,QAAQ,EAAE,aAAa;QACvB,KAAK;QACL,OAAO;QACP,SAAS;QACT,KAAK,EAAE,mBAAmB,CAAC,MAAM;KAClC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"skill-command-merger.js","sourceRoot":"","sources":["../../../../backend/src/skills/skill-command-merger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkBrD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAChC,gBAAuC,EACvC,gBAAuC;IAEvC,8CAA8C;IAC9C,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IACnD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;IAErE,kCAAkC;IAClC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,0DAA0D;YAC1D,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,WAAW,GAAG,IAAI,GAAG,EAA+B,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB;IACvB,MAAM,mBAAmB,GAA0B,EAAE,CAAC;IACtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,YAAY;IACZ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,WAAW,EAAE,CAAC;YAChB,wCAAwC;YACxC,mBAAmB,CAAC,IAAI,CAAC;gBACvB,GAAG,MAAM;gBACT,mBAAmB;gBACnB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,oBAAoB;gBACpB,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;aAClD,CAAC,CAAC;YACH,SAAS,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,eAAe;YACf,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,cAAc;IACd,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,qBAAqB,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,mDAAmD;IACnD,4BAA4B;IAC5B,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,mBAAmB,CAAC,CAAC;IAEpE,OAAO;QACL,QAAQ,EAAE,aAAa;QACvB,KAAK;QACL,OAAO;QACP,SAAS;QACT,KAAK,EAAE,mBAAmB,CAAC,MAAM;KAClC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-relay.d.ts","sourceRoot":"","sources":["../../../../backend/src/terminal/terminal-relay.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-relay.d.ts","sourceRoot":"","sources":["../../../../backend/src/terminal/terminal-relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAenD,qBAAa,aAAc,SAAQ,YAAY;IAOjC,OAAO,CAAC,UAAU;IAN9B,OAAO,CAAC,YAAY,CAAyC;IAC7D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,YAAY,CAAkB;gBAElB,UAAU,EAAE,WAAW;IAI3C;;OAEG;IACH,KAAK,IAAI,IAAI;IAiDb;;;OAGG;IACH,WAAW,IAAI,IAAI;IAKnB;;;OAGG;IACH,YAAY,IAAI,IAAI;IAUpB;;;OAGG;IACH,IAAI,IAAI,IAAI;CAsBb"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events';
|
|
1
2
|
import { logger } from '../logger/logger.js';
|
|
2
3
|
/**
|
|
3
4
|
* Relays PC terminal stdin/stdout to/from the PTY process.
|
|
4
5
|
* Sets stdin to raw mode so all keystrokes pass through directly.
|
|
6
|
+
* Emits: 'local_input' (PC keyboard input), 'local_resize' (cols, rows)
|
|
5
7
|
*/
|
|
6
8
|
const CTRL_C = '\x03';
|
|
7
9
|
// Kitty keyboard protocol CSI u variants for Ctrl+C:
|
|
@@ -9,7 +11,7 @@ const CTRL_C = '\x03';
|
|
|
9
11
|
// Match press/repeat (event type 1 or 2) but not release (3)
|
|
10
12
|
const KITTY_CTRL_C_RE = /\x1b\[99;5(?::(?:[12]))?(?:;\d+)*u/;
|
|
11
13
|
const DOUBLE_CTRL_C_WINDOW_MS = 500;
|
|
12
|
-
export class TerminalRelay {
|
|
14
|
+
export class TerminalRelay extends EventEmitter {
|
|
13
15
|
ptyManager;
|
|
14
16
|
stdinHandler = null;
|
|
15
17
|
resizeHandler = null;
|
|
@@ -17,6 +19,7 @@ export class TerminalRelay {
|
|
|
17
19
|
lastCtrlCTime = 0;
|
|
18
20
|
resizePaused = false;
|
|
19
21
|
constructor(ptyManager) {
|
|
22
|
+
super();
|
|
20
23
|
this.ptyManager = ptyManager;
|
|
21
24
|
}
|
|
22
25
|
/**
|
|
@@ -35,6 +38,7 @@ export class TerminalRelay {
|
|
|
35
38
|
this.stdinHandler = (data) => {
|
|
36
39
|
const str = data.toString();
|
|
37
40
|
this.ptyManager.write(str);
|
|
41
|
+
this.emit('local_input');
|
|
38
42
|
// Double Ctrl+C within window → send SIGINT to proxy process itself
|
|
39
43
|
// Support both classic ETX (\x03) and kitty keyboard protocol CSI u encoding
|
|
40
44
|
if (str.startsWith('\x1b')) {
|
|
@@ -52,12 +56,13 @@ export class TerminalRelay {
|
|
|
52
56
|
process.stdin.on('data', this.stdinHandler);
|
|
53
57
|
// Terminal resize → PTY resize
|
|
54
58
|
this.resizeHandler = () => {
|
|
55
|
-
if (this.resizePaused)
|
|
56
|
-
return;
|
|
57
59
|
const cols = process.stdout.columns;
|
|
58
60
|
const rows = process.stdout.rows;
|
|
59
61
|
if (cols && rows) {
|
|
60
|
-
this.
|
|
62
|
+
this.emit('local_resize', cols, rows);
|
|
63
|
+
if (!this.resizePaused) {
|
|
64
|
+
this.ptyManager.resize(cols, rows);
|
|
65
|
+
}
|
|
61
66
|
}
|
|
62
67
|
};
|
|
63
68
|
process.stdout.on('resize', this.resizeHandler);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-relay.js","sourceRoot":"","sources":["../../../../backend/src/terminal/terminal-relay.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-relay.js","sourceRoot":"","sources":["../../../../backend/src/terminal/terminal-relay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
|
+
/** 网络地址信息 */
|
|
2
|
+
export interface AddressInfo {
|
|
3
|
+
url: string;
|
|
4
|
+
type: 'wlan' | 'vpn' | 'wired' | 'other' | 'private' | 'public';
|
|
5
|
+
interface: string;
|
|
6
|
+
}
|
|
1
7
|
export interface BannerOptions {
|
|
8
|
+
/** 首选 URL(用于大 QR 码) */
|
|
2
9
|
url: string;
|
|
10
|
+
/** 所有可用地址列表 */
|
|
11
|
+
urls?: AddressInfo[];
|
|
3
12
|
token: string;
|
|
4
13
|
instanceName: string;
|
|
5
14
|
logDir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/banner.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/banner.ts"],"names":[],"mappings":"AAQA,aAAa;AACb,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,CAAC;IAChE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,uBAAuB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe;IACf,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAcD;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAwGxD"}
|
|
@@ -5,11 +5,22 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { generateQRCodeLines } from './qrcode-banner.js';
|
|
7
7
|
import { getCurrentVersion } from '../update.js';
|
|
8
|
+
/**
|
|
9
|
+
* 获取地址类型的显示标签
|
|
10
|
+
*/
|
|
11
|
+
function getTypeLabel(type) {
|
|
12
|
+
switch (type) {
|
|
13
|
+
case 'wlan': return '📶';
|
|
14
|
+
case 'vpn': return '🔒';
|
|
15
|
+
case 'wired': return '🔌';
|
|
16
|
+
default: return '🌐';
|
|
17
|
+
}
|
|
18
|
+
}
|
|
8
19
|
/**
|
|
9
20
|
* 将 banner 打印到 stderr(CLI 使用)
|
|
10
21
|
*/
|
|
11
22
|
export function printBanner(options) {
|
|
12
|
-
const { url, token, instanceName, logDir, pid, instanceId, warnings = [], showExitHint = true } = options;
|
|
23
|
+
const { url, token, instanceName, logDir, pid, instanceId, urls = [], warnings = [], showExitHint = true } = options;
|
|
13
24
|
const qrUrl = `${url}?token=${token}`;
|
|
14
25
|
const qrLines = generateQRCodeLines(qrUrl);
|
|
15
26
|
let version = '';
|
|
@@ -24,7 +35,20 @@ export function printBanner(options) {
|
|
|
24
35
|
: `Instance: ${instanceName}`;
|
|
25
36
|
const leftLines = [];
|
|
26
37
|
leftLines.push(instanceLine);
|
|
27
|
-
|
|
38
|
+
// Display all available URLs with their types
|
|
39
|
+
if (urls.length > 0) {
|
|
40
|
+
leftLines.push('URLs:');
|
|
41
|
+
// Find the max length for alignment
|
|
42
|
+
const maxUrlLen = Math.max(...urls.map(u => u.url.length));
|
|
43
|
+
for (const addr of urls) {
|
|
44
|
+
const icon = getTypeLabel(addr.type);
|
|
45
|
+
const paddedUrl = addr.url.padEnd(maxUrlLen);
|
|
46
|
+
leftLines.push(` ${icon} ${paddedUrl} (${addr.interface})`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
leftLines.push(`URL: ${url}`);
|
|
51
|
+
}
|
|
28
52
|
leftLines.push(`PID: ${pid}`);
|
|
29
53
|
leftLines.push(`Logs: ${logDir}`);
|
|
30
54
|
leftLines.push('');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"banner.js","sourceRoot":"","sources":["../../../../backend/src/utils/banner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"banner.js","sourceRoot":"","sources":["../../../../backend/src/utils/banner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/file-lock.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-lock.d.ts","sourceRoot":"","sources":["../../../../backend/src/utils/file-lock.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mCAAmC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA8ED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,CAAC,CAqB3F;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EACvC,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,CAAC,CAAC,CAqBZ"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { mkdirSync, rmdirSync, statSync } from 'node:fs';
|
|
1
|
+
import { mkdirSync, rmdirSync, statSync, existsSync } from 'node:fs';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
2
3
|
const DEFAULTS = {
|
|
3
4
|
retries: 50,
|
|
4
5
|
retryIntervalMs: 50,
|
|
@@ -15,7 +16,25 @@ function tryOnce(lockPath, staleMs) {
|
|
|
15
16
|
return 'acquired';
|
|
16
17
|
}
|
|
17
18
|
catch (err) {
|
|
18
|
-
if (err.code
|
|
19
|
+
if (err.code === 'ENOENT') {
|
|
20
|
+
// 父目录不存在,创建父目录后重试
|
|
21
|
+
const parentDir = dirname(lockPath);
|
|
22
|
+
if (!existsSync(parentDir)) {
|
|
23
|
+
mkdirSync(parentDir, { recursive: true, mode: 0o700 });
|
|
24
|
+
}
|
|
25
|
+
// 再次尝试获取锁
|
|
26
|
+
try {
|
|
27
|
+
mkdirSync(lockPath);
|
|
28
|
+
return 'acquired';
|
|
29
|
+
}
|
|
30
|
+
catch (retryErr) {
|
|
31
|
+
if (retryErr.code !== 'EEXIST') {
|
|
32
|
+
throw retryErr;
|
|
33
|
+
}
|
|
34
|
+
// fallthrough to stale lock check
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else if (err.code !== 'EEXIST') {
|
|
19
38
|
throw err;
|
|
20
39
|
}
|
|
21
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../../../backend/src/utils/file-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../../../../backend/src/utils/file-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,MAAM,QAAQ,GAA8B;IAC1C,OAAO,EAAE,EAAE;IACX,eAAe,EAAE,EAAE;IACnB,OAAO,EAAE,MAAM;CAChB,CAAC;AAKF;;;;GAIG;AACH,SAAS,OAAO,CAAC,QAAgB,EAAE,OAAe;IAChD,IAAI,CAAC;QACH,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpB,OAAO,UAAU,CAAC;IACpB,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,kBAAkB;YAClB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACzD,CAAC;YACD,UAAU;YACV,IAAI,CAAC;gBACH,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpB,OAAO,UAAU,CAAC;YACpB,CAAC;YAAC,OAAO,QAAa,EAAE,CAAC;gBACvB,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC/B,MAAM,QAAQ,CAAC;gBACjB,CAAC;gBACD,kCAAkC;YACpC,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,WAAW;IACX,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC;gBAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,gBAAgB,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,sBAAsB;QACtB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,WAAW,CAAC,QAAgB;IACnC,IAAI,CAAC;QACH,SAAS,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,0BAA0B;IAC5B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,SAAS,CAAC,EAAU;IAC3B,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAI,QAAgB,EAAE,EAAW,EAAE,OAAyB;IACtF,MAAM,IAAI,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;IACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;YAAC,QAAQ,GAAG,IAAI,CAAC;YAAC,MAAM;QAAC,CAAC;QACtD,IAAI,MAAM,KAAK,OAAO;YAAE,SAAS;QACjC,oBAAoB;QACpB,IAAI,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,UAAU,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;QAC5F,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,UAAU,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,EAAoB,EACpB,OAAyB;IAEzB,MAAM,IAAI,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;IACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;YAAC,QAAQ,GAAG,IAAI,CAAC;YAAC,MAAM;QAAC,CAAC;QACtD,IAAI,MAAM,KAAK,OAAO;YAAE,SAAS;QACjC,oBAAoB;QACpB,IAAI,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,UAAU,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAChF,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,UAAU,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { type NetworkInterface } from './network.js';
|
|
1
2
|
export type IpChangeCallback = (newIp: string, oldIp: string) => void;
|
|
3
|
+
export type NetworkChangeCallback = (interfaces: NetworkInterface[], preferredIp: string) => void;
|
|
2
4
|
export type GetIpFunction = () => string | null;
|
|
3
5
|
/**
|
|
4
6
|
* IP 变化监控器。
|
|
@@ -7,17 +9,23 @@ export type GetIpFunction = () => string | null;
|
|
|
7
9
|
* - 每隔 intervalMs 检测一次 IP
|
|
8
10
|
* - 连续 stabilityThreshold 次检测到相同新 IP 才触发回调
|
|
9
11
|
* - 避免短暂网络波动导致误报
|
|
12
|
+
*
|
|
13
|
+
* 增强功能:同时监控所有网络接口的变化
|
|
10
14
|
*/
|
|
11
15
|
export declare class IpMonitor {
|
|
12
16
|
private readonly onChange;
|
|
13
17
|
private readonly intervalMs;
|
|
14
18
|
private readonly stabilityThreshold;
|
|
15
19
|
private readonly getIp;
|
|
20
|
+
private readonly onNetworkChange?;
|
|
16
21
|
private intervalId;
|
|
17
22
|
private pendingIp;
|
|
18
23
|
private stabilityCount;
|
|
19
24
|
private _currentIp;
|
|
20
|
-
|
|
25
|
+
private _currentInterfaces;
|
|
26
|
+
private pendingInterfaces;
|
|
27
|
+
private interfaceStabilityCount;
|
|
28
|
+
constructor(onChange: IpChangeCallback, intervalMs?: number, stabilityThreshold?: number, getIp?: GetIpFunction, onNetworkChange?: NetworkChangeCallback | undefined);
|
|
21
29
|
/**
|
|
22
30
|
* 启动 IP 监控。
|
|
23
31
|
* @param initialIp 初始 IP 地址
|
|
@@ -31,9 +39,17 @@ export declare class IpMonitor {
|
|
|
31
39
|
* 检测 IP 变化。
|
|
32
40
|
*/
|
|
33
41
|
private check;
|
|
42
|
+
/**
|
|
43
|
+
* 检测网络接口列表变化。
|
|
44
|
+
*/
|
|
45
|
+
private checkInterfaces;
|
|
34
46
|
/**
|
|
35
47
|
* 获取当前 IP。
|
|
36
48
|
*/
|
|
37
49
|
get currentIp(): string;
|
|
50
|
+
/**
|
|
51
|
+
* 获取当前所有网络接口。
|
|
52
|
+
*/
|
|
53
|
+
get currentInterfaces(): NetworkInterface[];
|
|
38
54
|
}
|
|
39
55
|
//# sourceMappingURL=ip-monitor.d.ts.map
|