@forge/cli-shared 8.0.0-next.15 → 8.0.0-next.9

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/CHANGELOG.md CHANGED
@@ -1,51 +1,5 @@
1
1
  # @forge/cli-shared
2
2
 
3
- ## 8.0.0-next.15
4
-
5
- ### Patch Changes
6
-
7
- - Updated dependencies [3d96d1c]
8
- - @forge/manifest@10.0.0-next.13
9
-
10
- ## 8.0.0-next.14
11
-
12
- ### Minor Changes
13
-
14
- - ba634d9: Remove further sandbox runtime related components
15
-
16
- ### Patch Changes
17
-
18
- - Updated dependencies [ba634d9]
19
- - @forge/manifest@10.0.0-next.12
20
-
21
- ## 8.0.0-next.13
22
-
23
- ### Patch Changes
24
-
25
- - Updated dependencies [1992aaf]
26
- - Updated dependencies [c2e09b9]
27
- - @forge/manifest@10.0.0-next.11
28
-
29
- ## 8.0.0-next.12
30
-
31
- ### Major Changes
32
-
33
- - d33186c: Resolved sorting issue in the displayed log lines
34
-
35
- ## 8.0.0-next.11
36
-
37
- ### Patch Changes
38
-
39
- - Updated dependencies [e6cd96a]
40
- - @forge/manifest@10.0.0-next.10
41
-
42
- ## 8.0.0-next.10
43
-
44
- ### Patch Changes
45
-
46
- - Updated dependencies [33c5750]
47
- - @forge/manifest@10.0.0-next.9
48
-
49
3
  ## 8.0.0-next.9
50
4
 
51
5
  ### Patch Changes
@@ -18,7 +18,7 @@ export declare class LogsGraphQLClient implements ViewAppLogsClient {
18
18
  function?: string | undefined;
19
19
  trigger?: string | undefined;
20
20
  }>;
21
- viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, logLinesWithInvocation: Invocation[], totalRecieved: number): Promise<Invocation[]>;
21
+ viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
22
22
  viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
23
23
  private extractInvocationInfo;
24
24
  private extractLogLines;
@@ -1 +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,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,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IAoGX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
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,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;IAoFX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
@@ -34,7 +34,7 @@ class LogsGraphQLClient {
34
34
  logs: result.lines.map(sanitizeLogLine)
35
35
  };
36
36
  }
37
- async viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved) {
37
+ async viewAppLogsV2(details, invocationMap, totalRecieved) {
38
38
  const query = `
39
39
  query forge_cli_getApplicationLogsV2(
40
40
  $appId: String!,
@@ -79,48 +79,33 @@ class LogsGraphQLClient {
79
79
  throw new MissingAppLogsError();
80
80
  }
81
81
  for (const logLine of result.appLogsWithMetaData.appLogs) {
82
- if (details.grouped) {
83
- let logsMetadata = invocationMap.get(logLine.invocationId);
84
- if (!logsMetadata) {
85
- logsMetadata = {
86
- id: logLine.invocationId,
87
- appVersion: logLine.appVersion,
88
- function: logLine.functionKey || undefined,
89
- trigger: undefined,
90
- logs: []
91
- };
92
- }
93
- logsMetadata.logs.push({
94
- message: logLine.message || undefined,
95
- other: logLine.other ? JSON.parse(logLine.other) : [],
96
- level: logLine.lvl || undefined,
97
- timestamp: logLine.ts
98
- });
99
- invocationMap.set(logLine.invocationId, logsMetadata);
82
+ let logsMetadata = invocationMap.get(logLine.invocationId);
83
+ if (!logsMetadata) {
84
+ logsMetadata = {
85
+ id: logLine.invocationId,
86
+ appVersion: logLine.appVersion,
87
+ function: logLine.functionKey || undefined,
88
+ trigger: undefined,
89
+ logs: []
90
+ };
100
91
  }
101
- logLinesWithInvocation.push({
102
- id: logLine.invocationId,
103
- appVersion: logLine.appVersion,
104
- function: logLine.functionKey || undefined,
105
- logs: [
106
- {
107
- message: logLine.message || undefined,
108
- other: logLine.other ? JSON.parse(logLine.other) : [],
109
- level: logLine.lvl || undefined,
110
- timestamp: logLine.ts
111
- }
112
- ]
92
+ logsMetadata.logs.push({
93
+ message: logLine.message || undefined,
94
+ other: logLine.other ? JSON.parse(logLine.other) : [],
95
+ level: logLine.lvl || undefined,
96
+ timestamp: logLine.ts
113
97
  });
98
+ invocationMap.set(logLine.invocationId, logsMetadata);
114
99
  }
115
100
  const serverSideMaxLimit = result.appLogsWithMetaData.appLogs.length;
116
101
  totalRecieved += serverSideMaxLimit;
117
102
  if (result.appLogsWithMetaData.hasNextPage && details.maxLimit > totalRecieved) {
118
103
  details.offset = details.offset + serverSideMaxLimit;
119
104
  details.limit = details.limit - serverSideMaxLimit;
120
- return this.viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved);
105
+ return this.viewAppLogsV2(details, invocationMap, totalRecieved);
121
106
  }
122
107
  const invocations = [...invocationMap.values()];
123
- return details.grouped ? invocations : logLinesWithInvocation;
108
+ return invocations;
124
109
  }
125
110
  async viewAppLogs(details) {
126
111
  const query = `
@@ -18,13 +18,11 @@ export interface QueryDetails {
18
18
  context?: InstallContext;
19
19
  startTime?: string | null;
20
20
  containers?: boolean;
21
- grouped?: boolean;
22
21
  }
23
22
  export declare type AppLogsDetails = {
24
23
  appId: string;
25
24
  environmentId: string;
26
25
  limit: number;
27
- grouped?: boolean;
28
26
  startTime?: string | null;
29
27
  contextAri?: [Ari];
30
28
  runtime?: string | null;
@@ -62,7 +60,7 @@ export declare enum Runtime {
62
60
  }
63
61
  export interface ViewAppLogsClient {
64
62
  viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
65
- viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, logLinesWithInvocation: Invocation[], totalRecieved: number): Promise<Invocation[]>;
63
+ viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
66
64
  viewInvocationLogs(details: AppInvocationLogsDetails): Promise<Invocation>;
67
65
  }
68
66
  export declare class ViewAppLogsCommand {
@@ -72,7 +70,7 @@ export declare class ViewAppLogsCommand {
72
70
  private readonly logsClient;
73
71
  private readonly statsigService;
74
72
  constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient, statsigService: StatsigService);
75
- getAll({ environmentKey, limit, context, startTime, grouped, containers }: QueryDetails): Promise<Invocation[]>;
73
+ getAll({ environmentKey, limit, context, startTime, containers }: QueryDetails): Promise<Invocation[]>;
76
74
  getLogs(details: AppLogsDetails): Promise<Invocation[]>;
77
75
  getOne(details: InvocationQueryDetails): Promise<Invocation>;
78
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}
@@ -21,7 +21,7 @@ class ViewAppLogsCommand {
21
21
  this.logsClient = logsClient;
22
22
  this.statsigService = statsigService;
23
23
  }
24
- async getAll({ environmentKey, limit, context, startTime = null, grouped = false, containers = false }) {
24
+ async getAll({ environmentKey, limit, context, startTime = null, containers = false }) {
25
25
  const { id: appId } = await this.getAppConfig();
26
26
  const [environmentId, cloudId] = await Promise.all([
27
27
  this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
@@ -33,8 +33,7 @@ class ViewAppLogsCommand {
33
33
  environmentId,
34
34
  limit,
35
35
  startTime,
36
- contextAri: contextAri ? [contextAri] : undefined,
37
- grouped
36
+ contextAri: contextAri ? [contextAri] : undefined
38
37
  };
39
38
  if (containers) {
40
39
  details.runtime = Runtime.CONTAINER.toLowerCase();
@@ -64,7 +63,7 @@ class ViewAppLogsCommand {
64
63
  dateSearchInput,
65
64
  queryStartTime: earliestStart.toISOString(),
66
65
  maxLimit: details.limit
67
- }, new Map(), [], 0);
66
+ }, new Map(), 0);
68
67
  }
69
68
  async getOne(details) {
70
69
  return this.logsClient.viewInvocationLogs({ invocationId: details.invocationId });