@forge/cli-shared 5.6.0-next.9 → 6.0.0-next.16

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @forge/cli-shared
 
+## 6.0.0-next.16
+
+### Major Changes
+
+- f354267: Migrating forge logs commands to use v2 logs APIs to fetch logs. Updated the functionality of the `forge logs -n <limit>` or `forge logs --limit <limit>` CLI command. Instead of showing logs from the last <limit> invocations, it will show the last <limit> log lines.
+
+## 5.6.0-next.15
+
+### Patch Changes
+
+- 9c5836c: cleanup ff
+- Updated dependencies [d9e0900]
+  - @forge/manifest@7.9.0-next.13
+
+## 5.6.0-next.14
+
+### Patch Changes
+
+- Updated dependencies [5cd256c]
+  - @forge/manifest@7.9.0-next.12
+
+## 5.6.0-next.13
+
+### Patch Changes
+
+- Updated dependencies [08ff14e]
+  - @forge/manifest@7.9.0-next.11
+
+## 5.6.0-next.12
+
+### Patch Changes
+
+- Updated dependencies [d500498]
+  - @forge/manifest@7.9.0-next.10
+
+## 5.6.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [47f24ba]
+- Updated dependencies [75698c0]
+- Updated dependencies [6cd61be]
+  - @forge/manifest@7.9.0-next.9
+
+## 5.6.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [bdca785]
+  - @forge/manifest@7.9.0-next.8
+
 ## 5.6.0-next.9
 
 ### Patch Changes

package/out/app-logs/graphql-client.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLClient } from '../graphql';
-import { AppInvocationLogsDetails, AppLogsDetails, Invocation, InvocationLogLine, ViewAppLogsClient } from './view-logs';
+import { AppInvocationLogsDetails, AppLogsDetails, AppLogsDetailsV2, Invocation, InvocationLogLine, ViewAppLogsClient } from './view-logs';
 export declare class MissingAppLogsError extends Error {
 }
 export declare class MissingAppLogLinesError extends Error {
@@ -18,6 +18,7 @@ export declare class LogsGraphQLClient implements ViewAppLogsClient {
         function?: string | undefined;
         trigger?: string | undefined;
     }>;
+    viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
     viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
     private extractInvocationInfo;
     private extractLogLines;

package/out/app-logs/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,aAAa,CACxB,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IAkFX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}

package/out/app-logs/graphql-client.js

@@ -34,6 +34,77 @@ class LogsGraphQLClient {
             logs: result.lines.map(sanitizeLogLine)
         };
     }
+    async viewAppLogsV2(details, invocationMap, totalRecieved) {
+        const query = `
+      query forge_cli_getApplicationLogsV2(
+        $appId: String!,
+        $environmentId: String!,
+        $dateSearchInput: DateSearchInput,
+        $offset: Int!,
+        $limit: Int!,
+        $queryStartTime: String!
+      ) {
+        appLogsWithMetaData(
+          appId: $appId
+          environmentId: $environmentId
+          limit: $limit
+          offset: $offset
+          queryStartTime: $queryStartTime
+          query: {
+            dates: $dateSearchInput
+          }
+        ) {
+          appLogs {
+            appId
+            appVersion
+            message
+            environmentId
+            invocationId
+            functionKey
+            lvl
+            error
+            other
+            ts
+          }
+          hasNextPage
+          totalLogs
+          __typename
+        }
+      }
+    `;
+        const result = await this.graphqlClient.query(query, details);
+        if (!result || !result.appLogsWithMetaData || !result.appLogsWithMetaData.appLogs) {
+            throw new MissingAppLogsError();
+        }
+        for (const logLine of result.appLogsWithMetaData.appLogs) {
+            let logsMetadata = invocationMap.get(logLine.invocationId);
+            if (!logsMetadata) {
+                logsMetadata = {
+                    id: logLine.invocationId,
+                    appVersion: logLine.appVersion,
+                    function: logLine.functionKey || undefined,
+                    trigger: undefined,
+                    logs: []
+                };
+            }
+            logsMetadata.logs.push({
+                message: logLine.message || undefined,
+                other: logLine.other ? JSON.parse(logLine.other) : [],
+                level: logLine.lvl || undefined,
+                timestamp: logLine.ts
+            });
+            invocationMap.set(logLine.invocationId, logsMetadata);
+        }
+        const serverSideMaxLimit = result.appLogsWithMetaData.appLogs.length;
+        totalRecieved += serverSideMaxLimit;
+        if (result.appLogsWithMetaData.hasNextPage && details.maxLimit > totalRecieved) {
+            details.offset = details.offset + serverSideMaxLimit;
+            details.limit = details.limit - serverSideMaxLimit;
+            return this.viewAppLogsV2(details, invocationMap, totalRecieved);
+        }
+        const invocations = [...invocationMap.values()];
+        return invocations;
+    }
     async viewAppLogs(details) {
         const query = `
       query forge_cli_getApplicationLogs($appId: ID!, $environmentId: [ID!]!, $limit: Int!, $contextAri: [ID!], $startTime: String) {

package/out/app-logs/view-logs.d.ts

@@ -2,8 +2,9 @@
 import { Ari } from '@forge/util/packages/ari';
 import { URL } from 'url';
 import { AppConfigProvider } from '../apps';
-import { AppEnvironmentClient } from '../graphql';
+import { AppEnvironmentClient, DateSearchInput } from '../graphql';
 import { GlobalEdgeClient } from '../http-client';
+import { FeatureFlagService } from '../service';
 export interface Context {
     site: URL;
     product: string;
@@ -24,6 +25,12 @@ export declare type AppLogsDetails = {
     startTime?: string | null;
     contextAri?: [Ari];
 };
+export declare type AppLogsDetailsV2 = AppLogsDetails & {
+    offset: number;
+    dateSearchInput: DateSearchInput;
+    queryStartTime: string;
+    maxLimit: number;
+};
 export interface InvocationQueryDetails {
     environmentKey: string;
     invocationId: string;
@@ -47,6 +54,7 @@ export interface Invocation {
 }
 export interface ViewAppLogsClient {
     viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
+    viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
     viewInvocationLogs(details: AppInvocationLogsDetails): Promise<Invocation>;
 }
 export declare class ViewAppLogsCommand {
@@ -54,8 +62,10 @@ export declare class ViewAppLogsCommand {
     private readonly appEnvironmentClient;
     private readonly globalEdgeClient;
     private readonly logsClient;
-    constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient);
+    private readonly featureFlagService;
+    constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient, featureFlagService: FeatureFlagService);
     getAll({ environmentKey, limit, context, startTime }: QueryDetails): Promise<Invocation[]>;
+    getLogs(details: AppLogsDetails): Promise<Invocation[]>;
     getOne(details: InvocationQueryDetails): Promise<Invocation>;
 }
 //# sourceMappingURL=view-logs.d.ts.map

package/out/app-logs/view-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,oBAAY,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC5E;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAHV,YAAY,EAAE,iBAAiB,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,iBAAiB;IAGnC,MAAM,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,SAAgB,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAmBjG,MAAM,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;CAI1E"}
+{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}

package/out/app-logs/view-logs.js

@@ -8,11 +8,13 @@ class ViewAppLogsCommand {
     appEnvironmentClient;
     globalEdgeClient;
     logsClient;
-    constructor(getAppConfig, appEnvironmentClient, globalEdgeClient, logsClient) {
+    featureFlagService;
+    constructor(getAppConfig, appEnvironmentClient, globalEdgeClient, logsClient, featureFlagService) {
         this.getAppConfig = getAppConfig;
         this.appEnvironmentClient = appEnvironmentClient;
         this.globalEdgeClient = globalEdgeClient;
         this.logsClient = logsClient;
+        this.featureFlagService = featureFlagService;
     }
     async getAll({ environmentKey, limit, context, startTime = null }) {
         const { id: appId } = await this.getAppConfig();
@@ -21,13 +23,39 @@ class ViewAppLogsCommand {
             context ? this.globalEdgeClient.getCloudId(context.site) : undefined
         ]);
         const contextAri = cloudId ? (0, ari_2.buildContextAri)(cloudId, context.product) : undefined;
-        return this.logsClient.viewAppLogs({
+        const details = {
             appId: ari_1.EcosystemAppAri.parse(appId).appId,
             environmentId,
             limit,
             startTime,
             contextAri: contextAri ? [contextAri] : undefined
-        });
+        };
+        const isV2ApiEnabled = await this.featureFlagService.isLogsV2ApiEnabled();
+        if (isV2ApiEnabled) {
+            return this.getLogs(details);
+        }
+        return this.logsClient.viewAppLogs(details);
+    }
+    async getLogs(details) {
+        const latestStart = new Date().toISOString();
+        let earliestStart = new Date();
+        if (details.startTime) {
+            earliestStart = new Date(details.startTime);
+        }
+        else {
+            earliestStart.setHours(new Date().getHours() - 1);
+        }
+        const dateSearchInput = {
+            earliestStart: earliestStart.toISOString(),
+            latestStart
+        };
+        return this.logsClient.viewAppLogsV2({
+            ...details,
+            offset: 0,
+            dateSearchInput,
+            queryStartTime: earliestStart.toISOString(),
+            maxLimit: details.limit
+        }, new Map(), 0);
     }
     async getOne(details) {
         return this.logsClient.viewInvocationLogs({ invocationId: details.invocationId });