@lockerpm/desktop-service 1.1.1 → 1.1.2

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 (9) hide show
  1. package/lib/cjs/services/grpc.service.js +19 -1
  2. package/lib/cjs/services/socket.service.js +4 -1
  3. package/lib/cjs/types/services/grpc.service.d.ts.map +1 -1
  4. package/lib/cjs/types/services/socket.service.d.ts.map +1 -1
  5. package/lib/esm/services/grpc.service.js +19 -1
  6. package/lib/esm/services/socket.service.js +4 -1
  7. package/lib/esm/types/services/grpc.service.d.ts.map +1 -1
  8. package/lib/esm/types/services/socket.service.d.ts.map +1 -1
  9. package/package.json +1 -1
package/lib/cjs/services/grpc.service.js CHANGED
@@ -49,7 +49,7 @@ class GRPCService {
49
49
  }
50
50
  for (const httpPort of config_1.HTTP_PORTS) {
51
51
  this.logger.debug(`Ping background service on port ${httpPort}`);
52
- const { success, res } = yield this.pingService(httpPort);
52
+ const { success, res, keepGoing } = yield this.pingService(httpPort);
53
53
  if (success && res) {
54
54
  const port = res.tcpPort;
55
55
  const client = yield this.testConnection(port);
@@ -63,6 +63,11 @@ class GRPCService {
63
63
  }
64
64
  }
65
65
  }
66
+ else {
67
+ if (!keepGoing) {
68
+ break;
69
+ }
70
+ }
66
71
  }
67
72
  this.logger.error('Cannot connect to GRPC server');
68
73
  });
@@ -79,11 +84,24 @@ class GRPCService {
79
84
  return {
80
85
  success: data.message === 'pong' && data.alias === this.serviceAlias,
81
86
  res: data,
87
+ keepGoing: true,
82
88
  };
83
89
  }
84
90
  catch (e) {
91
+ const error = e;
92
+ let keepGoing = false;
93
+ if (error === null || error === void 0 ? void 0 : error.response) {
94
+ keepGoing = true;
95
+ }
96
+ else if (error === null || error === void 0 ? void 0 : error.request) {
97
+ // Timeout
98
+ if (error === null || error === void 0 ? void 0 : error.toString().toLowerCase().includes('timeout')) {
99
+ keepGoing = true;
100
+ }
101
+ }
85
102
  return {
86
103
  success: false,
104
+ keepGoing,
87
105
  };
88
106
  }
89
107
  });
package/lib/cjs/services/socket.service.js CHANGED
@@ -27,11 +27,14 @@ class SocketService {
27
27
  this.serviceAlias = '';
28
28
  this.currentPort = 0;
29
29
  this.currentSslPort = 0;
30
- const { logger, pairingService, userService, eventService, ssl } = params;
30
+ const { logger, pairingService, userService, eventService, ssl, serviceAlias } = params;
31
31
  this.logger = logger;
32
32
  this.pairingService = pairingService;
33
33
  this.userService = userService;
34
34
  this.eventService = eventService;
35
+ if (serviceAlias) {
36
+ this.serviceAlias = serviceAlias;
37
+ }
35
38
  if (ssl) {
36
39
  this.sslConfig = ssl;
37
40
  this.initSslSocket();
package/lib/cjs/types/services/grpc.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.service.d.ts","sourceRoot":"","sources":["../../../../src/services/grpc.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAK1C,qBAAa,WAAW;IACtB,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,WAAW,SAAI;IAEf,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAK;gBAGvB,QAAQ,EAAE;QACR,MAAM,EAAE,UAAU,CAAA;QAClB,aAAa,EAAE,aAAa,CAAA;QAC5B,UAAU,EAAE,UAAU,CAAA;KACvB,EACD,OAAO,EAAE;QACP,GAAG,CAAC,EAAE;YACJ,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,YAAY,EAAE,MAAM,CAAA;KACrB;IAmBH,IAAI,OAAO,YAEV;IAEK,cAAc;YA2BN,WAAW;IAkBzB,OAAO,CAAC,cAAc;YAgBR,kBAAkB;YAgBlB,oBAAoB;CAKnC"}
1
+ {"version":3,"file":"grpc.service.d.ts","sourceRoot":"","sources":["../../../../src/services/grpc.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAK1C,qBAAa,WAAW;IACtB,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,WAAW,SAAI;IAEf,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAK;gBAGvB,QAAQ,EAAE;QACR,MAAM,EAAE,UAAU,CAAA;QAClB,aAAa,EAAE,aAAa,CAAA;QAC5B,UAAU,EAAE,UAAU,CAAA;KACvB,EACD,OAAO,EAAE;QACP,GAAG,CAAC,EAAE;YACJ,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,YAAY,EAAE,MAAM,CAAA;KACrB;IAmBH,IAAI,OAAO,YAEV;IAEK,cAAc;YA+BN,WAAW;IAgCzB,OAAO,CAAC,cAAc;YAgBR,kBAAkB;YAgBlB,oBAAoB;CAKnC"}
package/lib/cjs/types/services/socket.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"socket.service.d.ts","sourceRoot":"","sources":["../../../../src/services/socket.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAIL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAM9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,SAAS,CAKQ;IACzB,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,OAAO,CAET;IACN,OAAO,CAAC,YAAY,CAAK;IAEzB,WAAW,SAAI;IACf,cAAc,SAAI;gBAEN,MAAM,EAAE;QAClB,MAAM,EAAE,UAAU,CAAA;QAClB,cAAc,EAAE,cAAc,CAAA;QAC9B,WAAW,EAAE,WAAW,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAA;YACZ,GAAG,EAAE,MAAM,CAAA;SACZ,CAAA;QACD,YAAY,EAAE,MAAM,CAAA;KACrB;IAaD,IAAI,OAAO,YAIV;IAEK,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAsBzF,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAWnE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAa9E,UAAU;IAeV,aAAa;IAiBnB,OAAO,CAAC,gBAAgB;IA8FxB,OAAO,CAAC,WAAW;YAKL,aAAa;CAoG5B"}
1
+ {"version":3,"file":"socket.service.d.ts","sourceRoot":"","sources":["../../../../src/services/socket.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAIL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAM9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,SAAS,CAKQ;IACzB,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,OAAO,CAET;IACN,OAAO,CAAC,YAAY,CAAK;IAEzB,WAAW,SAAI;IACf,cAAc,SAAI;gBAEN,MAAM,EAAE;QAClB,MAAM,EAAE,UAAU,CAAA;QAClB,cAAc,EAAE,cAAc,CAAA;QAC9B,WAAW,EAAE,WAAW,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAA;YACZ,GAAG,EAAE,MAAM,CAAA;SACZ,CAAA;QACD,YAAY,EAAE,MAAM,CAAA;KACrB;IAgBD,IAAI,OAAO,YAIV;IAEK,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAsBzF,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAWnE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAa9E,UAAU;IAeV,aAAa;IAiBnB,OAAO,CAAC,gBAAgB;IA8FxB,OAAO,CAAC,WAAW;YAKL,aAAa;CAoG5B"}
package/lib/esm/services/grpc.service.js CHANGED
@@ -45,7 +45,7 @@ class GRPCService {
45
45
  }
46
46
  for (const httpPort of config_1.HTTP_PORTS) {
47
47
  this.logger.debug(`Ping background service on port ${httpPort}`);
48
- const { success, res } = await this.pingService(httpPort);
48
+ const { success, res, keepGoing } = await this.pingService(httpPort);
49
49
  if (success && res) {
50
50
  const port = res.tcpPort;
51
51
  const client = await this.testConnection(port);
@@ -59,6 +59,11 @@ class GRPCService {
59
59
  }
60
60
  }
61
61
  }
62
+ else {
63
+ if (!keepGoing) {
64
+ break;
65
+ }
66
+ }
62
67
  }
63
68
  this.logger.error('Cannot connect to GRPC server');
64
69
  }
@@ -73,11 +78,24 @@ class GRPCService {
73
78
  return {
74
79
  success: data.message === 'pong' && data.alias === this.serviceAlias,
75
80
  res: data,
81
+ keepGoing: true,
76
82
  };
77
83
  }
78
84
  catch (e) {
85
+ const error = e;
86
+ let keepGoing = false;
87
+ if (error?.response) {
88
+ keepGoing = true;
89
+ }
90
+ else if (error?.request) {
91
+ // Timeout
92
+ if (error?.toString().toLowerCase().includes('timeout')) {
93
+ keepGoing = true;
94
+ }
95
+ }
79
96
  return {
80
97
  success: false,
98
+ keepGoing,
81
99
  };
82
100
  }
83
101
  }
package/lib/esm/services/socket.service.js CHANGED
@@ -22,11 +22,14 @@ class SocketService {
22
22
  currentPort = 0;
23
23
  currentSslPort = 0;
24
24
  constructor(params) {
25
- const { logger, pairingService, userService, eventService, ssl } = params;
25
+ const { logger, pairingService, userService, eventService, ssl, serviceAlias } = params;
26
26
  this.logger = logger;
27
27
  this.pairingService = pairingService;
28
28
  this.userService = userService;
29
29
  this.eventService = eventService;
30
+ if (serviceAlias) {
31
+ this.serviceAlias = serviceAlias;
32
+ }
30
33
  if (ssl) {
31
34
  this.sslConfig = ssl;
32
35
  this.initSslSocket();
package/lib/esm/types/services/grpc.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.service.d.ts","sourceRoot":"","sources":["../../../../src/services/grpc.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAK1C,qBAAa,WAAW;IACtB,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,WAAW,SAAI;IAEf,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAK;gBAGvB,QAAQ,EAAE;QACR,MAAM,EAAE,UAAU,CAAA;QAClB,aAAa,EAAE,aAAa,CAAA;QAC5B,UAAU,EAAE,UAAU,CAAA;KACvB,EACD,OAAO,EAAE;QACP,GAAG,CAAC,EAAE;YACJ,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,YAAY,EAAE,MAAM,CAAA;KACrB;IAmBH,IAAI,OAAO,YAEV;IAEK,cAAc;YA2BN,WAAW;IAkBzB,OAAO,CAAC,cAAc;YAgBR,kBAAkB;YAgBlB,oBAAoB;CAKnC"}
1
+ {"version":3,"file":"grpc.service.d.ts","sourceRoot":"","sources":["../../../../src/services/grpc.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAK1C,qBAAa,WAAW;IACtB,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAA;IAC/C,WAAW,SAAI;IAEf,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAY;IAEvB,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAK;gBAGvB,QAAQ,EAAE;QACR,MAAM,EAAE,UAAU,CAAA;QAClB,aAAa,EAAE,aAAa,CAAA;QAC5B,UAAU,EAAE,UAAU,CAAA;KACvB,EACD,OAAO,EAAE;QACP,GAAG,CAAC,EAAE;YACJ,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,YAAY,EAAE,MAAM,CAAA;KACrB;IAmBH,IAAI,OAAO,YAEV;IAEK,cAAc;YA+BN,WAAW;IAgCzB,OAAO,CAAC,cAAc;YAgBR,kBAAkB;YAgBlB,oBAAoB;CAKnC"}
package/lib/esm/types/services/socket.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"socket.service.d.ts","sourceRoot":"","sources":["../../../../src/services/socket.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAIL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAM9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,SAAS,CAKQ;IACzB,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,OAAO,CAET;IACN,OAAO,CAAC,YAAY,CAAK;IAEzB,WAAW,SAAI;IACf,cAAc,SAAI;gBAEN,MAAM,EAAE;QAClB,MAAM,EAAE,UAAU,CAAA;QAClB,cAAc,EAAE,cAAc,CAAA;QAC9B,WAAW,EAAE,WAAW,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAA;YACZ,GAAG,EAAE,MAAM,CAAA;SACZ,CAAA;QACD,YAAY,EAAE,MAAM,CAAA;KACrB;IAaD,IAAI,OAAO,YAIV;IAEK,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAsBzF,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAWnE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAa9E,UAAU;IAeV,aAAa;IAiBnB,OAAO,CAAC,gBAAgB;IA8FxB,OAAO,CAAC,WAAW;YAKL,aAAa;CAoG5B"}
1
+ {"version":3,"file":"socket.service.d.ts","sourceRoot":"","sources":["../../../../src/services/socket.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAIL,eAAe,EACf,mBAAmB,EAEpB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAM9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,SAAS,CAKQ;IACzB,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,OAAO,CAET;IACN,OAAO,CAAC,YAAY,CAAK;IAEzB,WAAW,SAAI;IACf,cAAc,SAAI;gBAEN,MAAM,EAAE;QAClB,MAAM,EAAE,UAAU,CAAA;QAClB,cAAc,EAAE,cAAc,CAAA;QAC9B,WAAW,EAAE,WAAW,CAAA;QACxB,YAAY,EAAE,YAAY,CAAA;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,EAAE,MAAM,CAAA;YACZ,GAAG,EAAE,MAAM,CAAA;SACZ,CAAA;QACD,YAAY,EAAE,MAAM,CAAA;KACrB;IAgBD,IAAI,OAAO,YAIV;IAEK,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAsBzF,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAWnE,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAa9E,UAAU;IAeV,aAAa;IAiBnB,OAAO,CAAC,gBAAgB;IA8FxB,OAAO,CAAC,WAAW;YAKL,aAAa;CAoG5B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lockerpm/desktop-service",
3
- "version": "1.1.1",
3
+ "version": "1.1.2",
4
4
  "description": "",
5
5
  "exports": {
6
6
  ".": {