dsh-llm-ustc 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -6
- package/lib/adapter.js +1 -5
- package/lib/adapter.js.map +1 -1
- package/lib/client.js +2 -3
- package/lib/config.js +5 -5
- package/lib/config.js.map +1 -1
- package/lib/constants.js +1 -1
- package/lib/helper.js +54 -131
- package/lib/helper.js.map +1 -1
- package/lib/iwan.js +93 -0
- package/lib/iwan.js.map +1 -0
- package/lib/model-catalog.js +1 -1
- package/lib/model-catalog.js.map +1 -1
- package/lib/oidc.js +208 -0
- package/lib/oidc.js.map +1 -0
- package/lib/types/adapter.d.ts.map +1 -1
- package/lib/types/client/index.d.ts +1 -10
- package/lib/types/client/index.d.ts.map +1 -1
- package/lib/types/config.d.ts +2 -2
- package/lib/types/config.d.ts.map +1 -1
- package/lib/types/constants.d.ts +1 -1
- package/lib/types/helper.d.ts +5 -22
- package/lib/types/helper.d.ts.map +1 -1
- package/lib/types/iwan.d.ts +8 -0
- package/lib/types/iwan.d.ts.map +1 -0
- package/lib/types/oidc.d.ts +17 -0
- package/lib/types/oidc.d.ts.map +1 -0
- package/lib/types/types.d.ts +6 -8
- package/lib/types/types.d.ts.map +1 -1
- package/lib/types/web.d.ts +5 -5
- package/lib/types/web.d.ts.map +1 -1
- package/lib/web.js +18 -30
- package/lib/web.js.map +1 -1
- package/package.json +31 -32
package/README.md
CHANGED
|
@@ -6,7 +6,7 @@ DeepSeek Harness `ustc` LLM Provider，访问中国科学技术大学
|
|
|
6
6
|
|
|
7
7
|
## 要求
|
|
8
8
|
|
|
9
|
-
- DeepSeek Harness `0.1.0-rc.
|
|
9
|
+
- DeepSeek Harness `0.1.0-rc.7`
|
|
10
10
|
- Node.js 24（也支持 Node.js `^22.19.0`）
|
|
11
11
|
- Windows、macOS 或 Linux，x64/ARM64
|
|
12
12
|
- 科大 LLM API Key
|
|
@@ -23,7 +23,7 @@ dsh plugin --profile web add dsh-llm-ustc@latest
|
|
|
23
23
|
如需固定版本，可以将 `latest` 换成具体版本号：
|
|
24
24
|
|
|
25
25
|
```sh
|
|
26
|
-
dsh plugin --profile web add dsh-llm-ustc@0.
|
|
26
|
+
dsh plugin --profile web add dsh-llm-ustc@0.2.0
|
|
27
27
|
```
|
|
28
28
|
|
|
29
29
|
安装时 npm 会通过六个 `optionalDependencies` 之一自动选择当前操作系统和架构的
|
|
@@ -41,10 +41,12 @@ DSH Web 进程。
|
|
|
41
41
|
## 网络边界
|
|
42
42
|
|
|
43
43
|
- helper 只监听随机 `127.0.0.1` 端口，并要求每次启动生成的会话令牌。
|
|
44
|
-
-
|
|
45
|
-
- 上游固定为 `api.llm.ustc.edu.cn:443`，Host 和 TLS SNI
|
|
46
|
-
|
|
47
|
-
-
|
|
44
|
+
- 数据面允许访问固定上游 Host 下的任意相对路径、查询参数和 HTTP 方法。
|
|
45
|
+
- 上游固定为 `api.llm.ustc.edu.cn:443`，Host 和 TLS SNI 不可配置；拒绝绝对
|
|
46
|
+
URL、`CONNECT`/authority-form、非 loopback 本地 Host 和 SOCKS IP 目标。
|
|
47
|
+
- OIDC、控制面签名和线路目录由 Host 侧 TypeScript 处理；helper 只接收当前线路的
|
|
48
|
+
IP、端口、账号和临时解密后的密码，并负责 iWAN 数据面。
|
|
49
|
+
- helper 和 Host 侧 OIDC/控制面客户端忽略 `HTTP_PROXY`、`HTTPS_PROXY`、`ALL_PROXY` 与
|
|
48
50
|
`NO_PROXY`；插件不会修改进程外的环境变量。
|
|
49
51
|
- 不创建 TUN 设备，不修改系统 DNS、代理、路由表或其他 DSH Provider 的网络流量。
|
|
50
52
|
- `401/403/429/5xx` 是合法 HTTP 响应，不触发 iWAN 切换。
|
package/lib/adapter.js
CHANGED
|
@@ -4,11 +4,7 @@ import { PiAiAdapter } from '@deepseek-ai/dsh-llm-pi-ai';
|
|
|
4
4
|
import { createProvider } from '@earendil-works/pi-ai';
|
|
5
5
|
import { openAICompletionsApi } from '@earendil-works/pi-ai/api/openai-completions.lazy';
|
|
6
6
|
import { API_KEY_REF, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_TOKENS, PROVIDER, PROVIDER_NAME, } from "./constants.js";
|
|
7
|
-
const RETRY_POLICY = resolveRetryPolicy(
|
|
8
|
-
mode: 'normal',
|
|
9
|
-
maxRetries: 0,
|
|
10
|
-
retryableCodes: ['STREAM_CLOSED'],
|
|
11
|
-
}, 'llm-ustc.retryPolicy');
|
|
7
|
+
const RETRY_POLICY = resolveRetryPolicy(undefined, 'llm-ustc.retryPolicy');
|
|
12
8
|
const USTC_REASONING_EFFORTS = [
|
|
13
9
|
{ id: ReasoningEffortId('off'), name: 'Off' },
|
|
14
10
|
{ id: ReasoningEffortId('high'), name: 'High' },
|
package/lib/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,kBAAkB,GAMnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAoC,MAAM,4BAA4B,CAAA;AAC1F,OAAO,EAAE,cAAc,EAAc,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAA;AACxF,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,kBAAkB,EAClB,QAAQ,EACR,aAAa,GACd,MAAM,gBAAgB,CAAA;AAIvB,MAAM,YAAY,GAAG,kBAAkB,CAAC
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/client.js
CHANGED
|
@@ -264,7 +264,7 @@ function LoadedSettings({ controller, t, state }) {
|
|
|
264
264
|
className: "ulu-status-row",
|
|
265
265
|
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("route") }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
|
|
266
266
|
className: "ulu-route-value",
|
|
267
|
-
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: snapshot.
|
|
267
|
+
children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: snapshot.usingIwan ? t("iwanRoute") : t("directRoute") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Tooltip, {
|
|
268
268
|
label: t("refreshRoute"),
|
|
269
269
|
side: "top",
|
|
270
270
|
children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
|
|
@@ -488,8 +488,7 @@ function apply(ctx) {
|
|
|
488
488
|
}, "dsh-llm-ustc: settings invalidations");
|
|
489
489
|
ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
|
|
490
490
|
name: "settings.plugin.item",
|
|
491
|
-
|
|
492
|
-
order: 25,
|
|
491
|
+
key: LOCALE_NS,
|
|
493
492
|
inject: () => ({
|
|
494
493
|
controller,
|
|
495
494
|
t
|
package/lib/config.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import z from '@deepseek-ai/schemastery';
|
|
2
2
|
export const Config = z.object({
|
|
3
3
|
selectedServerId: z.string(),
|
|
4
|
-
|
|
4
|
+
directRecoverySeconds: z.number().step(1).min(30).max(86_400).default(300),
|
|
5
5
|
});
|
|
6
6
|
export function resolveConfig(config) {
|
|
7
|
-
const
|
|
8
|
-
if (!Number.isSafeInteger(
|
|
9
|
-
throw new TypeError('llm-ustc.
|
|
7
|
+
const directRecoverySeconds = config.directRecoverySeconds ?? 300;
|
|
8
|
+
if (!Number.isSafeInteger(directRecoverySeconds) || directRecoverySeconds < 30 || directRecoverySeconds > 86_400) {
|
|
9
|
+
throw new TypeError('llm-ustc.directRecoverySeconds must be an integer from 30 to 86400');
|
|
10
10
|
}
|
|
11
11
|
const selected = config.selectedServerId?.trim();
|
|
12
12
|
return {
|
|
13
13
|
...(selected === undefined || selected.length === 0 ? {} : { selectedServerId: selected }),
|
|
14
|
-
|
|
14
|
+
directRecoverySeconds,
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=config.js.map
|
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAOxC,MAAM,CAAC,MAAM,MAAM,GAAc,CAAC,CAAC,MAAM,CAAC;IACxC,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC5B,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,0BAA0B,CAAA;AAOxC,MAAM,CAAC,MAAM,MAAM,GAAc,CAAC,CAAC,MAAM,CAAC;IACxC,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC5B,qBAAqB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;CAC3E,CAAC,CAAA;AAOF,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,MAAM,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,GAAG,CAAA;IACjE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,IAAI,qBAAqB,GAAG,EAAE,IAAI,qBAAqB,GAAG,MAAM,EAAE,CAAC;QACjH,MAAM,IAAI,SAAS,CAAC,oEAAoE,CAAC,CAAA;IAC3F,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAA;IAChD,OAAO;QACL,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC;QAC1F,qBAAqB;KACtB,CAAA;AACH,CAAC"}
|
package/lib/constants.js
CHANGED
|
@@ -6,6 +6,6 @@ export const IWAN_CONFIG_REF = 'USTC_LLM_IWAN_CONFIG';
|
|
|
6
6
|
export const DEFAULT_MODEL = 'deepseek-v4-flash-ascend';
|
|
7
7
|
export const DEFAULT_CONTEXT_WINDOW = 262_144;
|
|
8
8
|
export const DEFAULT_MAX_TOKENS = 32_768;
|
|
9
|
-
export const HELPER_PROTOCOL = '
|
|
9
|
+
export const HELPER_PROTOCOL = 'v2';
|
|
10
10
|
export const SETTINGS_ROUTE = '/_dsh/llm-ustc/settings';
|
|
11
11
|
//# sourceMappingURL=constants.js.map
|
package/lib/helper.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import {
|
|
2
|
+
import { randomBytes } from 'node:crypto';
|
|
3
3
|
import { createInterface } from 'node:readline';
|
|
4
4
|
import { credentialRef } from '@deepseek-ai/dsh-credentials';
|
|
5
5
|
import { HELPER_PROTOCOL, IWAN_CONFIG_REF } from "./constants.js";
|
|
6
|
+
import { selectedTunnel } from "./iwan.js";
|
|
6
7
|
import { resolveHelperBinary } from "./native.js";
|
|
7
8
|
export class HelperManager {
|
|
8
9
|
ctx;
|
|
@@ -12,7 +13,8 @@ export class HelperManager {
|
|
|
12
13
|
starting;
|
|
13
14
|
lifecycle = Promise.resolve();
|
|
14
15
|
closed = false;
|
|
15
|
-
|
|
16
|
+
usingIwan = false;
|
|
17
|
+
directRecovered;
|
|
16
18
|
config;
|
|
17
19
|
generation = 0;
|
|
18
20
|
constructor(ctx, config) {
|
|
@@ -20,7 +22,7 @@ export class HelperManager {
|
|
|
20
22
|
this.config = config;
|
|
21
23
|
}
|
|
22
24
|
reconfigure(config) {
|
|
23
|
-
if (
|
|
25
|
+
if (this.config.selectedServerId === config.selectedServerId && this.config.directRecoverySeconds === config.directRecoverySeconds)
|
|
24
26
|
return;
|
|
25
27
|
this.config = config;
|
|
26
28
|
this.lifecycle = this.lifecycle.then(() => this.stopNow());
|
|
@@ -30,8 +32,8 @@ export class HelperManager {
|
|
|
30
32
|
this.config = { ...previous, selectedServerId: serverId };
|
|
31
33
|
return () => { this.config = previous; };
|
|
32
34
|
}
|
|
33
|
-
|
|
34
|
-
this.
|
|
35
|
+
onDirectRecovered(handler) {
|
|
36
|
+
this.directRecovered = handler;
|
|
35
37
|
}
|
|
36
38
|
async ensureStarted() {
|
|
37
39
|
if (this.closed)
|
|
@@ -46,13 +48,10 @@ export class HelperManager {
|
|
|
46
48
|
}
|
|
47
49
|
async endpoint() {
|
|
48
50
|
const baseURL = await this.ensureStarted();
|
|
49
|
-
const sessionToken = this.sessionToken;
|
|
50
|
-
if (sessionToken === undefined)
|
|
51
|
-
throw new Error('USTC helper started without a session token');
|
|
52
51
|
return {
|
|
53
52
|
baseURL: `${baseURL}/v1`,
|
|
54
53
|
generation: this.generation,
|
|
55
|
-
headers: { 'x-dsh-ustc-session': sessionToken },
|
|
54
|
+
headers: { 'x-dsh-ustc-session': this.sessionToken },
|
|
56
55
|
};
|
|
57
56
|
}
|
|
58
57
|
async stop() {
|
|
@@ -70,6 +69,7 @@ export class HelperManager {
|
|
|
70
69
|
this.child = undefined;
|
|
71
70
|
this.baseURL = undefined;
|
|
72
71
|
this.sessionToken = undefined;
|
|
72
|
+
this.usingIwan = false;
|
|
73
73
|
if (child === undefined || child.exitCode !== null)
|
|
74
74
|
return;
|
|
75
75
|
child.stdin.end();
|
|
@@ -82,28 +82,6 @@ export class HelperManager {
|
|
|
82
82
|
this.closed = true;
|
|
83
83
|
await this.stop();
|
|
84
84
|
}
|
|
85
|
-
async request(path, init = {}, timeoutMs = 20_000) {
|
|
86
|
-
const timeout = AbortSignal.timeout(timeoutMs);
|
|
87
|
-
const response = await this.fetch(path, {
|
|
88
|
-
...init,
|
|
89
|
-
signal: init.signal == null ? timeout : AbortSignal.any([init.signal, timeout]),
|
|
90
|
-
});
|
|
91
|
-
const text = await response.text();
|
|
92
|
-
let value;
|
|
93
|
-
try {
|
|
94
|
-
value = JSON.parse(text);
|
|
95
|
-
}
|
|
96
|
-
catch {
|
|
97
|
-
value = undefined;
|
|
98
|
-
}
|
|
99
|
-
if (!response.ok) {
|
|
100
|
-
const message = isRecord(value) && isRecord(value.error) && typeof value.error.message === 'string'
|
|
101
|
-
? value.error.message
|
|
102
|
-
: `USTC helper request failed (HTTP ${response.status})`;
|
|
103
|
-
throw new Error(message);
|
|
104
|
-
}
|
|
105
|
-
return value;
|
|
106
|
-
}
|
|
107
85
|
async fetch(path, init = {}) {
|
|
108
86
|
if (!path.startsWith('/') || path.startsWith('//'))
|
|
109
87
|
throw new TypeError('helper request path must be absolute');
|
|
@@ -119,62 +97,42 @@ export class HelperManager {
|
|
|
119
97
|
headers,
|
|
120
98
|
});
|
|
121
99
|
}
|
|
122
|
-
|
|
123
|
-
return this.
|
|
100
|
+
get route() {
|
|
101
|
+
return this.usingIwan;
|
|
124
102
|
}
|
|
125
|
-
async refreshRoute(
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
return
|
|
129
|
-
await this.selectServer(status.selectedServerId, apiKey);
|
|
130
|
-
return this.status();
|
|
131
|
-
}
|
|
132
|
-
async statusIfRunning() {
|
|
133
|
-
const baseURL = this.baseURL;
|
|
134
|
-
const sessionToken = this.sessionToken;
|
|
135
|
-
if (baseURL === undefined || sessionToken === undefined || this.child?.exitCode !== null)
|
|
136
|
-
return undefined;
|
|
137
|
-
try {
|
|
138
|
-
const response = await fetch(`${baseURL}/_control/status`, {
|
|
139
|
-
headers: { accept: 'application/json', 'x-dsh-ustc-session': sessionToken },
|
|
140
|
-
signal: AbortSignal.timeout(1_000),
|
|
141
|
-
});
|
|
142
|
-
return response.ok ? await response.json() : undefined;
|
|
143
|
-
}
|
|
144
|
-
catch {
|
|
145
|
-
return undefined;
|
|
103
|
+
async refreshRoute() {
|
|
104
|
+
if (this.config.selectedServerId === undefined) {
|
|
105
|
+
await this.stop();
|
|
106
|
+
return;
|
|
146
107
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
return this.request('/_control/servers');
|
|
150
|
-
}
|
|
151
|
-
beginOidc() {
|
|
152
|
-
return this.request('/_control/oidc/begin', { method: 'POST' });
|
|
153
|
-
}
|
|
154
|
-
async completeOidc(callbackUrl) {
|
|
155
|
-
const result = await this.request('/_control/oidc/complete', {
|
|
108
|
+
await this.stop();
|
|
109
|
+
const response = await this.fetch('/_route', {
|
|
156
110
|
method: 'POST',
|
|
157
|
-
|
|
111
|
+
signal: AbortSignal.timeout(20_000),
|
|
158
112
|
});
|
|
159
|
-
await
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}, 20_000);
|
|
113
|
+
const usingIwan = await response.json();
|
|
114
|
+
if (!response.ok) {
|
|
115
|
+
const message = isRecord(usingIwan) && isRecord(usingIwan.error) && typeof usingIwan.error.message === 'string'
|
|
116
|
+
? usingIwan.error.message
|
|
117
|
+
: `USTC helper request failed (HTTP ${response.status})`;
|
|
118
|
+
throw new Error(message);
|
|
119
|
+
}
|
|
120
|
+
this.usingIwan = usingIwan;
|
|
168
121
|
}
|
|
169
122
|
async start() {
|
|
170
123
|
const binary = await resolveHelperBinary();
|
|
171
124
|
const sessionToken = randomBytes(32).toString('base64url');
|
|
172
125
|
const credential = await this.ctx.credentials.resolve(credentialRef(IWAN_CONFIG_REF));
|
|
173
|
-
const
|
|
126
|
+
const tunnel = selectedTunnel(credential?.value, this.config.selectedServerId);
|
|
127
|
+
const env = { ...process.env };
|
|
128
|
+
for (const name of Object.keys(env)) {
|
|
129
|
+
if (['http_proxy', 'https_proxy', 'all_proxy', 'no_proxy'].includes(name.toLowerCase()))
|
|
130
|
+
delete env[name];
|
|
131
|
+
}
|
|
174
132
|
const child = spawn(binary, [], {
|
|
175
133
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
176
134
|
windowsHide: true,
|
|
177
|
-
env
|
|
135
|
+
env,
|
|
178
136
|
});
|
|
179
137
|
this.child = child;
|
|
180
138
|
child.stderr.setEncoding('utf8');
|
|
@@ -193,9 +151,8 @@ export class HelperManager {
|
|
|
193
151
|
});
|
|
194
152
|
child.stdin.write(`${JSON.stringify({
|
|
195
153
|
sessionToken,
|
|
196
|
-
...(
|
|
197
|
-
|
|
198
|
-
directReprobeSeconds: this.config.directReprobeSeconds,
|
|
154
|
+
...(tunnel === undefined ? {} : { tunnel }),
|
|
155
|
+
directRecoverySeconds: this.config.directRecoverySeconds,
|
|
199
156
|
})}\n`);
|
|
200
157
|
const lines = createInterface({ input: child.stdout });
|
|
201
158
|
const handshake = await new Promise((resolve, reject) => {
|
|
@@ -203,7 +160,7 @@ export class HelperManager {
|
|
|
203
160
|
lines.once('line', line => {
|
|
204
161
|
clearTimeout(timer);
|
|
205
162
|
try {
|
|
206
|
-
resolve(
|
|
163
|
+
resolve(JSON.parse(line));
|
|
207
164
|
}
|
|
208
165
|
catch (error) {
|
|
209
166
|
reject(error);
|
|
@@ -222,11 +179,24 @@ export class HelperManager {
|
|
|
222
179
|
lines.on('line', line => {
|
|
223
180
|
if (this.child !== child)
|
|
224
181
|
return;
|
|
225
|
-
|
|
226
|
-
|
|
182
|
+
let route;
|
|
183
|
+
try {
|
|
184
|
+
const value = JSON.parse(line);
|
|
185
|
+
route = isRecord(value) && value.event === 'route' && typeof value.iwan === 'boolean'
|
|
186
|
+
? value.iwan
|
|
187
|
+
: undefined;
|
|
188
|
+
}
|
|
189
|
+
catch {
|
|
190
|
+
route = undefined;
|
|
191
|
+
}
|
|
192
|
+
if (route === undefined)
|
|
193
|
+
return;
|
|
194
|
+
const recovered = this.usingIwan && !route;
|
|
195
|
+
this.usingIwan = route;
|
|
196
|
+
if (!recovered || this.directRecovered === undefined)
|
|
227
197
|
return;
|
|
228
|
-
void this.
|
|
229
|
-
this.ctx.logger.warn('dsh-llm-ustc could not
|
|
198
|
+
void this.directRecovered().catch(error => {
|
|
199
|
+
this.ctx.logger.warn('dsh-llm-ustc could not refresh models after direct recovery: %s', redact(String(error)));
|
|
230
200
|
});
|
|
231
201
|
});
|
|
232
202
|
child.once('exit', () => {
|
|
@@ -234,6 +204,7 @@ export class HelperManager {
|
|
|
234
204
|
this.child = undefined;
|
|
235
205
|
this.baseURL = undefined;
|
|
236
206
|
this.sessionToken = undefined;
|
|
207
|
+
this.usingIwan = false;
|
|
237
208
|
}
|
|
238
209
|
});
|
|
239
210
|
this.sessionToken = sessionToken;
|
|
@@ -242,51 +213,6 @@ export class HelperManager {
|
|
|
242
213
|
return this.baseURL;
|
|
243
214
|
}
|
|
244
215
|
}
|
|
245
|
-
export function parseHelperEvent(line) {
|
|
246
|
-
try {
|
|
247
|
-
const value = JSON.parse(line);
|
|
248
|
-
if (!isRecord(value) || value.event !== 'models' || !Array.isArray(value.models))
|
|
249
|
-
return undefined;
|
|
250
|
-
const models = value.models.flatMap(model => {
|
|
251
|
-
if (!isRecord(model) || typeof model.id !== 'string' || typeof model.name !== 'string')
|
|
252
|
-
return [];
|
|
253
|
-
return [{ id: model.id, name: model.name }];
|
|
254
|
-
});
|
|
255
|
-
return models.length === 0 ? undefined : models;
|
|
256
|
-
}
|
|
257
|
-
catch {
|
|
258
|
-
return undefined;
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
function parseHandshake(line) {
|
|
262
|
-
const value = JSON.parse(line);
|
|
263
|
-
if (!isRecord(value) || typeof value.protocol !== 'string' || !Number.isSafeInteger(value.port) || typeof value.pid !== 'number') {
|
|
264
|
-
throw new TypeError('USTC helper returned an invalid startup handshake');
|
|
265
|
-
}
|
|
266
|
-
const port = value.port;
|
|
267
|
-
if (port < 1 || port > 65_535)
|
|
268
|
-
throw new TypeError('USTC helper returned an invalid port');
|
|
269
|
-
return { protocol: value.protocol, port, pid: value.pid };
|
|
270
|
-
}
|
|
271
|
-
export function sanitizedEnvironment(source) {
|
|
272
|
-
const result = { ...source };
|
|
273
|
-
for (const name of Object.keys(result)) {
|
|
274
|
-
if (name.toLowerCase() === 'http_proxy' || name.toLowerCase() === 'https_proxy' || name.toLowerCase() === 'all_proxy' || name.toLowerCase() === 'no_proxy') {
|
|
275
|
-
delete result[name];
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
return result;
|
|
279
|
-
}
|
|
280
|
-
function parseIwanConfig(raw) {
|
|
281
|
-
const value = JSON.parse(raw);
|
|
282
|
-
if (!isRecord(value) || typeof value.domain !== 'string' || !Array.isArray(value.servers) || value.servers.length === 0) {
|
|
283
|
-
throw new TypeError(`${IWAN_CONFIG_REF} does not contain a valid iWAN configuration`);
|
|
284
|
-
}
|
|
285
|
-
return value;
|
|
286
|
-
}
|
|
287
|
-
function sameConfig(left, right) {
|
|
288
|
-
return left.selectedServerId === right.selectedServerId && left.directReprobeSeconds === right.directReprobeSeconds;
|
|
289
|
-
}
|
|
290
216
|
function isRecord(value) {
|
|
291
217
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
292
218
|
}
|
|
@@ -296,7 +222,4 @@ function redact(value) {
|
|
|
296
222
|
.replace(/com\.panabit\.mobile:\/\/[^\s]+/giu, 'com.panabit.mobile://[redacted]')
|
|
297
223
|
.replace(/[A-Za-z0-9_-]{32,}/gu, match => `${match.slice(0, 6)}...[redacted]`);
|
|
298
224
|
}
|
|
299
|
-
export function secretFingerprint(secret) {
|
|
300
|
-
return createHash('sha256').update(secret).digest('hex').slice(0, 12);
|
|
301
|
-
}
|
|
302
225
|
//# sourceMappingURL=helper.js.map
|
package/lib/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAyBjD,MAAM,OAAO,aAAa;IAWK;IAVrB,KAAK,CAA4C;IACjD,YAAY,CAAoB;IAChC,OAAO,CAAoB;IAC3B,QAAQ,CAA6B;IACrC,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5C,MAAM,GAAG,KAAK,CAAA;IACd,eAAe,CAAwD;IACvE,MAAM,CAAgB;IACtB,UAAU,GAAG,CAAC,CAAA;IAEtB,YAA6B,GAAY,EAAE,MAAsB;QAApC,QAAG,GAAH,GAAG,CAAS;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,WAAW,CAAC,MAAsB;QAChC,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;YAAE,OAAM;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,mBAAmB,CAAC,QAAgB;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAA;QACzD,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAA,CAAC,CAAC,CAAA;IACzC,CAAC;IAED,iBAAiB,CAAC,OAAiD;QACjE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACnE,MAAM,IAAI,CAAC,SAAS,CAAA;QACpB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,OAAO,CAAA;QACpF,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAA;QACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA,CAAC,CAAC,CAAC,CAAA;QACzE,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;QACtC,IAAI,YAAY,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAC9F,OAAO;YACL,OAAO,EAAE,GAAG,OAAO,KAAK;YACxB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,EAAE,oBAAoB,EAAE,YAAY,EAAE;SAChD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAC1D,MAAM,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC;gBAAC,MAAM,IAAI,CAAC,QAAQ,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACtC,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;QACxB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;QAC7B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,OAAM;QAC1D,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QACjB,MAAM,MAAM,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;QACpF,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACtF,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,KAAK,CAAC,IAAI,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,IAAY,EAAE,OAAoB,EAAE,EAAE,SAAS,GAAG,MAAM;QACvE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACtC,GAAG,IAAI;YACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAChF,CAAC,CAAA;QACF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,IAAI,KAAc,CAAA;QAClB,IAAI,CAAC;YAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,KAAK,GAAG,SAAS,CAAA;QAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ;gBACjG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO;gBACrB,CAAC,CAAC,oCAAoC,QAAQ,CAAC,MAAM,GAAG,CAAA;YAC1D,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,KAAU,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAAoB,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAA;QAC/G,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QAC5G,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,YAAa,CAAC,CAAA;QACrD,OAAO,KAAK,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,EAAE;YAChC,GAAG,IAAI;YACP,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;IACzC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAe;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAClC,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS;YAAE,OAAO,MAAM,CAAA;QAClF,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;QACxD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;QACtC,IAAI,OAAO,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI;YAAE,OAAO,SAAS,CAAA;QAC1G,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,kBAAkB,EAAE;gBACzD,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,YAAY,EAAE;gBAC3E,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;aACnC,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAkB,CAAC,CAAC,CAAC,SAAS,CAAA;QACxE,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAC1C,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IACjE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAmB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAe,yBAAyB,EAAE;YACzE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;SACtC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;QACjG,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,MAAe;QAClD,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,EAAE,CAAC;SACpF,EAAE,MAAM,CAAC,CAAA;IACZ,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,MAAM,MAAM,GAAG,MAAM,mBAAmB,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAC3F,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,WAAW,EAAE,IAAI;YACjB,GAAG,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC;SACvC,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;YACpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAChC,IAAI,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACpG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;YAC1D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,YAAY;YACZ,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC;YACnD,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YACvG,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;SACvD,CAAC,IAAI,CAAC,CAAA;QACP,MAAM,KAAK,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAY,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YACzF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,IAAI,CAAC;oBAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAA;gBAAC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAAC,CAAC;YACvE,CAAC,CAAC,CAAA;YACF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;YACpE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,IAAI,IAAI,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YACjG,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,IAAI,SAAS,CAAC,QAAQ,KAAK,eAAe,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,EAAE,CAAA;YACZ,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,CAAC,QAAQ,yBAAyB,eAAe,EAAE,CAAC,CAAA;QACvG,CAAC;QACD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;YACtB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK;gBAAE,OAAM;YAChC,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACrC,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;gBAAE,OAAM;YACtE,KAAK,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC9C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpG,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACtB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;gBACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;gBACxB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;YAC/B,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAA;QACnD,IAAI,CAAC,UAAU,IAAI,CAAC,CAAA;QACpB,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAA;QACzC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAA;QAClG,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC1C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAA;YACjG,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAA;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAA;IACzC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjI,MAAM,IAAI,SAAS,CAAC,mDAAmD,CAAC,CAAA;IAC1E,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAA;IACjC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,MAAM;QAAE,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAA;IAC1F,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAA;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAyB;IAC5D,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAA;IAC5B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,aAAa,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,EAAE,CAAC;YAC3J,OAAO,MAAM,CAAC,IAAI,CAAC,CAAA;QACrB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAA;IACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxH,MAAM,IAAI,SAAS,CAAC,GAAG,eAAe,8CAA8C,CAAC,CAAA;IACvF,CAAC;IACD,OAAO,KAA8B,CAAA;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB,EAAE,KAAqB;IAC7D,OAAO,IAAI,CAAC,gBAAgB,KAAK,KAAK,CAAC,gBAAgB,IAAI,IAAI,CAAC,oBAAoB,KAAK,KAAK,CAAC,oBAAoB,CAAA;AACrH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC7E,CAAC;AAED,SAAS,MAAM,CAAC,KAAa;IAC3B,OAAO,KAAK;SACT,OAAO,CAAC,iCAAiC,EAAE,mBAAmB,CAAC;SAC/D,OAAO,CAAC,oCAAoC,EAAE,iCAAiC,CAAC;SAChF,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAA;AAClF,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;AACvE,CAAC"}
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAQjD,MAAM,OAAO,aAAa;IAYK;IAXrB,KAAK,CAA4C;IACjD,YAAY,CAAoB;IAChC,OAAO,CAAoB;IAC3B,QAAQ,CAA6B;IACrC,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5C,MAAM,GAAG,KAAK,CAAA;IACd,SAAS,GAAG,KAAK,CAAA;IACjB,eAAe,CAAmC;IAClD,MAAM,CAAgB;IACtB,UAAU,GAAG,CAAC,CAAA;IAEtB,YAA6B,GAAY,EAAE,MAAsB;QAApC,QAAG,GAAH,GAAG,CAAS;QACvC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,WAAW,CAAC,MAAsB;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,KAAK,MAAM,CAAC,qBAAqB;YAAE,OAAM;QAC1I,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,mBAAmB,CAAC,QAAgB;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAA;QACzD,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAA,CAAC,CAAC,CAAA;IACzC,CAAC;IAED,iBAAiB,CAAC,OAA4B;QAC5C,IAAI,CAAC,eAAe,GAAG,OAAO,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACnE,MAAM,IAAI,CAAC,SAAS,CAAA;QACpB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,OAAO,CAAA;QACpF,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAA;QACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA,CAAC,CAAC,CAAC,CAAA;QACzE,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC1C,OAAO;YACL,OAAO,EAAE,GAAG,OAAO,KAAK;YACxB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,EAAE,oBAAoB,EAAE,IAAI,CAAC,YAAa,EAAE;SACtD,CAAA;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAC1D,MAAM,IAAI,CAAC,SAAS,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC;gBAAC,MAAM,IAAI,CAAC,QAAQ,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACtC,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;QACxB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;QAC7B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QACtB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,OAAM;QAC1D,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QACjB,MAAM,MAAM,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;QACpF,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACtF,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,KAAK,CAAC,IAAI,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,OAAoB,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAA;QAC/G,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QAC5G,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,YAAa,CAAC,CAAA;QACrD,OAAO,KAAK,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,EAAE;YAChC,GAAG,IAAI;YACP,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,OAAM;QACR,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACjB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YAC3C,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;SACpC,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAa,CAAA;QAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,OAAO,SAAS,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ;gBAC7G,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO;gBACzB,CAAC,CAAC,oCAAoC,QAAQ,CAAC,MAAM,GAAG,CAAA;YAC1D,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAoB,CAAA;IACvC,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,MAAM,MAAM,GAAG,MAAM,mBAAmB,EAAE,CAAA;QAC1C,MAAM,YAAY,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAA;QACrF,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAC9E,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAA;QAC3G,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE;YAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,WAAW,EAAE,IAAI;YACjB,GAAG;SACJ,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;YACpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAChC,IAAI,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACpG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;YAC1D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,YAAY;YACZ,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;YAC3C,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;SACzD,CAAC,IAAI,CAAC,CAAA;QACP,MAAM,KAAK,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAqC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1F,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YACzF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,IAAI,CAAC;oBAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAuC,CAAC,CAAA;gBAAC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAAC,CAAC;YACzG,CAAC,CAAC,CAAA;YACF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;YACpE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,IAAI,IAAI,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YACjG,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,IAAI,SAAS,CAAC,QAAQ,KAAK,eAAe,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,EAAE,CAAA;YACZ,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,CAAC,QAAQ,yBAAyB,eAAe,EAAE,CAAC,CAAA;QACvG,CAAC;QACD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;YACtB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK;gBAAE,OAAM;YAChC,IAAI,KAA0B,CAAA;YAC9B,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAA;gBACzC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS;oBACnF,CAAC,CAAC,KAAK,CAAC,IAAI;oBACZ,CAAC,CAAC,SAAS,CAAA;YACf,CAAC;YAAC,MAAM,CAAC;gBAAC,KAAK,GAAG,SAAS,CAAA;YAAC,CAAC;YAC7B,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAM;YAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,CAAA;YAC1C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;YACtB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;gBAAE,OAAM;YAC5D,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACxC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACtB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;gBACtB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;gBACxB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;gBAC7B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;YACxB,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAA;QACnD,IAAI,CAAC,UAAU,IAAI,CAAC,CAAA;QACpB,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC7E,CAAC;AAED,SAAS,MAAM,CAAC,KAAa;IAC3B,OAAO,KAAK;SACT,OAAO,CAAC,iCAAiC,EAAE,mBAAmB,CAAC;SAC/D,OAAO,CAAC,oCAAoC,EAAE,iCAAiC,CAAC;SAChF,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAA;AAClF,CAAC"}
|
package/lib/iwan.js
ADDED
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { createDecipheriv, createHash } from 'node:crypto';
|
|
2
|
+
import { isIPv4 } from 'node:net';
|
|
3
|
+
import { IWAN_CONFIG_REF } from "./constants.js";
|
|
4
|
+
export const IWAN_APP_SECRET = 'ca6a3532abd2986a03b86b3a';
|
|
5
|
+
export function parseIwanConfig(raw) {
|
|
6
|
+
let value;
|
|
7
|
+
try {
|
|
8
|
+
value = JSON.parse(raw);
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
throw new TypeError(`${IWAN_CONFIG_REF} is not valid JSON`, { cause: error });
|
|
12
|
+
}
|
|
13
|
+
return validateIwanConfig(value);
|
|
14
|
+
}
|
|
15
|
+
export function validateIwanConfig(value) {
|
|
16
|
+
if (!isRecord(value) || typeof value.domain !== 'string' || value.domain.length === 0 || !Array.isArray(value.servers) || value.servers.length === 0) {
|
|
17
|
+
throw new TypeError(`${IWAN_CONFIG_REF} does not contain a valid iWAN configuration`);
|
|
18
|
+
}
|
|
19
|
+
const servers = value.servers.map(validateServer);
|
|
20
|
+
return { domain: value.domain, servers };
|
|
21
|
+
}
|
|
22
|
+
export function publicIwanServers(raw) {
|
|
23
|
+
if (raw === undefined)
|
|
24
|
+
return [];
|
|
25
|
+
try {
|
|
26
|
+
return parseIwanConfig(raw).servers.map(server => ({
|
|
27
|
+
id: server.id,
|
|
28
|
+
name: server.name,
|
|
29
|
+
endpoint: `${server.host}:${server.port}`,
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return [];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
export function selectedTunnel(raw, serverId) {
|
|
37
|
+
if (raw === undefined || serverId === undefined)
|
|
38
|
+
return undefined;
|
|
39
|
+
const config = parseIwanConfig(raw);
|
|
40
|
+
const server = config.servers.find(candidate => candidate.id === serverId);
|
|
41
|
+
if (server === undefined)
|
|
42
|
+
throw new TypeError(`selected iWAN line ${JSON.stringify(serverId)} is unavailable`);
|
|
43
|
+
return {
|
|
44
|
+
host: server.host,
|
|
45
|
+
port: server.port,
|
|
46
|
+
username: server.username,
|
|
47
|
+
password: decryptPassword(config.domain, server.username, server.passWord),
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
export function decryptPassword(domain, username, encrypted) {
|
|
51
|
+
const packed = Buffer.from(encrypted, 'base64url');
|
|
52
|
+
if (packed.length < 28)
|
|
53
|
+
throw new TypeError('iWAN line credential is malformed');
|
|
54
|
+
const nonce = packed.subarray(0, 12);
|
|
55
|
+
const ciphertext = packed.subarray(12, -16);
|
|
56
|
+
const tag = packed.subarray(-16);
|
|
57
|
+
const key = createHash('sha256').update(`${IWAN_APP_SECRET}|${domain}|${username}`).digest();
|
|
58
|
+
try {
|
|
59
|
+
const decipher = createDecipheriv('aes-256-gcm', key, nonce);
|
|
60
|
+
decipher.setAAD(Buffer.from(`${domain}|${username}`));
|
|
61
|
+
decipher.setAuthTag(tag);
|
|
62
|
+
const password = Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString('utf8');
|
|
63
|
+
if (password.length === 0)
|
|
64
|
+
throw new TypeError('iWAN line credential is empty');
|
|
65
|
+
return password;
|
|
66
|
+
}
|
|
67
|
+
catch (error) {
|
|
68
|
+
throw new TypeError('iWAN line credential could not be decrypted', { cause: error });
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
function validateServer(value) {
|
|
72
|
+
if (!isRecord(value)
|
|
73
|
+
|| typeof value.id !== 'string' || value.id.length === 0
|
|
74
|
+
|| typeof value.name !== 'string' || value.name.length === 0
|
|
75
|
+
|| typeof value.host !== 'string' || !isIPv4(value.host)
|
|
76
|
+
|| !Number.isSafeInteger(value.port) || value.port < 1 || value.port > 65_535
|
|
77
|
+
|| typeof value.username !== 'string' || value.username.length === 0
|
|
78
|
+
|| typeof value.passWord !== 'string' || value.passWord.length === 0) {
|
|
79
|
+
throw new TypeError(`${IWAN_CONFIG_REF} contains an invalid iWAN line`);
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
id: value.id,
|
|
83
|
+
name: value.name,
|
|
84
|
+
host: value.host,
|
|
85
|
+
port: value.port,
|
|
86
|
+
username: value.username,
|
|
87
|
+
passWord: value.passWord,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
function isRecord(value) {
|
|
91
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=iwan.js.map
|
package/lib/iwan.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iwan.js","sourceRoot":"","sources":["../src/iwan.ts"],"names":[],"mappings":"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"}
|
package/lib/model-catalog.js
CHANGED
|
@@ -9,7 +9,7 @@ export class ModelCatalog {
|
|
|
9
9
|
this.ctx = ctx;
|
|
10
10
|
this.helper = helper;
|
|
11
11
|
this.store = store;
|
|
12
|
-
this.helper.
|
|
12
|
+
this.helper.onDirectRecovered(async () => { await this.refresh(); });
|
|
13
13
|
}
|
|
14
14
|
models() {
|
|
15
15
|
return this.store.models();
|
package/lib/model-catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAE,eAAe,EAAc,MAAM,YAAY,CAAA;AAGxD,MAAM,OAAO,YAAY;IAEJ;IACA;IACA;IAHnB,YACmB,GAAY,EACZ,MAAqB,EACrB,KAAiB;QAFjB,QAAG,GAAH,GAAG,CAAS;QACZ,WAAM,GAAN,MAAM,CAAe;QACrB,UAAK,GAAL,KAAK,CAAY;QAElC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|