@wirecat/zoom-cli 0.45.0 → 0.47.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 +1 -1
- package/dist/agent-skill.d.ts.map +1 -1
- package/dist/agent-skill.js +4 -7
- package/dist/agent-skill.js.map +1 -1
- package/dist/commands.d.ts +2 -0
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +8 -1
- package/dist/commands.js.map +1 -1
- package/dist/config-issues.d.ts +26 -0
- package/dist/config-issues.d.ts.map +1 -0
- package/dist/config-issues.js +97 -0
- package/dist/config-issues.js.map +1 -0
- package/dist/config.d.ts +22 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +122 -86
- package/dist/config.js.map +1 -1
- package/dist/contract-overrides.d.ts.map +1 -1
- package/dist/contract-overrides.js +0 -13
- package/dist/contract-overrides.js.map +1 -1
- package/dist/mcp-command.d.ts.map +1 -1
- package/dist/mcp-command.js +1 -9
- package/dist/mcp-command.js.map +1 -1
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +5 -4
- package/dist/mcp.js.map +1 -1
- package/dist/permissions.d.ts +0 -2
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +2 -12
- package/dist/permissions.js.map +1 -1
- package/dist/program-bindings.d.ts.map +1 -1
- package/dist/program-bindings.js +18 -20
- package/dist/program-bindings.js.map +1 -1
- package/dist/recording-schedule-setup.d.ts.map +1 -1
- package/dist/recording-schedule-setup.js +0 -1
- package/dist/recording-schedule-setup.js.map +1 -1
- package/dist/request-events.d.ts +9 -0
- package/dist/request-events.d.ts.map +1 -0
- package/dist/request-events.js +41 -0
- package/dist/request-events.js.map +1 -0
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +1 -2
- package/dist/run.js.map +1 -1
- package/dist/setup-commands.d.ts +4 -3
- package/dist/setup-commands.d.ts.map +1 -1
- package/dist/setup-commands.js +26 -23
- package/dist/setup-commands.js.map +1 -1
- package/dist/tokens.d.ts +1 -3
- package/dist/tokens.d.ts.map +1 -1
- package/dist/tokens.js +4 -19
- package/dist/tokens.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +15 -15
- package/dist/run-recording.d.ts +0 -27
- package/dist/run-recording.d.ts.map +0 -1
- package/dist/run-recording.js +0 -106
- package/dist/run-recording.js.map +0 -1
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { isCliError } from "@wirecat/cli-base";
|
|
2
|
+
import { providerRequest } from "@wirecat/cli-core/cli";
|
|
3
|
+
const SEGMENT = /^(?:v\d+|[a-z][a-z_]{0,23})$/;
|
|
4
|
+
/**
|
|
5
|
+
* `GET /v2/users/:id/recordings`: the method and the path's fixed words. A segment that is not one — a meeting
|
|
6
|
+
* id, a uuid, an email, a download token — becomes `:id`, and the host and query are dropped.
|
|
7
|
+
*/
|
|
8
|
+
export const operationOf = (method, url) => {
|
|
9
|
+
let path;
|
|
10
|
+
try {
|
|
11
|
+
path = new URL(url).pathname;
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return `${method.toUpperCase()} :url`;
|
|
15
|
+
}
|
|
16
|
+
const words = path
|
|
17
|
+
.split("/")
|
|
18
|
+
.filter(Boolean)
|
|
19
|
+
.map((segment) => {
|
|
20
|
+
const [head = "", verb] = segment.split(":");
|
|
21
|
+
const base = SEGMENT.test(head) ? head : ":id";
|
|
22
|
+
if (verb === undefined)
|
|
23
|
+
return base;
|
|
24
|
+
return SEGMENT.test(verb) ? `${base}:${verb}` : base;
|
|
25
|
+
});
|
|
26
|
+
return `${method.toUpperCase()} /${words.join("/")}`;
|
|
27
|
+
};
|
|
28
|
+
/** A fetch that logs each request's operation, status and duration into the command's run — never its content. */
|
|
29
|
+
export const observedFetch = (fetcher, sink) => async (input, init) => {
|
|
30
|
+
const answered = providerRequest(operationOf(init?.method ?? "GET", input instanceof Request ? input.url : String(input)), sink);
|
|
31
|
+
try {
|
|
32
|
+
const response = await fetcher(input, init);
|
|
33
|
+
answered(response.status < 400 ? { status: response.status } : { status: response.status, errorCode: "provider_error" });
|
|
34
|
+
return response;
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
answered({ error, errorCode: isCliError(error) ? error.code : "network_error" });
|
|
38
|
+
throw error;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=request-events.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-events.js","sourceRoot":"","sources":["../src/request-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAqB,MAAM,uBAAuB,CAAA;AAE1E,MAAM,OAAO,GAAG,8BAA8B,CAAA;AAE9C;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,GAAW,EAAU,EAAE;IACjE,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAA;IACvC,CAAC;IACD,MAAM,KAAK,GAAG,IAAI;SACf,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;QAC9C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAA;QACnC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtD,CAAC,CAAC,CAAA;IACJ,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AACtD,CAAC,CAAA;AAED,kHAAkH;AAClH,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,OAAqB,EAAE,IAAmC,EAAgB,EAAE,CAC7E,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;IACpB,MAAM,QAAQ,GAAG,eAAe,CAC9B,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,EAAE,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACxF,IAAI,CACL,CAAA;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC3C,QAAQ,CACN,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAC/G,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAA;QAChF,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAA"}
|
package/dist/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAiC,MAAM,uBAAuB,CAAA;AAM7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAI/C,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7B,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACzC;AAUD,eAAO,MAAM,cAAc,SAAU,WAAW,cAAc,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,KAAG,iBAiCxF,CAAA;AAED,eAAO,MAAM,UAAU,SACf,MAAM,EAAE,QACR,WAAW,cACL,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,KACnC,OAAO,CAAC,MAAM,CAYb,CAAA"}
|
package/dist/run.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { run as sharedRun } from "@wirecat/cli-core/cli";
|
|
1
|
+
import { runSettings, run as sharedRun } from "@wirecat/cli-core/cli";
|
|
2
2
|
import { zoomRunsCommand } from "./commands.js";
|
|
3
3
|
import { readConfig } from "./config.js";
|
|
4
4
|
import { ZOOM_FIRST_SCREEN } from "./first-screen.js";
|
|
@@ -6,7 +6,6 @@ import { discoveryLevels, permissionKeyForPath } from "./permissions.js";
|
|
|
6
6
|
import { chooseProfile } from "./profile.js";
|
|
7
7
|
import { bindZoomProgram } from "./program-bindings.js";
|
|
8
8
|
import { ZM } from "./read-only.js";
|
|
9
|
-
import { runSettings } from "./run-recording.js";
|
|
10
9
|
const configured = (path) => {
|
|
11
10
|
try {
|
|
12
11
|
return readConfig(path);
|
package/dist/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,GAAG,IAAI,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
|
package/dist/setup-commands.d.ts
CHANGED
|
@@ -3,11 +3,12 @@ import type { Command } from "commander";
|
|
|
3
3
|
import { type ZoomConfig } from "./config.js";
|
|
4
4
|
import type { ProgramDeps } from "./program.js";
|
|
5
5
|
import type { TokenManager } from "./tokens.js";
|
|
6
|
-
export declare const addConfigCommands: (program: Command, { configPath,
|
|
6
|
+
export declare const addConfigCommands: (program: Command, { configPath, output, warn, named, }: {
|
|
7
7
|
configPath: string;
|
|
8
|
-
getConfig: () => ZoomConfig;
|
|
9
8
|
output: (body: Body) => void;
|
|
10
|
-
|
|
9
|
+
warn: (text: string) => void;
|
|
10
|
+
/** The profile named for this command, if any; never asks for one. */
|
|
11
|
+
named: () => string | undefined;
|
|
11
12
|
}) => void;
|
|
12
13
|
export interface SessionCommandDeps {
|
|
13
14
|
deps: Pick<ProgramDeps, "configPath" | "diagnostic" | "checkSession" | "tokens" | "now" | "env" | "outputIsTTY" | "openBrowser" | "readPaste">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-commands.d.ts","sourceRoot":"","sources":["../src/setup-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup-commands.d.ts","sourceRoot":"","sources":["../src/setup-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,IAAI,EAWV,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAqD,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAKhG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAsB/C,eAAO,MAAM,iBAAiB,YACnB,OAAO,wCAMb;IACD,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAA;IAC5B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5B,sEAAsE;IACtE,KAAK,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CAChC,KACA,IAuBF,CAAA;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,IAAI,CACR,WAAW,EACT,YAAY,GACZ,YAAY,GACZ,cAAc,GACd,QAAQ,GACR,KAAK,GACL,KAAK,GACL,aAAa,GACb,aAAa,GACb,WAAW,CACd,CAAA;IACD,SAAS,EAAE,MAAM,UAAU,CAAA;IAC3B,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAA;IAC5B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,GAAG,EAAE,MAAM,IAAI,CAAA;IACf,OAAO,EAAE,MAAM,MAAM,CAAA;IACrB,MAAM,EAAE,MAAM,YAAY,CAAA;IAC1B,KAAK,EAAE,MAAM,OAAO,KAAK,CAAA;IACzB,MAAM,EAAE,MAAM,WAAW,GAAG,SAAS,CAAA;CACtC;AAED,2FAA2F;AAC3F,eAAO,MAAM,kBAAkB,YAAa,OAAO,WAAW,kBAAkB,KAAG,IAqFlF,CAAA"}
|
package/dist/setup-commands.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import {
|
|
2
|
+
import { dirname } from "node:path";
|
|
3
|
+
import { CliError } from "@wirecat/cli-base";
|
|
3
4
|
import { annotate } from "@wirecat/cli-base/commands";
|
|
4
|
-
import { commandWords, grantsAuthority, itemOf, LOCAL_READ, LOCAL_WRITE, logsInOrOut, NO_EFFECTS, REMOTE_WRITE, refuseCommandName, } from "@wirecat/cli-core/cli";
|
|
5
|
+
import { commandWords, grantsAuthority, itemOf, LOCAL_READ, LOCAL_WRITE, logsInOrOut, NO_EFFECTS, privateFiles, REMOTE_WRITE, refuseCommandName, } from "@wirecat/cli-core/cli";
|
|
5
6
|
import { addStandardCommands } from "./commands.js";
|
|
6
|
-
import { addProfile, setConfig } from "./config.js";
|
|
7
|
+
import { addProfile, inspectConfig, setConfig, unsetConfig } from "./config.js";
|
|
8
|
+
import { publicIssue } from "./config-issues.js";
|
|
7
9
|
import { login } from "./login.js";
|
|
8
10
|
import { addModelsCommands } from "./models-commands.js";
|
|
9
11
|
import { permissionKeys } from "./permissions.js";
|
|
@@ -31,19 +33,28 @@ const probeKeyring = (keyring) => {
|
|
|
31
33
|
}
|
|
32
34
|
return available ? "available" : "unavailable";
|
|
33
35
|
};
|
|
34
|
-
export const addConfigCommands = (program, { configPath,
|
|
36
|
+
export const addConfigCommands = (program, { configPath, output, warn, named, }) => {
|
|
35
37
|
const cfg = annotate(program.command("config"), { effects: NO_EFFECTS }).description("local Zoom configuration");
|
|
36
38
|
annotate(cfg.command("show"), { effects: LOCAL_READ })
|
|
37
39
|
.description("show local configuration")
|
|
38
40
|
.action(() => {
|
|
39
|
-
|
|
41
|
+
const { config, issues } = inspectConfig(configPath, permissionKeys(program));
|
|
42
|
+
output(itemOf(config));
|
|
43
|
+
for (const issue of issues)
|
|
44
|
+
warn(`${issue.what}, so it is left out${issue.fix ? ` — \`${issue.fix}\` removes it` : ""}`);
|
|
40
45
|
});
|
|
41
46
|
grantsAuthority(annotate(cfg.command("set"), { effects: LOCAL_WRITE }))
|
|
42
47
|
.description("set a configuration value")
|
|
43
48
|
.argument("<key>", "setting name, such as zoom.client_id")
|
|
44
49
|
.argument("<value>", "new value")
|
|
45
50
|
.action((key, value) => {
|
|
46
|
-
output(itemOf(setConfig(configPath, key, value,
|
|
51
|
+
output(itemOf(setConfig(configPath, key, value, named, permissionKeys(program))));
|
|
52
|
+
});
|
|
53
|
+
grantsAuthority(annotate(cfg.command("unset"), { effects: LOCAL_WRITE, examples: ["zm config unset files.folder"] }))
|
|
54
|
+
.description("remove a setting, or a part of the file doctor reports a problem in")
|
|
55
|
+
.argument("<key>", "setting name, such as files.folder, or the key a doctor fix names")
|
|
56
|
+
.action((key) => {
|
|
57
|
+
output(itemOf(unsetConfig(configPath, key, named(), permissionKeys(program))));
|
|
47
58
|
});
|
|
48
59
|
};
|
|
49
60
|
/** The shared discovery, doctor and session status commands, plus Zoom's browser login. */
|
|
@@ -54,29 +65,21 @@ export const addSessionCommands = (program, context) => {
|
|
|
54
65
|
raw: buffer,
|
|
55
66
|
doctor: () => {
|
|
56
67
|
const keyring = probeKeyring(deps.tokens.options.keyring);
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (!isCliError(error))
|
|
63
|
-
throw error;
|
|
64
|
-
return {
|
|
65
|
-
version: VERSION,
|
|
66
|
-
runtime: { node: process.versions.node },
|
|
67
|
-
config: { readable: false, path: deps.configPath, error: error.message },
|
|
68
|
-
profiles: null,
|
|
69
|
-
authentication: { configured: null, state: "not_checked", keyring },
|
|
70
|
-
database: "not_checked",
|
|
71
|
-
};
|
|
72
|
-
}
|
|
68
|
+
const { found, issues, config } = inspectConfig(deps.configPath, permissionKeys(program));
|
|
69
|
+
const files = privateFiles({ files: [deps.configPath], dirs: [dirname(deps.configPath)] });
|
|
70
|
+
if (files.checked)
|
|
71
|
+
for (const { fix } of files.problems)
|
|
72
|
+
deps.diagnostic(`to make it private: ${fix}`);
|
|
73
73
|
return {
|
|
74
74
|
version: VERSION,
|
|
75
75
|
runtime: { node: process.versions.node },
|
|
76
|
-
config: {
|
|
76
|
+
config: { path: deps.configPath, found, issues: issues.map(publicIssue) },
|
|
77
77
|
profiles: config.profiles,
|
|
78
78
|
authentication: { configured: config.clientId !== null, state: "not_checked", keyring },
|
|
79
79
|
database: "not_checked",
|
|
80
|
+
files: files.checked
|
|
81
|
+
? { ...files, problems: files.problems.map(({ path, mode, want }) => ({ path, mode, want })) }
|
|
82
|
+
: files,
|
|
80
83
|
};
|
|
81
84
|
},
|
|
82
85
|
sessionStatus: async (check) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-commands.js","sourceRoot":"","sources":["../src/setup-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-commands.js","sourceRoot":"","sources":["../src/setup-commands.ts"],"names":[],"mappings":"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"}
|
package/dist/tokens.d.ts
CHANGED
|
@@ -9,8 +9,6 @@ export interface TokenOptions {
|
|
|
9
9
|
clientId: string;
|
|
10
10
|
/** The keyring account the login lives under; the client id when unset. */
|
|
11
11
|
account?: string;
|
|
12
|
-
/** Where a login saved before profiles were words lives, read once and moved to `account`. */
|
|
13
|
-
legacyAccount?: string;
|
|
14
12
|
keyring: KeyringStore;
|
|
15
13
|
service: string;
|
|
16
14
|
fetch: typeof fetch;
|
|
@@ -26,7 +24,7 @@ export declare class TokenManager {
|
|
|
26
24
|
private refreshState;
|
|
27
25
|
constructor(options: TokenOptions);
|
|
28
26
|
/** The login of one profile: `<client id>:<profile>` in the keyring. */
|
|
29
|
-
forProfile(profile: string
|
|
27
|
+
forProfile(profile: string): TokenManager;
|
|
30
28
|
withSignal(signal?: AbortSignal, fetcher?: typeof fetch): TokenManager;
|
|
31
29
|
private accountOf;
|
|
32
30
|
private read;
|
package/dist/tokens.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI7D,MAAM,WAAW,MAAM;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AACD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI7D,MAAM,WAAW,MAAM;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AACD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,YAAY,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,OAAO,KAAK,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AACD,oGAAoG;AACpG,eAAO,MAAM,eAAe,YAAI,SAAS,EAAE,OAAO,EAAE,KAAK,CAAU,CAAA;AACnE,eAAO,MAAM,eAAe,wBAAwB,CAAA;AAKpD,qBAAa,YAAY;IAEX,QAAQ,CAAC,OAAO,EAAE,YAAY;IAD1C,OAAO,CAAC,YAAY,CAAqC;IACzD,YAAqB,OAAO,EAAE,YAAY,EAAI;IAC9C,wEAAwE;IACxE,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAkBxC;IACD,UAAU,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,KAA0B,GAAG,YAAY,CAqBzF;IACD,OAAO,CAAC,SAAS;IAGjB,OAAO,CAAC,IAAI;IAOZ,IAAI,CAAC,OAAO,SAAmB,GAAG,MAAM,GAAG,IAAI,CA0B9C;IACD,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAmB,GAAG,IAAI,CAMrD;IACK,QAAQ,CACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,SAAwB,EAChC,OAAO,SAAmC,GACzC,OAAO,CAAC,MAAM,CAAC,CAgFjB;IACK,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAsB9B;CACF"}
|
package/dist/tokens.js
CHANGED
|
@@ -13,7 +13,7 @@ export class TokenManager {
|
|
|
13
13
|
this.options = options;
|
|
14
14
|
}
|
|
15
15
|
/** The login of one profile: `<client id>:<profile>` in the keyring. */
|
|
16
|
-
forProfile(profile
|
|
16
|
+
forProfile(profile) {
|
|
17
17
|
const parent = this.options;
|
|
18
18
|
const scoped = new TokenManager({
|
|
19
19
|
get clientId() {
|
|
@@ -22,9 +22,6 @@ export class TokenManager {
|
|
|
22
22
|
get account() {
|
|
23
23
|
return `${parent.clientId}:${profile}`;
|
|
24
24
|
},
|
|
25
|
-
get legacyAccount() {
|
|
26
|
-
return profile === legacyProfile ? parent.clientId : undefined;
|
|
27
|
-
},
|
|
28
25
|
keyring: parent.keyring,
|
|
29
26
|
service: parent.service,
|
|
30
27
|
fetch: parent.fetch,
|
|
@@ -39,7 +36,7 @@ export class TokenManager {
|
|
|
39
36
|
const parent = this.options;
|
|
40
37
|
// The account is built from the client id, so both are fixed together on first use.
|
|
41
38
|
let login;
|
|
42
|
-
const pinned = () => (login ??= { clientId: parent.clientId, account: parent.account
|
|
39
|
+
const pinned = () => (login ??= { clientId: parent.clientId, account: parent.account });
|
|
43
40
|
const scoped = new TokenManager({
|
|
44
41
|
get clientId() {
|
|
45
42
|
return pinned().clientId;
|
|
@@ -47,9 +44,6 @@ export class TokenManager {
|
|
|
47
44
|
get account() {
|
|
48
45
|
return pinned().account;
|
|
49
46
|
},
|
|
50
|
-
get legacyAccount() {
|
|
51
|
-
return pinned().legacyAccount;
|
|
52
|
-
},
|
|
53
47
|
keyring: parent.keyring,
|
|
54
48
|
service: parent.service,
|
|
55
49
|
fetch: fetcher,
|
|
@@ -72,13 +66,7 @@ export class TokenManager {
|
|
|
72
66
|
}
|
|
73
67
|
}
|
|
74
68
|
load(account = this.accountOf()) {
|
|
75
|
-
|
|
76
|
-
const legacy = account === this.options.account ? this.options.legacyAccount : undefined;
|
|
77
|
-
let moved = false;
|
|
78
|
-
if (!saved && legacy) {
|
|
79
|
-
saved = this.read(legacy);
|
|
80
|
-
moved = saved !== null;
|
|
81
|
-
}
|
|
69
|
+
const saved = this.read(account);
|
|
82
70
|
if (!saved)
|
|
83
71
|
return null;
|
|
84
72
|
try {
|
|
@@ -92,15 +80,12 @@ export class TokenManager {
|
|
|
92
80
|
!Array.isArray(value.scopes) ||
|
|
93
81
|
!value.scopes.every((s) => typeof s === "string"))
|
|
94
82
|
throw new Error("invalid token entry");
|
|
95
|
-
|
|
83
|
+
return {
|
|
96
84
|
accessToken: value.accessToken,
|
|
97
85
|
refreshToken: value.refreshToken,
|
|
98
86
|
expiresAt: value.expiresAt,
|
|
99
87
|
scopes: value.scopes,
|
|
100
88
|
};
|
|
101
|
-
if (moved)
|
|
102
|
-
this.save(tokens, account);
|
|
103
|
-
return tokens;
|
|
104
89
|
}
|
|
105
90
|
catch (error) {
|
|
106
91
|
if (isCliError(error) && error.code === "configuration_error")
|
package/dist/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.47.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = "0.
|
|
1
|
+
export const VERSION = "0.47.0";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wirecat/zoom-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.47.0",
|
|
4
4
|
"description": "Zoom cloud recording archives, persistent transcripts and meeting tools",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"engines": {
|
|
8
8
|
"node": "^22.16.0 || >=24"
|
|
9
9
|
},
|
|
10
|
-
"packageManager": "pnpm@11.
|
|
10
|
+
"packageManager": "pnpm@11.28.8",
|
|
11
11
|
"repository": {
|
|
12
12
|
"type": "git",
|
|
13
13
|
"url": "git+https://github.com/WireCatLabs/zoom-cli.git"
|
|
@@ -57,26 +57,26 @@
|
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@modelcontextprotocol/server": "2.3.0",
|
|
60
|
-
"@wirecat/cli-base": "0.
|
|
61
|
-
"@wirecat/cli-core": "0.
|
|
60
|
+
"@wirecat/cli-base": "0.57.0",
|
|
61
|
+
"@wirecat/cli-core": "0.430.0",
|
|
62
62
|
"commander": "15.0.0",
|
|
63
63
|
"valibot": "1.5.0"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@biomejs/biome": "2.
|
|
67
|
-
"@cspell/dict-en-gb": "5.0.
|
|
66
|
+
"@biomejs/biome": "2.6.3",
|
|
67
|
+
"@cspell/dict-en-gb": "5.0.38",
|
|
68
68
|
"@cspell/dict-es-es": "3.0.9",
|
|
69
|
-
"@cspell/dict-ru_ru": "2.3.
|
|
70
|
-
"@modelcontextprotocol/client": "2.
|
|
69
|
+
"@cspell/dict-ru_ru": "2.3.4",
|
|
70
|
+
"@modelcontextprotocol/client": "2.4.0",
|
|
71
71
|
"@types/node": "^22.20.5",
|
|
72
|
-
"@vitest/coverage-v8": "^5.0.
|
|
73
|
-
"@wirecat/cli-testing": "0.5.
|
|
74
|
-
"cspell": "10.
|
|
75
|
-
"lefthook": "2.
|
|
76
|
-
"markdownlint-cli2": "0.
|
|
77
|
-
"rumdl": "^0.
|
|
72
|
+
"@vitest/coverage-v8": "^5.0.5",
|
|
73
|
+
"@wirecat/cli-testing": "0.5.3",
|
|
74
|
+
"cspell": "10.4.0",
|
|
75
|
+
"lefthook": "2.2.2",
|
|
76
|
+
"markdownlint-cli2": "0.24.0",
|
|
77
|
+
"rumdl": "^0.3.0",
|
|
78
78
|
"typescript": "^7.0.2",
|
|
79
|
-
"vitest": "^5.0.
|
|
79
|
+
"vitest": "^5.0.5"
|
|
80
80
|
},
|
|
81
81
|
"publishConfig": {
|
|
82
82
|
"access": "public"
|
package/dist/run-recording.d.ts
DELETED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { type RenderFormat } from "@wirecat/cli-base";
|
|
2
|
-
import { type BaseEnvironment } from "@wirecat/cli-core/cli";
|
|
3
|
-
import type { Command } from "commander";
|
|
4
|
-
import type { ZoomConfig } from "./config.js";
|
|
5
|
-
export interface RunSettings {
|
|
6
|
-
record: boolean;
|
|
7
|
-
keepFailedRuns: boolean;
|
|
8
|
-
keepRunsForDays: number;
|
|
9
|
-
}
|
|
10
|
-
/** `--record`/`--no-record` first, then the config; a failure is kept unless either says no. */
|
|
11
|
-
export declare const runSettings: (flag: boolean | undefined, config?: Pick<ZoomConfig, "record" | "keepRunsForDays">) => RunSettings;
|
|
12
|
-
/**
|
|
13
|
-
* `GET /v2/users/:id/recordings`: the method and the path's fixed words. A segment that is not one — a meeting
|
|
14
|
-
* id, a uuid, an email, a download token — becomes `:id`, and the host and query are dropped.
|
|
15
|
-
*/
|
|
16
|
-
export declare const operationOf: (method: string, url: string) => string;
|
|
17
|
-
export interface CommandRuns {
|
|
18
|
-
start(action: Command, environment: BaseEnvironment, settings: RunSettings, profile: string): void;
|
|
19
|
-
succeed(): Promise<void>;
|
|
20
|
-
fail(error: unknown): Promise<void>;
|
|
21
|
-
/** The id the command's run has, kept or not, so its answer can name it. */
|
|
22
|
-
runId(): string | undefined;
|
|
23
|
-
/** A fetch that logs each request's operation, status and duration into the command's run — never its content. */
|
|
24
|
-
observe(fetcher: typeof fetch): typeof fetch;
|
|
25
|
-
}
|
|
26
|
-
export declare const commandRuns: (format: () => RenderFormat) => CommandRuns;
|
|
27
|
-
//# sourceMappingURL=run-recording.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"run-recording.d.ts","sourceRoot":"","sources":["../src/run-recording.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAA;IACf,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,gGAAgG;AAChG,eAAO,MAAM,WAAW,SAChB,OAAO,GAAG,SAAS,WAChB,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,iBAAiB,CAAC,KACtD,WAOF,CAAA;AAID;;;GAGG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,OAAO,MAAM,KAAG,MAiBzD,CAAA;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAClG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACxB,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnC,4EAA4E;IAC5E,KAAK,IAAI,MAAM,GAAG,SAAS,CAAA;IAC3B,kHAAkH;IAClH,OAAO,CAAC,OAAO,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,CAAA;CAC7C;AAQD,eAAO,MAAM,WAAW,WAAY,MAAM,YAAY,KAAG,WA2DxD,CAAA"}
|
package/dist/run-recording.js
DELETED
|
@@ -1,106 +0,0 @@
|
|
|
1
|
-
import { isCliError } from "@wirecat/cli-base";
|
|
2
|
-
import { KEEP_RUNS_FOR_DAYS, startRecording, } from "@wirecat/cli-core/cli";
|
|
3
|
-
import { ZM } from "./read-only.js";
|
|
4
|
-
/** `--record`/`--no-record` first, then the config; a failure is kept unless either says no. */
|
|
5
|
-
export const runSettings = (flag, config) => {
|
|
6
|
-
const record = flag ?? config?.record ?? false;
|
|
7
|
-
return {
|
|
8
|
-
record,
|
|
9
|
-
keepFailedRuns: record || (flag !== false && config?.record !== false),
|
|
10
|
-
keepRunsForDays: config?.keepRunsForDays ?? KEEP_RUNS_FOR_DAYS,
|
|
11
|
-
};
|
|
12
|
-
};
|
|
13
|
-
const SEGMENT = /^(?:v\d+|[a-z][a-z_]{0,23})$/;
|
|
14
|
-
/**
|
|
15
|
-
* `GET /v2/users/:id/recordings`: the method and the path's fixed words. A segment that is not one — a meeting
|
|
16
|
-
* id, a uuid, an email, a download token — becomes `:id`, and the host and query are dropped.
|
|
17
|
-
*/
|
|
18
|
-
export const operationOf = (method, url) => {
|
|
19
|
-
let path;
|
|
20
|
-
try {
|
|
21
|
-
path = new URL(url).pathname;
|
|
22
|
-
}
|
|
23
|
-
catch {
|
|
24
|
-
return `${method.toUpperCase()} :url`;
|
|
25
|
-
}
|
|
26
|
-
const words = path
|
|
27
|
-
.split("/")
|
|
28
|
-
.filter(Boolean)
|
|
29
|
-
.map((segment) => {
|
|
30
|
-
const [head = "", verb] = segment.split(":");
|
|
31
|
-
const base = SEGMENT.test(head) ? head : ":id";
|
|
32
|
-
if (verb === undefined)
|
|
33
|
-
return base;
|
|
34
|
-
return SEGMENT.test(verb) ? `${base}:${verb}` : base;
|
|
35
|
-
});
|
|
36
|
-
return `${method.toUpperCase()} /${words.join("/")}`;
|
|
37
|
-
};
|
|
38
|
-
const commandWords = (action) => {
|
|
39
|
-
const words = [];
|
|
40
|
-
for (let at = action; at?.parent; at = at.parent)
|
|
41
|
-
words.unshift(at.name());
|
|
42
|
-
return words;
|
|
43
|
-
};
|
|
44
|
-
export const commandRuns = (format) => {
|
|
45
|
-
let recording;
|
|
46
|
-
const event = (value) => recording?.events(value);
|
|
47
|
-
return {
|
|
48
|
-
start(action, environment, settings, profile) {
|
|
49
|
-
const words = commandWords(action);
|
|
50
|
-
// Reading the log is not worth a run of its own, as in cli-core's `runs`.
|
|
51
|
-
if (words[0] === "runs")
|
|
52
|
-
return;
|
|
53
|
-
const command = `${environment.agent ? "mcp " : ""}${words.join(" ")}`;
|
|
54
|
-
recording = startRecording({
|
|
55
|
-
app: ZM,
|
|
56
|
-
command,
|
|
57
|
-
profile,
|
|
58
|
-
record: settings.record,
|
|
59
|
-
keepFailed: settings.keepFailedRuns,
|
|
60
|
-
keepDays: settings.keepRunsForDays,
|
|
61
|
-
trace: false,
|
|
62
|
-
format: format() === "pretty" ? "pretty" : "json",
|
|
63
|
-
...(environment.streams ? { streams: environment.streams } : {}),
|
|
64
|
-
...(environment.env ? { env: environment.env } : {}),
|
|
65
|
-
});
|
|
66
|
-
},
|
|
67
|
-
runId: () => recording?.runId,
|
|
68
|
-
async succeed() {
|
|
69
|
-
const done = recording;
|
|
70
|
-
recording = undefined;
|
|
71
|
-
await done?.succeed();
|
|
72
|
-
},
|
|
73
|
-
async fail(error) {
|
|
74
|
-
const done = recording;
|
|
75
|
-
recording = undefined;
|
|
76
|
-
await done?.fail(error);
|
|
77
|
-
},
|
|
78
|
-
observe: (fetcher) => async (input, init) => {
|
|
79
|
-
const operation = operationOf(init?.method ?? "GET", input instanceof Request ? input.url : String(input));
|
|
80
|
-
const started = Date.now();
|
|
81
|
-
event({ event: "request", operation });
|
|
82
|
-
try {
|
|
83
|
-
const response = await fetcher(input, init);
|
|
84
|
-
event({
|
|
85
|
-
event: "response",
|
|
86
|
-
operation,
|
|
87
|
-
status: response.status,
|
|
88
|
-
durationMs: Date.now() - started,
|
|
89
|
-
outcome: response.status < 400 ? "ok" : "error",
|
|
90
|
-
});
|
|
91
|
-
return response;
|
|
92
|
-
}
|
|
93
|
-
catch (error) {
|
|
94
|
-
event({
|
|
95
|
-
event: "response",
|
|
96
|
-
operation,
|
|
97
|
-
durationMs: Date.now() - started,
|
|
98
|
-
outcome: "error",
|
|
99
|
-
errorCode: isCliError(error) ? error.code : "network_error",
|
|
100
|
-
});
|
|
101
|
-
throw error;
|
|
102
|
-
}
|
|
103
|
-
},
|
|
104
|
-
};
|
|
105
|
-
};
|
|
106
|
-
//# sourceMappingURL=run-recording.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"run-recording.js","sourceRoot":"","sources":["../src/run-recording.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAEL,kBAAkB,EAGlB,cAAc,GACf,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAQnC,gGAAgG;AAChG,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAyB,EACzB,MAAuD,EAC1C,EAAE;IACf,MAAM,MAAM,GAAG,IAAI,IAAI,MAAM,EAAE,MAAM,IAAI,KAAK,CAAA;IAC9C,OAAO;QACL,MAAM;QACN,cAAc,EAAE,MAAM,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,KAAK,CAAC;QACtE,eAAe,EAAE,MAAM,EAAE,eAAe,IAAI,kBAAkB;KAC/D,CAAA;AACH,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,8BAA8B,CAAA;AAE9C;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,GAAW,EAAU,EAAE;IACjE,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,OAAO,CAAA;IACvC,CAAC;IACD,MAAM,KAAK,GAAG,IAAI;SACf,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;QAC9C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAA;QACnC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtD,CAAC,CAAC,CAAA;IACJ,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AACtD,CAAC,CAAA;AAYD,MAAM,YAAY,GAAG,CAAC,MAAe,EAAY,EAAE;IACjD,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,IAAI,EAAE,GAAmB,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM;QAAE,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;IAC1F,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAA0B,EAAe,EAAE;IACrE,IAAI,SAAgC,CAAA;IACpC,MAAM,KAAK,GAAG,CAAC,KAAmB,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;IAC/D,OAAO;QACL,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO;YAC1C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;YAClC,0EAA0E;YAC1E,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM;gBAAE,OAAM;YAC/B,MAAM,OAAO,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;YACtE,SAAS,GAAG,cAAc,CAAC;gBACzB,GAAG,EAAE,EAAE;gBACP,OAAO;gBACP,OAAO;gBACP,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,UAAU,EAAE,QAAQ,CAAC,cAAc;gBACnC,QAAQ,EAAE,QAAQ,CAAC,eAAe;gBAClC,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,MAAM,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;gBACjD,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrD,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,KAAK;QAC7B,KAAK,CAAC,OAAO;YACX,MAAM,IAAI,GAAG,SAAS,CAAA;YACtB,SAAS,GAAG,SAAS,CAAA;YACrB,MAAM,IAAI,EAAE,OAAO,EAAE,CAAA;QACvB,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK;YACd,MAAM,IAAI,GAAG,SAAS,CAAA;YACtB,SAAS,GAAG,SAAS,CAAA;YACrB,MAAM,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,EAAE,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;YAC1G,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC1B,KAAK,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAA;YACtC,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAC3C,KAAK,CAAC;oBACJ,KAAK,EAAE,UAAU;oBACjB,SAAS;oBACT,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;oBAChC,OAAO,EAAE,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;iBAChD,CAAC,CAAA;gBACF,OAAO,QAAQ,CAAA;YACjB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,KAAK,CAAC;oBACJ,KAAK,EAAE,UAAU;oBACjB,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;oBAChC,OAAO,EAAE,OAAO;oBAChB,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe;iBAC5D,CAAC,CAAA;gBACF,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}
|