@microsoft/teamsfx-core 2.0.15-rc.3 → 2.0.16-alpha.84bf1cf45.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/build/client/graphAPIClient.d.ts +18 -0
- package/build/client/graphAPIClient.d.ts.map +1 -0
- package/build/client/graphAPIClient.js +96 -0
- package/build/client/graphAPIClient.js.map +1 -0
- package/build/common/featureFlags.d.ts +5 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -0
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/templates-config.json +3 -3
- package/build/common/wrappedAxiosClient.d.ts +2 -0
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +14 -1
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +2 -2
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +2 -0
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +9 -5
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts +3 -2
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +9 -2
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/update.d.ts +2 -0
- package/build/component/driver/apiKey/update.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +8 -2
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.d.ts +2 -2
- package/build/component/driver/apiKey/utility/utility.d.ts.map +1 -1
- package/build/component/driver/apiKey/utility/utility.js +1 -3
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/devTool/httpClient.d.ts +14 -0
- package/build/component/driver/devTool/httpClient.d.ts.map +1 -0
- package/build/component/driver/devTool/httpClient.js +62 -0
- package/build/component/driver/devTool/httpClient.js.map +1 -0
- package/build/component/driver/devTool/installDriver.d.ts +5 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +33 -0
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +7 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
- package/build/component/driver/devTool/nodeInstaller.d.ts +47 -0
- package/build/component/driver/devTool/nodeInstaller.d.ts.map +1 -0
- package/build/component/driver/devTool/nodeInstaller.js +330 -0
- package/build/component/driver/devTool/nodeInstaller.js.map +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +20 -21
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +19 -3
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/typeSpec/compile.d.ts +1 -0
- package/build/component/driver/typeSpec/compile.d.ts.map +1 -1
- package/build/component/driver/typeSpec/compile.js +52 -29
- package/build/component/driver/typeSpec/compile.js.map +1 -1
- package/build/component/driver/typeSpec/constants.d.ts +0 -1
- package/build/component/driver/typeSpec/constants.d.ts.map +1 -1
- package/build/component/driver/typeSpec/constants.js +1 -2
- package/build/component/driver/typeSpec/constants.js.map +1 -1
- package/build/component/driver/typeSpec/interface/typeSpecCompileArgs.d.ts +2 -0
- package/build/component/driver/typeSpec/interface/typeSpecCompileArgs.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.d.ts +1 -0
- package/build/component/generator/declarativeAgent/generator.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.js +63 -4
- package/build/component/generator/declarativeAgent/generator.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +3 -0
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.js +11 -0
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.js.map +1 -1
- package/build/component/generator/templates/metadata/da.d.ts.map +1 -1
- package/build/component/generator/templates/metadata/da.js +12 -0
- package/build/component/generator/templates/metadata/da.js.map +1 -1
- package/build/component/generator/templates/metadata/special.js +4 -4
- package/build/component/generator/templates/metadata/special.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +3 -0
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/m365/serviceConstant.d.ts +6 -0
- package/build/component/m365/serviceConstant.d.ts.map +1 -1
- package/build/component/m365/serviceConstant.js +63 -1
- package/build/component/m365/serviceConstant.js.map +1 -1
- package/build/core/FxCore.d.ts +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +1 -1
- package/build/core/FxCore.js.map +1 -1
- package/build/error/depCheck.d.ts +3 -0
- package/build/error/depCheck.d.ts.map +1 -1
- package/build/error/depCheck.js +15 -1
- package/build/error/depCheck.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +1 -0
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +8 -0
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +5 -3
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -1
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +3 -3
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/AddKnowledgeInputs.d.ts +1 -1
- package/build/question/inputs/AddKnowledgeInputs.d.ts.map +1 -1
- package/build/question/options/AddKnowledgeOptions.d.ts.map +1 -1
- package/build/question/options/AddKnowledgeOptions.js +5 -2
- package/build/question/options/AddKnowledgeOptions.js.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.d.ts +2 -2
- package/build/question/scaffold/vsc/createFromTdpNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js +9 -6
- package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.d.ts +2 -2
- package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.js +9 -8
- package/build/question/scaffold/vsc/createRootNode.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -5
- package/resource/package.nls.cs.json +50 -37
- package/resource/package.nls.de.json +50 -37
- package/resource/package.nls.es.json +50 -37
- package/resource/package.nls.fr.json +50 -37
- package/resource/package.nls.it.json +50 -37
- package/resource/package.nls.ja.json +50 -37
- package/resource/package.nls.json +27 -3
- package/resource/package.nls.ko.json +50 -37
- package/resource/package.nls.pl.json +50 -37
- package/resource/package.nls.pt-BR.json +50 -37
- package/resource/package.nls.ru.json +50 -37
- package/resource/package.nls.tr.json +50 -37
- package/resource/package.nls.zh-Hans.json +50 -37
- package/resource/package.nls.zh-Hant.json +50 -37
- package/resource/yaml-schema/v1.8/yaml.schema.json +13 -1
- package/resource/yaml-schema/yaml.schema.json +13 -1
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/component/driver/typeSpec/error/noActionError.d.ts +0 -5
- package/build/component/driver/typeSpec/error/noActionError.d.ts.map +0 -1
- package/build/component/driver/typeSpec/error/noActionError.js +0 -21
- package/build/component/driver/typeSpec/error/noActionError.js.map +0 -1
|
@@ -0,0 +1,330 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.nodejsInstaller = exports.NodejsInstaller = exports.NodejsMirrors = exports.ComponentName = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
// Copyright (c) Microsoft Corporation.
|
|
6
|
+
// Licensed under the MIT license.
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
9
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
10
|
+
const linkedom_1 = require("linkedom");
|
|
11
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
12
|
+
const path = tslib_1.__importStar(require("path"));
|
|
13
|
+
const tar_1 = require("tar");
|
|
14
|
+
const error_1 = require("../../../error");
|
|
15
|
+
const nodeChecker_1 = require("../../deps-checker/internal/nodeChecker");
|
|
16
|
+
const httpClient_1 = require("./httpClient");
|
|
17
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
18
|
+
const stream_1 = tslib_1.__importDefault(require("stream"));
|
|
19
|
+
const Handlebars = tslib_1.__importStar(require("handlebars"));
|
|
20
|
+
exports.ComponentName = "NodeInstaller";
|
|
21
|
+
exports.NodejsMirrors = [
|
|
22
|
+
{
|
|
23
|
+
name: "NPM",
|
|
24
|
+
url: "https://registry.npmmirror.com/-/binary/node/",
|
|
25
|
+
indexJsonUrl: "https://cdn.npmmirror.com/binaries/node/index.json",
|
|
26
|
+
packageUrlTpl: Handlebars.compile("https://cdn.npmmirror.com/binaries/node/{{version}}/node-{{version}}-{{name}}{{ext}}"),
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
name: "Official",
|
|
30
|
+
url: "https://nodejs.org/dist/",
|
|
31
|
+
indexJsonUrl: "https://nodejs.org/dist/index.json",
|
|
32
|
+
packageUrlTpl: Handlebars.compile("https://nodejs.org/dist/{{version}}/node-{{version}}-{{name}}{{ext}}"),
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
name: "Tencent",
|
|
36
|
+
url: "https://mirrors.cloud.tencent.com/nodejs-release/",
|
|
37
|
+
indexJsonUrl: "https://mirrors.cloud.tencent.com/nodejs-release/index.json",
|
|
38
|
+
packageUrlTpl: Handlebars.compile("https://mirrors.cloud.tencent.com/nodejs-release/{{version}}/node-{{version}}-{{name}}{{ext}}"),
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
name: "Aliyun",
|
|
42
|
+
url: "https://mirrors.aliyun.com/nodejs-release/",
|
|
43
|
+
indexJsonUrl: "https://mirrors.aliyun.com/nodejs-release/index.json",
|
|
44
|
+
packageUrlTpl: Handlebars.compile("https://mirrors.aliyun.com/nodejs-release/{{version}}/node-{{version}}-{{name}}{{ext}}"),
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
class NodejsInstaller {
|
|
48
|
+
getNameAndExt() {
|
|
49
|
+
const platform = os_1.default.platform();
|
|
50
|
+
const arch = os_1.default.arch();
|
|
51
|
+
const osMap = {
|
|
52
|
+
win32: "win",
|
|
53
|
+
darwin: "darwin",
|
|
54
|
+
linux: "linux",
|
|
55
|
+
aix: "aix",
|
|
56
|
+
};
|
|
57
|
+
const archMap = {
|
|
58
|
+
x64: "x64",
|
|
59
|
+
arm64: "arm64",
|
|
60
|
+
arm: "armv7l",
|
|
61
|
+
ppc64: "ppc64le",
|
|
62
|
+
s390x: "s390x",
|
|
63
|
+
};
|
|
64
|
+
const targetOS = osMap[platform] || platform;
|
|
65
|
+
const targetArch = archMap[arch] || arch;
|
|
66
|
+
let extPattern;
|
|
67
|
+
switch (targetOS) {
|
|
68
|
+
case "win":
|
|
69
|
+
extPattern = ".zip"; // Windows zip is preferred
|
|
70
|
+
break;
|
|
71
|
+
case "darwin":
|
|
72
|
+
case "linux":
|
|
73
|
+
extPattern = ".tar.xz"; // macOS/Linux .tar.xz is preferred
|
|
74
|
+
break;
|
|
75
|
+
default:
|
|
76
|
+
extPattern = ".tar.gz";
|
|
77
|
+
}
|
|
78
|
+
return { name: `${targetOS}-${targetArch}`, ext: extPattern };
|
|
79
|
+
}
|
|
80
|
+
getLatestLTSVersion(mirror) {
|
|
81
|
+
const jsonData = mirror.indexJson;
|
|
82
|
+
const ltsVersion = jsonData.find((entry) => entry.lts !== false);
|
|
83
|
+
return ltsVersion === null || ltsVersion === void 0 ? void 0 : ltsVersion.version;
|
|
84
|
+
}
|
|
85
|
+
async fetchJSON(url) {
|
|
86
|
+
try {
|
|
87
|
+
const res = await httpClient_1.httpClient.getText(url);
|
|
88
|
+
return (0, teamsfx_api_1.ok)(JSON.parse(res));
|
|
89
|
+
}
|
|
90
|
+
catch (e) {
|
|
91
|
+
return (0, teamsfx_api_1.err)(new error_1.InstallNodeJSError(e.message));
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
async fetchString(url, timeout) {
|
|
95
|
+
try {
|
|
96
|
+
const res = await httpClient_1.httpClient.getText(url, { timeout: timeout });
|
|
97
|
+
return (0, teamsfx_api_1.ok)(res);
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
return (0, teamsfx_api_1.err)(new error_1.InstallNodeJSError(e.message));
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
resolveUrl(baseUrl, href) {
|
|
104
|
+
return new URL(href, baseUrl).toString();
|
|
105
|
+
}
|
|
106
|
+
async testMirrorSpeed(mirror, osArchName, ext, timeout, logger) {
|
|
107
|
+
try {
|
|
108
|
+
const time1 = Date.now();
|
|
109
|
+
const indexJson = await httpClient_1.httpClient.getText(mirror.indexJsonUrl, { timeout: timeout });
|
|
110
|
+
mirror.indexJson = JSON.parse(indexJson);
|
|
111
|
+
const ltsVersion = exports.nodejsInstaller.getLatestLTSVersion(mirror);
|
|
112
|
+
if (!ltsVersion) {
|
|
113
|
+
return mirror;
|
|
114
|
+
}
|
|
115
|
+
mirror.version = ltsVersion;
|
|
116
|
+
const packageUrl = this.getDownloadUrl(mirror, ltsVersion, osArchName, ext);
|
|
117
|
+
mirror.packageUrl = packageUrl;
|
|
118
|
+
await httpClient_1.httpClient.headTime(packageUrl, { timeout: timeout });
|
|
119
|
+
const time2 = Date.now();
|
|
120
|
+
mirror.time = time2 - time1;
|
|
121
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Mirror: ${mirror.name}, URL: ${packageUrl}, Time: ${mirror.time} ms`);
|
|
122
|
+
}
|
|
123
|
+
catch (e) {
|
|
124
|
+
logger === null || logger === void 0 ? void 0 : logger.error(`Mirror: ${mirror.name}, Error: ${e.message}`);
|
|
125
|
+
}
|
|
126
|
+
return mirror;
|
|
127
|
+
}
|
|
128
|
+
async getBestMirror(osArchName, ext, logger) {
|
|
129
|
+
// const mirror = await this.testMirrorSpeed(FirstPriorityMirror, osArchName, ext, 1000, logger);
|
|
130
|
+
// if (mirror.packageUrl) {
|
|
131
|
+
// return mirror;
|
|
132
|
+
// }
|
|
133
|
+
for (let i = 0; i < 5; ++i) {
|
|
134
|
+
const mirror = await Promise.race(exports.NodejsMirrors.map((mirror) => this.testMirrorSpeed(mirror, osArchName, ext, 1000, logger)));
|
|
135
|
+
if (mirror.packageUrl) {
|
|
136
|
+
return mirror;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return undefined;
|
|
140
|
+
}
|
|
141
|
+
parseHtmlToGetUrl(url, html, pattern) {
|
|
142
|
+
const { document } = (0, linkedom_1.parseHTML)(html);
|
|
143
|
+
const links = [...document.querySelectorAll("a")]
|
|
144
|
+
.map((a) => a.getAttribute("href"))
|
|
145
|
+
.filter((href) => href && href.includes(pattern))
|
|
146
|
+
.map((href) => this.resolveUrl(url, href));
|
|
147
|
+
if (links.length === 0) {
|
|
148
|
+
return undefined;
|
|
149
|
+
}
|
|
150
|
+
return links[0];
|
|
151
|
+
}
|
|
152
|
+
async fetchBinary(url, timeout, onProgress) {
|
|
153
|
+
try {
|
|
154
|
+
const res = await httpClient_1.httpClient.get(url, {
|
|
155
|
+
timeout: timeout,
|
|
156
|
+
progress: (downloaded, total) => {
|
|
157
|
+
if (onProgress) {
|
|
158
|
+
const progress = ((downloaded / total) * 100).toFixed(2);
|
|
159
|
+
onProgress(`download progress: ${progress}%`);
|
|
160
|
+
}
|
|
161
|
+
},
|
|
162
|
+
});
|
|
163
|
+
return (0, teamsfx_api_1.ok)(res);
|
|
164
|
+
}
|
|
165
|
+
catch (e) {
|
|
166
|
+
return (0, teamsfx_api_1.err)(new error_1.InstallNodeJSError(e.message));
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
getAdmZip(buffer) {
|
|
170
|
+
return new adm_zip_1.default(buffer);
|
|
171
|
+
}
|
|
172
|
+
extractZip(buffer, targetDir) {
|
|
173
|
+
const zip = this.getAdmZip(buffer);
|
|
174
|
+
zip.extractAllTo(targetDir, true);
|
|
175
|
+
}
|
|
176
|
+
extractTar(buffer, fileName, targetDir) {
|
|
177
|
+
if (fileName.endsWith(".tar.gz")) {
|
|
178
|
+
const bufferStream = new stream_1.default.PassThrough();
|
|
179
|
+
bufferStream.end(buffer);
|
|
180
|
+
bufferStream.pipe((0, tar_1.extract)({ cwd: targetDir }));
|
|
181
|
+
}
|
|
182
|
+
else if (fileName.endsWith(".tar.xz")) {
|
|
183
|
+
const bufferStream = new stream_1.default.PassThrough();
|
|
184
|
+
bufferStream.end(buffer);
|
|
185
|
+
bufferStream.pipe((0, tar_1.extract)({ cwd: targetDir }));
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
extractPackage(buffer, fileName, targetDir) {
|
|
189
|
+
if (fileName.endsWith(".zip")) {
|
|
190
|
+
this.extractZip(buffer, targetDir);
|
|
191
|
+
}
|
|
192
|
+
else if (fileName.endsWith(".tar.gz") || fileName.endsWith(".tar.xz")) {
|
|
193
|
+
this.extractTar(buffer, fileName, targetDir);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
getDownloadUrl(mirror, version, osArchName, ext) {
|
|
197
|
+
const packageUrl = mirror.packageUrlTpl({
|
|
198
|
+
version: version,
|
|
199
|
+
name: osArchName,
|
|
200
|
+
ext: ext,
|
|
201
|
+
});
|
|
202
|
+
return packageUrl;
|
|
203
|
+
}
|
|
204
|
+
async ensureNodeJS(context, checkSystemInstalled, checkUserFolderInstalled) {
|
|
205
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
206
|
+
const startTime = Date.now();
|
|
207
|
+
const progressBar = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress.title"), 5);
|
|
208
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.start();
|
|
209
|
+
// Checking NodeJS in system environment
|
|
210
|
+
let progressText = (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress1");
|
|
211
|
+
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(progressText);
|
|
212
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(progressText);
|
|
213
|
+
if (checkSystemInstalled) {
|
|
214
|
+
const nodeVersion = await nodeChecker_1.NodeChecker.getInstalledNodeVersion();
|
|
215
|
+
if (nodeVersion !== null) {
|
|
216
|
+
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.InstalledSystem", nodeVersion.version));
|
|
217
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
218
|
+
return (0, teamsfx_api_1.ok)({ status: "ignore" });
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.NotInstalledSystem"));
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
// Checking NodeJS in user folder
|
|
225
|
+
progressText = (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress2");
|
|
226
|
+
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(progressText);
|
|
227
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(progressText);
|
|
228
|
+
const { name, ext } = this.getNameAndExt();
|
|
229
|
+
const downloadDir = path.join(os_1.default.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "nodejs");
|
|
230
|
+
await fs_extra_1.default.ensureDir(downloadDir);
|
|
231
|
+
if (checkUserFolderInstalled) {
|
|
232
|
+
const subFolders = await fs_extra_1.default.readdir(downloadDir);
|
|
233
|
+
const foundFolder = subFolders.find((subFolder) => subFolder.endsWith(name));
|
|
234
|
+
if (foundFolder) {
|
|
235
|
+
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.InstalledUser", path.join(downloadDir, foundFolder)));
|
|
236
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
237
|
+
return (0, teamsfx_api_1.ok)({ status: "ignore", installPath: path.join(downloadDir, foundFolder) });
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
(_g = context.logProvider) === null || _g === void 0 ? void 0 : _g.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.NotInstalledUser", downloadDir));
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
// Testing speed of download mirrors
|
|
244
|
+
progressText = (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress3");
|
|
245
|
+
(_h = context.logProvider) === null || _h === void 0 ? void 0 : _h.info(progressText);
|
|
246
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(progressText);
|
|
247
|
+
const bestMirror = await exports.nodejsInstaller.getBestMirror(name, ext, context.logProvider);
|
|
248
|
+
if (!(bestMirror === null || bestMirror === void 0 ? void 0 : bestMirror.packageUrl) || !(bestMirror === null || bestMirror === void 0 ? void 0 : bestMirror.version)) {
|
|
249
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
250
|
+
return (0, teamsfx_api_1.err)(new error_1.InstallNodeJSError((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.NoMirrorUsable")));
|
|
251
|
+
}
|
|
252
|
+
(_j = context.logProvider) === null || _j === void 0 ? void 0 : _j.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.BestMirror", bestMirror.name, bestMirror.url, bestMirror.time));
|
|
253
|
+
// User confirmation for installation
|
|
254
|
+
const confirmRes = await ((_l = (_k = context.ui) === null || _k === void 0 ? void 0 : _k.confirm) === null || _l === void 0 ? void 0 : _l.call(_k, {
|
|
255
|
+
name: "confirm",
|
|
256
|
+
title: (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Confirm", bestMirror.version),
|
|
257
|
+
}));
|
|
258
|
+
if (confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isErr()) {
|
|
259
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
260
|
+
return (0, teamsfx_api_1.err)(confirmRes.error);
|
|
261
|
+
}
|
|
262
|
+
// Downloading NodeJS package
|
|
263
|
+
progressText = (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress4", bestMirror.packageUrl);
|
|
264
|
+
(_m = context.logProvider) === null || _m === void 0 ? void 0 : _m.info(progressText);
|
|
265
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(progressText);
|
|
266
|
+
const t1 = Date.now();
|
|
267
|
+
const downloadRes = await exports.nodejsInstaller.fetchBinary(bestMirror.packageUrl, undefined, (progress) => { var _a; return void ((_a = progressBar === null || progressBar === void 0 ? void 0 : progressBar.text) === null || _a === void 0 ? void 0 : _a.call(progressBar, progress)); });
|
|
268
|
+
const t2 = Date.now();
|
|
269
|
+
if (downloadRes.isErr()) {
|
|
270
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
271
|
+
return (0, teamsfx_api_1.err)(downloadRes.error);
|
|
272
|
+
}
|
|
273
|
+
const binary = downloadRes.value;
|
|
274
|
+
(_o = context.logProvider) === null || _o === void 0 ? void 0 : _o.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.SuccessDownload", bestMirror.packageUrl, binary.length, t2 - t1));
|
|
275
|
+
// Extracting package
|
|
276
|
+
progressText = (0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.Progress5");
|
|
277
|
+
(_p = context.logProvider) === null || _p === void 0 ? void 0 : _p.info(progressText);
|
|
278
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(progressText);
|
|
279
|
+
exports.nodejsInstaller.extractPackage(binary, bestMirror.packageUrl, downloadDir);
|
|
280
|
+
const t3 = Date.now();
|
|
281
|
+
const targetNodeJSPath = path.join(downloadDir, `node-${bestMirror.version}-${name}`);
|
|
282
|
+
(_q = context.logProvider) === null || _q === void 0 ? void 0 : _q.info((0, localizeUtils_1.getLocalizedString)("action.devTool.nodeInstaller.SuccessExtract", targetNodeJSPath, t3 - t2));
|
|
283
|
+
progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true);
|
|
284
|
+
const totalTime = t3 - startTime;
|
|
285
|
+
return (0, teamsfx_api_1.ok)({ status: "installed", installPath: targetNodeJSPath, totalTime: totalTime });
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
exports.NodejsInstaller = NodejsInstaller;
|
|
289
|
+
exports.nodejsInstaller = new NodejsInstaller();
|
|
290
|
+
// const logProvider = {
|
|
291
|
+
// info: (message: string) => {
|
|
292
|
+
// console.log(message);
|
|
293
|
+
// },
|
|
294
|
+
// debug: (message: string) => {
|
|
295
|
+
// console.debug(message);
|
|
296
|
+
// },
|
|
297
|
+
// error: (message: string) => {
|
|
298
|
+
// console.error(message);
|
|
299
|
+
// },
|
|
300
|
+
// };
|
|
301
|
+
// async function main() {
|
|
302
|
+
// const result = await nodejsInstaller.ensureNodeJS(
|
|
303
|
+
// {
|
|
304
|
+
// logProvider: logProvider,
|
|
305
|
+
// ui: {
|
|
306
|
+
// createProgressBar: (title: string, totalSteps: number) => {
|
|
307
|
+
// return {
|
|
308
|
+
// start: (message?: string) => {
|
|
309
|
+
// console.log(`${title}: ${message || ""}`);
|
|
310
|
+
// },
|
|
311
|
+
// next: (message?: string) => {
|
|
312
|
+
// console.log(`Next step: ${message || ""}`);
|
|
313
|
+
// },
|
|
314
|
+
// end: (success: boolean) => {
|
|
315
|
+
// console.log(`Progress ended. Success: ${success.toString()}`);
|
|
316
|
+
// },
|
|
317
|
+
// text: (message: string) => {
|
|
318
|
+
// process.stdout.write(`Progress: ${message}\r`);
|
|
319
|
+
// },
|
|
320
|
+
// };
|
|
321
|
+
// },
|
|
322
|
+
// },
|
|
323
|
+
// } as any,
|
|
324
|
+
// false,
|
|
325
|
+
// false
|
|
326
|
+
// );
|
|
327
|
+
// console.log(result);
|
|
328
|
+
// }
|
|
329
|
+
// main();
|
|
330
|
+
//# sourceMappingURL=nodeInstaller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodeInstaller.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/nodeInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,IAAI,EAAM,MAAM,wBAAwB,CAAC;AAK3F,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAa9D,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAA+E;IAC1F,QAAQ,CAAC,aAAa,SAAqD;IAG9D,GAAG,CACd,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa3E,OAAO;IA2DrB;;;;;;OAMG;IACG,gCAAgC,CACpC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAuGjC,OAAO,CAAC,YAAY;CAoBrB"}
|
|
@@ -4,21 +4,21 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CreateOrUpdateEnvironmentFileDriver = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const lib_1 = require("@feathersjs/hooks/lib");
|
|
8
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
7
|
const dotenv = tslib_1.__importStar(require("dotenv"));
|
|
10
8
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
11
9
|
const os = tslib_1.__importStar(require("os"));
|
|
12
10
|
const path = tslib_1.__importStar(require("path"));
|
|
13
11
|
const typedi_1 = require("typedi");
|
|
12
|
+
const lib_1 = require("@feathersjs/hooks/lib");
|
|
13
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
14
14
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
15
15
|
const common_1 = require("../../../error/common");
|
|
16
|
-
const question_1 = require("../../../question");
|
|
17
|
-
const constants_1 = require("../../constants");
|
|
18
16
|
const common_2 = require("../../utils/common");
|
|
19
|
-
const
|
|
20
|
-
const constants_2 = require("../aad/utility/constants");
|
|
17
|
+
const constants_1 = require("../aad/utility/constants");
|
|
21
18
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
19
|
+
const pathUtils_1 = require("../../utils/pathUtils");
|
|
20
|
+
const constants_2 = require("../../constants");
|
|
21
|
+
const question_1 = require("../../../question");
|
|
22
22
|
const actionName = "file/createOrUpdateEnvironmentFile";
|
|
23
23
|
const helpLink = "https://aka.ms/teamsfx-actions/file-createOrUpdateEnvironmentFile";
|
|
24
24
|
let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDriver {
|
|
@@ -77,11 +77,11 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
77
77
|
}
|
|
78
78
|
catch (error) {
|
|
79
79
|
if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
|
|
80
|
-
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(
|
|
80
|
+
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
|
|
81
81
|
throw error;
|
|
82
82
|
}
|
|
83
83
|
const message = JSON.stringify(error);
|
|
84
|
-
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(
|
|
84
|
+
(_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
|
|
85
85
|
throw (0, common_1.assembleError)(error, actionName);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -94,8 +94,8 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
94
94
|
*/
|
|
95
95
|
async askForOpenAIEnvironmentVariables(ctx, args, envOutput) {
|
|
96
96
|
const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/;
|
|
97
|
-
if (args.envs[
|
|
98
|
-
const matches = placeHolderReg.exec(args.envs[
|
|
97
|
+
if (args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY]) {
|
|
98
|
+
const matches = placeHolderReg.exec(args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY]);
|
|
99
99
|
if (matches != null && matches.length > 1) {
|
|
100
100
|
const result = await ctx.ui.inputText({
|
|
101
101
|
name: (0, question_1.azureOpenAIKeyQuestion)().name,
|
|
@@ -112,12 +112,12 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
112
112
|
}
|
|
113
113
|
else {
|
|
114
114
|
envOutput.set(matches[1], result.value.result);
|
|
115
|
-
args.envs[
|
|
115
|
+
args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY] = result.value.result;
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
if (args.envs[
|
|
120
|
-
const matches = placeHolderReg.exec(args.envs[
|
|
119
|
+
if (args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT]) {
|
|
120
|
+
const matches = placeHolderReg.exec(args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT]);
|
|
121
121
|
if (matches != null && matches.length > 1) {
|
|
122
122
|
const result = await ctx.ui.inputText({
|
|
123
123
|
name: (0, question_1.azureOpenAIEndpointQuestion)().name,
|
|
@@ -133,12 +133,12 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
133
133
|
}
|
|
134
134
|
else {
|
|
135
135
|
envOutput.set(matches[1], result.value.result);
|
|
136
|
-
args.envs[
|
|
136
|
+
args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT] = result.value.result;
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
|
-
if (args.envs[
|
|
141
|
-
const matches = placeHolderReg.exec(args.envs[
|
|
140
|
+
if (args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME]) {
|
|
141
|
+
const matches = placeHolderReg.exec(args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME]);
|
|
142
142
|
if (matches != null && matches.length > 1) {
|
|
143
143
|
const result = await ctx.ui.inputText({
|
|
144
144
|
name: (0, question_1.azureOpenAIDeploymentNameQuestion)().name,
|
|
@@ -154,17 +154,16 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
154
154
|
}
|
|
155
155
|
else {
|
|
156
156
|
envOutput.set(matches[1], result.value.result);
|
|
157
|
-
args.envs[
|
|
157
|
+
args.envs[constants_2.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME] = result.value.result;
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
-
if (args.envs[
|
|
162
|
-
const matches = placeHolderReg.exec(args.envs[
|
|
161
|
+
if (args.envs[constants_2.OpenAIEnvironmentVariables.OPENAI_API_KEY]) {
|
|
162
|
+
const matches = placeHolderReg.exec(args.envs[constants_2.OpenAIEnvironmentVariables.OPENAI_API_KEY]);
|
|
163
163
|
if (matches != null && matches.length > 1) {
|
|
164
164
|
const result = await ctx.ui.inputText({
|
|
165
165
|
name: (0, question_1.openAIKeyQuestion)().name,
|
|
166
166
|
title: (0, question_1.openAIKeyQuestion)().title,
|
|
167
|
-
password: true,
|
|
168
167
|
validation: (input) => {
|
|
169
168
|
if (input.length < 1) {
|
|
170
169
|
return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIKey.validation");
|
|
@@ -176,7 +175,7 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
|
|
|
176
175
|
}
|
|
177
176
|
else {
|
|
178
177
|
envOutput.set(matches[1], result.value.result);
|
|
179
|
-
args.envs[
|
|
178
|
+
args.envs[constants_2.OpenAIEnvironmentVariables.OPENAI_API_KEY] = result.value.result;
|
|
180
179
|
}
|
|
181
180
|
}
|
|
182
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC
|
|
1
|
+
{"version":3,"file":"createOrUpdateEnvironmentFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { DeclarativeCopilotManifestValidationResult } from "../interfaces/Valida
|
|
|
5
5
|
import { Context } from "vm";
|
|
6
6
|
export declare class CopilotGptManifestUtils {
|
|
7
7
|
readCopilotGptManifestFile(path: string): Promise<Result<DeclarativeCopilotManifestSchema, FxError>>;
|
|
8
|
+
readCopilotGptManifestFileSync(path: string): Result<DeclarativeCopilotManifestSchema, FxError>;
|
|
8
9
|
/**
|
|
9
10
|
* Get Declarative Copilot Manifest with env value filled.
|
|
10
11
|
* @param path path of declaraitve Copilot
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CopilotGptManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":";AAIA,OAAO,EACL,MAAM,EACN,gCAAgC,EAEhC,OAAO,EACP,mBAAmB,EAEnB,QAAQ,EACR,MAAM,EAGN,IAAI,EACJ,gCAAgC,EAGhC,aAAa,EACd,MAAM,wBAAwB,CAAC;AAehC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,0CAA0C,EAAE,MAAM,gCAAgC,CAAC;AAK5F,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,qBAAa,uBAAuB;IACrB,0BAA0B,CACrC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"CopilotGptManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,22 @@ class CopilotGptManifestUtils {
|
|
|
38
38
|
return (0, teamsfx_api_1.err)(new common_1.JSONSyntaxError(path, e, "CopilotGptManifestUtils"));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
+
readCopilotGptManifestFileSync(path) {
|
|
42
|
+
if (!fs_extra_1.default.existsSync(path)) {
|
|
43
|
+
return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("CopilotGptManifestUtils", path));
|
|
44
|
+
}
|
|
45
|
+
// Be compatible with UTF8-BOM encoding
|
|
46
|
+
// Avoid Unexpected token error at JSON.parse()
|
|
47
|
+
let content = fs_extra_1.default.readFileSync(path, { encoding: "utf-8" });
|
|
48
|
+
content = (0, strip_bom_1.default)(content);
|
|
49
|
+
try {
|
|
50
|
+
const manifest = JSON.parse(content);
|
|
51
|
+
return (0, teamsfx_api_1.ok)(manifest);
|
|
52
|
+
}
|
|
53
|
+
catch (e) {
|
|
54
|
+
return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("CopilotGptManifestUtils", path));
|
|
55
|
+
}
|
|
56
|
+
}
|
|
41
57
|
/**
|
|
42
58
|
* Get Declarative Copilot Manifest with env value filled.
|
|
43
59
|
* @param path path of declaraitve Copilot
|
|
@@ -103,14 +119,14 @@ class CopilotGptManifestUtils {
|
|
|
103
119
|
}
|
|
104
120
|
}
|
|
105
121
|
async getManifestPath(teamsManifestPath) {
|
|
106
|
-
var _a, _b, _c;
|
|
122
|
+
var _a, _b, _c, _d, _e;
|
|
107
123
|
const teamsManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
|
|
108
124
|
if (teamsManifestRes.isErr()) {
|
|
109
125
|
return (0, teamsfx_api_1.err)(teamsManifestRes.error);
|
|
110
126
|
}
|
|
111
127
|
const filePath = teamsManifestRes.value.copilotExtensions
|
|
112
|
-
? (_a = teamsManifestRes.value.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0].file
|
|
113
|
-
: (
|
|
128
|
+
? (_b = (_a = teamsManifestRes.value.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.file
|
|
129
|
+
: (_e = (_d = (_c = teamsManifestRes.value.copilotAgents) === null || _c === void 0 ? void 0 : _c.declarativeAgents) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.file;
|
|
114
130
|
if (!filePath) {
|
|
115
131
|
return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("copilotExtensions.declarativeCopilots.file", teamsManifestPath)));
|
|
116
132
|
}
|