@supraio/client-sdk 0.0.1-master.11 → 0.0.1-master.13

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.
Files changed (45) hide show
  1. package/dist/browser/src/Options.d.ts +55 -0
  2. package/dist/browser/src/Platform/daemonHelper.d.ts +11 -5
  3. package/dist/browser/src/Platform/daemonHelper.js +50 -12
  4. package/dist/browser/src/Platform/daemonHelper.js.map +1 -1
  5. package/dist/browser/src/Platform/pathHelper.d.ts +3 -3
  6. package/dist/browser/src/Platform/pathHelper.js +3 -3
  7. package/dist/browser/src/Platform/pathHelper.js.map +1 -1
  8. package/dist/browser/src/Process/Options.d.ts +5 -13
  9. package/dist/browser/src/Process/Process.d.ts +3 -1
  10. package/dist/browser/src/Process/ProcessSdk.d.ts +16 -12
  11. package/dist/browser/src/Process/ProcessSdk.js +73 -38
  12. package/dist/browser/src/Process/ProcessSdk.js.map +1 -1
  13. package/dist/browser/src/Sdk.js +1 -1
  14. package/dist/browser/src/Sdk.js.map +1 -1
  15. package/dist/browser/src/Session/FSSessionStorage.js +1 -1
  16. package/dist/browser/src/Session/FSSessionStorage.js.map +1 -1
  17. package/dist/browser/src/Session/RemoteSession.d.ts +2 -4
  18. package/dist/browser/src/index.d.ts +1 -0
  19. package/dist/browser/src/index.js +1 -0
  20. package/dist/browser/src/index.js.map +1 -1
  21. package/dist/browser/src/polyfill.js +1 -0
  22. package/dist/browser/src/polyfill.js.map +1 -1
  23. package/dist/node/src/Options.d.ts +55 -0
  24. package/dist/node/src/Platform/daemonHelper.d.ts +11 -5
  25. package/dist/node/src/Platform/daemonHelper.js +54 -13
  26. package/dist/node/src/Platform/daemonHelper.js.map +1 -1
  27. package/dist/node/src/Platform/pathHelper.d.ts +3 -3
  28. package/dist/node/src/Platform/pathHelper.js +3 -3
  29. package/dist/node/src/Platform/pathHelper.js.map +1 -1
  30. package/dist/node/src/Process/Options.d.ts +5 -13
  31. package/dist/node/src/Process/Process.d.ts +3 -1
  32. package/dist/node/src/Process/ProcessSdk.d.ts +16 -12
  33. package/dist/node/src/Process/ProcessSdk.js +73 -38
  34. package/dist/node/src/Process/ProcessSdk.js.map +1 -1
  35. package/dist/node/src/Sdk.js +1 -1
  36. package/dist/node/src/Sdk.js.map +1 -1
  37. package/dist/node/src/Session/FSSessionStorage.js +1 -1
  38. package/dist/node/src/Session/FSSessionStorage.js.map +1 -1
  39. package/dist/node/src/Session/RemoteSession.d.ts +2 -4
  40. package/dist/node/src/index.d.ts +1 -0
  41. package/dist/node/src/index.js +3 -0
  42. package/dist/node/src/index.js.map +1 -1
  43. package/dist/node/src/polyfill.js +1 -0
  44. package/dist/node/src/polyfill.js.map +1 -1
  45. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"FSSessionStorage.js","sourceRoot":"","sources":["../../../../src/Session/FSSessionStorage.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,MAAM,yBAAyB,GAAG,UAAU,CAAC;AAE7C,MAAM,OAAO,gBAAgB;IAKnB;IAHD,EAAE,GAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,kCAAkC;IAE3F,YACS,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;IAClC,CAAC;IAEG,KAAK,CAAC,WAAW,CAAC,QAA0B;QAClD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChE,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,WAAW;QACvB,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChE,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7E,MAAM,QAAQ,GAAqB,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,sBAAsB;QACnC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACtD,CAAC;CACD"}
1
+ {"version":3,"file":"FSSessionStorage.js","sourceRoot":"","sources":["../../../../src/Session/FSSessionStorage.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpD,MAAM,yBAAyB,GAAG,UAAU,CAAC;AAE7C,MAAM,OAAO,gBAAgB;IAKnB;IAHD,EAAE,GAAkB,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,kCAAkC;IAE3F,YACS,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;IAClC,CAAC;IAEG,KAAK,CAAC,WAAW,CAAC,QAA0B;QAClD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChE,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,WAAW;QACvB,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChE,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7E,MAAM,QAAQ,GAAqB,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,sBAAsB;QACnC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IACtD,CAAC;CACD"}
@@ -1,11 +1,9 @@
1
+ import { ClientOptions } from "../Options";
1
2
  export interface RemoteSession {
2
3
  uid: string;
3
4
  ssh?: {
4
5
  publicKey: string;
5
6
  };
6
- client: {
7
- id: string;
8
- secret: string;
9
- };
7
+ client: ClientOptions;
10
8
  createdAt: Date;
11
9
  }
@@ -1,3 +1,4 @@
1
1
  import './polyfill';
2
2
  export * from './Sdk';
3
3
  export * from './Options';
4
+ export { waitReady } from './Platform/daemonHelper';
@@ -1,4 +1,5 @@
1
1
  import './polyfill';
2
2
  export * from './Sdk';
3
3
  export * from './Options';
4
+ export { waitReady } from './Platform/daemonHelper';
4
5
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAC;AACpB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,CAAC;AACpB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC"}
@@ -3,6 +3,7 @@ import os from 'os';
3
3
  if (typeof window !== 'undefined') {
4
4
  window.global = window.global ?? window;
5
5
  window.process = window.process ?? {
6
+ browser: true,
6
7
  env: {
7
8
  TARGET: 'browser',
8
9
  },
@@ -1 +1 @@
1
- {"version":3,"file":"polyfill.js","sourceRoot":"","sources":["../../../src/polyfill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,IAAI,CAAC;AAQpB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;IACnC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IACxC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI;QAClC,GAAG,EAAE;YACJ,MAAM,EAAE,SAAS;SACjB;KACD,CAAC;IACF,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IACxC,IAAI,OAAO,EAAE,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACtC,EAAE,CAAC,QAAkC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC;IACxD,CAAC;IACD,IAAI,OAAO,EAAE,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACrC,EAAE,CAAC,OAAwB,GAAG,EAAE,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,OAAO,EAAE,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAEtC,EAAE,CAAC,QAA8D,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IACpI,CAAC;AACF,CAAC;KAAM,CAAC;IACP,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAiB,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"polyfill.js","sourceRoot":"","sources":["../../../src/polyfill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,IAAI,CAAC;AAQpB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;IACnC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IACxC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI;QAClC,OAAO,EAAE,IAAI;QACb,GAAG,EAAE;YACJ,MAAM,EAAE,SAAS;SACjB;KACD,CAAC;IACF,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IACxC,IAAI,OAAO,EAAE,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QACtC,EAAE,CAAC,QAAkC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC;IACxD,CAAC;IACD,IAAI,OAAO,EAAE,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACrC,EAAE,CAAC,OAAwB,GAAG,EAAE,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,OAAO,EAAE,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAEtC,EAAE,CAAC,QAA8D,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IACpI,CAAC;AACF,CAAC;KAAM,CAAC;IACP,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,MAAiB,CAAC;AACpD,CAAC"}
@@ -27,6 +27,49 @@ export declare enum NetPacketDriver {
27
27
  /** TCP replacement for simple_udp which prevents loosing packets */
28
28
  DriverSimpleTCP = "simple_tcp"
29
29
  }
30
+ export interface ClientOptions {
31
+ /**
32
+ * The clientID that is used to authenticate the client againts the server.
33
+ */
34
+ id: string;
35
+ /**
36
+ * The clientSecret that is used to authenticate the client againts the server.
37
+ */
38
+ secret: string;
39
+ }
40
+ export interface ServerOptions {
41
+ /**
42
+ * The hostname of the server where the metadata and screen server is located.
43
+ * It's hostname so it doesn't contain protocol or port.
44
+ * I.e. `metadata.example.com` or `192.168.1.2`
45
+ */
46
+ hostname: string;
47
+ /**
48
+ * If the connection to the server should be secured using TLS (https).
49
+ * Default to false.
50
+ */
51
+ secure?: boolean;
52
+ /**
53
+ * The port where the screen server is located.
54
+ * Default to 6113.
55
+ */
56
+ metadataPort?: number;
57
+ /**
58
+ * The port where the metadata server is located.
59
+ * Default to 6116.
60
+ */
61
+ metadataWSPort?: number;
62
+ /**
63
+ * The port where the screen server is located.
64
+ * Default to 6114.
65
+ */
66
+ screenPort?: number;
67
+ /**
68
+ * The port where the screen server is located.
69
+ * Default to 6117.
70
+ */
71
+ screenWSPort?: number;
72
+ }
30
73
  export interface ServiceOptions {
31
74
  /**
32
75
  * Where are the runtime options stored.
@@ -60,6 +103,18 @@ export interface ServiceOptions {
60
103
  * Defaults to NetPacketDriver.DriverSimpleUDP=simple_udp
61
104
  */
62
105
  screenDriver?: NetPacketDriver;
106
+ /**
107
+ * The server where the metadata and screen server is located.
108
+ * If specified, it will use this server prior to the server related to the session.
109
+ * If not specified, it will fetch the best server from the database based on the current firebase session.
110
+ */
111
+ server?: ServerOptions;
112
+ /**
113
+ * The client options that are used to authenticate the client against the server.
114
+ * If specified, it will use this client prior to the client related to the remote session.
115
+ * If not specified, it will fetch the best client from the database based on the current firebase session.
116
+ */
117
+ client?: ClientOptions;
63
118
  }
64
119
  export interface FirebaseOptions {
65
120
  apiKey: string;
@@ -1,6 +1,10 @@
1
- import { Server } from '../Server/Server';
2
- import { RemoteSession } from '../Session/RemoteSession';
3
- import { NetPacketDriver, NetStreamDriver, Options } from '../Options';
1
+ import { ClientOptions, NetPacketDriver, NetStreamDriver, ServerOptions, ServiceOptions } from '../Options';
2
+ export declare class TimeoutError extends Error {
3
+ constructor(message: string);
4
+ }
5
+ export declare class UnknownMessageTypeError extends Error {
6
+ constructor();
7
+ }
4
8
  export declare enum MsgType {
5
9
  AttachProcess = 36,
6
10
  SuccessResponse = 37,
@@ -10,7 +14,8 @@ export declare enum MsgType {
10
14
  DetachProcess = 41,
11
15
  ListProcesses = 42,
12
16
  GetProcessInfo = 43,
13
- ListAttachedProcesses = 45
17
+ ListAttachedProcesses = 45,
18
+ Unknown = 65535
14
19
  }
15
20
  export interface IServerInfo {
16
21
  MetadataDriver: NetStreamDriver;
@@ -34,5 +39,6 @@ export interface IStopProcessInfo extends IServerInfo {
34
39
  export interface IGetProcessInfo extends IServerInfo {
35
40
  ScreenID: string;
36
41
  }
37
- export declare function getServerInfo(server: Server, session: RemoteSession, options: Options | undefined): IServerInfo;
42
+ export declare function getServerInfo(serverOptions: ServerOptions, clientOptions: ClientOptions, options: ServiceOptions | undefined): IServerInfo;
38
43
  export declare function invoke(sockPath: string, msgType: MsgType, msgData: Buffer): Promise<Buffer>;
44
+ export declare function waitReady(serviceOptions: ServiceOptions | undefined, timeoutMs?: number): Promise<void>;
@@ -1,10 +1,27 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MsgType = void 0;
3
+ exports.MsgType = exports.UnknownMessageTypeError = exports.TimeoutError = void 0;
4
4
  exports.getServerInfo = getServerInfo;
5
5
  exports.invoke = invoke;
6
+ exports.waitReady = waitReady;
6
7
  const generator_1 = require("../Hash/generator");
7
8
  const Options_1 = require("../Options");
9
+ const pathHelper_1 = require("./pathHelper");
10
+ const wait_1 = require("../Timer/wait");
11
+ class TimeoutError extends Error {
12
+ constructor(message) {
13
+ super(message);
14
+ Object.setPrototypeOf(this, TimeoutError.prototype);
15
+ }
16
+ }
17
+ exports.TimeoutError = TimeoutError;
18
+ class UnknownMessageTypeError extends Error {
19
+ constructor() {
20
+ super('Unknown message type');
21
+ Object.setPrototypeOf(this, UnknownMessageTypeError.prototype);
22
+ }
23
+ }
24
+ exports.UnknownMessageTypeError = UnknownMessageTypeError;
8
25
  var MsgType;
9
26
  (function (MsgType) {
10
27
  MsgType[MsgType["AttachProcess"] = 36] = "AttachProcess";
@@ -16,6 +33,7 @@ var MsgType;
16
33
  MsgType[MsgType["ListProcesses"] = 42] = "ListProcesses";
17
34
  MsgType[MsgType["GetProcessInfo"] = 43] = "GetProcessInfo";
18
35
  MsgType[MsgType["ListAttachedProcesses"] = 45] = "ListAttachedProcesses";
36
+ MsgType[MsgType["Unknown"] = 65535] = "Unknown";
19
37
  })(MsgType || (exports.MsgType = MsgType = {}));
20
38
  const MSG_TYPE_SIZE = 2;
21
39
  const INVOCATION_ID_SIZE = 50;
@@ -24,19 +42,19 @@ const DEFAULT_METADATA_PORT = 6113;
24
42
  const DEFAULT_METADATA_WS_PORT = 6116;
25
43
  const DEFAULT_SCREEN_PORT = 6114;
26
44
  const DEFAULT_SCREEN_WS_PORT = 6117;
27
- function getServerInfo(server, session, options) {
28
- const metadataDriver = options?.service?.metadataDriver ?? Options_1.NetStreamDriver.DriverSimpleTCP;
29
- const screenDriver = options?.service?.screenDriver ?? Options_1.NetPacketDriver.DriverSimpleUDP;
30
- const metadataPort = getMetadataPortForDriver(server, metadataDriver);
31
- const screenPort = getScreenPortForDriver(server, screenDriver);
45
+ function getServerInfo(serverOptions, clientOptions, options) {
46
+ const metadataDriver = options?.metadataDriver ?? Options_1.NetStreamDriver.DriverSimpleTCP;
47
+ const screenDriver = options?.screenDriver ?? Options_1.NetPacketDriver.DriverSimpleUDP;
48
+ const metadataPort = getMetadataPortForDriver(serverOptions, metadataDriver);
49
+ const screenPort = getScreenPortForDriver(serverOptions, screenDriver);
32
50
  return {
33
- ClientID: session.client.id,
34
- ClientSecret: session.client.secret,
51
+ ClientID: clientOptions.id,
52
+ ClientSecret: clientOptions.secret,
35
53
  MetadataDriver: metadataDriver,
36
- MetadataHost: server.hostname + ':' + metadataPort,
54
+ MetadataHost: serverOptions.hostname + ':' + metadataPort,
37
55
  ScreenDriver: screenDriver,
38
- ScreenHost: server.hostname + ':' + screenPort,
39
- Secure: server.secure,
56
+ ScreenHost: serverOptions.hostname + ':' + screenPort,
57
+ Secure: serverOptions.secure ?? false,
40
58
  };
41
59
  }
42
60
  function getMetadataPortForDriver(server, driver) {
@@ -160,7 +178,13 @@ function invoke(sockPath, msgType, msgData) {
160
178
  resolve(responseData);
161
179
  }
162
180
  else if (respMsgType === MsgType.ErrorResponse) {
163
- reject(new Error(responseData.toString('utf8')));
181
+ const errorMessage = responseData.toString('utf8');
182
+ if (errorMessage === 'Unknown message type') {
183
+ reject(new UnknownMessageTypeError());
184
+ }
185
+ else {
186
+ reject(new Error(errorMessage));
187
+ }
164
188
  }
165
189
  else {
166
190
  reject(new Error(`Unknown response type=${respMsgType}, invocationId=${responseId}, data=` + responseData.toString('utf8')));
@@ -209,9 +233,26 @@ function invoke(sockPath, msgType, msgData) {
209
233
  });
210
234
  });
211
235
  const timeoutHandler = setTimeout(() => {
212
- reject(new Error('Request timed out'));
236
+ reject(new TimeoutError('Request timed out'));
213
237
  socket.end();
214
238
  }, 5e3);
215
239
  });
216
240
  }
241
+ async function waitReady(serviceOptions, timeoutMs = 15e3) {
242
+ const start = Date.now();
243
+ const sockPath = (0, pathHelper_1.getSockPath)(serviceOptions);
244
+ do {
245
+ try {
246
+ await invoke(sockPath, MsgType.Unknown, Buffer.from(JSON.stringify({})));
247
+ return; // Unexpected success but probably mean ready daemon
248
+ }
249
+ catch (error) {
250
+ if (error instanceof UnknownMessageTypeError) {
251
+ return; // Expected unknown message type = ready daemon
252
+ }
253
+ await (0, wait_1.wait)(1e3);
254
+ }
255
+ } while (Date.now() - start < timeoutMs);
256
+ throw new Error('Daemon waiting for ready timed out');
257
+ }
217
258
  //# sourceMappingURL=daemonHelper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"daemonHelper.js","sourceRoot":"","sources":["../../../../src/Platform/daemonHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"daemonHelper.js","sourceRoot":"","sources":["../../../../src/Platform/daemonHelper.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { Options } from "../Options";
2
- export declare function getRunPath(options?: Options): string;
1
+ import { Options, ServiceOptions } from "../Options";
2
+ export declare function getRunPath(options?: ServiceOptions): string;
3
3
  export declare function getLogPath(options?: Options): string;
4
4
  export declare function getClientDaemonBinPath(options?: Options): string;
5
- export declare function getSockPath(options?: Options): string;
5
+ export declare function getSockPath(options?: ServiceOptions): string;
@@ -14,7 +14,7 @@ const CLIENT_DAEMON_BIN = 'supra-client-daemon';
14
14
  const IS_WINDOWS = ['win32', 'cygwin'].includes((0, os_1.platform)());
15
15
  const PATH_ENV_DELIMITER = IS_WINDOWS ? ';' : ':';
16
16
  function getRunPath(options) {
17
- const runPath = options?.service?.runPath ?? (0, path_1.join)((0, os_1.homedir)(), RUN_RELATIVE_DIR);
17
+ const runPath = options?.runPath ?? (0, path_1.join)((0, os_1.homedir)(), RUN_RELATIVE_DIR);
18
18
  return runPath;
19
19
  }
20
20
  function getLogPath(options) {
@@ -45,12 +45,12 @@ function getClientDaemonBinPath(options) {
45
45
  function getSockPath(options) {
46
46
  if (IS_WINDOWS) {
47
47
  // Windows doesn' support UNIX socket
48
- const runPath = options?.service?.sockPath ?? SOCK_HOST;
48
+ const runPath = options?.sockPath ?? SOCK_HOST;
49
49
  return runPath;
50
50
  }
51
51
  else {
52
52
  const runPath = getRunPath(options);
53
- const sockPath = options?.service?.sockPath ?? (0, path_1.join)(runPath, SOCK_FILENAME);
53
+ const sockPath = options?.sockPath ?? (0, path_1.join)(runPath, SOCK_FILENAME);
54
54
  return sockPath;
55
55
  }
56
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"pathHelper.js","sourceRoot":"","sources":["../../../../src/Platform/pathHelper.ts"],"names":[],"mappings":";;AAaA,gCAGC;AAED,gCAGC;AAED,wDAqBC;AAED,kCAUC;AAxDD,2BAAuC;AACvC,+BAAmC;AAInC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACzD,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACzD,MAAM,aAAa,GAAG,aAAa,CAAC;AACpC,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAChD,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC5D,MAAM,kBAAkB,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAElD,SAAgB,UAAU,CAAC,OAAiB;IAC3C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAgB,UAAU,CAAC,OAAiB;IAC3C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAAiB;IACvD,MAAM,KAAK,GAAqB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkC;IAC5F,IAAI,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;QAC3C,OAAO,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,qBAAqB;IACtB,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IACvD,IAAI,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;QAC9E,WAAW,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE;QACpC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC;KAC1C,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,WAAW,CAAC,OAAiB;IAC5C,IAAI,UAAU,EAAE,CAAC;QAChB,qCAAqC;QACrC,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,SAAS,CAAC;QACxD,OAAO,OAAO,CAAC;IAChB,CAAC;SAAM,CAAC;QACP,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAA,WAAI,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC5E,OAAO,QAAQ,CAAC;IACjB,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"pathHelper.js","sourceRoot":"","sources":["../../../../src/Platform/pathHelper.ts"],"names":[],"mappings":";;AAaA,gCAGC;AAED,gCAGC;AAED,wDAqBC;AAED,kCAUC;AAxDD,2BAAuC;AACvC,+BAAmC;AAInC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACzD,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACzD,MAAM,aAAa,GAAG,aAAa,CAAC;AACpC,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAChD,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC5D,MAAM,kBAAkB,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAElD,SAAgB,UAAU,CAAC,OAAwB;IAClD,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,gBAAgB,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAgB,UAAU,CAAC,OAAiB;IAC3C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAAiB;IACvD,MAAM,KAAK,GAAqB,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,kCAAkC;IAC5F,IAAI,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;QAC3C,OAAO,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,qBAAqB;IACtB,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IACvD,IAAI,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;QACvC,WAAW,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;QAC9E,WAAW,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE;QACpC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC;KAC1C,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,WAAW,CAAC,OAAwB;IACnD,IAAI,UAAU,EAAE,CAAC;QAChB,qCAAqC;QACrC,MAAM,OAAO,GAAG,OAAO,EAAE,QAAQ,IAAI,SAAS,CAAC;QAC/C,OAAO,OAAO,CAAC;IAChB,CAAC;SAAM,CAAC;QACP,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAA,WAAI,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IACjB,CAAC;AACF,CAAC"}
@@ -1,26 +1,18 @@
1
- export interface OpenOptions {
2
- /** Identify server where the process will be running */
3
- serverUid: string;
4
- /** Name of application which creating the process */
5
- appName: string;
6
- /** array of args passed to program process when is started */
7
- appArgs: string[];
8
- /** Whether to create new process even if another already running */
9
- createNew?: boolean;
10
- /** If this option is specified, it will fail when process of application not running */
11
- runningOnly?: boolean;
1
+ export interface OpenOptions extends StartOptions {
12
2
  }
13
3
  export interface StartOptions {
14
4
  /** Identify server where the process will be running */
15
- serverUid: string;
5
+ serverUid?: string;
16
6
  /** Name of application which creating the process */
17
7
  appName: string;
18
8
  /** array of args passed to program process when is started */
19
9
  appArgs: string[];
10
+ /** Whether to create new process even if another already running */
11
+ createNew?: boolean;
20
12
  }
21
13
  export interface CloseOptions {
22
14
  /** Identify server where the process will be stopped */
23
- serverUid: string;
15
+ serverUid?: string;
24
16
  /** Name of application which closing the process */
25
17
  appName: string;
26
18
  }
@@ -1,5 +1,7 @@
1
1
  export interface Process {
2
2
  appName: string;
3
3
  screenId: string;
4
- serverUid: string;
4
+ }
5
+ export interface ProcessWithServerUid extends Process {
6
+ serverUid?: string;
5
7
  }
@@ -1,23 +1,24 @@
1
1
  import { OpenOptions, CloseOptions, StartOptions, GetProcessesOptions } from "./Options";
2
- import { Process } from './Process';
3
- import { Options } from '../Options';
2
+ import { ProcessWithServerUid } from './Process';
3
+ import { ServiceOptions } from '../Options';
4
4
  import { SessionSdk } from '../Session/SessionSdk';
5
5
  import { ServerSdk } from '../Server/ServerSdk';
6
6
  export declare class ProcessSdk {
7
- private options;
8
- private sessionSdk;
9
- private serverSdk;
7
+ private serviceOptions;
8
+ private sessionSdk?;
9
+ private serverSdk?;
10
10
  private sockPath;
11
- constructor(options: Options | undefined, sessionSdk: SessionSdk, serverSdk: ServerSdk);
11
+ constructor(serviceOptions: ServiceOptions | undefined, sessionSdk?: SessionSdk | undefined, serverSdk?: ServerSdk | undefined);
12
12
  /**
13
- * Open process with given options.
13
+ * Open process with given options. It will start process if it's not running and open it in foreground.
14
14
  * It can open existing process or create new process based on options.
15
- * If not special options specified, try to reuse existing process of app.
15
+ * It does the same as `start` but also opens the process in foreground.
16
16
  */
17
17
  open(openOptions: OpenOptions): Promise<void>;
18
18
  /**
19
- * Start process with given options.
20
- * It's not starting new, when app is already running
19
+ * Start process if it's not running with given options.
20
+ * It can start existing process or create new process based on options.
21
+ * Unlike `open`, it only starts the process and doesn't open it in foreground.
21
22
  */
22
23
  start(startOptions: StartOptions): Promise<{
23
24
  screenDriver: import("../Options").NetPacketDriver;
@@ -37,10 +38,13 @@ export declare class ProcessSdk {
37
38
  /**
38
39
  * Returns all currently running processes remotely
39
40
  */
40
- getProcesses(getProcessesOptions?: GetProcessesOptions): Promise<Process[]>;
41
+ getProcesses(getProcessesOptions?: GetProcessesOptions): Promise<ProcessWithServerUid[]>;
42
+ private getServers;
41
43
  /**
42
44
  * Returns all currently running processes locally attached to this computer
43
45
  */
44
- getAttachedProcesses(getProcessesOptions?: GetProcessesOptions): Promise<Process[]>;
46
+ getAttachedProcesses(getProcessesOptions?: GetProcessesOptions): Promise<ProcessWithServerUid[]>;
47
+ private getServerOptions;
48
+ private getClientOptions;
45
49
  private getServerProcesses;
46
50
  }
@@ -5,51 +5,48 @@ const daemonHelper_1 = require("../Platform/daemonHelper");
5
5
  const pathHelper_1 = require("../Platform/pathHelper");
6
6
  const SCREEN_ID_SIZE = 40;
7
7
  class ProcessSdk {
8
- options;
8
+ serviceOptions;
9
9
  sessionSdk;
10
10
  serverSdk;
11
11
  sockPath;
12
- constructor(options, sessionSdk, serverSdk) {
13
- this.options = options;
12
+ constructor(serviceOptions, sessionSdk, serverSdk) {
13
+ this.serviceOptions = serviceOptions;
14
14
  this.sessionSdk = sessionSdk;
15
15
  this.serverSdk = serverSdk;
16
- this.sockPath = (0, pathHelper_1.getSockPath)(options);
16
+ this.sockPath = (0, pathHelper_1.getSockPath)(serviceOptions);
17
17
  }
18
18
  /**
19
- * Open process with given options.
19
+ * Open process with given options. It will start process if it's not running and open it in foreground.
20
20
  * It can open existing process or create new process based on options.
21
- * If not special options specified, try to reuse existing process of app.
21
+ * It does the same as `start` but also opens the process in foreground.
22
22
  */
23
23
  async open(openOptions) {
24
- const server = await this.serverSdk.findServer(openOptions);
25
- const serverInfo = (0, daemonHelper_1.getServerInfo)(server, await this.sessionSdk.getRemote(), this.options);
26
- const processes = await this.getServerProcesses(server);
27
- const runningProcess = processes.find((process) => process.appName === openOptions.appName);
28
- if (!runningProcess) {
29
- const startInfo = {
30
- ...serverInfo,
31
- AppName: openOptions.appName,
32
- AppArgs: openOptions.appArgs,
33
- };
34
- await (0, daemonHelper_1.invoke)(this.sockPath, daemonHelper_1.MsgType.StartProcess, Buffer.from(JSON.stringify(startInfo), 'utf8'));
35
- }
24
+ const serverInfo = await this.start(openOptions);
36
25
  const attachInfo = {
37
- ...serverInfo,
38
- AppName: openOptions.appName,
26
+ MetadataDriver: serverInfo.metadataDriver,
27
+ MetadataHost: serverInfo.metadataHost,
28
+ ScreenDriver: serverInfo.screenDriver,
29
+ ScreenHost: serverInfo.screenHost,
30
+ ClientID: serverInfo.clientID,
31
+ ClientSecret: serverInfo.clientSecret,
32
+ Secure: serverInfo.secure,
33
+ AppName: openOptions.appName, // TODO it should use rather processId instead of appName because of possible name conflicts
39
34
  };
40
35
  await (0, daemonHelper_1.invoke)(this.sockPath, daemonHelper_1.MsgType.AttachProcess, Buffer.from(JSON.stringify(attachInfo), 'ascii'));
41
36
  }
42
37
  /**
43
- * Start process with given options.
44
- * It's not starting new, when app is already running
38
+ * Start process if it's not running with given options.
39
+ * It can start existing process or create new process based on options.
40
+ * Unlike `open`, it only starts the process and doesn't open it in foreground.
45
41
  */
46
42
  async start(startOptions) {
47
- const server = await this.serverSdk.findServer(startOptions);
48
- const serverInfo = (0, daemonHelper_1.getServerInfo)(server, await this.sessionSdk.getRemote(), this.options);
49
- const processes = await this.getServerProcesses(server);
43
+ const serverOptions = await this.getServerOptions(startOptions);
44
+ const clientOptions = await this.getClientOptions();
45
+ const serverInfo = (0, daemonHelper_1.getServerInfo)(serverOptions, clientOptions, this.serviceOptions);
46
+ const processes = await this.getServerProcesses(serverOptions, clientOptions);
50
47
  const runningProcess = processes.find((process) => process.appName === startOptions.appName);
51
48
  let screenID;
52
- if (!runningProcess) {
49
+ if (!runningProcess || startOptions.createNew) {
53
50
  const startInfo = {
54
51
  ...serverInfo,
55
52
  AppName: startOptions.appName,
@@ -77,12 +74,13 @@ class ProcessSdk {
77
74
  * It closes the given process remotely and locally as well.
78
75
  */
79
76
  async close(closeOptions) {
80
- const server = await this.serverSdk.findServer(closeOptions);
81
- const processes = await this.getServerProcesses(server);
77
+ const serverOptions = await this.getServerOptions(closeOptions);
78
+ const clientOptions = await this.getClientOptions();
79
+ const processes = await this.getServerProcesses(serverOptions, clientOptions);
82
80
  const runningProcess = processes.find((process) => process.appName === closeOptions.appName);
83
81
  if (runningProcess) {
84
82
  const stopInfo = {
85
- ...(0, daemonHelper_1.getServerInfo)(server, await this.sessionSdk.getRemote(), this.options),
83
+ ...(0, daemonHelper_1.getServerInfo)(serverOptions, clientOptions, this.serviceOptions),
86
84
  AppName: runningProcess.appName,
87
85
  };
88
86
  await (0, daemonHelper_1.invoke)(this.sockPath, daemonHelper_1.MsgType.StopProcess, Buffer.from(JSON.stringify(stopInfo), 'ascii'));
@@ -95,18 +93,36 @@ class ProcessSdk {
95
93
  * Returns all currently running processes remotely
96
94
  */
97
95
  async getProcesses(getProcessesOptions) {
98
- const serverOptions = {};
96
+ const clientOptions = await this.getClientOptions();
97
+ const getServerOptions = {};
99
98
  if (getProcessesOptions?.serverUid) {
100
- serverOptions.serverUids = [getProcessesOptions.serverUid];
99
+ getServerOptions.serverUids = [getProcessesOptions.serverUid];
101
100
  }
102
- const servers = await this.serverSdk.getServers(serverOptions);
101
+ const servers = await this.getServers(getServerOptions);
103
102
  const processes = [];
104
103
  for (const server of servers) {
105
- const serverProcesses = await this.getServerProcesses(server);
106
- processes.push(...serverProcesses);
104
+ const serverProcesses = await this.getServerProcesses(server, clientOptions);
105
+ for (const process of serverProcesses) {
106
+ processes.push({
107
+ ...process,
108
+ serverUid: 'serverUid' in server ? server.serverUid : undefined,
109
+ });
110
+ }
107
111
  }
108
112
  return processes;
109
113
  }
114
+ async getServers(serverOptions) {
115
+ if (this.serviceOptions?.server) {
116
+ if (serverOptions.serverUids) {
117
+ throw new Error(`Cannot get servers by uids when serviceOptions.server is set. It's a single server API.`);
118
+ }
119
+ return [this.serviceOptions.server];
120
+ }
121
+ if (!this.serverSdk) {
122
+ throw new Error(`Server SDK is not set. It requires a service.server options to work with processes`);
123
+ }
124
+ return await this.serverSdk.getServers(serverOptions);
125
+ }
110
126
  /**
111
127
  * Returns all currently running processes locally attached to this computer
112
128
  */
@@ -123,8 +139,28 @@ class ProcessSdk {
123
139
  .filter((process) => !getProcessesOptions?.serverUid || getProcessesOptions.serverUid === process.serverUid);
124
140
  return attachedProcesses;
125
141
  }
126
- async getServerProcesses(server) {
127
- const serverInfo = (0, daemonHelper_1.getServerInfo)(server, await this.sessionSdk.getRemote(), this.options);
142
+ async getServerOptions(findServerOptions) {
143
+ if (this.serviceOptions?.server) {
144
+ return this.serviceOptions?.server;
145
+ }
146
+ if (!this.serverSdk) {
147
+ throw new Error(`Server SDK is not set. It requires a service.server options to work with processes`);
148
+ }
149
+ const server = await this.serverSdk.findServer(findServerOptions);
150
+ return server;
151
+ }
152
+ async getClientOptions() {
153
+ if (this.serviceOptions?.client) {
154
+ return this.serviceOptions?.client;
155
+ }
156
+ if (!this.sessionSdk) {
157
+ throw new Error(`Session SDK is not set. It requires a service.client options to work with processes`);
158
+ }
159
+ const remoteSession = await this.sessionSdk.getRemote();
160
+ return remoteSession.client;
161
+ }
162
+ async getServerProcesses(serverOptions, clientOptions) {
163
+ const serverInfo = (0, daemonHelper_1.getServerInfo)(serverOptions, clientOptions, this.serviceOptions);
128
164
  const screenIdsData = await (0, daemonHelper_1.invoke)(this.sockPath, daemonHelper_1.MsgType.ListProcesses, Buffer.from(JSON.stringify(serverInfo)));
129
165
  const screenIds = [];
130
166
  for (let i = 0; i < screenIdsData.byteLength; i += SCREEN_ID_SIZE) {
@@ -135,14 +171,13 @@ class ProcessSdk {
135
171
  for (const screenId of screenIds) {
136
172
  try {
137
173
  const getInfo = {
138
- ...(0, daemonHelper_1.getServerInfo)(server, await this.sessionSdk.getRemote(), this.options),
174
+ ...(0, daemonHelper_1.getServerInfo)(serverOptions, clientOptions, this.serviceOptions),
139
175
  ScreenID: screenId,
140
176
  };
141
177
  const processInfoData = await (0, daemonHelper_1.invoke)(this.sockPath, daemonHelper_1.MsgType.GetProcessInfo, Buffer.from(JSON.stringify(getInfo), 'ascii'));
142
178
  const process = {
143
179
  appName: processInfoData.toString('ascii'),
144
180
  screenId,
145
- serverUid: server.serverUid,
146
181
  };
147
182
  processes.push(process);
148
183
  }