@futdevpro/nts-dynamo 1.9.38 → 1.9.39

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/build/_modules/socket/_services/socket-server.service.d.ts.map +1 -1
  2. package/build/_modules/socket/_services/socket-server.service.js +44 -28
  3. package/build/_modules/socket/_services/socket-server.service.js.map +1 -1
  4. package/build/_services/base/data.service.d.ts.map +1 -1
  5. package/build/_services/base/data.service.js +36 -19
  6. package/build/_services/base/data.service.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/_modules/socket/_services/socket-server.service.ts +56 -28
  9. package/src/_services/base/data.service.ts +43 -27
package/build/_modules/socket/_services/socket-server.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"socket-server.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/socket-server.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"socket-server.service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/socket-server.service.ts"],"names":[],"mappings":"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"}
package/build/_modules/socket/_services/socket-server.service.js CHANGED
@@ -39,7 +39,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
39
39
  constructor() {
40
40
  super();
41
41
  this.asyncConstructor().catch((error) => {
42
- fsm_dynamo_1.DyFM_Log.error(`Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`, error);
42
+ fsm_dynamo_1.DyFM_Log.error(`Socket Server Service setup failed: "${this.params?.name}" (${this.params?.port})`, error);
43
43
  });
44
44
  }
45
45
  async asyncConstructor() {
@@ -48,11 +48,11 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
48
48
  this.incomingEvents = this.getIncomingEvents() ?? [];
49
49
  await this.prepareEvents();
50
50
  if (this.logSetup)
51
- console.log(`Socket Server Service setup done: ${this.params.name} (${this.params.port}) ` +
51
+ console.log(`Socket Server Service setup done: "${this.params.name}" (${this.params.port}) ` +
52
52
  `security: ${this.params.security}\n`);
53
53
  }
54
54
  catch (error) {
55
- fsm_dynamo_1.DyFM_Log.error(`Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`, error);
55
+ fsm_dynamo_1.DyFM_Log.error(`Socket Server Service setup failed: "${this.params?.name}" (${this.params?.port})`, error);
56
56
  throw new fsm_dynamo_1.DyFM_Error({
57
57
  errorCode: 'NTS-SSS-001',
58
58
  error: error,
@@ -144,7 +144,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
144
144
  this.subscriptionEvent.socketName = this.params.name;
145
145
  }
146
146
  else {
147
- fsm_dynamo_1.DyFM_Log.error('getPresenceFromSubscriptionEventContent is not set', `${this.params.name} (${this.params.port})`);
147
+ fsm_dynamo_1.DyFM_Log.error('getPresenceFromSubscriptionEventContent is not set', `"${this.params.name}" (${this.params.port})`);
148
148
  }
149
149
  /** Set incoming events serviceName */
150
150
  this.incomingEvents.forEach((event) => {
@@ -153,7 +153,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
153
153
  }
154
154
  catch (error) {
155
155
  fsm_dynamo_1.DyFM_Log.error(`Socket Server Service - Event Preparation setup failed: ` +
156
- `${this.params?.name} (${this.params?.port})`, error);
156
+ `"${this.params?.name}" (${this.params?.port})`, error);
157
157
  throw error;
158
158
  }
159
159
  }
@@ -176,12 +176,12 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
176
176
  */
177
177
  if (global_settings_const_1.DyNTS_global_settings.log_settings.socket_eventContent) {
178
178
  fsm_dynamo_1.DyFM_Log.log(`--=> incoming socket(${this.params.name}) ` +
179
- `event: ${socket_1.DyFM_SocketEvent_Key.subscribe};` +
179
+ `event: "${socket_1.DyFM_SocketEvent_Key.subscribe}";` +
180
180
  `\ncontent:`, content);
181
181
  }
182
182
  else {
183
183
  fsm_dynamo_1.DyFM_Log.log(`--=> incoming socket(${this.params.name}) ` +
184
- `event: ${socket_1.DyFM_SocketEvent_Key.subscribe}`);
184
+ `event: "${socket_1.DyFM_SocketEvent_Key.subscribe}"`);
185
185
  }
186
186
  const presence = await this.getPresenceFromSubscriptionEventContent(content, socket);
187
187
  presence.serviceName = this.params.name;
@@ -196,10 +196,10 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
196
196
  }
197
197
  catch (error) {
198
198
  if (global_settings_const_1.DyNTS_global_settings.log_settings.socket_eventContent) {
199
- fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: ${this.params.name} `, `(${this.params.port}) will disconnect now...`, error);
199
+ fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: "${this.params.name}" `, `(${this.params.port}) will disconnect now...`, error);
200
200
  }
201
201
  else {
202
- fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: ${this.params.name} `, `(${this.params.port}) will disconnect now...`);
202
+ fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: "${this.params.name}" `, `(${this.params.port}) will disconnect now...`);
203
203
  }
204
204
  socket.emit(socket_1.DyFM_SocketEvent_Key.error, error);
205
205
  socket.disconnect();
@@ -231,10 +231,10 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
231
231
  }
232
232
  catch (error) {
233
233
  if (global_settings_const_1.DyNTS_global_settings.log_settings.socket_eventContent) {
234
- fsm_dynamo_1.DyFM_Log.error(`Socket unsubscribe failed: ${this.params.name} `, `(${this.params.port}) will disconnect now...`, error);
234
+ fsm_dynamo_1.DyFM_Log.error(`Socket unsubscribe failed: "${this.params.name}" `, `(${this.params.port}) will disconnect now...`, error);
235
235
  }
236
236
  else {
237
- fsm_dynamo_1.DyFM_Log.error(`Socket unsubscribe failed: ${this.params.name} `, `(${this.params.port}) will disconnect now...`);
237
+ fsm_dynamo_1.DyFM_Log.error(`Socket unsubscribe failed: "${this.params.name}" `, `(${this.params.port}) will disconnect now...`);
238
238
  }
239
239
  socket.emit(socket_1.DyFM_SocketEvent_Key.error, error);
240
240
  }
@@ -246,7 +246,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
246
246
  await event.executeEventTasks(content, issuer);
247
247
  }
248
248
  catch (error) {
249
- fsm_dynamo_1.DyFM_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
249
+ fsm_dynamo_1.DyFM_Log.error(`Socket Event failed: "${this.params.name}" (${this.params.port})`, error);
250
250
  socket.emit(socket_1.DyFM_SocketEvent_Key.error, error);
251
251
  }
252
252
  });
@@ -256,15 +256,15 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
256
256
  }
257
257
  }
258
258
  catch (error) {
259
- fsm_dynamo_1.DyFM_Log.error(`Socket Connection failed: ${this.params.name} ` +
259
+ fsm_dynamo_1.DyFM_Log.error(`Socket Connection failed: "${this.params.name}" ` +
260
260
  `(${this.params.port}) will disconnect now...`, error);
261
261
  socket.emit(socket_1.DyFM_SocketEvent_Key.error, error);
262
262
  socket.disconnect();
263
263
  }
264
264
  });
265
265
  newSocketServer.listen(this.params.port);
266
- fsm_dynamo_1.DyFM_Log.success(`\nsocket server setup finished: ${this.params.name}` +
267
- `\nsocket server listening on port: ${this.params.port}`);
266
+ fsm_dynamo_1.DyFM_Log.success(`\nsocket server setup finished: "${this.params.name}"` +
267
+ `\nsocket server listening on port: "${this.params.port}"`);
268
268
  successCallback();
269
269
  if (security === socket_security_enum_1.DyNTS_SocketSecurity.open) {
270
270
  this.openSocketServer = newSocketServer;
@@ -276,7 +276,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
276
276
  }
277
277
  }
278
278
  catch (error) {
279
- fsm_dynamo_1.DyFM_Log.error(`Socket Server Service - Deep Setup failed: ${this.params?.name} ` +
279
+ fsm_dynamo_1.DyFM_Log.error(`Socket Server Service - Deep Setup failed: "${this.params?.name}" ` +
280
280
  `(${this.params?.port})`, error);
281
281
  throw error;
282
282
  }
@@ -293,10 +293,10 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
293
293
  }
294
294
  catch (error) {
295
295
  if (global_settings_const_1.DyNTS_global_settings.log_settings.socket_eventContent) {
296
- fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: ${this.params?.name} (${this.params?.port})`, error);
296
+ fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`, error);
297
297
  }
298
298
  else {
299
- fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: ${this.params?.name} (${this.params?.port})`);
299
+ fsm_dynamo_1.DyFM_Log.error(`Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`);
300
300
  }
301
301
  throw error;
302
302
  }
@@ -325,8 +325,8 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
325
325
  const activePresence = this.presences[activePresenceIndex];
326
326
  if (activePresence.issuerLocalId !== issuer) {
327
327
  throw new fsm_dynamo_1.DyFM_Error({
328
- ...this._getDefaultErrorSettings('sendEventForId', new Error(`socket subscription for ${issuer} and ` +
329
- `${activePresence.issuerLocalId} does not match.`), issuer),
328
+ ...this._getDefaultErrorSettings('sendEventForId', new Error(`socket subscription for "${issuer}" and ` +
329
+ `"${activePresence.issuerLocalId}" does not match.`), issuer),
330
330
  errorCode: 'NTS-SSS-201',
331
331
  });
332
332
  }
@@ -353,7 +353,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
353
353
  throw new fsm_dynamo_1.DyFM_Error({
354
354
  ...this._getDefaultErrorSettings('sendEventForId', error, issuer),
355
355
  errorCode: 'NTS-SSS-200',
356
- message: `socket(${this.params.name}) Subscription Removal failed: ${this.params?.name}`,
356
+ message: `socket(${this.params.name}) Subscription Removal failed: "${this.params?.name}"`,
357
357
  });
358
358
  }
359
359
  }
@@ -402,22 +402,36 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
402
402
  }
403
403
  async sendEventForId(id, event, content, issuer) {
404
404
  try {
405
+ if (!event) {
406
+ throw new fsm_dynamo_1.DyFM_Error({
407
+ ...this._getDefaultErrorSettings('sendEventForId', new Error('No event was provided'), content?.source),
408
+ status: 400,
409
+ errorCode: 'NTS-SSS-300',
410
+ });
411
+ }
412
+ if (!id) {
413
+ throw new fsm_dynamo_1.DyFM_Error({
414
+ ...this._getDefaultErrorSettings('sendEventForId', new Error('No ID was provided'), content?.source),
415
+ status: 400,
416
+ errorCode: 'NTS-SSS-301',
417
+ });
418
+ }
405
419
  const presence = this.presences.find((pres) => pres.issuerLocalId === id);
406
420
  if (!presence) {
407
421
  throw new fsm_dynamo_1.DyFM_Error({
408
- ...this._getDefaultErrorSettings('sendEventForId', new Error(`No active socket with this specific ID: ${id}`), content?.source),
422
+ ...this._getDefaultErrorSettings('sendEventForId', new Error(`No active socket with this specific ID: "${id}"`), content?.source),
409
423
  status: 404,
410
424
  errorCode: 'NTS-SSS-301',
411
425
  });
412
426
  }
413
427
  presence.emitEvent(event, content, issuer);
414
428
  if (global_settings_const_1.DyNTS_global_settings.log_settings.socket_eventContent) {
415
- fsm_dynamo_1.DyFM_Log.success(` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
416
- `\n presenceId: ${id}, sockets: ${presence.sockets.length}` +
429
+ fsm_dynamo_1.DyFM_Log.success(` <--= emitted socket(${this.params.name}) event: "${event}", ` +
430
+ `\n presenceId: "${id}", sockets: ${presence.sockets.length}` +
417
431
  `\n content:`, content);
418
432
  }
419
433
  else {
420
- fsm_dynamo_1.DyFM_Log.success(` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
434
+ fsm_dynamo_1.DyFM_Log.success(` <--= emitted socket(${this.params.name}) event: "${event}", ` +
421
435
  `\n presenceId: ${id}, sockets: ${presence.sockets.length}`);
422
436
  }
423
437
  }
@@ -431,7 +445,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
431
445
  const presence = this.presences.find((pres) => pres.issuerLocalId === id);
432
446
  if (!presence) {
433
447
  throw new fsm_dynamo_1.DyFM_Error({
434
- ...this._getDefaultErrorSettings('sendEventForId', new Error(`No active socket(${this.params.name}) with this specific ID: ${id}`), content?.source),
448
+ ...this._getDefaultErrorSettings('sendEventForId', new Error(`No active socket(${this.params.name}) with this specific ID: "${id}"`), content?.source),
435
449
  status: 404,
436
450
  errorCode: 'NTS-SSS-302',
437
451
  });
@@ -455,7 +469,7 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
455
469
  }
456
470
  broadcastEvent(event, content, issuer) {
457
471
  try {
458
- fsm_dynamo_1.DyFM_Log.log(` <=-== broadcasting socket(${this.params.name}) event: ${event}`);
472
+ fsm_dynamo_1.DyFM_Log.log(` <=-== broadcasting socket(${this.params.name}) event: "${event}"`);
459
473
  this.presences.forEach((presence) => {
460
474
  presence.emitEvent(event, content, issuer);
461
475
  });
@@ -472,7 +486,9 @@ class DyNTS_SocketServerService extends singleton_service_1.DyNTS_SingletonServi
472
486
  _getDefaultErrorSettings(fnName, error, issuer) {
473
487
  return {
474
488
  status: error?.___status ?? 500,
475
- message: error?.message ?? `${fnName} was UNSUCCESSFUL (NTS)`,
489
+ message: error?.message ??
490
+ error?._message ??
491
+ `${fnName} was UNSUCCESSFUL (NTS)`,
476
492
  addECToUserMsg: !error?.__userMessage,
477
493
  userMessage: error?.__userMessage ?? this.defaultErrorUserMsg,
478
494
  issuer: issuer,
package/build/_modules/socket/_services/socket-server.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"socket-server.service.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/socket-server.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"socket-server.service.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/socket-server.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.service.d.ts","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/build/_services/base/data.service.js CHANGED
@@ -193,6 +193,9 @@ class DyNTS_DataService {
193
193
  ...this._getDefaultErrorSettings('getDataByDependencyId', new Error(`getDataByDependencyId failed, "${this.depKey}" is missing! ` +
194
194
  `(${this.dataParams.dataName})`)),
195
195
  errorCode: 'NTS-DS0-GD2',
196
+ additionalContent: {
197
+ data: this.data,
198
+ },
196
199
  });
197
200
  }
198
201
  const dataExists = await this.dataDBService.getDataByDependencyId(dependencyId ?? this.data[this.depKey]).catch((error) => {
@@ -277,6 +280,9 @@ class DyNTS_DataService {
277
280
  ...this._getDefaultErrorSettings('getDataListByDependencyId', new Error(`getDataListByDependencyId failed, "${this.depKey}" is missing! ` +
278
281
  `(${this.dataParams.dataName})`)),
279
282
  errorCode: 'NTS-DS0-GLD2',
283
+ additionalContent: {
284
+ data: this.data
285
+ },
280
286
  });
281
287
  }
282
288
  const dataListExists = await this.dataDBService.getDataListByDependencyId(dependencyId ?? this.data[this.depKey]).catch((error) => {
@@ -484,6 +490,10 @@ class DyNTS_DataService {
484
490
  ...this._getDefaultErrorSettings('updateData', new Error(`no usable parameter provided for updateData; no updateBy, no id, no dependencyId ` +
485
491
  `(${this.dataParams.dataName})`)),
486
492
  errorCode: 'NTS-DS0-UD1',
493
+ additionalContent: {
494
+ data: this.data,
495
+ filterBy: set.filterBy,
496
+ },
487
497
  });
488
498
  }
489
499
  }
@@ -521,7 +531,7 @@ class DyNTS_DataService {
521
531
  errorCode: 'NTS-DS0-SD4',
522
532
  });
523
533
  }
524
- await this.validateForSave();
534
+ await this.validateForSave(data);
525
535
  if (!data._id && (!this.depKey || !data[this.depKey])) {
526
536
  // if ID of dependencyID is not present, data not exists, create new data
527
537
  data = await this.dataDBService.createData(data, this.issuer);
@@ -533,22 +543,23 @@ class DyNTS_DataService {
533
543
  let dataExists;
534
544
  // check if data already exists with the specific ID
535
545
  if (data._id) {
536
- dataExists = await this.getDataById(null, true);
537
- if (dataExists) {
538
- // if data exists do modify
539
- data = await this.dataDBService.modifyData(data, this.issuer);
540
- if (!dontSetToService) {
541
- this.data = data;
542
- }
543
- return data;
544
- }
545
- else {
546
+ dataExists = await this.getDataById(data._id, true);
547
+ if (!dataExists) {
546
548
  throw new fsm_dynamo_1.DyFM_Error({
547
549
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: provided ID not exists ` +
548
- `(id: ${data._id}, ${this.dataParams.dataName})`)),
550
+ `(id: "${data._id}", ${this.dataParams.dataName})`)),
549
551
  errorCode: 'NTS-DS0-SD1',
552
+ additionalContent: {
553
+ data: data,
554
+ },
550
555
  });
551
556
  }
557
+ // if data exists do modify
558
+ data = await this.dataDBService.modifyData(data, this.issuer);
559
+ if (!dontSetToService) {
560
+ this.data = data;
561
+ }
562
+ return data;
552
563
  }
553
564
  if (this.depKey) {
554
565
  if (!data[this.depKey]) {
@@ -556,10 +567,13 @@ class DyNTS_DataService {
556
567
  ...this._getDefaultErrorSettings('saveData', new Error(`saveData was unsuccessful: dependency data id missing from data ` +
557
568
  `(key: ${this.depKey}, ${this.dataParams.dataName})`)),
558
569
  errorCode: 'NTS-DS0-SD2',
570
+ additionalContent: {
571
+ data: data,
572
+ },
559
573
  });
560
574
  }
561
575
  if (this.depKeyIsUnique) {
562
- dataExists = await this.getDataByDependencyId(null, true);
576
+ dataExists = await this.getDataByDependencyId(data[this.depKey], true);
563
577
  if (dataExists) {
564
578
  // if data exists do modify
565
579
  data = await this.dataDBService.modifyData(data, this.issuer);
@@ -648,18 +662,18 @@ class DyNTS_DataService {
648
662
  }
649
663
  for (const element of this.dataParams.properties) {
650
664
  // basic required validations
651
- if ((element.required &&
652
- (data[element.key] === null ||
653
- data[element.key] === undefined)) ||
654
- (element.index &&
655
- (data[element.key] === null ||
656
- data[element.key] === undefined))) {
665
+ if ((element.required ||
666
+ element.index) && (data[element.key] === null ||
667
+ data[element.key] === undefined)) {
657
668
  throw new fsm_dynamo_1.DyFM_Error({
658
669
  ...this._getDefaultErrorSettings('validateForSave', new Error(`validateForSave failed, "${element.key}" is missing! ` +
659
670
  `(${this.dataParams.dataName})`)),
660
671
  status: 522,
661
672
  errorCode: 'NTS-DS0-VD1',
662
673
  userMessage: this.defaultValidationErrorUserMsg,
674
+ additionalContent: {
675
+ data: data,
676
+ },
663
677
  });
664
678
  }
665
679
  // specific Date validation
@@ -671,6 +685,9 @@ class DyNTS_DataService {
671
685
  status: 522,
672
686
  errorCode: 'NTS-DS0-VD2',
673
687
  userMessage: this.defaultValidationErrorUserMsg,
688
+ additionalContent: {
689
+ data: data,
690
+ },
674
691
  });
675
692
  }
676
693
  // call additional validators
package/build/_services/base/data.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.service.js","sourceRoot":"","sources":["../../../src/_services/base/data.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/nts-dynamo",
3
- "version": "01.09.38",
3
+ "version": "01.09.39",
4
4
  "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
5
5
  "scripts": {
6
6
  "prep": "npm i rimraf nodemon -g",
package/src/_modules/socket/_services/socket-server.service.ts CHANGED
@@ -68,7 +68,7 @@ export abstract class DyNTS_SocketServerService<
68
68
 
69
69
  this.asyncConstructor().catch((error: any) => {
70
70
  DyFM_Log.error(
71
- `Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`,
71
+ `Socket Server Service setup failed: "${this.params?.name}" (${this.params?.port})`,
72
72
  error
73
73
  );
74
74
  });
@@ -91,12 +91,12 @@ export abstract class DyNTS_SocketServerService<
91
91
  await this.prepareEvents();
92
92
 
93
93
  if (this.logSetup) console.log(
94
- `Socket Server Service setup done: ${this.params.name} (${this.params.port}) ` +
94
+ `Socket Server Service setup done: "${this.params.name}" (${this.params.port}) ` +
95
95
  `security: ${this.params.security}\n`
96
96
  );
97
97
  } catch (error) {
98
98
  DyFM_Log.error(
99
- `Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`,
99
+ `Socket Server Service setup failed: "${this.params?.name}" (${this.params?.port})`,
100
100
  error
101
101
  );
102
102
 
@@ -225,7 +225,7 @@ export abstract class DyNTS_SocketServerService<
225
225
  } else {
226
226
  DyFM_Log.error(
227
227
  'getPresenceFromSubscriptionEventContent is not set',
228
- `${this.params.name} (${this.params.port})`
228
+ `"${this.params.name}" (${this.params.port})`
229
229
  );
230
230
  }
231
231
 
@@ -236,7 +236,7 @@ export abstract class DyNTS_SocketServerService<
236
236
  } catch (error) {
237
237
  DyFM_Log.error(
238
238
  `Socket Server Service - Event Preparation setup failed: ` +
239
- `${this.params?.name} (${this.params?.port})`,
239
+ `"${this.params?.name}" (${this.params?.port})`,
240
240
  error
241
241
  );
242
242
 
@@ -272,13 +272,13 @@ export abstract class DyNTS_SocketServerService<
272
272
  if (DyNTS_global_settings.log_settings.socket_eventContent) {
273
273
  DyFM_Log.log(
274
274
  `--=> incoming socket(${this.params.name}) ` +
275
- `event: ${DyFM_SocketEvent_Key.subscribe};` +
275
+ `event: "${DyFM_SocketEvent_Key.subscribe}";` +
276
276
  `\ncontent:`, content
277
277
  );
278
278
  } else {
279
279
  DyFM_Log.log(
280
280
  `--=> incoming socket(${this.params.name}) ` +
281
- `event: ${DyFM_SocketEvent_Key.subscribe}`
281
+ `event: "${DyFM_SocketEvent_Key.subscribe}"`
282
282
  );
283
283
  }
284
284
 
@@ -309,13 +309,13 @@ export abstract class DyNTS_SocketServerService<
309
309
  } catch (error) {
310
310
  if (DyNTS_global_settings.log_settings.socket_eventContent) {
311
311
  DyFM_Log.error(
312
- `Socket Subscription failed: ${this.params.name} ` ,
312
+ `Socket Subscription failed: "${this.params.name}" ` ,
313
313
  `(${this.params.port}) will disconnect now...`,
314
314
  error
315
315
  );
316
316
  } else {
317
317
  DyFM_Log.error(
318
- `Socket Subscription failed: ${this.params.name} ` ,
318
+ `Socket Subscription failed: "${this.params.name}" ` ,
319
319
  `(${this.params.port}) will disconnect now...`
320
320
  );
321
321
  }
@@ -368,13 +368,13 @@ export abstract class DyNTS_SocketServerService<
368
368
  } catch (error) {
369
369
  if (DyNTS_global_settings.log_settings.socket_eventContent) {
370
370
  DyFM_Log.error(
371
- `Socket unsubscribe failed: ${this.params.name} ` ,
371
+ `Socket unsubscribe failed: "${this.params.name}" ` ,
372
372
  `(${this.params.port}) will disconnect now...`,
373
373
  error
374
374
  );
375
375
  } else {
376
376
  DyFM_Log.error(
377
- `Socket unsubscribe failed: ${this.params.name} ` ,
377
+ `Socket unsubscribe failed: "${this.params.name}" ` ,
378
378
  `(${this.params.port}) will disconnect now...`
379
379
  );
380
380
  }
@@ -392,7 +392,7 @@ export abstract class DyNTS_SocketServerService<
392
392
  await event.executeEventTasks(content, issuer);
393
393
  } catch (error) {
394
394
  DyFM_Log.error(
395
- `Socket Event failed: ${this.params.name} (${this.params.port})`,
395
+ `Socket Event failed: "${this.params.name}" (${this.params.port})`,
396
396
  error
397
397
  );
398
398
  socket.emit(DyFM_SocketEvent_Key.error, error);
@@ -406,7 +406,7 @@ export abstract class DyNTS_SocketServerService<
406
406
  }
407
407
  } catch (error) {
408
408
  DyFM_Log.error(
409
- `Socket Connection failed: ${this.params.name} ` +
409
+ `Socket Connection failed: "${this.params.name}" ` +
410
410
  `(${this.params.port}) will disconnect now...`,
411
411
  error
412
412
  );
@@ -418,8 +418,8 @@ export abstract class DyNTS_SocketServerService<
418
418
  newSocketServer.listen(this.params.port);
419
419
 
420
420
  DyFM_Log.success(
421
- `\nsocket server setup finished: ${this.params.name}` +
422
- `\nsocket server listening on port: ${this.params.port}`
421
+ `\nsocket server setup finished: "${this.params.name}"` +
422
+ `\nsocket server listening on port: "${this.params.port}"`
423
423
  );
424
424
 
425
425
  successCallback();
@@ -435,7 +435,7 @@ export abstract class DyNTS_SocketServerService<
435
435
  }
436
436
  } catch (error) {
437
437
  DyFM_Log.error(
438
- `Socket Server Service - Deep Setup failed: ${this.params?.name} ` +
438
+ `Socket Server Service - Deep Setup failed: "${this.params?.name}" ` +
439
439
  `(${this.params?.port})`,
440
440
  error
441
441
  );
@@ -458,12 +458,12 @@ export abstract class DyNTS_SocketServerService<
458
458
  } catch (error) {
459
459
  if (DyNTS_global_settings.log_settings.socket_eventContent) {
460
460
  DyFM_Log.error(
461
- `Socket Subscription failed: ${this.params?.name} (${this.params?.port})`,
461
+ `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`,
462
462
  error
463
463
  );
464
464
  } else {
465
465
  DyFM_Log.error(
466
- `Socket Subscription failed: ${this.params?.name} (${this.params?.port})`
466
+ `Socket Subscription failed: "${this.params?.name}" (${this.params?.port})`
467
467
  );
468
468
  }
469
469
 
@@ -516,8 +516,8 @@ export abstract class DyNTS_SocketServerService<
516
516
  ...this._getDefaultErrorSettings(
517
517
  'sendEventForId',
518
518
  new Error(
519
- `socket subscription for ${issuer} and ` +
520
- `${activePresence.issuerLocalId} does not match.`
519
+ `socket subscription for "${issuer}" and ` +
520
+ `"${activePresence.issuerLocalId}" does not match.`
521
521
  ),
522
522
  issuer
523
523
  ),
@@ -568,7 +568,7 @@ export abstract class DyNTS_SocketServerService<
568
568
  ),
569
569
 
570
570
  errorCode: 'NTS-SSS-200',
571
- message: `socket(${this.params.name}) Subscription Removal failed: ${this.params?.name}`,
571
+ message: `socket(${this.params.name}) Subscription Removal failed: "${this.params?.name}"`,
572
572
  });
573
573
  }
574
574
  }
@@ -630,6 +630,32 @@ export abstract class DyNTS_SocketServerService<
630
630
 
631
631
  async sendEventForId(id: string, event: string, content: any, issuer: string): Promise<void> {
632
632
  try {
633
+ if (!event) {
634
+ throw new DyFM_Error({
635
+ ...this._getDefaultErrorSettings(
636
+ 'sendEventForId',
637
+ new Error('No event was provided'),
638
+ content?.source
639
+ ),
640
+
641
+ status: 400,
642
+ errorCode: 'NTS-SSS-300',
643
+ });
644
+ }
645
+
646
+ if (!id) {
647
+ throw new DyFM_Error({
648
+ ...this._getDefaultErrorSettings(
649
+ 'sendEventForId',
650
+ new Error('No ID was provided'),
651
+ content?.source
652
+ ),
653
+
654
+ status: 400,
655
+ errorCode: 'NTS-SSS-301',
656
+ });
657
+ }
658
+
633
659
  const presence: DyNTS_SocketPresence = this.presences.find(
634
660
  (pres: DyNTS_SocketPresence) => pres.issuerLocalId === id
635
661
  );
@@ -638,7 +664,7 @@ export abstract class DyNTS_SocketServerService<
638
664
  throw new DyFM_Error({
639
665
  ...this._getDefaultErrorSettings(
640
666
  'sendEventForId',
641
- new Error(`No active socket with this specific ID: ${id}`),
667
+ new Error(`No active socket with this specific ID: "${id}"`),
642
668
  content?.source
643
669
  ),
644
670
 
@@ -651,13 +677,13 @@ export abstract class DyNTS_SocketServerService<
651
677
 
652
678
  if (DyNTS_global_settings.log_settings.socket_eventContent) {
653
679
  DyFM_Log.success(
654
- ` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
655
- `\n presenceId: ${id}, sockets: ${presence.sockets.length}` +
680
+ ` <--= emitted socket(${this.params.name}) event: "${event}", ` +
681
+ `\n presenceId: "${id}", sockets: ${presence.sockets.length}` +
656
682
  `\n content:`, content
657
683
  );
658
684
  } else {
659
685
  DyFM_Log.success(
660
- ` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
686
+ ` <--= emitted socket(${this.params.name}) event: "${event}", ` +
661
687
  `\n presenceId: ${id}, sockets: ${presence.sockets.length}`
662
688
  );
663
689
  }
@@ -678,7 +704,7 @@ export abstract class DyNTS_SocketServerService<
678
704
  throw new DyFM_Error({
679
705
  ...this._getDefaultErrorSettings(
680
706
  'sendEventForId',
681
- new Error(`No active socket(${this.params.name}) with this specific ID: ${id}`),
707
+ new Error(`No active socket(${this.params.name}) with this specific ID: "${id}"`),
682
708
  content?.source
683
709
  ),
684
710
 
@@ -709,7 +735,7 @@ export abstract class DyNTS_SocketServerService<
709
735
 
710
736
  broadcastEvent(event: string, content: any, issuer: string): void {
711
737
  try {
712
- DyFM_Log.log(` <=-== broadcasting socket(${this.params.name}) event: ${event}`);
738
+ DyFM_Log.log(` <=-== broadcasting socket(${this.params.name}) event: "${event}"`);
713
739
 
714
740
  this.presences.forEach((presence: DyNTS_SocketPresence) => {
715
741
  presence.emitEvent(event, content, issuer);
@@ -733,7 +759,9 @@ export abstract class DyNTS_SocketServerService<
733
759
  ): DyFM_Error_Settings {
734
760
  return {
735
761
  status: (error as DyFM_Error)?.___status ?? 500,
736
- message: (error as Error)?.message ?? `${fnName} was UNSUCCESSFUL (NTS)`,
762
+ message: (error as Error)?.message ??
763
+ (error as DyFM_Error)?._message ??
764
+ `${fnName} was UNSUCCESSFUL (NTS)`,
737
765
  addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
738
766
  userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
739
767
  issuer: issuer,
package/src/_services/base/data.service.ts CHANGED
@@ -243,6 +243,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
243
243
  ),
244
244
 
245
245
  errorCode: 'NTS-DS0-GD2',
246
+ additionalContent: {
247
+ data: this.data,
248
+ },
246
249
  });
247
250
  }
248
251
 
@@ -367,6 +370,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
367
370
  ),
368
371
 
369
372
  errorCode: 'NTS-DS0-GLD2',
373
+ additionalContent: {
374
+ data: this.data
375
+ },
370
376
  });
371
377
  }
372
378
 
@@ -604,13 +610,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
604
610
  ),
605
611
 
606
612
  errorCode: 'NTS-DS0-UD1',
613
+ additionalContent: {
614
+ data: this.data,
615
+ filterBy: set.filterBy,
616
+ },
607
617
  });
608
618
  }
609
- } catch (error) {
610
-
619
+ } catch (error) {
611
620
  if (error?.errorCode == 'NTS-DS0-UD1') {
612
621
  throw error;
613
-
614
622
  } else {
615
623
  throw new DyFM_Error({
616
624
  ...this._getDefaultErrorSettings('updateData', error),
@@ -649,7 +657,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
649
657
  });
650
658
  }
651
659
 
652
- await this.validateForSave();
660
+ await this.validateForSave(data);
653
661
 
654
662
  if (!data._id && (!this.depKey || !data[this.depKey])) {
655
663
  // if ID of dependencyID is not present, data not exists, create new data
@@ -666,31 +674,33 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
666
674
 
667
675
  // check if data already exists with the specific ID
668
676
  if (data._id) {
669
- dataExists = await this.getDataById(null, true);
670
-
671
- if (dataExists) {
672
- // if data exists do modify
673
- data = await this.dataDBService.modifyData(data, this.issuer);
674
-
675
- if (!dontSetToService) {
676
- this.data = data;
677
- }
678
-
679
- return data;
677
+ dataExists = await this.getDataById(data._id, true);
680
678
 
681
- } else {
679
+ if (!dataExists) {
682
680
  throw new DyFM_Error({
683
681
  ...this._getDefaultErrorSettings(
684
682
  'saveData',
685
683
  new Error(
686
684
  `saveData was unsuccessful: provided ID not exists ` +
687
- `(id: ${data._id}, ${this.dataParams.dataName})`
685
+ `(id: "${data._id}", ${this.dataParams.dataName})`
688
686
  )
689
687
  ),
690
688
 
691
689
  errorCode: 'NTS-DS0-SD1',
690
+ additionalContent: {
691
+ data: data,
692
+ },
692
693
  });
693
694
  }
695
+
696
+ // if data exists do modify
697
+ data = await this.dataDBService.modifyData(data, this.issuer);
698
+
699
+ if (!dontSetToService) {
700
+ this.data = data;
701
+ }
702
+
703
+ return data;
694
704
  }
695
705
 
696
706
  if (this.depKey) {
@@ -705,11 +715,14 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
705
715
  ),
706
716
 
707
717
  errorCode: 'NTS-DS0-SD2',
718
+ additionalContent: {
719
+ data: data,
720
+ },
708
721
  });
709
722
  }
710
723
 
711
724
  if (this.depKeyIsUnique) {
712
- dataExists = await this.getDataByDependencyId(null, true);
725
+ dataExists = await this.getDataByDependencyId(data[this.depKey], true);
713
726
 
714
727
  if (dataExists) {
715
728
  // if data exists do modify
@@ -826,15 +839,12 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
826
839
  for (const element of this.dataParams.properties) {
827
840
  // basic required validations
828
841
  if (
829
- (element.required &&
830
- (data[element.key] === null ||
831
- data[element.key] === undefined
832
- )
833
- ) ||
834
- (element.index &&
835
- (data[element.key] === null ||
836
- data[element.key] === undefined
837
- )
842
+ (
843
+ element.required ||
844
+ element.index
845
+ ) && (
846
+ data[element.key] === null ||
847
+ data[element.key] === undefined
838
848
  )
839
849
  ) {
840
850
  throw new DyFM_Error({
@@ -849,6 +859,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
849
859
  status: 522,
850
860
  errorCode: 'NTS-DS0-VD1',
851
861
  userMessage: this.defaultValidationErrorUserMsg,
862
+ additionalContent: {
863
+ data: data,
864
+ },
852
865
  });
853
866
  }
854
867
 
@@ -868,6 +881,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
868
881
  status: 522,
869
882
  errorCode: 'NTS-DS0-VD2',
870
883
  userMessage: this.defaultValidationErrorUserMsg,
884
+ additionalContent: {
885
+ data: data,
886
+ },
871
887
  });
872
888
  }
873
889