@forge/cli-shared

9.4.1-next.5-experimental-241de519.4.1-next.7-experimental-e16d59f
out/app-logs/graphql-client.js
~out/app-logs/graphql-client.jsModified
+27−14
Index: package/out/app-logs/graphql-client.js
===================================================================
--- package/out/app-logs/graphql-client.js
+++ package/out/app-logs/graphql-client.js
@@ -6,8 +6,23 @@
     level: line.level || undefined,
     message: line.message || undefined,
     other: line.other
 });
+const sanitizeLogLineWithMetadata = (line) => ({
+    timestamp: line.ts,
+    level: line.lvl || undefined,
+    message: line.message || undefined,
+    other: line.other ? JSON.parse(line.other) : [],
+    browserName: line.browserName || undefined,
+    browserVersion: line.browserVersion || undefined,
+    errorType: line.errorType || undefined,
+    extensionType: line.extensionType || undefined,
+    installationId: line.installationId || undefined,
+    logSource: line.logSource || undefined,
+    osName: line.osName || undefined,
+    renderType: line.renderType || undefined,
+    userAgent: line.userAgent || undefined
+});
 class MissingAppLogsError extends Error {
 }
 exports.MissingAppLogsError = MissingAppLogsError;
 class MissingAppLogLinesError extends Error {
@@ -74,8 +89,17 @@
             lvl
             error
             other
             ts
+            browserName
+            browserVersion
+            errorType
+            extensionType
+            installationId
+            logSource
+            osName
+            renderType
+            userAgent
           }
           appLogsFilterBuckets {
             containers {
               key
@@ -104,8 +128,9 @@
         if (!result || !result.appLogsWithMetaData || !result.appLogsWithMetaData.appLogs) {
             throw new MissingAppLogsError();
         }
         for (const logLine of result.appLogsWithMetaData.appLogs) {
+            const log = sanitizeLogLineWithMetadata(logLine);
             if (details.grouped) {
                 let logsMetadata = invocationMap.get(logLine.invocationId);
                 if (!logsMetadata) {
                     logsMetadata = {
@@ -115,28 +140,16 @@
                         trigger: undefined,
                         logs: []
                     };
                 }
-                logsMetadata.logs.push({
-                    message: logLine.message || undefined,
-                    other: logLine.other ? JSON.parse(logLine.other) : [],
-                    level: logLine.lvl || undefined,
-                    timestamp: logLine.ts
-                });
+                logsMetadata.logs.push(log);
                 invocationMap.set(logLine.invocationId, logsMetadata);
             }
             logLinesWithInvocation.push({
                 id: logLine.invocationId,
                 appVersion: logLine.appVersion,
                 function: logLine.functionKey || undefined,
-                logs: [
-                    {
-                        message: logLine.message || undefined,
-                        other: logLine.other ? JSON.parse(logLine.other) : [],
-                        level: logLine.lvl || undefined,
-                        timestamp: logLine.ts
-                    }
-                ]
+                logs: [log]
             });
         }
         const serverSideMaxLimit = result.appLogsWithMetaData.appLogs.length;
         totalRecieved += serverSideMaxLimit;