kurtosis-sdk 0.51.13 → 0.52.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.
@@ -15,7 +15,6 @@ interface IEngineServiceService extends grpc.ServiceDefinition<grpc.UntypedServi
15
15
  destroyEnclave: grpc.MethodDefinition<engine_service_pb.DestroyEnclaveArgs, google_protobuf_empty_pb.Empty>;
16
16
  clean: grpc.MethodDefinition<engine_service_pb.CleanArgs, engine_service_pb.CleanResponse>;
17
17
  getUserServiceLogs: grpc.MethodDefinition<engine_service_pb.GetUserServiceLogsArgs, engine_service_pb.GetUserServiceLogsResponse>;
18
- streamUserServiceLogs: grpc.MethodDefinition<engine_service_pb.GetUserServiceLogsArgs, engine_service_pb.GetUserServiceLogsResponse>;
19
18
  }
20
19
 
21
20
  export const EngineServiceService: IEngineServiceService;
@@ -27,8 +26,7 @@ export interface IEngineServiceServer extends grpc.UntypedServiceImplementation
27
26
  stopEnclave: grpc.handleUnaryCall<engine_service_pb.StopEnclaveArgs, google_protobuf_empty_pb.Empty>;
28
27
  destroyEnclave: grpc.handleUnaryCall<engine_service_pb.DestroyEnclaveArgs, google_protobuf_empty_pb.Empty>;
29
28
  clean: grpc.handleUnaryCall<engine_service_pb.CleanArgs, engine_service_pb.CleanResponse>;
30
- getUserServiceLogs: grpc.handleUnaryCall<engine_service_pb.GetUserServiceLogsArgs, engine_service_pb.GetUserServiceLogsResponse>;
31
- streamUserServiceLogs: grpc.handleServerStreamingCall<engine_service_pb.GetUserServiceLogsArgs, engine_service_pb.GetUserServiceLogsResponse>;
29
+ getUserServiceLogs: grpc.handleServerStreamingCall<engine_service_pb.GetUserServiceLogsArgs, engine_service_pb.GetUserServiceLogsResponse>;
32
30
  }
33
31
 
34
32
  export class EngineServiceClient extends grpc.Client {
@@ -51,9 +49,6 @@ export class EngineServiceClient extends grpc.Client {
51
49
  clean(argument: engine_service_pb.CleanArgs, callback: grpc.requestCallback<engine_service_pb.CleanResponse>): grpc.ClientUnaryCall;
52
50
  clean(argument: engine_service_pb.CleanArgs, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<engine_service_pb.CleanResponse>): grpc.ClientUnaryCall;
53
51
  clean(argument: engine_service_pb.CleanArgs, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<engine_service_pb.CleanResponse>): grpc.ClientUnaryCall;
54
- getUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, callback: grpc.requestCallback<engine_service_pb.GetUserServiceLogsResponse>): grpc.ClientUnaryCall;
55
- getUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadataOrOptions: grpc.Metadata | grpc.CallOptions | null, callback: grpc.requestCallback<engine_service_pb.GetUserServiceLogsResponse>): grpc.ClientUnaryCall;
56
- getUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadata: grpc.Metadata | null, options: grpc.CallOptions | null, callback: grpc.requestCallback<engine_service_pb.GetUserServiceLogsResponse>): grpc.ClientUnaryCall;
57
- streamUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadataOrOptions?: grpc.Metadata | grpc.CallOptions | null): grpc.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
58
- streamUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadata?: grpc.Metadata | null, options?: grpc.CallOptions | null): grpc.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
52
+ getUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadataOrOptions?: grpc.Metadata | grpc.CallOptions | null): grpc.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
53
+ getUserServiceLogs(argument: engine_service_pb.GetUserServiceLogsArgs, metadata?: grpc.Metadata | null, options?: grpc.CallOptions | null): grpc.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
59
54
  }
@@ -207,18 +207,6 @@ clean: {
207
207
  getUserServiceLogs: {
208
208
  path: '/engine_api.EngineService/GetUserServiceLogs',
209
209
  requestStream: false,
210
- responseStream: false,
211
- requestType: engine_service_pb.GetUserServiceLogsArgs,
212
- responseType: engine_service_pb.GetUserServiceLogsResponse,
213
- requestSerialize: serialize_engine_api_GetUserServiceLogsArgs,
214
- requestDeserialize: deserialize_engine_api_GetUserServiceLogsArgs,
215
- responseSerialize: serialize_engine_api_GetUserServiceLogsResponse,
216
- responseDeserialize: deserialize_engine_api_GetUserServiceLogsResponse,
217
- },
218
- // Stream user service stream logs
219
- streamUserServiceLogs: {
220
- path: '/engine_api.EngineService/StreamUserServiceLogs',
221
- requestStream: false,
222
210
  responseStream: true,
223
211
  requestType: engine_service_pb.GetUserServiceLogsArgs,
224
212
  responseType: engine_service_pb.GetUserServiceLogsResponse,
@@ -52,13 +52,6 @@ export class EngineServiceClient {
52
52
  ): grpcWeb.ClientReadableStream<engine_service_pb.CleanResponse>;
53
53
 
54
54
  getUserServiceLogs(
55
- request: engine_service_pb.GetUserServiceLogsArgs,
56
- metadata: grpcWeb.Metadata | undefined,
57
- callback: (err: grpcWeb.RpcError,
58
- response: engine_service_pb.GetUserServiceLogsResponse) => void
59
- ): grpcWeb.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
60
-
61
- streamUserServiceLogs(
62
55
  request: engine_service_pb.GetUserServiceLogsArgs,
63
56
  metadata?: grpcWeb.Metadata
64
57
  ): grpcWeb.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
@@ -103,11 +96,6 @@ export class EngineServicePromiseClient {
103
96
  getUserServiceLogs(
104
97
  request: engine_service_pb.GetUserServiceLogsArgs,
105
98
  metadata?: grpcWeb.Metadata
106
- ): Promise<engine_service_pb.GetUserServiceLogsResponse>;
107
-
108
- streamUserServiceLogs(
109
- request: engine_service_pb.GetUserServiceLogsArgs,
110
- metadata?: grpcWeb.Metadata
111
99
  ): grpcWeb.ClientReadableStream<engine_service_pb.GetUserServiceLogsResponse>;
112
100
 
113
101
  }
@@ -450,67 +450,6 @@ proto.engine_api.EngineServicePromiseClient.prototype.clean =
450
450
  */
451
451
  const methodDescriptor_EngineService_GetUserServiceLogs = new grpc.web.MethodDescriptor(
452
452
  '/engine_api.EngineService/GetUserServiceLogs',
453
- grpc.web.MethodType.UNARY,
454
- proto.engine_api.GetUserServiceLogsArgs,
455
- proto.engine_api.GetUserServiceLogsResponse,
456
- /**
457
- * @param {!proto.engine_api.GetUserServiceLogsArgs} request
458
- * @return {!Uint8Array}
459
- */
460
- function(request) {
461
- return request.serializeBinary();
462
- },
463
- proto.engine_api.GetUserServiceLogsResponse.deserializeBinary
464
- );
465
-
466
-
467
- /**
468
- * @param {!proto.engine_api.GetUserServiceLogsArgs} request The
469
- * request proto
470
- * @param {?Object<string, string>} metadata User defined
471
- * call metadata
472
- * @param {function(?grpc.web.RpcError, ?proto.engine_api.GetUserServiceLogsResponse)}
473
- * callback The callback function(error, response)
474
- * @return {!grpc.web.ClientReadableStream<!proto.engine_api.GetUserServiceLogsResponse>|undefined}
475
- * The XHR Node Readable Stream
476
- */
477
- proto.engine_api.EngineServiceClient.prototype.getUserServiceLogs =
478
- function(request, metadata, callback) {
479
- return this.client_.rpcCall(this.hostname_ +
480
- '/engine_api.EngineService/GetUserServiceLogs',
481
- request,
482
- metadata || {},
483
- methodDescriptor_EngineService_GetUserServiceLogs,
484
- callback);
485
- };
486
-
487
-
488
- /**
489
- * @param {!proto.engine_api.GetUserServiceLogsArgs} request The
490
- * request proto
491
- * @param {?Object<string, string>=} metadata User defined
492
- * call metadata
493
- * @return {!Promise<!proto.engine_api.GetUserServiceLogsResponse>}
494
- * Promise that resolves to the response
495
- */
496
- proto.engine_api.EngineServicePromiseClient.prototype.getUserServiceLogs =
497
- function(request, metadata) {
498
- return this.client_.unaryCall(this.hostname_ +
499
- '/engine_api.EngineService/GetUserServiceLogs',
500
- request,
501
- metadata || {},
502
- methodDescriptor_EngineService_GetUserServiceLogs);
503
- };
504
-
505
-
506
- /**
507
- * @const
508
- * @type {!grpc.web.MethodDescriptor<
509
- * !proto.engine_api.GetUserServiceLogsArgs,
510
- * !proto.engine_api.GetUserServiceLogsResponse>}
511
- */
512
- const methodDescriptor_EngineService_StreamUserServiceLogs = new grpc.web.MethodDescriptor(
513
- '/engine_api.EngineService/StreamUserServiceLogs',
514
453
  grpc.web.MethodType.SERVER_STREAMING,
515
454
  proto.engine_api.GetUserServiceLogsArgs,
516
455
  proto.engine_api.GetUserServiceLogsResponse,
@@ -532,13 +471,13 @@ const methodDescriptor_EngineService_StreamUserServiceLogs = new grpc.web.Method
532
471
  * @return {!grpc.web.ClientReadableStream<!proto.engine_api.GetUserServiceLogsResponse>}
533
472
  * The XHR Node Readable Stream
534
473
  */
535
- proto.engine_api.EngineServiceClient.prototype.streamUserServiceLogs =
474
+ proto.engine_api.EngineServiceClient.prototype.getUserServiceLogs =
536
475
  function(request, metadata) {
537
476
  return this.client_.serverStreaming(this.hostname_ +
538
- '/engine_api.EngineService/StreamUserServiceLogs',
477
+ '/engine_api.EngineService/GetUserServiceLogs',
539
478
  request,
540
479
  metadata || {},
541
- methodDescriptor_EngineService_StreamUserServiceLogs);
480
+ methodDescriptor_EngineService_GetUserServiceLogs);
542
481
  };
543
482
 
544
483
 
@@ -549,13 +488,13 @@ proto.engine_api.EngineServiceClient.prototype.streamUserServiceLogs =
549
488
  * @return {!grpc.web.ClientReadableStream<!proto.engine_api.GetUserServiceLogsResponse>}
550
489
  * The XHR Node Readable Stream
551
490
  */
552
- proto.engine_api.EngineServicePromiseClient.prototype.streamUserServiceLogs =
491
+ proto.engine_api.EngineServicePromiseClient.prototype.getUserServiceLogs =
553
492
  function(request, metadata) {
554
493
  return this.client_.serverStreaming(this.hostname_ +
555
- '/engine_api.EngineService/StreamUserServiceLogs',
494
+ '/engine_api.EngineService/GetUserServiceLogs',
556
495
  request,
557
496
  metadata || {},
558
- methodDescriptor_EngineService_StreamUserServiceLogs);
497
+ methodDescriptor_EngineService_GetUserServiceLogs);
559
498
  };
560
499
 
561
500
 
@@ -262,6 +262,9 @@ export class GetUserServiceLogsArgs extends jspb.Message {
262
262
  getServiceGuidSetMap(): jspb.Map<string, boolean>;
263
263
  clearServiceGuidSetMap(): GetUserServiceLogsArgs;
264
264
 
265
+ getFollowLogs(): boolean;
266
+ setFollowLogs(value: boolean): GetUserServiceLogsArgs;
267
+
265
268
  serializeBinary(): Uint8Array;
266
269
  toObject(includeInstance?: boolean): GetUserServiceLogsArgs.AsObject;
267
270
  static toObject(includeInstance: boolean, msg: GetUserServiceLogsArgs): GetUserServiceLogsArgs.AsObject;
@@ -274,6 +277,7 @@ export namespace GetUserServiceLogsArgs {
274
277
  export type AsObject = {
275
278
  enclaveId: string,
276
279
  serviceGuidSetMap: Array<[string, boolean]>,
280
+ followLogs: boolean,
277
281
  }
278
282
  }
279
283
 
@@ -2219,7 +2219,8 @@ proto.engine_api.GetUserServiceLogsArgs.prototype.toObject = function(opt_includ
2219
2219
  proto.engine_api.GetUserServiceLogsArgs.toObject = function(includeInstance, msg) {
2220
2220
  var f, obj = {
2221
2221
  enclaveId: jspb.Message.getFieldWithDefault(msg, 1, ""),
2222
- serviceGuidSetMap: (f = msg.getServiceGuidSetMap()) ? f.toObject(includeInstance, undefined) : []
2222
+ serviceGuidSetMap: (f = msg.getServiceGuidSetMap()) ? f.toObject(includeInstance, undefined) : [],
2223
+ followLogs: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
2223
2224
  };
2224
2225
 
2225
2226
  if (includeInstance) {
@@ -2266,6 +2267,10 @@ proto.engine_api.GetUserServiceLogsArgs.deserializeBinaryFromReader = function(m
2266
2267
  jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readBool, null, "", false);
2267
2268
  });
2268
2269
  break;
2270
+ case 3:
2271
+ var value = /** @type {boolean} */ (reader.readBool());
2272
+ msg.setFollowLogs(value);
2273
+ break;
2269
2274
  default:
2270
2275
  reader.skipField();
2271
2276
  break;
@@ -2306,6 +2311,13 @@ proto.engine_api.GetUserServiceLogsArgs.serializeBinaryToWriter = function(messa
2306
2311
  if (f && f.getLength() > 0) {
2307
2312
  f.serializeBinary(2, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeBool);
2308
2313
  }
2314
+ f = message.getFollowLogs();
2315
+ if (f) {
2316
+ writer.writeBool(
2317
+ 3,
2318
+ f
2319
+ );
2320
+ }
2309
2321
  };
2310
2322
 
2311
2323
 
@@ -2349,6 +2361,24 @@ proto.engine_api.GetUserServiceLogsArgs.prototype.clearServiceGuidSetMap = funct
2349
2361
  return this;};
2350
2362
 
2351
2363
 
2364
+ /**
2365
+ * optional bool follow_logs = 3;
2366
+ * @return {boolean}
2367
+ */
2368
+ proto.engine_api.GetUserServiceLogsArgs.prototype.getFollowLogs = function() {
2369
+ return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
2370
+ };
2371
+
2372
+
2373
+ /**
2374
+ * @param {boolean} value
2375
+ * @return {!proto.engine_api.GetUserServiceLogsArgs} returns this
2376
+ */
2377
+ proto.engine_api.GetUserServiceLogsArgs.prototype.setFollowLogs = function(value) {
2378
+ return jspb.Message.setProto3BooleanField(this, 3, value);
2379
+ };
2380
+
2381
+
2352
2382
 
2353
2383
 
2354
2384
 
@@ -4,4 +4,4 @@ export declare function newCreateEnclaveArgs(enclaveId: string, apiContainerImag
4
4
  export declare function newStopEnclaveArgs(enclaveId: string): DestroyEnclaveArgs;
5
5
  export declare function newDestroyEnclaveArgs(enclaveId: string): DestroyEnclaveArgs;
6
6
  export declare function newCleanArgs(shouldCleanAll: boolean): CleanArgs;
7
- export declare function newGetUserServiceLogsArgs(enclaveID: string, userServiceGUIDs: Set<ServiceGUID>): GetUserServiceLogsArgs;
7
+ export declare function newGetUserServiceLogsArgs(enclaveID: string, userServiceGUIDs: Set<ServiceGUID>, shouldFollowLogs: boolean): GetUserServiceLogsArgs;
@@ -32,7 +32,7 @@ function newCleanArgs(shouldCleanAll) {
32
32
  return result;
33
33
  }
34
34
  exports.newCleanArgs = newCleanArgs;
35
- function newGetUserServiceLogsArgs(enclaveID, userServiceGUIDs) {
35
+ function newGetUserServiceLogsArgs(enclaveID, userServiceGUIDs, shouldFollowLogs) {
36
36
  const result = new engine_service_pb_1.GetUserServiceLogsArgs();
37
37
  result.setEnclaveId(enclaveID);
38
38
  const serviceGUIDSetMap = result.getServiceGuidSetMap();
@@ -40,6 +40,7 @@ function newGetUserServiceLogsArgs(enclaveID, userServiceGUIDs) {
40
40
  for (const serviceGUID of userServiceGUIDs) {
41
41
  serviceGUIDSetMap.set(serviceGUID, isServiceGUIDInSet);
42
42
  }
43
+ result.setFollowLogs(shouldFollowLogs);
43
44
  return result;
44
45
  }
45
46
  exports.newGetUserServiceLogsArgs = newGetUserServiceLogsArgs;
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { Result } from "neverthrow";
3
- import { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, StopEnclaveArgs, GetUserServiceLogsArgs, GetUserServiceLogsResponse } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
3
+ import { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, StopEnclaveArgs, GetUserServiceLogsArgs } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
4
4
  import { Readable } from "stream";
5
5
  export interface GenericEngineClient {
6
6
  getEngineInfo(): Promise<Result<GetEngineInfoResponse, Error>>;
@@ -9,6 +9,5 @@ export interface GenericEngineClient {
9
9
  stopEnclave(stopEnclaveArgs: StopEnclaveArgs): Promise<Result<null, Error>>;
10
10
  destroyEnclave(destroyEnclaveArgs: DestroyEnclaveArgs): Promise<Result<null, Error>>;
11
11
  clean(cleanArgs: CleanArgs): Promise<Result<CleanResponse, Error>>;
12
- getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<GetUserServiceLogsResponse, Error>>;
13
- streamUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
12
+ getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
14
13
  }
@@ -3,7 +3,7 @@ import { Result } from 'neverthrow';
3
3
  import { Readable } from 'stream';
4
4
  import type { EngineServiceClient as EngineServiceClientNode } from "../../kurtosis_engine_rpc_api_bindings/engine_service_grpc_pb";
5
5
  import type { GenericEngineClient } from "./generic_engine_client";
6
- import type { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, GetUserServiceLogsArgs, GetUserServiceLogsResponse, StopEnclaveArgs } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
6
+ import type { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, GetUserServiceLogsArgs, StopEnclaveArgs } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
7
7
  export declare class GrpcNodeEngineClient implements GenericEngineClient {
8
8
  private readonly client;
9
9
  constructor(client: EngineServiceClientNode);
@@ -13,7 +13,6 @@ export declare class GrpcNodeEngineClient implements GenericEngineClient {
13
13
  destroyEnclave(destroyEnclaveArgs: DestroyEnclaveArgs): Promise<Result<null, Error>>;
14
14
  clean(cleanArgs: CleanArgs): Promise<Result<CleanResponse, Error>>;
15
15
  getEnclavesResponse(): Promise<Result<GetEnclavesResponse, Error>>;
16
- getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<GetUserServiceLogsResponse, Error>>;
17
- streamUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
16
+ getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
18
17
  private createNewUserServiceLogsReadable;
19
18
  }
@@ -169,33 +169,9 @@ class GrpcNodeEngineClient {
169
169
  });
170
170
  }
171
171
  getUserServiceLogs(getUserServiceLogsArgs) {
172
- return __awaiter(this, void 0, void 0, function* () {
173
- const getUserServiceLogsPromise = new Promise((resolve, _unusedReject) => {
174
- this.client.getUserServiceLogs(getUserServiceLogsArgs, (error, response) => {
175
- if (error === null) {
176
- if (!response) {
177
- resolve((0, neverthrow_1.err)(new Error(consts_1.NO_ERROR_ENCOUNTERED_BUT_RESPONSE_FALSY_MSG)));
178
- }
179
- else {
180
- resolve((0, neverthrow_1.ok)(response));
181
- }
182
- }
183
- else {
184
- resolve((0, neverthrow_1.err)(error));
185
- }
186
- });
187
- });
188
- const getUserServiceLogsResponseResult = yield getUserServiceLogsPromise;
189
- if (getUserServiceLogsResponseResult.isErr()) {
190
- return (0, neverthrow_1.err)(getUserServiceLogsResponseResult.error);
191
- }
192
- return (0, neverthrow_1.ok)(getUserServiceLogsResponseResult.value);
193
- });
194
- }
195
- streamUserServiceLogs(getUserServiceLogsArgs) {
196
172
  return __awaiter(this, void 0, void 0, function* () {
197
173
  const streamUserServiceLogsPromise = new Promise((resolve, _unusedReject) => {
198
- const getUserServiceLogsStreamResponse = this.client.streamUserServiceLogs(getUserServiceLogsArgs);
174
+ const getUserServiceLogsStreamResponse = this.client.getUserServiceLogs(getUserServiceLogsArgs);
199
175
  resolve((0, neverthrow_1.ok)(getUserServiceLogsStreamResponse));
200
176
  });
201
177
  const streamUserServiceLogsResponseResult = yield streamUserServiceLogsPromise;
@@ -2,7 +2,7 @@
2
2
  import { Result } from "neverthrow";
3
3
  import type { EngineServiceClient as EngineServiceClientWeb } from "../../kurtosis_engine_rpc_api_bindings/engine_service_grpc_web_pb";
4
4
  import type { GenericEngineClient } from "./generic_engine_client";
5
- import type { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, StopEnclaveArgs, GetUserServiceLogsArgs, GetUserServiceLogsResponse } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
5
+ import type { CleanArgs, CleanResponse, CreateEnclaveArgs, CreateEnclaveResponse, DestroyEnclaveArgs, GetEnclavesResponse, GetEngineInfoResponse, StopEnclaveArgs, GetUserServiceLogsArgs } from "../../kurtosis_engine_rpc_api_bindings/engine_service_pb";
6
6
  import { Readable } from "stream";
7
7
  export declare class GrpcWebEngineClient implements GenericEngineClient {
8
8
  private readonly client;
@@ -13,7 +13,6 @@ export declare class GrpcWebEngineClient implements GenericEngineClient {
13
13
  destroyEnclave(destroyEnclaveArgs: DestroyEnclaveArgs): Promise<Result<null, Error>>;
14
14
  clean(cleanArgs: CleanArgs): Promise<Result<CleanResponse, Error>>;
15
15
  getEnclavesResponse(): Promise<Result<GetEnclavesResponse, Error>>;
16
- getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<GetUserServiceLogsResponse, Error>>;
17
- streamUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
16
+ getUserServiceLogs(getUserServiceLogsArgs: GetUserServiceLogsArgs): Promise<Result<Readable, Error>>;
18
17
  private createNewUserServiceLogsReadable;
19
18
  }
@@ -169,33 +169,9 @@ class GrpcWebEngineClient {
169
169
  });
170
170
  }
171
171
  getUserServiceLogs(getUserServiceLogsArgs) {
172
- return __awaiter(this, void 0, void 0, function* () {
173
- const getUserServiceLogsPromise = new Promise((resolve, _unusedReject) => {
174
- this.client.getUserServiceLogs(getUserServiceLogsArgs, {}, (error, response) => {
175
- if (error === null) {
176
- if (!response) {
177
- resolve((0, neverthrow_1.err)(new Error(consts_1.NO_ERROR_ENCOUNTERED_BUT_RESPONSE_FALSY_MSG)));
178
- }
179
- else {
180
- resolve((0, neverthrow_1.ok)(response));
181
- }
182
- }
183
- else {
184
- resolve((0, neverthrow_1.err)(error));
185
- }
186
- });
187
- });
188
- const getUserServiceLogsResponseResult = yield getUserServiceLogsPromise;
189
- if (getUserServiceLogsResponseResult.isErr()) {
190
- return (0, neverthrow_1.err)(getUserServiceLogsResponseResult.error);
191
- }
192
- return (0, neverthrow_1.ok)(getUserServiceLogsResponseResult.value);
193
- });
194
- }
195
- streamUserServiceLogs(getUserServiceLogsArgs) {
196
172
  return __awaiter(this, void 0, void 0, function* () {
197
173
  const streamUserServiceLogsPromise = new Promise((resolve, _unusedReject) => {
198
- const getUserServiceLogsStreamResponse = this.client.streamUserServiceLogs(getUserServiceLogsArgs);
174
+ const getUserServiceLogsStreamResponse = this.client.getUserServiceLogs(getUserServiceLogsArgs);
199
175
  resolve((0, neverthrow_1.ok)(getUserServiceLogsStreamResponse));
200
176
  });
201
177
  const streamUserServiceLogsResponseResult = yield streamUserServiceLogsPromise;
@@ -15,8 +15,7 @@ export declare class KurtosisContext {
15
15
  stopEnclave(enclaveId: EnclaveID): Promise<Result<null, Error>>;
16
16
  destroyEnclave(enclaveId: EnclaveID): Promise<Result<null, Error>>;
17
17
  clean(shouldCleanAll: boolean): Promise<Result<Set<string>, Error>>;
18
- getUserServiceLogs(enclaveID: EnclaveID, userServiceGUIDs: Set<ServiceGUID>): Promise<Result<Map<string, Array<string>>, Error>>;
19
- streamUserServiceLogs(enclaveID: EnclaveID, userServiceGUIDs: Set<ServiceGUID>): Promise<Result<Readable, Error>>;
18
+ getUserServiceLogs(enclaveID: EnclaveID, userServiceGUIDs: Set<ServiceGUID>, shouldFollowLogs: boolean): Promise<Result<Readable, Error>>;
20
19
  private newEnclaveContextFromEnclaveInfo;
21
20
  private static validateEngineApiVersion;
22
21
  }
@@ -164,22 +164,6 @@ class KurtosisContext {
164
164
  return (0, neverthrow_1.ok)(result);
165
165
  });
166
166
  }
167
- // Docs available at https://docs.kurtosistech.com/kurtosis/engine-lib-documentation
168
- getUserServiceLogs(enclaveID, userServiceGUIDs) {
169
- return __awaiter(this, void 0, void 0, function* () {
170
- const getUserServiceLogsArgs = (0, constructor_calls_1.newGetUserServiceLogsArgs)(enclaveID, userServiceGUIDs);
171
- const getUserServiceLogsResult = yield this.client.getUserServiceLogs(getUserServiceLogsArgs);
172
- if (getUserServiceLogsResult.isErr()) {
173
- return (0, neverthrow_1.err)(getUserServiceLogsResult.error);
174
- }
175
- const getUserServiceLogsResponse = getUserServiceLogsResult.value;
176
- const result = new Map;
177
- getUserServiceLogsResponse.getUserServiceLogsByUserServiceGuidMap().forEach((userServiceLogLine, userServiceGUIDStr) => {
178
- result.set(userServiceGUIDStr, userServiceLogLine.getLineList());
179
- });
180
- return (0, neverthrow_1.ok)(result);
181
- });
182
- }
183
167
  //The Readable object returned will be constantly streaming the user service logs an sending on this form Map<ServiceGuid, Array<string>>
184
168
  //The map value contains the user service logs lines
185
169
  //Example of how to read the stream:
@@ -188,10 +172,10 @@ class KurtosisContext {
188
172
  // //insert your code here
189
173
  //})
190
174
  //You can cancel receiving the stream from the service calling serviceLogsReadable.destroy()
191
- streamUserServiceLogs(enclaveID, userServiceGUIDs) {
175
+ getUserServiceLogs(enclaveID, userServiceGUIDs, shouldFollowLogs) {
192
176
  return __awaiter(this, void 0, void 0, function* () {
193
- const getUserServiceLogsArgs = (0, constructor_calls_1.newGetUserServiceLogsArgs)(enclaveID, userServiceGUIDs);
194
- const streamUserServiceLogsResult = yield this.client.streamUserServiceLogs(getUserServiceLogsArgs);
177
+ const getUserServiceLogsArgs = (0, constructor_calls_1.newGetUserServiceLogsArgs)(enclaveID, userServiceGUIDs, shouldFollowLogs);
178
+ const streamUserServiceLogsResult = yield this.client.getUserServiceLogs(getUserServiceLogsArgs);
195
179
  if (streamUserServiceLogsResult.isErr()) {
196
180
  return (0, neverthrow_1.err)(streamUserServiceLogsResult.error);
197
181
  }
@@ -4,5 +4,5 @@ exports.KURTOSIS_VERSION = void 0;
4
4
  // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
5
5
  // This is necessary so that Kurt Core consumers (e.g. modules) will know if they're compatible with the currently-running
6
6
  // API container
7
- exports.KURTOSIS_VERSION = "0.51.13";
7
+ exports.KURTOSIS_VERSION = "0.52.0";
8
8
  // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "kurtosis-sdk",
3
3
  "//": "NOTE: DO NOT UPDATE THIS VERSION MANUALLY - IT WILL BE UPDATED DURING THE RELEASE PROCESS!",
4
- "version": "0.51.13",
4
+ "version": "0.52.0",
5
5
  "main": "./build/index",
6
6
  "description": "This repo contains a Typescript client for communicating with the Kurtosis Engine server, which is responsible for creating, managing and destroying Kurtosis Enclaves.",
7
7
  "types": "./build/index",