@microsoft/teamsfx-core 3.0.11 → 3.0.12-alpha.0a63a75aae.0

package/build/component/m365/packageService.js

@@ -9,6 +9,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const https_1 = tslib_1.__importDefault(require("https"));
 const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
 const globalVars_1 = require("../../common/globalVars");
 const localizeUtils_1 = require("../../common/localizeUtils");
@@ -28,7 +29,7 @@ var AppScope;
     AppScope["Personal"] = "Personal";
     AppScope["Shared"] = "Shared";
     AppScope["Tenant"] = "Tenant";
-})(AppScope = exports.AppScope || (exports.AppScope = {}));
+})(AppScope || (exports.AppScope = AppScope = {}));
 exports.AgentPermission = {
     name: "Agent",
     owner: "Owner",
@@ -36,21 +37,41 @@ exports.AgentPermission = {
 };
 // Call m365 service for package CRUD
 class PackageService {
+    static sharedInstance;
+    axiosInstance;
+    initEndpoint;
+    logger;
+    static GetSharedInstance() {
+        if (!PackageService.sharedInstance) {
+            PackageService.sharedInstance = new PackageService((0, constants_2.getResourceServiceEndpoint)(constants_2.ResourceServiceType.MOS3), globalVars_1.TOOLS.logProvider);
+        }
+        return PackageService.sharedInstance;
+    }
     constructor(endpoint, logger) {
         this.axiosInstance = wrappedAxiosClient_1.WrappedAxiosClient.create({
             timeout: 30000,
+            httpsAgent: new https_1.default.Agent({ keepAlive: true }),
         });
         this.initEndpoint = endpoint;
         this.logger = logger;
     }
-    static GetSharedInstance() {
-        if (!PackageService.sharedInstance) {
-            PackageService.sharedInstance = new PackageService((0, constants_2.getResourceServiceEndpoint)(constants_2.ResourceServiceType.MOS3), globalVars_1.TOOLS.logProvider);
+    async withNetworkRetry(fn, retries = 3) {
+        for (let i = 0; i < retries; i++) {
+            try {
+                return await fn();
+            }
+            catch (e) {
+                // Only retry on network/TLS errors (no HTTP response means transport-level failure)
+                if (e.response || i === retries - 1) {
+                    throw e;
+                }
+                this.logger?.warning(`Request failed with ${e.code ?? e.message}, retrying (${i + 1}/${retries})...`);
+                await (0, utils_1.waitSeconds)(1);
+            }
         }
-        return PackageService.sharedInstance;
+        throw new Error("Unexpected: retry loop exited");
     }
     async getTitleServiceUrl(token) {
-        var _a, _b;
         try {
             try {
                 new URL(this.initEndpoint);
@@ -58,23 +79,22 @@ class PackageService {
             catch (_) {
                 throw new Error("Invalid URL. Mis-configuration SIDELOADING_SERVICE_ENDPOINT.");
             }
-            const envInfo = await this.axiosInstance.get("/config/v1/environment", {
+            const envInfo = await this.withNetworkRetry(() => this.axiosInstance.get("/config/v1/environment", {
                 baseURL: this.initEndpoint,
                 headers: {
                     Authorization: `Bearer ${token}`,
                 },
-            });
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(JSON.stringify(envInfo.data));
+            }));
+            this.logger?.debug(JSON.stringify(envInfo.data));
             new URL(envInfo.data.titlesServiceUrl);
             return envInfo.data.titlesServiceUrl;
         }
         catch (error) {
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.error(`Get ServiceUrl failed. ${error.message}`);
+            this.logger?.error(`Get ServiceUrl failed. ${error.message}`);
             throw error;
         }
     }
     async sideLoadXmlManifest(token, manifestPath) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             const data = await fs_extra_1.default.readFile(manifestPath);
             const content = new form_data_1.default();
@@ -91,27 +111,27 @@ class PackageService {
             if (uploadResponse.status === 200) {
                 const titleId = uploadResponse.data.titleId;
                 const appId = uploadResponse.data.appId;
-                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`TitleId: ${titleId}`);
-                (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(`AppId: ${appId}`);
-                (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Sideloading done.");
+                this.logger?.info(`TitleId: ${titleId}`);
+                this.logger?.info(`AppId: ${appId}`);
+                this.logger?.verbose("Sideloading done.");
                 return [titleId, appId];
             }
             else if (uploadResponse.status === 202) {
                 const statusId = uploadResponse.data.statusId;
-                (_d = this.logger) === null || _d === void 0 ? void 0 : _d.debug(`Acquiring package with statusId: ${statusId} ...`);
+                this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
                 do {
                     const statusResponse = await this.axiosInstance.get(`/dev/v1/users/packages/status/${statusId}`, {
                         baseURL: serviceUrl,
                         headers: { Authorization: `Bearer ${token}` },
                     });
                     const resCode = statusResponse.status;
-                    (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`Package status: ${resCode} ...`);
+                    this.logger?.debug(`Package status: ${resCode} ...`);
                     if (resCode === 200) {
                         const titleId = statusResponse.data.titleId;
                         const appId = statusResponse.data.appId;
-                        (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`TitleId: ${titleId}`);
-                        (_g = this.logger) === null || _g === void 0 ? void 0 : _g.info(`AppId: ${appId}`);
-                        (_h = this.logger) === null || _h === void 0 ? void 0 : _h.verbose("Sideloading done.");
+                        this.logger?.info(`TitleId: ${titleId}`);
+                        this.logger?.info(`AppId: ${appId}`);
+                        this.logger?.verbose("Sideloading done.");
                         return [titleId, appId];
                     }
                     else {
@@ -166,7 +186,6 @@ class PackageService {
     }
     // Side loading using Builder API
     async sideLoadingV2(token, manifestPath, appScope) {
-        var _a, _b, _c, _d, _e, _f;
         try {
             this.checkZip(manifestPath);
             const data = await fs_extra_1.default.readFile(manifestPath);
@@ -174,31 +193,40 @@ class PackageService {
             content.append("package", data);
             content.append("info", JSON.stringify({ builderName: "TeamsToolKit" }));
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
+            this.logger?.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
             const uploadHeaders = content.getHeaders();
             uploadHeaders["Authorization"] = `Bearer ${token}`;
-            const uploadResponse = await this.axiosInstance.post("/builder/v1/users/packages", content, {
+            const uploadResponse = await this.withNetworkRetry(() => this.axiosInstance.post("/builder/v1/users/packages", content, {
                 baseURL: serviceUrl,
                 headers: uploadHeaders,
                 params: {
                     scope: appScope,
+                    shouldBlock: true,
                 },
-            });
+            }));
+            if (uploadResponse.status === 200 || uploadResponse.status === 201) {
+                const titleId = uploadResponse.data.titlePreview.titleId;
+                const appId = uploadResponse.data.titlePreview.appId;
+                this.logger?.info(`TitleId: ${titleId}`);
+                this.logger?.info(`AppId: ${appId}`);
+                this.logger?.verbose("Sideloading done.");
+                return [titleId, appId];
+            }
             const statusId = uploadResponse.data.statusId;
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Acquiring package with statusId: ${statusId} ...`);
+            this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
             do {
                 const statusResponse = await this.axiosInstance.get(`/builder/v1/users/packages/status/${statusId}`, {
                     baseURL: serviceUrl,
                     headers: { Authorization: `Bearer ${token}` },
                 });
                 const resCode = statusResponse.status;
-                (_c = this.logger) === null || _c === void 0 ? void 0 : _c.debug(`Package status: ${resCode} ...`);
+                this.logger?.debug(`Package status: ${resCode} ...`);
                 if (resCode === 200) {
                     const titleId = statusResponse.data.titleId;
                     const appId = statusResponse.data.appId;
-                    (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`TitleId: ${titleId}`);
-                    (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`AppId: ${appId}`);
-                    (_f = this.logger) === null || _f === void 0 ? void 0 : _f.verbose("Sideloading done.");
+                    this.logger?.info(`TitleId: ${titleId}`);
+                    this.logger?.info(`AppId: ${appId}`);
+                    this.logger?.verbose("Sideloading done.");
                     return [titleId, appId];
                 }
                 else {
@@ -218,23 +246,22 @@ class PackageService {
         }
     }
     async sideLoadingV1(token, manifestPath) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             this.checkZip(manifestPath);
             const data = await fs_extra_1.default.readFile(manifestPath);
             const content = new form_data_1.default();
             content.append("package", data);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug("Uploading package with sideLoading V1 ...");
+            this.logger?.debug("Uploading package with sideLoading V1 ...");
             const uploadHeaders = content.getHeaders();
             uploadHeaders["Authorization"] = `Bearer ${token}`;
-            const uploadResponse = await this.axiosInstance.post("/dev/v1/users/packages", content.getBuffer(), {
+            const uploadResponse = await this.withNetworkRetry(() => this.axiosInstance.post("/dev/v1/users/packages", content.getBuffer(), {
                 baseURL: serviceUrl,
                 headers: uploadHeaders,
-            });
+            }));
             const operationId = uploadResponse.data.operationId;
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Package uploaded. OperationId: ${operationId}`);
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Acquiring package ...");
+            this.logger?.debug(`Package uploaded. OperationId: ${operationId}`);
+            this.logger?.verbose("Acquiring package ...");
             const acquireResponse = await this.axiosInstance.post("/dev/v1/users/packages/acquisitions", {
                 operationId: operationId,
             }, {
@@ -244,20 +271,20 @@ class PackageService {
                 },
             });
             const statusId = acquireResponse.data.statusId;
-            (_d = this.logger) === null || _d === void 0 ? void 0 : _d.debug(`Acquiring package with statusId: ${statusId} ...`);
+            this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
             do {
                 const statusResponse = await this.axiosInstance.get(`/dev/v1/users/packages/status/${statusId}`, {
                     baseURL: serviceUrl,
                     headers: { Authorization: `Bearer ${token}` },
                 });
                 const resCode = statusResponse.status;
-                (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`Package status: ${resCode} ...`);
+                this.logger?.debug(`Package status: ${resCode} ...`);
                 if (resCode === 200) {
                     const titleId = statusResponse.data.titleId;
                     const appId = statusResponse.data.appId;
-                    (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`TitleId: ${titleId}`);
-                    (_g = this.logger) === null || _g === void 0 ? void 0 : _g.info(`AppId: ${appId}`);
-                    (_h = this.logger) === null || _h === void 0 ? void 0 : _h.verbose("Sideloading done.");
+                    this.logger?.info(`TitleId: ${titleId}`);
+                    this.logger?.info(`AppId: ${appId}`);
+                    this.logger?.verbose("Sideloading done.");
                     return [titleId, appId];
                 }
                 else {
@@ -296,10 +323,9 @@ class PackageService {
         }
     }
     async getLaunchInfoByManifestId(token, manifestId) {
-        var _a, _b, _c;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting LaunchInfo with ManifestId ${manifestId} ...`);
+            this.logger?.verbose(`Getting LaunchInfo with ManifestId ${manifestId} ...`);
             const launchInfo = await this.axiosInstance.post("/catalog/v1/users/titles/launchInfo", {
                 Id: manifestId,
                 IdType: "ManifestId",
@@ -331,11 +357,11 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(JSON.stringify(launchInfo.data));
+            this.logger?.debug(JSON.stringify(launchInfo.data));
             return launchInfo.data;
         }
         catch (error) {
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.error("Get LaunchInfo failed.");
+            this.logger?.error("Get LaunchInfo failed.");
             if (error.response) {
                 if (error.response.status === 404) {
                     throw new errors_1.NotExtendedToM365Error(M365ErrorSource);
@@ -346,24 +372,22 @@ class PackageService {
         }
     }
     async retrieveTitleId(token, manifestId) {
-        var _a, _b, _c, _d, _e;
         const launchInfo = await this.getLaunchInfoByManifestId(token, manifestId);
-        const titleId = (_c = (_b = (_a = launchInfo.acquisition) === null || _a === void 0 ? void 0 : _a.titleId) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : (_d = launchInfo.acquisition) === null || _d === void 0 ? void 0 : _d.titleId;
-        (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`TitleId: ${titleId}`);
+        const titleId = launchInfo.acquisition?.titleId?.id ??
+            launchInfo.acquisition?.titleId;
+        this.logger?.debug(`TitleId: ${titleId}`);
         return titleId;
     }
     async retrieveAppId(token, manifestId) {
-        var _a, _b;
         const launchInfo = await this.getLaunchInfoByManifestId(token, manifestId);
-        const appId = (_a = launchInfo.acquisition) === null || _a === void 0 ? void 0 : _a.appId;
-        (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`AppId: ${appId}`);
+        const appId = launchInfo.acquisition?.appId;
+        this.logger?.debug(`AppId: ${appId}`);
         return appId;
     }
     async unacquire(token, titleId) {
-        var _a, _b, _c;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Unacquiring package with TitleId ${titleId} ...`);
+            this.logger?.verbose(`Unacquiring package with TitleId ${titleId} ...`);
             await this.axiosInstance.delete(`/catalog/v1/users/acquisitions/${titleId}`, {
                 baseURL: serviceUrl,
                 headers: {
@@ -380,13 +404,13 @@ class PackageService {
             }
             catch (error) {
                 if (error.response && error.response.status === 404) {
-                    (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`TitleId ${titleId} not found, skip deleting.`);
+                    this.logger?.debug(`TitleId ${titleId} not found, skip deleting.`);
                 }
                 else {
                     throw error;
                 }
             }
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Unacquiring done.");
+            this.logger?.verbose("Unacquiring done.");
         }
         catch (error) {
             if (error.response) {
@@ -396,10 +420,9 @@ class PackageService {
         }
     }
     async getLaunchInfoByTitleId(token, titleId) {
-        var _a, _b;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting LaunchInfo with TitleId ${titleId} ...`);
+            this.logger?.verbose(`Getting LaunchInfo with TitleId ${titleId} ...`);
             const launchInfo = await this.axiosInstance.get(`/catalog/v1/users/titles/${titleId}/launchInfo`, {
                 baseURL: serviceUrl,
                 params: {
@@ -411,7 +434,7 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(JSON.stringify(launchInfo.data));
+            this.logger?.info(JSON.stringify(launchInfo.data));
             return launchInfo.data;
         }
         catch (error) {
@@ -422,10 +445,9 @@ class PackageService {
         }
     }
     async getActiveExperiences(token, ensureUpToDate = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Get active experiences from service URL ${serviceUrl} ...`);
+            this.logger?.debug(`Get active experiences from service URL ${serviceUrl} ...`);
             // users/experiences is deprecating, using users/uitypes instead
             let response = await this.axiosInstance.get("/catalog/v1/users/uitypes", {
                 baseURL: serviceUrl,
@@ -434,12 +456,12 @@ class PackageService {
                 },
             });
             let status = response.status;
-            let activeExperiences = (_b = response.data) === null || _b === void 0 ? void 0 : _b.activeExperiences;
-            const nextInterval = (_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.nextInterval) !== null && _d !== void 0 ? _d : -1;
-            (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
+            let activeExperiences = response.data?.activeExperiences;
+            const nextInterval = response.data?.nextInterval ?? -1;
+            this.logger?.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
             // Short nextInterval means cache is refreshing
             if (ensureUpToDate && nextInterval > 0 && nextInterval < 10) {
-                (_f = this.logger) === null || _f === void 0 ? void 0 : _f.debug(`Active experiences is refreshing, wait for ${nextInterval} seconds.`);
+                this.logger?.debug(`Active experiences is refreshing, wait for ${nextInterval} seconds.`);
                 await (0, utils_1.waitSeconds)(nextInterval);
                 response = await this.axiosInstance.get("/catalog/v1/users/uitypes", {
                     baseURL: serviceUrl,
@@ -448,8 +470,8 @@ class PackageService {
                     },
                 });
                 status = response.status;
-                activeExperiences = (_g = response.data) === null || _g === void 0 ? void 0 : _g.activeExperiences;
-                (_h = this.logger) === null || _h === void 0 ? void 0 : _h.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
+                activeExperiences = response.data?.activeExperiences;
+                this.logger?.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
             }
             return activeExperiences;
         }
@@ -461,7 +483,6 @@ class PackageService {
         }
     }
     async removePermission(token, titleId, user) {
-        var _a;
         try {
             const appRes = await this.previewApp(token, titleId);
             if (appRes.isErr()) {
@@ -473,7 +494,7 @@ class PackageService {
             }
             const newOwners = owners.filter((owner) => owner.entityId !== user.aadId);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Removing permission to user ${user.displayName} ...`);
+            this.logger?.verbose(`Removing permission to user ${user.displayName} ...`);
             await this.axiosInstance.put(`/builder/v1/users/titles/${titleId}/owners?idType=TitleId`, {
                 Owners: newOwners,
             }, {
@@ -493,7 +514,6 @@ class PackageService {
         }
     }
     async addOwner(token, titleId, user) {
-        var _a;
         try {
             const appRes = await this.previewApp(token, titleId);
             if (appRes.isErr()) {
@@ -514,7 +534,7 @@ class PackageService {
                 EntityType: "User",
             });
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Granting permission to user ${user.displayName} ...`);
+            this.logger?.verbose(`Granting permission to user ${user.displayName} ...`);
             await this.axiosInstance.put(`/builder/v1/users/titles/${titleId}/owners?idType=TitleId`, {
                 Owners: newOwners,
             }, {
@@ -534,9 +554,8 @@ class PackageService {
         }
     }
     async shareWithTenant(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Change shared scope of agent to tenant with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Change shared scope of agent to tenant with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             await this.axiosInstance.post(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 EntityCollection: {
@@ -560,9 +579,8 @@ class PackageService {
         }
     }
     async getSharedUsers(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting shared users with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Getting shared users with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             const response = await this.axiosInstance.get(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 baseURL: serviceUrl,
@@ -585,11 +603,10 @@ class PackageService {
     }
     // This will overwrite existing entity list
     async shareWithUsers(token, entities, titleId, appId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Adding shared users to app with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Adding shared users to app with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            await this.axiosInstance.post(`/builder/v1/users/titles/${appId !== null && appId !== void 0 ? appId : titleId}/allowed?idType=${appId ? "AppId" : "TitleId"}`, {
+            await this.axiosInstance.post(`/builder/v1/users/titles/${appId ?? titleId}/allowed?idType=${appId ? "AppId" : "TitleId"}`, {
                 EntityCollection: {
                     ForAllUsers: false,
                     Entities: entities,
@@ -611,9 +628,8 @@ class PackageService {
         }
     }
     async unshare(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Removing shared users from app with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Removing shared users from app with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             await this.axiosInstance.delete(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 baseURL: serviceUrl,
@@ -650,12 +666,11 @@ class PackageService {
         }
     }
     async getCopilotStatus(token, ensureUpToDate = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             const activeExperiences = await this.getActiveExperiences(token, ensureUpToDate);
             const copilotAllowed = activeExperiences == undefined ? undefined : activeExperiences.includes("CopilotTeams");
             (0, telemetry_1.sendTelemetryEvent)(telemetry_1.Component.core, telemetry_1.TelemetryEvent.CheckCopilot, {
-                [telemetry_1.TelemetryProperty.IsCopilotAllowed]: (_a = copilotAllowed === null || copilotAllowed === void 0 ? void 0 : copilotAllowed.toString()) !== null && _a !== void 0 ? _a : "undefined",
+                [telemetry_1.TelemetryProperty.IsCopilotAllowed]: copilotAllowed?.toString() ?? "undefined",
             });
             return copilotAllowed;
         }
@@ -663,12 +678,12 @@ class PackageService {
             (0, telemetry_1.sendTelemetryErrorEvent)(telemetry_1.Component.core, telemetry_1.TelemetryEvent.CheckCopilot, new teamsfx_api_1.SystemError({
                 error,
                 source: M365ErrorSource,
-                message: (_b = error.message) !== null && _b !== void 0 ? _b : "Failed to get copilot status.",
+                message: error.message ?? "Failed to get copilot status.",
                 categories: [types_1.ErrorCategory.External],
             }), {
-                [telemetry_1.TelemetryProperty.CheckCopilotTracingId]: `${
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                (_j = (_e = (_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d.traceresponse) !== null && _e !== void 0 ? _e : (_h = (_g = (_f = error.innerError) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.headers) === null || _h === void 0 ? void 0 : _h.traceresponse) !== null && _j !== void 0 ? _j : ""}`,
+                [telemetry_1.TelemetryProperty.CheckCopilotTracingId]: `${error.response?.headers?.traceresponse ??
+                    error.innerError?.response?.headers?.traceresponse ??
+                    ""}`,
             });
             return undefined;
         }
@@ -686,16 +701,15 @@ class PackageService {
         return false;
     }
     traceError(error) {
-        var _a, _b, _c, _d;
         // add error details and trace to message
-        const tracingId = ((_b = (_a = error.response.headers) === null || _a === void 0 ? void 0 : _a.traceresponse) !== null && _b !== void 0 ? _b : "");
+        const tracingId = (error.response.headers?.traceresponse ?? "");
         const originalMessage = error.message;
-        const innerError = ((_c = error.response.data) === null || _c === void 0 ? void 0 : _c.error) ||
+        const innerError = error.response.data?.error ||
             error.response.data.Error || { code: "", message: "" };
         const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.Code}: ${innerError.Message} `;
         error.message = finalMessage;
         // HTTP 400 as user error due to invalid input
-        if (((_d = error.response) === null || _d === void 0 ? void 0 : _d.status) === 400) {
+        if (error.response?.status === 400) {
             error = new teamsfx_api_1.UserError({
                 name: "PackageServiceError",
                 error,
@@ -717,14 +731,13 @@ class PackageService {
         return error;
     }
     checkZip(path) {
-        var _a, _b;
         try {
             const zip = new adm_zip_1.default(path, {});
             zip.getEntries();
         }
         catch (error) {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Invalid input zip ${path}. ${error.message}`);
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.warning(`Please make sure input path is a valid app package zip. ${path}`);
+            this.logger?.debug(`Invalid input zip ${path}. ${error.message}`);
+            this.logger?.warning(`Please make sure input path is a valid app package zip. ${path}`);
         }
     }
     getManifestFromZip(path) {
@@ -738,6 +751,7 @@ class PackageService {
         return JSON.parse(manifestContent);
     }
 }
+exports.PackageService = PackageService;
 tslib_1.__decorate([
     (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ source: M365ErrorSource, component: M365ErrorComponent })]),
     tslib_1.__metadata("design:type", Function),
@@ -846,5 +860,4 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], PackageService.prototype, "previewApp", null);
-exports.PackageService = PackageService;
 //# sourceMappingURL=packageService.js.map