@lsproxy/proxy 1.0.1 → 1.1.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/dist/backend-pool.d.ts +5 -0
- package/dist/backend-pool.d.ts.map +1 -1
- package/dist/backend-pool.js +17 -1
- package/dist/backend-pool.js.map +1 -1
- package/dist/client-session.d.ts +4 -1
- package/dist/client-session.d.ts.map +1 -1
- package/dist/client-session.js +12 -5
- package/dist/client-session.js.map +1 -1
- package/dist/document-state.d.ts +2 -0
- package/dist/document-state.d.ts.map +1 -1
- package/dist/document-state.js +8 -0
- package/dist/document-state.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/proxy-server.d.ts +5 -0
- package/dist/proxy-server.d.ts.map +1 -1
- package/dist/proxy-server.js +20 -1
- package/dist/proxy-server.js.map +1 -1
- package/dist/status.d.ts +45 -0
- package/dist/status.d.ts.map +1 -0
- package/dist/status.js +63 -0
- package/dist/status.js.map +1 -0
- package/package.json +3 -3
package/dist/backend-pool.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { BackendRuntime } from './status.js';
|
|
1
2
|
import { LSPClient } from '@lspeasy/client';
|
|
2
3
|
export interface BackendPoolOptions {
|
|
3
4
|
backendIdleMs?: number;
|
|
@@ -11,6 +12,10 @@ export declare class BackendPool {
|
|
|
11
12
|
constructor(root: string, opts?: BackendPoolOptions);
|
|
12
13
|
getLanguageIdForExtension(ext: string): string | undefined;
|
|
13
14
|
getBackend(languageId: string): LSPClient | undefined;
|
|
15
|
+
/** Increment the forwarded-request counter for a live backend; no-op if cold. */
|
|
16
|
+
recordRequest(languageId: string): void;
|
|
17
|
+
/** Runtime snapshot of every live backend, for status reporting. */
|
|
18
|
+
listBackends(): BackendRuntime[];
|
|
14
19
|
ensureBackend(languageId: string): Promise<LSPClient>;
|
|
15
20
|
private startBackend;
|
|
16
21
|
stopBackend(languageId: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-pool.d.ts","sourceRoot":"","sources":["../src/backend-pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backend-pool.d.ts","sourceRoot":"","sources":["../src/backend-pool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAkC5C,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAUD,qBAAa,WAAW;IAOpB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyC;IAClE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyB;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,YACmB,IAAI,EAAE,MAAM,EAC7B,IAAI,GAAE,kBAAuB,EAI9B;IAED,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzD;IAED,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAEpD;IAED,iFAAiF;IACjF,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAGtC;IAED,oEAAoE;IACpE,YAAY,IAAI,cAAc,EAAE,CAQ/B;IAEK,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAkB1D;YAEa,YAAY;IAiCpB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAcnD;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7B;IAED,OAAO,CAAC,cAAc;CAMvB"}
|
package/dist/backend-pool.js
CHANGED
|
@@ -46,6 +46,22 @@ export class BackendPool {
|
|
|
46
46
|
getBackend(languageId) {
|
|
47
47
|
return this.backends.get(languageId)?.client;
|
|
48
48
|
}
|
|
49
|
+
/** Increment the forwarded-request counter for a live backend; no-op if cold. */
|
|
50
|
+
recordRequest(languageId) {
|
|
51
|
+
const entry = this.backends.get(languageId);
|
|
52
|
+
if (entry)
|
|
53
|
+
entry.requestCount += 1;
|
|
54
|
+
}
|
|
55
|
+
/** Runtime snapshot of every live backend, for status reporting. */
|
|
56
|
+
listBackends() {
|
|
57
|
+
return [...this.backends.entries()].map(([languageId, entry]) => ({
|
|
58
|
+
languageId,
|
|
59
|
+
pid: entry.proc.pid ?? -1,
|
|
60
|
+
startedAt: entry.startedAt,
|
|
61
|
+
requestCount: entry.requestCount,
|
|
62
|
+
healthy: entry.proc.exitCode === null
|
|
63
|
+
}));
|
|
64
|
+
}
|
|
49
65
|
async ensureBackend(languageId) {
|
|
50
66
|
const existing = this.backends.get(languageId);
|
|
51
67
|
if (existing) {
|
|
@@ -88,7 +104,7 @@ export class BackendPool {
|
|
|
88
104
|
workspaceFolders: [{ uri: rootUri, name: basename(rootDir) }]
|
|
89
105
|
});
|
|
90
106
|
await client.connect(transport);
|
|
91
|
-
const entry = { client, proc };
|
|
107
|
+
const entry = { client, proc, startedAt: Date.now(), requestCount: 0 };
|
|
92
108
|
this.backends.set(languageId, entry);
|
|
93
109
|
this.resetIdleTimer(languageId, entry);
|
|
94
110
|
return client;
|
package/dist/backend-pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-pool.js","sourceRoot":"","sources":["../src/backend-pool.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"backend-pool.js","sourceRoot":"","sources":["../src/backend-pool.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,0BAA0B,EAC1B,oBAAoB,EAErB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,oFAAoF;AACpF,MAAM,mBAAmB,GAAG;IAC1B,YAAY,EAAE;QACZ,eAAe,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC/C,UAAU,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC1C,WAAW,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC3C,cAAc,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC9C,cAAc,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC9C,UAAU,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC1C,cAAc,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC9C,KAAK,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QACrC,UAAU,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC1C,aAAa,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC7C,MAAM,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QACtC,UAAU,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC1C,UAAU,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC1C,eAAe,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;KAChD;IACD,SAAS,EAAE;QACT,SAAS,EAAE,IAAI;QACf,cAAc,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;QAC9C,MAAM,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE;KACvC;CACoC,CAAC;AAcxC,MAAM,OAAO,WAAW;IAOH,IAAI;IANN,QAAQ,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC3C,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;IACjD,YAAY,CAAyB;IACrC,aAAa,CAAS;IAEvC,YACmB,IAAY,EAC7B,IAAI,GAAuB,EAAE;oBADZ,IAAI;QAGrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,yBAAyB,CAAC,GAAW;QACnC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,UAAU,CAAC,UAAkB;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC/C,CAAC;IAED,iFAAiF;IACjF,aAAa,CAAC,UAAkB;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,KAAK;YAAE,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,oEAAoE;IACpE,YAAY;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAChE,UAAU;YACV,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YACzB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI;SACtC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,OAAO,QAAQ,CAAC,MAAM,CAAC;QACzB,CAAC;QAED,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC;QACvB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,UAAkB;QAC3C,MAAM,UAAU,GAAG,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4CAA4C,UAAU,GAAG,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACjE,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,MAAkB;YAC9B,MAAM,EAAE,IAAI,CAAC,KAAiB;SAC/B,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;YAC3B,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,mBAAyC;YACvD,OAAO;YACP,gBAAgB,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SAC9D,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhC,MAAM,KAAK,GAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;QACrF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC9B,OAAO,KAAK,CAAC,SAAS,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IAEO,cAAc,CAAC,UAAkB,EAAE,KAAmB;QAC5D,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACvF,CAAC;CACF"}
|
package/dist/client-session.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Transport } from '@lspeasy/core';
|
|
2
2
|
import type { BackendPool } from './backend-pool.js';
|
|
3
3
|
import type { DocumentStateManager } from './document-state.js';
|
|
4
|
+
import type { StatusReport } from './status.js';
|
|
4
5
|
export interface ClientSessionOptions {
|
|
5
6
|
sessionId: string;
|
|
6
7
|
transport: Transport;
|
|
@@ -8,6 +9,7 @@ export interface ClientSessionOptions {
|
|
|
8
9
|
docState: DocumentStateManager;
|
|
9
10
|
root: string;
|
|
10
11
|
onEnd: (sessionId: string) => void;
|
|
12
|
+
onStatus: () => StatusReport;
|
|
11
13
|
}
|
|
12
14
|
export declare class ClientSession {
|
|
13
15
|
private readonly id;
|
|
@@ -15,6 +17,7 @@ export declare class ClientSession {
|
|
|
15
17
|
private readonly pool;
|
|
16
18
|
private readonly docState;
|
|
17
19
|
private readonly onEnd;
|
|
20
|
+
private readonly onStatus;
|
|
18
21
|
private languageId;
|
|
19
22
|
private requestIdCounter;
|
|
20
23
|
private readonly pendingClientRequests;
|
|
@@ -25,7 +28,7 @@ export declare class ClientSession {
|
|
|
25
28
|
private handleRequest;
|
|
26
29
|
private handleInitialize;
|
|
27
30
|
private handleNotification;
|
|
28
|
-
private
|
|
31
|
+
private resolveBackend;
|
|
29
32
|
private languageIdForUri;
|
|
30
33
|
private handleClose;
|
|
31
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session.d.ts","sourceRoot":"","sources":["../src/client-session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"client-session.d.ts","sourceRoot":"","sources":["../src/client-session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,MAAM,YAAY,CAAC;CAC9B;AAWD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8B;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAyD;IAC/F,OAAO,CAAC,mBAAmB,CAAkC;IAE7D,YAAY,IAAI,EAAE,oBAAoB,EAWrC;YAEa,aAAa;YAqCb,eAAe;YAQf,aAAa;YAmBb,gBAAgB;YAgBhB,kBAAkB;IAgDhC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,WAAW;CAMpB"}
|
package/dist/client-session.js
CHANGED
|
@@ -6,6 +6,7 @@ export class ClientSession {
|
|
|
6
6
|
pool;
|
|
7
7
|
docState;
|
|
8
8
|
onEnd;
|
|
9
|
+
onStatus;
|
|
9
10
|
languageId = 'plaintext';
|
|
10
11
|
requestIdCounter = 0;
|
|
11
12
|
pendingClientRequests = new Map();
|
|
@@ -16,6 +17,7 @@ export class ClientSession {
|
|
|
16
17
|
this.pool = opts.pool;
|
|
17
18
|
this.docState = opts.docState;
|
|
18
19
|
this.onEnd = opts.onEnd;
|
|
20
|
+
this.onStatus = opts.onStatus;
|
|
19
21
|
this.transport.onMessage((msg) => this.handleMessage(msg));
|
|
20
22
|
this.transport.onClose(() => this.handleClose());
|
|
21
23
|
this.transport.onError((e) => process.stderr.write(`[session:${this.id}] ${e.message}\n`));
|
|
@@ -71,7 +73,11 @@ export class ClientSession {
|
|
|
71
73
|
// Ack without tearing down the shared backend
|
|
72
74
|
return null;
|
|
73
75
|
}
|
|
74
|
-
|
|
76
|
+
if (msg.method === '$/lsproxy.status') {
|
|
77
|
+
return this.onStatus();
|
|
78
|
+
}
|
|
79
|
+
const { backend, languageId } = this.resolveBackend(msg);
|
|
80
|
+
this.pool.recordRequest(languageId);
|
|
75
81
|
return backend.sendRequest(msg.method, msg.params);
|
|
76
82
|
}
|
|
77
83
|
async handleInitialize(params) {
|
|
@@ -117,19 +123,20 @@ export class ClientSession {
|
|
|
117
123
|
return;
|
|
118
124
|
}
|
|
119
125
|
// Forward all other notifications (didChange, willSave, etc.)
|
|
120
|
-
const backend = this.
|
|
126
|
+
const { backend } = this.resolveBackend(msg);
|
|
121
127
|
await backend.sendNotification(msg.method, msg.params);
|
|
122
128
|
}
|
|
123
|
-
|
|
129
|
+
resolveBackend(msg) {
|
|
124
130
|
// Prefer routing by URI extension; fall back to session's primary languageId
|
|
125
131
|
const params = msg.params;
|
|
126
132
|
const td = params?.['textDocument'];
|
|
127
133
|
const uri = td?.['uri'];
|
|
128
134
|
const langId = uri ? (this.languageIdForUri(uri) ?? this.languageId) : this.languageId;
|
|
129
|
-
const
|
|
135
|
+
const byUri = this.pool.getBackend(langId);
|
|
136
|
+
const backend = byUri ?? this.pool.getBackend(this.languageId);
|
|
130
137
|
if (!backend)
|
|
131
138
|
throw new Error(`No backend available for languageId "${langId}"`);
|
|
132
|
-
return backend;
|
|
139
|
+
return { backend, languageId: byUri ? langId : this.languageId };
|
|
133
140
|
}
|
|
134
141
|
languageIdForUri(uri) {
|
|
135
142
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session.js","sourceRoot":"","sources":["../src/client-session.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"client-session.js","sourceRoot":"","sources":["../src/client-session.ts"],"names":[],"mappings":"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"}
|
package/dist/document-state.d.ts
CHANGED
|
@@ -12,6 +12,8 @@ export declare class DocumentStateManager {
|
|
|
12
12
|
onDidClose(sessionId: string, uri: string): void;
|
|
13
13
|
onSessionEnd(sessionId: string): string[];
|
|
14
14
|
getContent(uri: string): string | undefined;
|
|
15
|
+
/** Count currently-tracked open documents, grouped by languageId. */
|
|
16
|
+
countByLanguage(): Record<string, number>;
|
|
15
17
|
private scheduleLazyClose;
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=document-state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-state.d.ts","sourceRoot":"","sources":["../src/document-state.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAUD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA+B;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAE9D,YAAY,IAAI,GAAE,oBAAyB,EAG1C;IAED,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,aAAa,CA0B5F;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAO/C;IAKD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAWxC;IAED,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1C;IAED,OAAO,CAAC,iBAAiB;CAM1B"}
|
|
1
|
+
{"version":3,"file":"document-state.d.ts","sourceRoot":"","sources":["../src/document-state.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAUD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA+B;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;IAE9D,YAAY,IAAI,GAAE,oBAAyB,EAG1C;IAED,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,aAAa,CA0B5F;IAED,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAO/C;IAKD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAWxC;IAED,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1C;IAED,qEAAqE;IACrE,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxC;IAED,OAAO,CAAC,iBAAiB;CAM1B"}
|
package/dist/document-state.js
CHANGED
|
@@ -59,6 +59,14 @@ export class DocumentStateManager {
|
|
|
59
59
|
getContent(uri) {
|
|
60
60
|
return this.docs.get(uri)?.content;
|
|
61
61
|
}
|
|
62
|
+
/** Count currently-tracked open documents, grouped by languageId. */
|
|
63
|
+
countByLanguage() {
|
|
64
|
+
const counts = {};
|
|
65
|
+
for (const entry of this.docs.values()) {
|
|
66
|
+
counts[entry.languageId] = (counts[entry.languageId] ?? 0) + 1;
|
|
67
|
+
}
|
|
68
|
+
return counts;
|
|
69
|
+
}
|
|
62
70
|
scheduleLazyClose(uri, entry) {
|
|
63
71
|
entry.closeTimer = setTimeout(() => {
|
|
64
72
|
this.docs.delete(uri);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-state.js","sourceRoot":"","sources":["../src/document-state.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"document-state.js","sourceRoot":"","sources":["../src/document-state.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEvD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/proxy-server.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type BackendPoolOptions } from './backend-pool.js';
|
|
2
|
+
import { type StatusReport } from './status.js';
|
|
2
3
|
export interface ProxyServerOptions extends BackendPoolOptions {
|
|
3
4
|
root: string;
|
|
4
5
|
socketOverride?: string;
|
|
@@ -17,7 +18,11 @@ export declare class ProxyServer {
|
|
|
17
18
|
private readonly activeSockets;
|
|
18
19
|
private idleTimer;
|
|
19
20
|
private sessionCounter;
|
|
21
|
+
private readonly startedAt;
|
|
22
|
+
private readonly configured;
|
|
20
23
|
constructor(opts: ProxyServerOptions);
|
|
24
|
+
/** Assemble the current daemon + backend status snapshot. */
|
|
25
|
+
getStatus(): StatusReport;
|
|
21
26
|
start(): Promise<void>;
|
|
22
27
|
stop(): Promise<void>;
|
|
23
28
|
private onSessionEnd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../src/proxy-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../src/proxy-server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIzE,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IAChD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAEhD,YAAY,IAAI,EAAE,kBAAkB,EAiBnC;IAED,6DAA6D;IACtD,SAAS,IAAI,YAAY,CAW/B;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA6C3B;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAgB1B;IAED,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;YAWN,YAAY;CAoB3B"}
|
package/dist/proxy-server.js
CHANGED
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
import { createServer, createConnection } from 'node:net';
|
|
3
3
|
import { writeFileSync, unlinkSync, existsSync, mkdirSync } from 'node:fs';
|
|
4
4
|
import { dirname } from 'node:path';
|
|
5
|
+
import { discoverServers } from '@lspeasy/core';
|
|
5
6
|
import { socketToTransport } from '@lspeasy/core/node';
|
|
6
7
|
import { BackendPool } from './backend-pool.js';
|
|
7
8
|
import { DocumentStateManager } from './document-state.js';
|
|
8
9
|
import { ClientSession } from './client-session.js';
|
|
9
10
|
import { socketPath, pidPath } from './socket-path.js';
|
|
11
|
+
import { buildStatusReport } from './status.js';
|
|
10
12
|
export class ProxyServer {
|
|
11
13
|
root;
|
|
12
14
|
sockPath;
|
|
@@ -19,8 +21,11 @@ export class ProxyServer {
|
|
|
19
21
|
activeSockets = new Set();
|
|
20
22
|
idleTimer;
|
|
21
23
|
sessionCounter = 0;
|
|
24
|
+
startedAt = Date.now();
|
|
25
|
+
configured;
|
|
22
26
|
constructor(opts) {
|
|
23
27
|
this.root = opts.root;
|
|
28
|
+
this.configured = discoverServers(opts.root);
|
|
24
29
|
this.sockPath = opts.socketOverride ?? socketPath(opts.root);
|
|
25
30
|
this.pidFilePath = opts.socketOverride
|
|
26
31
|
? opts.socketOverride.endsWith('.sock')
|
|
@@ -36,6 +41,19 @@ export class ProxyServer {
|
|
|
36
41
|
onClose: (uri) => this.lazyCloseUri(uri)
|
|
37
42
|
});
|
|
38
43
|
}
|
|
44
|
+
/** Assemble the current daemon + backend status snapshot. */
|
|
45
|
+
getStatus() {
|
|
46
|
+
return buildStatusReport({
|
|
47
|
+
now: Date.now(),
|
|
48
|
+
daemonPid: process.pid,
|
|
49
|
+
daemonStartedAt: this.startedAt,
|
|
50
|
+
root: this.root,
|
|
51
|
+
sessions: this.sessions.size,
|
|
52
|
+
configured: this.configured,
|
|
53
|
+
backends: this.pool.listBackends(),
|
|
54
|
+
openDocsByLanguage: this.docState.countByLanguage()
|
|
55
|
+
});
|
|
56
|
+
}
|
|
39
57
|
async start() {
|
|
40
58
|
mkdirSync(dirname(this.sockPath), { recursive: true });
|
|
41
59
|
const srv = createServer((socket) => {
|
|
@@ -49,7 +67,8 @@ export class ProxyServer {
|
|
|
49
67
|
pool: this.pool,
|
|
50
68
|
docState: this.docState,
|
|
51
69
|
root: this.root,
|
|
52
|
-
onEnd: (id) => this.onSessionEnd(id)
|
|
70
|
+
onEnd: (id) => this.onSessionEnd(id),
|
|
71
|
+
onStatus: () => this.getStatus()
|
|
53
72
|
});
|
|
54
73
|
this.sessions.set(sessionId, session);
|
|
55
74
|
this.resetIdleTimer();
|
package/dist/proxy-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../src/proxy-server.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAA4B,MAAM,UAAU,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../src/proxy-server.ts"],"names":[],"mappings":"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"}
|
package/dist/status.d.ts
ADDED
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { ConfiguredServer } from '@lspeasy/core';
|
|
2
|
+
export interface BackendRuntime {
|
|
3
|
+
languageId: string;
|
|
4
|
+
pid: number;
|
|
5
|
+
startedAt: number;
|
|
6
|
+
requestCount: number;
|
|
7
|
+
healthy: boolean;
|
|
8
|
+
}
|
|
9
|
+
export interface LanguageStatus {
|
|
10
|
+
languageId: string;
|
|
11
|
+
name: string;
|
|
12
|
+
extensions: string[];
|
|
13
|
+
command: string;
|
|
14
|
+
status: 'running' | 'cold';
|
|
15
|
+
healthy?: boolean;
|
|
16
|
+
pid?: number;
|
|
17
|
+
uptimeMs?: number;
|
|
18
|
+
openDocuments?: number;
|
|
19
|
+
requestsServed?: number;
|
|
20
|
+
}
|
|
21
|
+
export interface DaemonStatus {
|
|
22
|
+
pid: number;
|
|
23
|
+
uptimeMs: number;
|
|
24
|
+
root: string;
|
|
25
|
+
sessions: number;
|
|
26
|
+
backends: number;
|
|
27
|
+
}
|
|
28
|
+
export interface StatusReport {
|
|
29
|
+
daemon: DaemonStatus | null;
|
|
30
|
+
languages: LanguageStatus[];
|
|
31
|
+
}
|
|
32
|
+
export interface BuildStatusInput {
|
|
33
|
+
now: number;
|
|
34
|
+
daemonPid: number;
|
|
35
|
+
daemonStartedAt: number;
|
|
36
|
+
root: string;
|
|
37
|
+
sessions: number;
|
|
38
|
+
configured: ConfiguredServer[];
|
|
39
|
+
backends: BackendRuntime[];
|
|
40
|
+
openDocsByLanguage: Record<string, number>;
|
|
41
|
+
}
|
|
42
|
+
export declare function buildStatusReport(input: BuildStatusInput): StatusReport;
|
|
43
|
+
/** Status view when the daemon is unreachable: null daemon, all languages cold. */
|
|
44
|
+
export declare function coldStatusReport(configured: ConfiguredServer[]): StatusReport;
|
|
45
|
+
//# sourceMappingURL=status.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../src/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AA+BD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,YAAY,CAkCvE;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,EAAE,GAAG,YAAY,CAE7E"}
|
package/dist/status.js
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/** Group a server's extensions by the languageId they map to. */
|
|
2
|
+
function extensionsByLanguage(server) {
|
|
3
|
+
const byLang = new Map();
|
|
4
|
+
for (const [ext, languageId] of Object.entries(server.fileExtensions)) {
|
|
5
|
+
const list = byLang.get(languageId) ?? [];
|
|
6
|
+
list.push(ext);
|
|
7
|
+
byLang.set(languageId, list);
|
|
8
|
+
}
|
|
9
|
+
return byLang;
|
|
10
|
+
}
|
|
11
|
+
function coldLanguage(server, languageId, extensions) {
|
|
12
|
+
return { languageId, name: server.name, extensions, command: server.command, status: 'cold' };
|
|
13
|
+
}
|
|
14
|
+
function coldLanguages(configured) {
|
|
15
|
+
const out = [];
|
|
16
|
+
for (const server of configured) {
|
|
17
|
+
for (const [languageId, extensions] of extensionsByLanguage(server)) {
|
|
18
|
+
out.push(coldLanguage(server, languageId, extensions));
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return out;
|
|
22
|
+
}
|
|
23
|
+
export function buildStatusReport(input) {
|
|
24
|
+
const byLang = new Map(input.backends.map((b) => [b.languageId, b]));
|
|
25
|
+
const languages = [];
|
|
26
|
+
for (const server of input.configured) {
|
|
27
|
+
for (const [languageId, extensions] of extensionsByLanguage(server)) {
|
|
28
|
+
const rt = byLang.get(languageId);
|
|
29
|
+
if (rt) {
|
|
30
|
+
languages.push({
|
|
31
|
+
languageId,
|
|
32
|
+
name: server.name,
|
|
33
|
+
extensions,
|
|
34
|
+
command: server.command,
|
|
35
|
+
status: 'running',
|
|
36
|
+
healthy: rt.healthy,
|
|
37
|
+
pid: rt.pid,
|
|
38
|
+
uptimeMs: input.now - rt.startedAt,
|
|
39
|
+
openDocuments: input.openDocsByLanguage[languageId] ?? 0,
|
|
40
|
+
requestsServed: rt.requestCount
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
languages.push(coldLanguage(server, languageId, extensions));
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return {
|
|
49
|
+
daemon: {
|
|
50
|
+
pid: input.daemonPid,
|
|
51
|
+
uptimeMs: input.now - input.daemonStartedAt,
|
|
52
|
+
root: input.root,
|
|
53
|
+
sessions: input.sessions,
|
|
54
|
+
backends: input.backends.length
|
|
55
|
+
},
|
|
56
|
+
languages
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
/** Status view when the daemon is unreachable: null daemon, all languages cold. */
|
|
60
|
+
export function coldStatusReport(configured) {
|
|
61
|
+
return { daemon: null, languages: coldLanguages(configured) };
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../src/status.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lsproxy/proxy",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "Per-root LSP multiplexing daemon — holds warm language server connections for @lsproxy/cli",
|
|
5
5
|
"private": false,
|
|
6
6
|
"keywords": [
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"access": "public"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@lspeasy/client": "3.1.
|
|
45
|
-
"@lspeasy/core": "2.
|
|
44
|
+
"@lspeasy/client": "3.1.3",
|
|
45
|
+
"@lspeasy/core": "2.4.0"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"typescript": "^6.0.3"
|