@nsshunt/stsappframework 2.19.211 → 2.19.212

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.
@@ -107,7 +107,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
107
107
  // Log the fact that I have now voted for this currentTerm
108
108
  this.#votedLog[term] = true;
109
109
  // Return my yes vote
110
- console.log(`${message} - Vote No`.grey);
110
+ console.log(`${message} - Vote No`.yellow);
111
111
  callback(null, false); // NO vote
112
112
  };
113
113
  #FindService = (host, port) => {
@@ -210,16 +210,19 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
210
210
  }
211
211
  else if (this.#RAFTState.localeCompare(AppMasterRAFTState.LEADER) === 0) {
212
212
  console.log(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`.red);
213
- // Reject this RPC and continue in the CANDIDATE state
213
+ // Reject this RPC and continue in the LEADER state
214
214
  callback(null, false);
215
215
  return;
216
216
  }
217
217
  else {
218
- // FOLLOWER
218
+ // FOLLOWER or IDLE
219
+ if (this.#RAFTState.localeCompare(AppMasterRAFTState.IDLE) === 0) {
220
+ this.#ChangeState(AppMasterRAFTState.FOLLOWER);
221
+ }
219
222
  const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
220
223
  if (retVal.retVal === true) {
221
224
  if (term > this.#currentTerm) {
222
- console.log(`${retVal.msg}`);
225
+ console.log(`${retVal.msg}`.cyan);
223
226
  this.#currentTerm = term;
224
227
  }
225
228
  }
@@ -236,14 +239,14 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
236
239
  if (sentLeaderService) {
237
240
  if (sentLeaderService.host.localeCompare(this.#leaderNode.host) !== 0 || sentLeaderService.port !== this.#leaderNode.port) {
238
241
  this.#leaderNode = sentLeaderService;
239
- console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.yellow);
242
+ console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.white);
240
243
  }
241
244
  }
242
245
  }
243
246
  else {
244
247
  this.#leaderNode = this.#FindService(host, port);
245
248
  if (this.#leaderNode) {
246
- console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.yellow);
249
+ console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.white);
247
250
  }
248
251
  }
249
252
  // Now update the log if only more recent
@@ -471,7 +474,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
471
474
  this.#StartElectionTimeout();
472
475
  };
473
476
  #ChangeState(newState) {
474
- this.LogEx(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`.green);
477
+ this.LogEx(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`.magenta);
475
478
  this.#RAFTState = newState;
476
479
  }
477
480
  MasterStarted() {
@@ -1 +1 @@
1
- {"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nsshunt/stsappframework",
3
- "version": "2.19.211",
3
+ "version": "2.19.212",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
@@ -131,7 +131,7 @@ export class AppMaster extends MasterProcessBase
131
131
  // Log the fact that I have now voted for this currentTerm
132
132
  this.#votedLog[term] = true;
133
133
  // Return my yes vote
134
- console.log(`${message} - Vote No`.grey)
134
+ console.log(`${message} - Vote No`.yellow)
135
135
  callback(null, false); // NO vote
136
136
  }
137
137
 
@@ -243,15 +243,18 @@ export class AppMaster extends MasterProcessBase
243
243
  }
244
244
  } else if (this.#RAFTState.localeCompare(AppMasterRAFTState.LEADER) === 0) {
245
245
  console.log(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`.red);
246
- // Reject this RPC and continue in the CANDIDATE state
246
+ // Reject this RPC and continue in the LEADER state
247
247
  callback(null, false);
248
248
  return;
249
249
  } else {
250
- // FOLLOWER
250
+ // FOLLOWER or IDLE
251
+ if (this.#RAFTState.localeCompare(AppMasterRAFTState.IDLE) === 0) {
252
+ this.#ChangeState(AppMasterRAFTState.FOLLOWER);
253
+ }
251
254
  const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
252
255
  if (retVal.retVal === true) {
253
256
  if (term > this.#currentTerm) {
254
- console.log(`${retVal.msg}`);
257
+ console.log(`${retVal.msg}`.cyan);
255
258
  this.#currentTerm = term;
256
259
  }
257
260
  } else {
@@ -268,13 +271,13 @@ export class AppMaster extends MasterProcessBase
268
271
  if (sentLeaderService) {
269
272
  if (sentLeaderService.host.localeCompare(this.#leaderNode.host) !== 0 || sentLeaderService.port !== this.#leaderNode.port) {
270
273
  this.#leaderNode = sentLeaderService;
271
- console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.yellow);
274
+ console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.white);
272
275
  }
273
276
  }
274
277
  } else {
275
278
  this.#leaderNode = this.#FindService(host, port);
276
279
  if (this.#leaderNode) {
277
- console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.yellow);
280
+ console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`.white);
278
281
  }
279
282
  }
280
283
 
@@ -530,7 +533,7 @@ export class AppMaster extends MasterProcessBase
530
533
  }
531
534
 
532
535
  #ChangeState(newState: AppMasterRAFTState) {
533
- this.LogEx(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`.green);
536
+ this.LogEx(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`.magenta);
534
537
  this.#RAFTState = newState;
535
538
  }
536
539
 
@@ -1 +1 @@
1
- {"version":3,"file":"appmaster.d.ts","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAS,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAWpD,oBAAY,kBAAkB;IAC1B,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;CAC1B;AAED,qBAAa,SAAU,SAAQ,iBAAiB;;gBA0BhC,aAAa,EAAE,cAAc;IAydzC,aAAa,IAAI,IAAI;CAKxB"}
1
+ {"version":3,"file":"appmaster.d.ts","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAS,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAWpD,oBAAY,kBAAkB;IAC1B,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;CAC1B;AAED,qBAAa,SAAU,SAAQ,iBAAiB;;gBA0BhC,aAAa,EAAE,cAAc;IA4dzC,aAAa,IAAI,IAAI;CAKxB"}