@tiledesk/tiledesk-server 2.27.1 → 2.27.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.
package/CHANGELOG.md CHANGED
@@ -5,6 +5,10 @@
5
5
  🚀 IN PRODUCTION 🚀
6
6
  (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77)
7
7
 
8
+ # 2.27.2
9
+ - Improved chat21 sync tracing: traces are buffered in memory and saved in batches (insertMany) instead of one insert per trace
10
+ - Added env variables CHAT21_SYNC_TRACE_FLUSH_INTERVAL_MS (default 1000), CHAT21_SYNC_TRACE_BATCH_SIZE (default 200) and CHAT21_SYNC_TRACE_MAX_BUFFER_SIZE (default 10000)
11
+
8
12
  # 2.27.1
9
13
  - Added tracing for chat21 events
10
14
 
@@ -689,6 +689,26 @@ class Chat21Handler {
689
689
  });
690
690
  });
691
691
 
692
+ groupEvent.on('group.deleted', (request_id) => {
693
+
694
+ winston.debug("Chat21Handler on group.deleted for request_id: " + request_id);
695
+
696
+ setImmediate(() => {
697
+
698
+ chat21.auth.setAdminToken(adminToken);
699
+
700
+ return chat21.groups.delete(request_id).then(function (data) {
701
+ winston.verbose("[Chat21Handler] - group.deleted - Chat21 group deleted: " + JSON.stringify(data));
702
+ chat21Event.emit('group.deleted', data);
703
+ }).catch(function (err) {
704
+ winston.error("[Chat21Handler] - group.deleted - Error deleting chat21 group: ", err);
705
+ chat21Event.emit('group.deleted.error', err);
706
+ });
707
+
708
+ })
709
+
710
+ })
711
+
692
712
  }
693
713
 
694
714
  }
@@ -1,24 +1,24 @@
1
1
  {
2
2
  "name": "@tiledesk/tiledesk-chat21-app",
3
- "version": "1.1.7",
3
+ "version": "1.1.8",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@tiledesk/tiledesk-chat21-app",
9
- "version": "1.1.7",
9
+ "version": "1.1.8",
10
10
  "license": "AGPL-3.0",
11
11
  "dependencies": {
12
- "@chat21/chat21-node-sdk": "^1.1.8",
12
+ "@chat21/chat21-node-sdk": "^1.1.12",
13
13
  "firebase-admin": "^9.5.0",
14
14
  "winston": "^3.3.3"
15
15
  },
16
16
  "devDependencies": {}
17
17
  },
18
18
  "node_modules/@chat21/chat21-node-sdk": {
19
- "version": "1.1.8",
20
- "resolved": "https://registry.npmjs.org/@chat21/chat21-node-sdk/-/chat21-node-sdk-1.1.8.tgz",
21
- "integrity": "sha512-V6kUMs/3yDUNESMbmHA8C+F0bWFpAqPB4YHvdmTrHDiZfjmb45hotYnIBi7E1YCBaQ4KcKDgSOV8KCS0fY44GA==",
19
+ "version": "1.1.12",
20
+ "resolved": "https://registry.npmjs.org/@chat21/chat21-node-sdk/-/chat21-node-sdk-1.1.12.tgz",
21
+ "integrity": "sha512-KllkQ4HckOAG/l6xIycCCNgM5Y/fDDfEFbK5eVCCMoBJsS4DGJoRB/Zh1Td792E/tdzvn/skTBpGA9+I/hXqGA==",
22
22
  "dependencies": {
23
23
  "chai": "^4.3.0",
24
24
  "dotenv": "^8.2.0",
@@ -199,15 +199,6 @@
199
199
  "@firebase/app": "0.x"
200
200
  }
201
201
  },
202
- "node_modules/@firebase/auth-interop-types": {
203
- "version": "0.1.5",
204
- "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
205
- "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
206
- "peerDependencies": {
207
- "@firebase/app-types": "0.x",
208
- "@firebase/util": "0.x"
209
- }
210
- },
211
202
  "node_modules/@firebase/auth-types": {
212
203
  "version": "0.10.3",
213
204
  "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.10.3.tgz",
@@ -261,6 +252,23 @@
261
252
  "@firebase/app-types": "0.6.1"
262
253
  }
263
254
  },
255
+ "node_modules/@firebase/database/node_modules/@firebase/auth-interop-types": {
256
+ "version": "0.1.5",
257
+ "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
258
+ "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
259
+ "peerDependencies": {
260
+ "@firebase/app-types": "0.x",
261
+ "@firebase/util": "0.x"
262
+ }
263
+ },
264
+ "node_modules/@firebase/database/node_modules/@firebase/util": {
265
+ "version": "0.3.4",
266
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.4.tgz",
267
+ "integrity": "sha512-VwjJUE2Vgr2UMfH63ZtIX9Hd7x+6gayi6RUXaTqEYxSbf/JmehLmAEYSuxS/NckfzAXWeGnKclvnXVibDgpjQQ==",
268
+ "dependencies": {
269
+ "tslib": "^1.11.1"
270
+ }
271
+ },
264
272
  "node_modules/@firebase/firestore": {
265
273
  "version": "2.4.1",
266
274
  "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-2.4.1.tgz",
@@ -765,13 +773,24 @@
765
773
  "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
766
774
  },
767
775
  "node_modules/@firebase/util": {
768
- "version": "0.3.4",
769
- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.4.tgz",
770
- "integrity": "sha512-VwjJUE2Vgr2UMfH63ZtIX9Hd7x+6gayi6RUXaTqEYxSbf/JmehLmAEYSuxS/NckfzAXWeGnKclvnXVibDgpjQQ==",
776
+ "version": "1.15.3",
777
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.15.3.tgz",
778
+ "integrity": "sha512-c/z/gaIlaaLZEuGbE6sLUuJ61tskg1JghvhcNQzW948ASBinbVBBRnZTC4b4yt4LaEtJQkYlyzqLHcutFwEIvA==",
779
+ "hasInstallScript": true,
780
+ "peer": true,
771
781
  "dependencies": {
772
- "tslib": "^1.11.1"
782
+ "tslib": "^2.1.0"
783
+ },
784
+ "engines": {
785
+ "node": ">=20.0.0"
773
786
  }
774
787
  },
788
+ "node_modules/@firebase/util/node_modules/tslib": {
789
+ "version": "2.8.1",
790
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
791
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
792
+ "peer": true
793
+ },
775
794
  "node_modules/@firebase/webchannel-wrapper": {
776
795
  "version": "0.5.1",
777
796
  "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.5.1.tgz",
@@ -3645,9 +3664,9 @@
3645
3664
  },
3646
3665
  "dependencies": {
3647
3666
  "@chat21/chat21-node-sdk": {
3648
- "version": "1.1.8",
3649
- "resolved": "https://registry.npmjs.org/@chat21/chat21-node-sdk/-/chat21-node-sdk-1.1.8.tgz",
3650
- "integrity": "sha512-V6kUMs/3yDUNESMbmHA8C+F0bWFpAqPB4YHvdmTrHDiZfjmb45hotYnIBi7E1YCBaQ4KcKDgSOV8KCS0fY44GA==",
3667
+ "version": "1.1.12",
3668
+ "resolved": "https://registry.npmjs.org/@chat21/chat21-node-sdk/-/chat21-node-sdk-1.1.12.tgz",
3669
+ "integrity": "sha512-KllkQ4HckOAG/l6xIycCCNgM5Y/fDDfEFbK5eVCCMoBJsS4DGJoRB/Zh1Td792E/tdzvn/skTBpGA9+I/hXqGA==",
3651
3670
  "requires": {
3652
3671
  "chai": "^4.3.0",
3653
3672
  "dotenv": "^8.2.0",
@@ -3825,12 +3844,6 @@
3825
3844
  "@firebase/auth-types": "0.10.3"
3826
3845
  }
3827
3846
  },
3828
- "@firebase/auth-interop-types": {
3829
- "version": "0.1.5",
3830
- "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
3831
- "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
3832
- "requires": {}
3833
- },
3834
3847
  "@firebase/auth-types": {
3835
3848
  "version": "0.10.3",
3836
3849
  "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.10.3.tgz",
@@ -3873,6 +3886,22 @@
3873
3886
  "@firebase/util": "0.3.4",
3874
3887
  "faye-websocket": "0.11.3",
3875
3888
  "tslib": "^1.11.1"
3889
+ },
3890
+ "dependencies": {
3891
+ "@firebase/auth-interop-types": {
3892
+ "version": "0.1.5",
3893
+ "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
3894
+ "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
3895
+ "requires": {}
3896
+ },
3897
+ "@firebase/util": {
3898
+ "version": "0.3.4",
3899
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.4.tgz",
3900
+ "integrity": "sha512-VwjJUE2Vgr2UMfH63ZtIX9Hd7x+6gayi6RUXaTqEYxSbf/JmehLmAEYSuxS/NckfzAXWeGnKclvnXVibDgpjQQ==",
3901
+ "requires": {
3902
+ "tslib": "^1.11.1"
3903
+ }
3904
+ }
3876
3905
  }
3877
3906
  },
3878
3907
  "@firebase/database-types": {
@@ -4309,11 +4338,20 @@
4309
4338
  "requires": {}
4310
4339
  },
4311
4340
  "@firebase/util": {
4312
- "version": "0.3.4",
4313
- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.4.tgz",
4314
- "integrity": "sha512-VwjJUE2Vgr2UMfH63ZtIX9Hd7x+6gayi6RUXaTqEYxSbf/JmehLmAEYSuxS/NckfzAXWeGnKclvnXVibDgpjQQ==",
4341
+ "version": "1.15.3",
4342
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.15.3.tgz",
4343
+ "integrity": "sha512-c/z/gaIlaaLZEuGbE6sLUuJ61tskg1JghvhcNQzW948ASBinbVBBRnZTC4b4yt4LaEtJQkYlyzqLHcutFwEIvA==",
4344
+ "peer": true,
4315
4345
  "requires": {
4316
- "tslib": "^1.11.1"
4346
+ "tslib": "^2.1.0"
4347
+ },
4348
+ "dependencies": {
4349
+ "tslib": {
4350
+ "version": "2.8.1",
4351
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
4352
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
4353
+ "peer": true
4354
+ }
4317
4355
  }
4318
4356
  },
4319
4357
  "@firebase/webchannel-wrapper": {
@@ -11,7 +11,7 @@
11
11
  "url": "https://github.com/Tiledesk/tiledesk-server"
12
12
  },
13
13
  "dependencies": {
14
- "@chat21/chat21-node-sdk": "^1.1.8",
14
+ "@chat21/chat21-node-sdk": "^1.1.12",
15
15
  "winston": "^3.3.3",
16
16
  "firebase-admin": "^9.5.0"
17
17
  },
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@tiledesk/tiledesk-server",
3
3
  "description": "The Tiledesk server module",
4
- "version": "2.27.1",
4
+ "version": "2.27.2",
5
5
  "scripts": {
6
6
  "start": "node ./bin/www",
7
7
  "pretest": "mongodb-runner start",
@@ -6,12 +6,55 @@ const MAX_STRING_LENGTH = 2000;
6
6
  const enabled = process.env.CHAT21_SYNC_TRACE_ENABLED === "true";
7
7
  const host = os.hostname();
8
8
 
9
+ function positiveNumber(value, defaultValue) {
10
+ const parsed = parseInt(value, 10);
11
+ return Number.isFinite(parsed) && parsed > 0 ? parsed : defaultValue;
12
+ }
13
+
14
+ const FLUSH_INTERVAL_MS = positiveNumber(process.env.CHAT21_SYNC_TRACE_FLUSH_INTERVAL_MS, 1000);
15
+ const BATCH_SIZE = positiveNumber(process.env.CHAT21_SYNC_TRACE_BATCH_SIZE, 200);
16
+ const MAX_BUFFER_SIZE = positiveNumber(process.env.CHAT21_SYNC_TRACE_MAX_BUFFER_SIZE, 10000);
17
+
18
+ let buffer = [];
19
+ let flushing = false;
20
+ let dropped = 0;
21
+
9
22
  if (enabled) {
10
- winston.info("[Chat21SyncTracer] Chat21 sync tracing enabled");
23
+ winston.info("[Chat21SyncTracer] Chat21 sync tracing enabled. Flush interval (ms): " + FLUSH_INTERVAL_MS +
24
+ " batch size: " + BATCH_SIZE + " max buffer size: " + MAX_BUFFER_SIZE);
11
25
  // The TTL index must exist even when MONGOOSE_AUTOINDEX is false
12
26
  Chat21SyncTrace.createIndexes().catch((err) => {
13
27
  winston.error("[Chat21SyncTracer] Error creating indexes: ", err);
14
28
  });
29
+ setInterval(flush, FLUSH_INTERVAL_MS).unref();
30
+ }
31
+
32
+ /**
33
+ * Writes the buffered traces in batches. Only one flush runs at a time: while mongo is slow
34
+ * the buffer grows up to MAX_BUFFER_SIZE, then new traces are dropped.
35
+ * @returns {Promise<void>} never rejects
36
+ */
37
+ async function flush() {
38
+ if (flushing || buffer.length === 0) {
39
+ return;
40
+ }
41
+ flushing = true;
42
+ try {
43
+ if (dropped > 0) {
44
+ winston.warn("[Chat21SyncTracer] Buffer full, dropped " + dropped + " traces");
45
+ dropped = 0;
46
+ }
47
+ while (buffer.length > 0) {
48
+ const batch = buffer.splice(0, BATCH_SIZE);
49
+ try {
50
+ await Chat21SyncTrace.insertMany(batch, { ordered: false });
51
+ } catch (err) {
52
+ winston.error("[Chat21SyncTracer] Error saving " + batch.length + " traces: ", err);
53
+ }
54
+ }
55
+ } finally {
56
+ flushing = false;
57
+ }
15
58
  }
16
59
 
17
60
  function truncate(value) {
@@ -56,7 +99,7 @@ function describeRequest(request) {
56
99
  }
57
100
 
58
101
  /**
59
- * Saves a trace document. Never throws and never blocks the caller.
102
+ * Buffers a trace document, saved by the next flush. Never throws and never blocks the caller.
60
103
  * @param {string} event the traced flow, e.g. 'request.close'
61
104
  * @param {{request_id: string, id_project: *}} ref
62
105
  * @param {string} step
@@ -67,21 +110,24 @@ function trace(event, ref, step, outcome, data) {
67
110
  if (!enabled) {
68
111
  return;
69
112
  }
70
- try {
71
- Chat21SyncTrace.create({
72
- request_id: ref?.request_id,
73
- id_project: ref?.id_project ? String(ref.id_project) : undefined,
74
- event: event,
75
- step: step,
76
- outcome: outcome,
77
- data: data,
78
- host: host,
79
- pid: process.pid
80
- }).catch((err) => {
81
- winston.error("[Chat21SyncTracer] Error saving trace " + event + " " + step + ": ", err);
82
- });
83
- } catch (err) {
84
- winston.error("[Chat21SyncTracer] Error creating trace " + event + " " + step + ": ", err);
113
+ if (buffer.length >= MAX_BUFFER_SIZE) {
114
+ dropped++;
115
+ return;
116
+ }
117
+ // createdAt is set here: the document is written later, and the timeline order must reflect the event time
118
+ buffer.push({
119
+ request_id: ref?.request_id,
120
+ id_project: ref?.id_project ? String(ref.id_project) : undefined,
121
+ event: event,
122
+ step: step,
123
+ outcome: outcome,
124
+ data: data,
125
+ host: host,
126
+ pid: process.pid,
127
+ createdAt: new Date()
128
+ });
129
+ if (buffer.length >= BATCH_SIZE) {
130
+ flush();
85
131
  }
86
132
  }
87
133
 
@@ -104,6 +150,7 @@ module.exports = {
104
150
  enabled,
105
151
  trace,
106
152
  traceCall,
153
+ flush,
107
154
  describeError,
108
155
  describeResponse,
109
156
  describeRequest