@atlaskit/editor-synced-block-provider 8.1.8 → 8.1.10
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 +19 -0
- package/dist/cjs/providers/block-service/blockServiceAPI.js +16 -8
- package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js +4 -2
- package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js +15 -8
- package/dist/cjs/store-manager/syncBlockSubscriptionManager.js +46 -11
- package/dist/cjs/utils/errorHandling.js +65 -11
- package/dist/es2019/providers/block-service/blockServiceAPI.js +16 -8
- package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js +5 -3
- package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js +14 -7
- package/dist/es2019/store-manager/syncBlockSubscriptionManager.js +41 -11
- package/dist/es2019/utils/errorHandling.js +62 -5
- package/dist/esm/providers/block-service/blockServiceAPI.js +16 -8
- package/dist/esm/store-manager/referenceSyncBlockStoreManager.js +5 -3
- package/dist/esm/store-manager/sourceSyncBlockStoreManager.js +16 -9
- package/dist/esm/store-manager/syncBlockSubscriptionManager.js +46 -11
- package/dist/esm/utils/errorHandling.js +64 -10
- package/dist/types/providers/types.d.ts +18 -0
- package/dist/types/store-manager/syncBlockSubscriptionManager.d.ts +4 -5
- package/dist/types/utils/errorHandling.d.ts +44 -5
- package/package.json +5 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @atlaskit/editor-synced-block-provider
|
|
2
2
|
|
|
3
|
+
## 8.1.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`b4cfc35a62476`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b4cfc35a62476) -
|
|
8
|
+
Improve the reliability of synced-block real-time updates. Transient WebSocket drops now recover
|
|
9
|
+
silently via a more resilient reconnection strategy (more retry attempts, capped exponential
|
|
10
|
+
backoff with jitter) instead of being reported as failures. A failure is only surfaced once
|
|
11
|
+
reconnection is genuinely exhausted. Behind a feature gate.
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
|
|
14
|
+
## 8.1.9
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- [`a4e834c2647ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a4e834c2647ac) -
|
|
19
|
+
Add failure reason and HTTP status code attributes to synced block delete, update and create
|
|
20
|
+
operational error analytics, so failures can be broken down by cause.
|
|
21
|
+
|
|
3
22
|
## 8.1.8
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -574,7 +574,8 @@ var writeDataBatch = exports.writeDataBatch = /*#__PURE__*/function () {
|
|
|
574
574
|
return _context4.abrupt("return", data.map(function (block) {
|
|
575
575
|
return {
|
|
576
576
|
error: mapBlockError(_t6),
|
|
577
|
-
resourceId: block.resourceId
|
|
577
|
+
resourceId: block.resourceId,
|
|
578
|
+
statusCode: _t6.status
|
|
578
579
|
};
|
|
579
580
|
}));
|
|
580
581
|
case 11:
|
|
@@ -922,7 +923,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
922
923
|
}
|
|
923
924
|
return _context8.abrupt("return", {
|
|
924
925
|
error: mapBlockError(_t0),
|
|
925
|
-
resourceId: resourceId
|
|
926
|
+
resourceId: resourceId,
|
|
927
|
+
statusCode: _t0.status
|
|
926
928
|
});
|
|
927
929
|
case 8:
|
|
928
930
|
return _context8.abrupt("return", {
|
|
@@ -1002,7 +1004,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1002
1004
|
}
|
|
1003
1005
|
return _context9.abrupt("return", {
|
|
1004
1006
|
error: mapBlockError(_t10),
|
|
1005
|
-
resourceId: resourceId
|
|
1007
|
+
resourceId: resourceId,
|
|
1008
|
+
statusCode: _t10.status
|
|
1006
1009
|
});
|
|
1007
1010
|
case 8:
|
|
1008
1011
|
return _context9.abrupt("return", {
|
|
@@ -1086,7 +1089,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1086
1089
|
return _context0.abrupt("return", {
|
|
1087
1090
|
resourceId: resourceId,
|
|
1088
1091
|
success: false,
|
|
1089
|
-
error: mapBlockError(_t11)
|
|
1092
|
+
error: mapBlockError(_t11),
|
|
1093
|
+
statusCode: _t11.status
|
|
1090
1094
|
});
|
|
1091
1095
|
case 7:
|
|
1092
1096
|
return _context0.abrupt("return", {
|
|
@@ -1161,7 +1165,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1161
1165
|
return _context1.abrupt("return", {
|
|
1162
1166
|
resourceId: resourceId,
|
|
1163
1167
|
success: false,
|
|
1164
|
-
error: mapBlockError(_t13)
|
|
1168
|
+
error: mapBlockError(_t13),
|
|
1169
|
+
statusCode: _t13.status
|
|
1165
1170
|
});
|
|
1166
1171
|
case 9:
|
|
1167
1172
|
return _context1.abrupt("return", {
|
|
@@ -1191,7 +1196,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1191
1196
|
return _context1.abrupt("return", {
|
|
1192
1197
|
resourceId: resourceId,
|
|
1193
1198
|
success: false,
|
|
1194
|
-
error: mapBlockError(_t14)
|
|
1199
|
+
error: mapBlockError(_t14),
|
|
1200
|
+
statusCode: _t14.status
|
|
1195
1201
|
});
|
|
1196
1202
|
case 13:
|
|
1197
1203
|
return _context1.abrupt("return", {
|
|
@@ -1276,7 +1282,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1276
1282
|
}
|
|
1277
1283
|
return _context10.abrupt("return", {
|
|
1278
1284
|
success: false,
|
|
1279
|
-
error: mapBlockError(_t15)
|
|
1285
|
+
error: mapBlockError(_t15),
|
|
1286
|
+
statusCode: _t15.status
|
|
1280
1287
|
});
|
|
1281
1288
|
case 4:
|
|
1282
1289
|
return _context10.abrupt("return", {
|
|
@@ -1443,7 +1450,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
1443
1450
|
return _context12.abrupt("return", data.map(function (block) {
|
|
1444
1451
|
return {
|
|
1445
1452
|
error: mapBlockError(_t18),
|
|
1446
|
-
resourceId: block.resourceId
|
|
1453
|
+
resourceId: block.resourceId,
|
|
1454
|
+
statusCode: _t18.status
|
|
1447
1455
|
};
|
|
1448
1456
|
}));
|
|
1449
1457
|
case 15:
|
|
@@ -1084,7 +1084,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
|
|
|
1084
1084
|
(_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.failure({
|
|
1085
1085
|
reason: updateResult.error || 'Failed to update reference synced blocks on the document'
|
|
1086
1086
|
});
|
|
1087
|
-
(_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, (0, _errorHandling.updateReferenceErrorPayload)(updateResult.error || 'Failed to update reference synced blocks on the document'));
|
|
1087
|
+
(_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, (0, _errorHandling.updateReferenceErrorPayload)(updateResult.error || 'Failed to update reference synced blocks on the document', undefined, undefined, (0, _errorHandling.buildErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'), updateResult.error, updateResult.statusCode)));
|
|
1088
1088
|
}
|
|
1089
1089
|
_context4.next = 17;
|
|
1090
1090
|
break;
|
|
@@ -1099,7 +1099,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
|
|
|
1099
1099
|
reason: _t3.message
|
|
1100
1100
|
});
|
|
1101
1101
|
// No `resourceId` available in this catch — sourceProduct is intentionally omitted.
|
|
1102
|
-
|
|
1102
|
+
// No structured SyncBlockError/status here, so the attribution `reason` falls back
|
|
1103
|
+
// to `unknown` when the gate is on.
|
|
1104
|
+
(_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 || _this$fireAnalyticsEv9.call(this, (0, _errorHandling.updateReferenceErrorPayload)(_t3.message, undefined, undefined, (0, _errorHandling.buildErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'))));
|
|
1103
1105
|
case 17:
|
|
1104
1106
|
_context4.prev = 17;
|
|
1105
1107
|
if (!success) {
|
|
@@ -12,6 +12,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
12
12
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
14
|
var _monitoring = require("@atlaskit/editor-common/monitoring");
|
|
15
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
16
|
var _types = require("../common/types");
|
|
16
17
|
var _errorHandling = require("../utils/errorHandling");
|
|
17
18
|
var _experienceTracking = require("../utils/experienceTracking");
|
|
@@ -165,7 +166,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
165
166
|
value: (function () {
|
|
166
167
|
var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
167
168
|
var _this2 = this;
|
|
168
|
-
var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion, _t;
|
|
169
|
+
var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, attributionEnabled, _this$fireAnalyticsEv2, _this$flushCompletion, _t;
|
|
169
170
|
return _regenerator.default.wrap(function (_context) {
|
|
170
171
|
while (1) switch (_context.prev = _context.next) {
|
|
171
172
|
case 0:
|
|
@@ -284,11 +285,12 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
284
285
|
return _context.abrupt("return", true);
|
|
285
286
|
case 7:
|
|
286
287
|
(_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure();
|
|
288
|
+
attributionEnabled = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3');
|
|
287
289
|
writeResults.filter(function (result) {
|
|
288
290
|
return !result.resourceId || result.error;
|
|
289
291
|
}).forEach(function (result) {
|
|
290
292
|
var _this2$fireAnalyticsE2;
|
|
291
|
-
(_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId)));
|
|
293
|
+
(_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId), (0, _errorHandling.buildErrorAttribution)(attributionEnabled, result.error, result.statusCode)));
|
|
292
294
|
});
|
|
293
295
|
return _context.abrupt("return", false);
|
|
294
296
|
case 8:
|
|
@@ -300,8 +302,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
300
302
|
(0, _monitoring.logException)(_t, {
|
|
301
303
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|
|
302
304
|
});
|
|
303
|
-
// Top-level flush failure is not tied to a single resourceId.
|
|
304
|
-
|
|
305
|
+
// Top-level flush failure is not tied to a single resourceId. There is no structured
|
|
306
|
+
// SyncBlockError/status here, so the attribution `reason` falls back to `unknown`.
|
|
307
|
+
(_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.updateErrorPayload)(_t.message, undefined, undefined, (0, _errorHandling.buildErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'))));
|
|
305
308
|
return _context.abrupt("return", false);
|
|
306
309
|
case 10:
|
|
307
310
|
_context.prev = 10;
|
|
@@ -476,7 +479,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
476
479
|
(_this4$createExperien2 = _this4.createExperience) === null || _this4$createExperien2 === void 0 || _this4$createExperien2.failure({
|
|
477
480
|
reason: result.error || 'Failed to create bodied sync block'
|
|
478
481
|
});
|
|
479
|
-
(_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, (0, _errorHandling.createErrorPayload)(result.error || 'Failed to create bodied sync block', resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
|
|
482
|
+
(_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, (0, _errorHandling.createErrorPayload)(result.error || 'Failed to create bodied sync block', resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId), (0, _errorHandling.buildErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'), result.error, result.statusCode)));
|
|
480
483
|
}
|
|
481
484
|
}).catch(function (error) {
|
|
482
485
|
var _this4$createExperien3, _this4$fireAnalyticsE2;
|
|
@@ -508,7 +511,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
508
511
|
value: function () {
|
|
509
512
|
var _delete2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockIds, onDelete, onDeleteCompleted, reason) {
|
|
510
513
|
var _this5 = this;
|
|
511
|
-
var _this$deleteExperienc, results, callback, isDeleteSuccessful, _this$deleteExperienc2, _this$deleteExperienc3, _t2;
|
|
514
|
+
var _this$deleteExperienc, results, callback, isDeleteSuccessful, _this$deleteExperienc2, _this$deleteExperienc3, attributionEnabled, attribution, _t2;
|
|
512
515
|
return _regenerator.default.wrap(function (_context2) {
|
|
513
516
|
while (1) switch (_context2.prev = _context2.next) {
|
|
514
517
|
case 0:
|
|
@@ -555,13 +558,14 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
555
558
|
_this5.setPendingDeletion(Ids, false);
|
|
556
559
|
};
|
|
557
560
|
(_this$deleteExperienc3 = this.deleteExperience) === null || _this$deleteExperienc3 === void 0 || _this$deleteExperienc3.failure();
|
|
561
|
+
attributionEnabled = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3');
|
|
558
562
|
results.forEach(function (result) {
|
|
559
563
|
if (result.success) {
|
|
560
564
|
var _this5$fireAnalyticsE2;
|
|
561
565
|
(_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.deleteSuccessPayload)(result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId)));
|
|
562
566
|
} else {
|
|
563
567
|
var _this5$fireAnalyticsE3;
|
|
564
|
-
(_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, (0, _errorHandling.deleteErrorPayload)(result.error || 'Failed to delete synced block', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId)));
|
|
568
|
+
(_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, (0, _errorHandling.deleteErrorPayload)(result.error || 'Failed to delete synced block', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId), (0, _errorHandling.buildErrorAttribution)(attributionEnabled, result.error, result.statusCode)));
|
|
565
569
|
}
|
|
566
570
|
});
|
|
567
571
|
}
|
|
@@ -570,10 +574,13 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
570
574
|
case 4:
|
|
571
575
|
_context2.prev = 4;
|
|
572
576
|
_t2 = _context2["catch"](0);
|
|
577
|
+
// Thrown (non-result) failure — no structured SyncBlockError/status is available,
|
|
578
|
+
// so the attribution `reason` falls back to `unknown` when the gate is on.
|
|
579
|
+
attribution = (0, _errorHandling.buildErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'));
|
|
573
580
|
syncBlockIds.forEach(function (Ids) {
|
|
574
581
|
var _this5$fireAnalyticsE4;
|
|
575
582
|
_this5.setPendingDeletion(Ids, false);
|
|
576
|
-
(_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, (0, _errorHandling.deleteErrorPayload)(_t2.message, Ids.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(Ids.resourceId)));
|
|
583
|
+
(_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, (0, _errorHandling.deleteErrorPayload)(_t2.message, Ids.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(Ids.resourceId), attribution));
|
|
577
584
|
});
|
|
578
585
|
(0, _monitoring.logException)(_t2, {
|
|
579
586
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|
|
@@ -37,6 +37,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
37
37
|
// causing the cache to be deleted prematurely. We delay deletion to allow
|
|
38
38
|
// the new component to subscribe and cancel the pending deletion.
|
|
39
39
|
(0, _defineProperty2.default)(this, "pendingCacheDeletions", new Map());
|
|
40
|
+
// backoff cap (gate ON)
|
|
40
41
|
(0, _defineProperty2.default)(this, "retryAttempts", new Map());
|
|
41
42
|
(0, _defineProperty2.default)(this, "pendingRetries", new Map());
|
|
42
43
|
this.deps = deps;
|
|
@@ -47,6 +48,30 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
47
48
|
* that need to read the current subscription state.
|
|
48
49
|
*/
|
|
49
50
|
return (0, _createClass2.default)(SyncBlockSubscriptionManager, [{
|
|
51
|
+
key: "getMaxRetryAttempts",
|
|
52
|
+
value:
|
|
53
|
+
// EDITOR-7861: higher ceiling lets transient WS-gateway drops self-heal
|
|
54
|
+
// before a terminal failure is surfaced.
|
|
55
|
+
function getMaxRetryAttempts() {
|
|
56
|
+
return (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3') ? SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS_HARDENED : SyncBlockSubscriptionManager.MAX_RETRY_ATTEMPTS;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// Backoff delay for the given attempt.
|
|
60
|
+
// Gate OFF: pure exponential (1s, 2s, 4s, 8s, 16s).
|
|
61
|
+
// Gate ON (EDITOR-7861): exponential capped at MAX_RETRY_DELAY_MS with equal
|
|
62
|
+
// jitter (capped/2 + random*capped/2) — de-synchronises simultaneous
|
|
63
|
+
// reconnects while guaranteeing a non-zero delay (full jitter could hit 0).
|
|
64
|
+
}, {
|
|
65
|
+
key: "getReconnectionDelay",
|
|
66
|
+
value: function getReconnectionDelay(attempts) {
|
|
67
|
+
var exponential = SyncBlockSubscriptionManager.INITIAL_RETRY_DELAY_MS * Math.pow(SyncBlockSubscriptionManager.RETRY_BACKOFF_MULTIPLIER, attempts);
|
|
68
|
+
if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3')) {
|
|
69
|
+
return exponential;
|
|
70
|
+
}
|
|
71
|
+
var half = Math.min(exponential, SyncBlockSubscriptionManager.MAX_RETRY_DELAY_MS) / 2;
|
|
72
|
+
return Math.round(half + Math.random() * half);
|
|
73
|
+
}
|
|
74
|
+
}, {
|
|
50
75
|
key: "getSubscriptions",
|
|
51
76
|
value: function getSubscriptions() {
|
|
52
77
|
return this.subscriptions;
|
|
@@ -273,11 +298,17 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
273
298
|
var unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
|
|
274
299
|
_this5.handleGraphQLUpdate(syncBlockInstance);
|
|
275
300
|
}, function (error) {
|
|
276
|
-
var _this5$deps$getFireAn;
|
|
277
301
|
(0, _monitoring.logException)(error, {
|
|
278
302
|
location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
|
|
279
303
|
});
|
|
280
|
-
|
|
304
|
+
// EDITOR-7861: a single socket drop is usually transient and
|
|
305
|
+
// recovers on reconnect, so under the gate we don't fire a
|
|
306
|
+
// user-facing error here — it's only surfaced on exhaustion (see
|
|
307
|
+
// scheduleReconnection). Gate OFF keeps the legacy fire-on-drop.
|
|
308
|
+
if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3')) {
|
|
309
|
+
var _this5$deps$getFireAn;
|
|
310
|
+
(_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
|
|
311
|
+
}
|
|
281
312
|
_this5.handleSubscriptionTerminated(resourceId);
|
|
282
313
|
}, function () {
|
|
283
314
|
_this5.handleSubscriptionTerminated(resourceId);
|
|
@@ -308,19 +339,19 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
308
339
|
}
|
|
309
340
|
}
|
|
310
341
|
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
* Delay = INITIAL_RETRY_DELAY_MS * (RETRY_BACKOFF_MULTIPLIER ^ attempts)
|
|
314
|
-
* e.g. 1s, 2s, 4s, 8s, 16s
|
|
315
|
-
*/
|
|
342
|
+
// Schedules a reconnection with backoff (see getMaxRetryAttempts /
|
|
343
|
+
// getReconnectionDelay for the gated behaviour).
|
|
316
344
|
}, {
|
|
317
345
|
key: "scheduleReconnection",
|
|
318
346
|
value: function scheduleReconnection(resourceId) {
|
|
319
347
|
var _this$retryAttempts$g,
|
|
320
348
|
_this6 = this;
|
|
321
349
|
var attempts = (_this$retryAttempts$g = this.retryAttempts.get(resourceId)) !== null && _this$retryAttempts$g !== void 0 ? _this$retryAttempts$g : 0;
|
|
322
|
-
|
|
350
|
+
var maxAttempts = this.getMaxRetryAttempts();
|
|
351
|
+
if (attempts >= maxAttempts) {
|
|
323
352
|
var _this$deps$getFireAna;
|
|
353
|
+
// Exhausted all attempts — the only place a WS drop surfaces as a
|
|
354
|
+
// fetch error under the gate (EDITOR-7861).
|
|
324
355
|
var errorMessage = "Subscription reconnection failed after ".concat(attempts, " attempts");
|
|
325
356
|
(0, _monitoring.logException)(new Error(errorMessage), {
|
|
326
357
|
location: 'editor-synced-block-provider/syncBlockSubscriptionManager/max-retries-exhausted'
|
|
@@ -328,7 +359,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
328
359
|
(_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(errorMessage, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
|
|
329
360
|
return;
|
|
330
361
|
}
|
|
331
|
-
var delay =
|
|
362
|
+
var delay = this.getReconnectionDelay(attempts);
|
|
332
363
|
var timer = setTimeout(function () {
|
|
333
364
|
_this6.pendingRetries.delete(resourceId);
|
|
334
365
|
|
|
@@ -486,7 +517,11 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
486
517
|
}
|
|
487
518
|
}]);
|
|
488
519
|
}();
|
|
489
|
-
// Reconnection with exponential backoff
|
|
520
|
+
// Reconnection with exponential backoff.
|
|
490
521
|
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "INITIAL_RETRY_DELAY_MS", 1000);
|
|
491
522
|
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "RETRY_BACKOFF_MULTIPLIER", 2);
|
|
492
|
-
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);
|
|
523
|
+
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS", 5);
|
|
524
|
+
// legacy (gate OFF)
|
|
525
|
+
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_ATTEMPTS_HARDENED", 8);
|
|
526
|
+
// gate ON (EDITOR-7861)
|
|
527
|
+
(0, _defineProperty2.default)(SyncBlockSubscriptionManager, "MAX_RETRY_DELAY_MS", 30000);
|
|
@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.updateSuccessPayload = exports.updateReferenceErrorPayload = exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.sourceInfoOrphanedPayload = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchSuccessPayload = exports.fetchReferencesErrorPayload = exports.fetchErrorPayload = exports.deleteSuccessPayload = exports.deleteErrorPayload = exports.createSuccessPayloadNew = exports.createSuccessPayload = exports.createErrorPayload = exports.cacheDeletionForcedPayload = void 0;
|
|
7
|
+
exports.updateSuccessPayload = exports.updateReferenceErrorPayload = exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.sourceInfoOrphanedPayload = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchSuccessPayload = exports.fetchReferencesErrorPayload = exports.fetchErrorPayload = exports.deleteSuccessPayload = exports.deleteErrorPayload = exports.createSuccessPayloadNew = exports.createSuccessPayload = exports.createErrorPayload = exports.classifyErrorReason = exports.cacheDeletionForcedPayload = exports.buildErrorAttribution = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
10
|
+
var _types = require("../common/types");
|
|
10
11
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
11
12
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
12
13
|
var stringifyError = exports.stringifyError = function stringifyError(error) {
|
|
@@ -17,24 +18,77 @@ var stringifyError = exports.stringifyError = function stringifyError(error) {
|
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
20
|
|
|
21
|
+
/**
|
|
22
|
+
* The set of categorical failure reasons emitted on synced-block operational error
|
|
23
|
+
* events (EDITOR-7796). These let the analytics dashboard break delete/update/create
|
|
24
|
+
* failures down by cause (Block Service / HG / Relay) instead of relying on the
|
|
25
|
+
* free-text `error` blob. Mirrors the {@link SyncBlockError} enum values, plus an
|
|
26
|
+
* `unknown` fallback for unclassifiable errors.
|
|
27
|
+
*/
|
|
28
|
+
|
|
29
|
+
var SYNC_BLOCK_ERROR_REASONS = new Set(Object.values(_types.SyncBlockError));
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Maps a result `error` field (which may be a {@link SyncBlockError} enum value such as
|
|
33
|
+
* `'not_found'`, or an arbitrary stringified blob) to a stable categorical
|
|
34
|
+
* {@link SyncBlockErrorReason} for analytics grouping. Anything that is not a known
|
|
35
|
+
* `SyncBlockError` value collapses to `'unknown'` so the dashboard never has to group on
|
|
36
|
+
* free-text error blobs.
|
|
37
|
+
*/
|
|
38
|
+
var classifyErrorReason = exports.classifyErrorReason = function classifyErrorReason(error) {
|
|
39
|
+
if (error && SYNC_BLOCK_ERROR_REASONS.has(error)) {
|
|
40
|
+
return error;
|
|
41
|
+
}
|
|
42
|
+
return 'unknown';
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Extra, optional analytics attributes describing WHY an operational synced-block
|
|
47
|
+
* action failed. Spread conditionally so we never emit `undefined` keys (EDITOR-7796).
|
|
48
|
+
*/
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Builds the {@link ErrorAttributionAttributes} for a failed synced-block operation from
|
|
52
|
+
* the raw result `error` field and optional backend `statusCode`. Returns `undefined`
|
|
53
|
+
* when the `platform_editor_blocks_patch_3` gate is OFF, so the new `reason`/`statusCode`
|
|
54
|
+
* attributes are only emitted once the gate is rolled out (EDITOR-7796).
|
|
55
|
+
*
|
|
56
|
+
* `gateEnabled` is injected by the caller (the store managers evaluate `fg(...)`) so this
|
|
57
|
+
* helper stays pure and trivially unit-testable for both gate states.
|
|
58
|
+
*/
|
|
59
|
+
var buildErrorAttribution = exports.buildErrorAttribution = function buildErrorAttribution(gateEnabled, error, statusCode) {
|
|
60
|
+
if (!gateEnabled) {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
return _objectSpread({
|
|
64
|
+
reason: classifyErrorReason(error)
|
|
65
|
+
}, statusCode !== undefined && {
|
|
66
|
+
statusCode: statusCode
|
|
67
|
+
});
|
|
68
|
+
};
|
|
69
|
+
|
|
20
70
|
// `sourceProduct` is threaded through every helper so analytics
|
|
21
71
|
// events can be attributed to the source product (`confluence-page` vs `jira-work-item`).
|
|
22
72
|
// All helpers accept it as an optional trailing argument; the spread-only-when-truthy
|
|
23
73
|
// pattern below ensures we never emit `sourceProduct: undefined` (which would dirty the
|
|
24
74
|
// event schema with empty keys).
|
|
25
75
|
|
|
26
|
-
var getErrorPayload = exports.getErrorPayload = function getErrorPayload(actionSubjectId, error, resourceId, sourceProduct) {
|
|
76
|
+
var getErrorPayload = exports.getErrorPayload = function getErrorPayload(actionSubjectId, error, resourceId, sourceProduct, attribution) {
|
|
27
77
|
return {
|
|
28
78
|
action: _analytics.ACTION.ERROR,
|
|
29
79
|
actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
|
|
30
80
|
actionSubjectId: actionSubjectId,
|
|
31
81
|
eventType: _analytics.EVENT_TYPE.OPERATIONAL,
|
|
32
|
-
attributes: _objectSpread(_objectSpread({
|
|
82
|
+
attributes: _objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
33
83
|
error: error
|
|
34
84
|
}, resourceId && {
|
|
35
85
|
resourceId: resourceId
|
|
36
86
|
}), sourceProduct && {
|
|
37
87
|
sourceProduct: sourceProduct
|
|
88
|
+
}), (attribution === null || attribution === void 0 ? void 0 : attribution.reason) && {
|
|
89
|
+
reason: attribution.reason
|
|
90
|
+
}), (attribution === null || attribution === void 0 ? void 0 : attribution.statusCode) !== undefined && {
|
|
91
|
+
statusCode: attribution.statusCode
|
|
38
92
|
})
|
|
39
93
|
};
|
|
40
94
|
};
|
|
@@ -44,17 +98,17 @@ var fetchErrorPayload = exports.fetchErrorPayload = function fetchErrorPayload(e
|
|
|
44
98
|
var getSourceInfoErrorPayload = exports.getSourceInfoErrorPayload = function getSourceInfoErrorPayload(error, resourceId, sourceProduct) {
|
|
45
99
|
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error, resourceId, sourceProduct);
|
|
46
100
|
};
|
|
47
|
-
var updateErrorPayload = exports.updateErrorPayload = function updateErrorPayload(error, resourceId, sourceProduct) {
|
|
48
|
-
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct);
|
|
101
|
+
var updateErrorPayload = exports.updateErrorPayload = function updateErrorPayload(error, resourceId, sourceProduct, attribution) {
|
|
102
|
+
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct, attribution);
|
|
49
103
|
};
|
|
50
|
-
var updateReferenceErrorPayload = exports.updateReferenceErrorPayload = function updateReferenceErrorPayload(error, resourceId, sourceProduct) {
|
|
51
|
-
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct);
|
|
104
|
+
var updateReferenceErrorPayload = exports.updateReferenceErrorPayload = function updateReferenceErrorPayload(error, resourceId, sourceProduct, attribution) {
|
|
105
|
+
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_UPDATE, error, resourceId, sourceProduct, attribution);
|
|
52
106
|
};
|
|
53
|
-
var createErrorPayload = exports.createErrorPayload = function createErrorPayload(error, resourceId, sourceProduct) {
|
|
54
|
-
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error, resourceId, sourceProduct);
|
|
107
|
+
var createErrorPayload = exports.createErrorPayload = function createErrorPayload(error, resourceId, sourceProduct, attribution) {
|
|
108
|
+
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error, resourceId, sourceProduct, attribution);
|
|
55
109
|
};
|
|
56
|
-
var deleteErrorPayload = exports.deleteErrorPayload = function deleteErrorPayload(error, resourceId, sourceProduct) {
|
|
57
|
-
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error, resourceId, sourceProduct);
|
|
110
|
+
var deleteErrorPayload = exports.deleteErrorPayload = function deleteErrorPayload(error, resourceId, sourceProduct, attribution) {
|
|
111
|
+
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error, resourceId, sourceProduct, attribution);
|
|
58
112
|
};
|
|
59
113
|
var updateCacheErrorPayload = exports.updateCacheErrorPayload = function updateCacheErrorPayload(error, resourceId, sourceProduct) {
|
|
60
114
|
return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE_CACHE, error, resourceId, sourceProduct);
|
|
@@ -387,7 +387,8 @@ export const writeDataBatch = async (cloudId, parentAri, parentId, product, data
|
|
|
387
387
|
if (error instanceof BlockError) {
|
|
388
388
|
return data.map(block => ({
|
|
389
389
|
error: mapBlockError(error),
|
|
390
|
-
resourceId: block.resourceId
|
|
390
|
+
resourceId: block.resourceId,
|
|
391
|
+
statusCode: error.status
|
|
391
392
|
}));
|
|
392
393
|
}
|
|
393
394
|
return data.map(block => ({
|
|
@@ -632,7 +633,8 @@ class BlockServiceADFWriteProvider {
|
|
|
632
633
|
if (error instanceof BlockError) {
|
|
633
634
|
return {
|
|
634
635
|
error: mapBlockError(error),
|
|
635
|
-
resourceId
|
|
636
|
+
resourceId,
|
|
637
|
+
statusCode: error.status
|
|
636
638
|
};
|
|
637
639
|
}
|
|
638
640
|
return {
|
|
@@ -675,7 +677,8 @@ class BlockServiceADFWriteProvider {
|
|
|
675
677
|
if (error instanceof BlockError) {
|
|
676
678
|
return {
|
|
677
679
|
error: mapBlockError(error),
|
|
678
|
-
resourceId
|
|
680
|
+
resourceId,
|
|
681
|
+
statusCode: error.status
|
|
679
682
|
};
|
|
680
683
|
}
|
|
681
684
|
return {
|
|
@@ -731,7 +734,8 @@ class BlockServiceADFWriteProvider {
|
|
|
731
734
|
return {
|
|
732
735
|
resourceId,
|
|
733
736
|
success: false,
|
|
734
|
-
error: mapBlockError(error)
|
|
737
|
+
error: mapBlockError(error),
|
|
738
|
+
statusCode: error.status
|
|
735
739
|
};
|
|
736
740
|
}
|
|
737
741
|
return {
|
|
@@ -772,7 +776,8 @@ class BlockServiceADFWriteProvider {
|
|
|
772
776
|
return {
|
|
773
777
|
resourceId,
|
|
774
778
|
success: false,
|
|
775
|
-
error: mapBlockError(createError)
|
|
779
|
+
error: mapBlockError(createError),
|
|
780
|
+
statusCode: createError.status
|
|
776
781
|
};
|
|
777
782
|
} else {
|
|
778
783
|
return {
|
|
@@ -796,7 +801,8 @@ class BlockServiceADFWriteProvider {
|
|
|
796
801
|
return {
|
|
797
802
|
resourceId,
|
|
798
803
|
success: false,
|
|
799
|
-
error: mapBlockError(error)
|
|
804
|
+
error: mapBlockError(error),
|
|
805
|
+
statusCode: error.status
|
|
800
806
|
};
|
|
801
807
|
}
|
|
802
808
|
return {
|
|
@@ -848,7 +854,8 @@ class BlockServiceADFWriteProvider {
|
|
|
848
854
|
if (error instanceof BlockError) {
|
|
849
855
|
return {
|
|
850
856
|
success: false,
|
|
851
|
-
error: mapBlockError(error)
|
|
857
|
+
error: mapBlockError(error),
|
|
858
|
+
statusCode: error.status
|
|
852
859
|
};
|
|
853
860
|
}
|
|
854
861
|
return {
|
|
@@ -923,7 +930,8 @@ class BlockServiceADFWriteProvider {
|
|
|
923
930
|
if (error instanceof BlockError) {
|
|
924
931
|
return data.map(block => ({
|
|
925
932
|
error: mapBlockError(error),
|
|
926
|
-
resourceId: block.resourceId
|
|
933
|
+
resourceId: block.resourceId,
|
|
934
|
+
statusCode: error.status
|
|
927
935
|
}));
|
|
928
936
|
}
|
|
929
937
|
return data.map(block => ({
|
|
@@ -3,7 +3,7 @@ import isEqual from 'lodash/isEqual';
|
|
|
3
3
|
import { logException } from '@atlaskit/editor-common/monitoring';
|
|
4
4
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
5
|
import { SyncBlockError } from '../common/types';
|
|
6
|
-
import { cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
|
|
6
|
+
import { buildErrorAttribution, cacheDeletionForcedPayload, fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, sourceInfoOrphanedPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
|
|
7
7
|
import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
|
|
8
8
|
import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
|
|
9
9
|
import { createSyncBlockNode, getSourceProductFromResourceIdSafe, normalizeSyncBlockJSONContent } from '../utils/utils';
|
|
@@ -874,7 +874,7 @@ export class ReferenceSyncBlockStoreManager {
|
|
|
874
874
|
(_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 ? void 0 : _this$saveExperience2.failure({
|
|
875
875
|
reason: updateResult.error || 'Failed to update reference synced blocks on the document'
|
|
876
876
|
});
|
|
877
|
-
(_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
|
|
877
|
+
(_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document', undefined, undefined, buildErrorAttribution(fg('platform_editor_blocks_patch_3'), updateResult.error, updateResult.statusCode)));
|
|
878
878
|
}
|
|
879
879
|
} catch (error) {
|
|
880
880
|
var _this$saveExperience3, _this$fireAnalyticsEv13;
|
|
@@ -886,7 +886,9 @@ export class ReferenceSyncBlockStoreManager {
|
|
|
886
886
|
reason: error.message
|
|
887
887
|
});
|
|
888
888
|
// No `resourceId` available in this catch — sourceProduct is intentionally omitted.
|
|
889
|
-
|
|
889
|
+
// No structured SyncBlockError/status here, so the attribution `reason` falls back
|
|
890
|
+
// to `unknown` when the gate is on.
|
|
891
|
+
(_this$fireAnalyticsEv13 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv13 === void 0 ? void 0 : _this$fireAnalyticsEv13.call(this, updateReferenceErrorPayload(error.message, undefined, undefined, buildErrorAttribution(fg('platform_editor_blocks_patch_3'))));
|
|
890
892
|
} finally {
|
|
891
893
|
if (!success) {
|
|
892
894
|
// set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import { logException } from '@atlaskit/editor-common/monitoring';
|
|
3
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
4
|
import { SyncBlockError } from '../common/types';
|
|
4
|
-
import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
|
|
5
|
+
import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload, buildErrorAttribution } from '../utils/errorHandling';
|
|
5
6
|
import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
|
|
6
7
|
import { convertSyncBlockPMNodeToSyncBlockData, getSourceProductFromResourceIdSafe } from '../utils/utils';
|
|
7
8
|
/** Maximum time (ms) flush() will wait for in-flight block creations before proceeding. */
|
|
@@ -236,9 +237,10 @@ export class SourceSyncBlockStoreManager {
|
|
|
236
237
|
} else {
|
|
237
238
|
var _this$saveExperience3;
|
|
238
239
|
(_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 ? void 0 : _this$saveExperience3.failure();
|
|
240
|
+
const attributionEnabled = fg('platform_editor_blocks_patch_3');
|
|
239
241
|
writeResults.filter(result => !result.resourceId || result.error).forEach(result => {
|
|
240
242
|
var _this$fireAnalyticsEv3;
|
|
241
|
-
(_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
|
|
243
|
+
(_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId), buildErrorAttribution(attributionEnabled, result.error, result.statusCode)));
|
|
242
244
|
});
|
|
243
245
|
return false;
|
|
244
246
|
}
|
|
@@ -247,8 +249,9 @@ export class SourceSyncBlockStoreManager {
|
|
|
247
249
|
logException(error, {
|
|
248
250
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|
|
249
251
|
});
|
|
250
|
-
// Top-level flush failure is not tied to a single resourceId.
|
|
251
|
-
|
|
252
|
+
// Top-level flush failure is not tied to a single resourceId. There is no structured
|
|
253
|
+
// SyncBlockError/status here, so the attribution `reason` falls back to `unknown`.
|
|
254
|
+
(_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, updateErrorPayload(error.message, undefined, undefined, buildErrorAttribution(fg('platform_editor_blocks_patch_3'))));
|
|
252
255
|
return false;
|
|
253
256
|
} finally {
|
|
254
257
|
var _this$flushCompletion;
|
|
@@ -396,7 +399,7 @@ export class SourceSyncBlockStoreManager {
|
|
|
396
399
|
(_this$createExperienc3 = this.createExperience) === null || _this$createExperienc3 === void 0 ? void 0 : _this$createExperienc3.failure({
|
|
397
400
|
reason: result.error || 'Failed to create bodied sync block'
|
|
398
401
|
});
|
|
399
|
-
(_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId)));
|
|
402
|
+
(_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, createErrorPayload(result.error || 'Failed to create bodied sync block', resourceId, getSourceProductFromResourceIdSafe(resourceId), buildErrorAttribution(fg('platform_editor_blocks_patch_3'), result.error, result.statusCode)));
|
|
400
403
|
}
|
|
401
404
|
}).catch(error => {
|
|
402
405
|
var _this$createExperienc4, _this$fireAnalyticsEv9;
|
|
@@ -456,23 +459,27 @@ export class SourceSyncBlockStoreManager {
|
|
|
456
459
|
this.setPendingDeletion(Ids, false);
|
|
457
460
|
};
|
|
458
461
|
(_this$deleteExperienc3 = this.deleteExperience) === null || _this$deleteExperienc3 === void 0 ? void 0 : _this$deleteExperienc3.failure();
|
|
462
|
+
const attributionEnabled = fg('platform_editor_blocks_patch_3');
|
|
459
463
|
results.forEach(result => {
|
|
460
464
|
if (result.success) {
|
|
461
465
|
var _this$fireAnalyticsEv10;
|
|
462
466
|
(_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, deleteSuccessPayload(result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
|
|
463
467
|
} else {
|
|
464
468
|
var _this$fireAnalyticsEv11;
|
|
465
|
-
(_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
|
|
469
|
+
(_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId), buildErrorAttribution(attributionEnabled, result.error, result.statusCode)));
|
|
466
470
|
}
|
|
467
471
|
});
|
|
468
472
|
}
|
|
469
473
|
syncBlockIds.forEach(callback);
|
|
470
474
|
return isDeleteSuccessful;
|
|
471
475
|
} catch (error) {
|
|
476
|
+
// Thrown (non-result) failure — no structured SyncBlockError/status is available,
|
|
477
|
+
// so the attribution `reason` falls back to `unknown` when the gate is on.
|
|
478
|
+
const attribution = buildErrorAttribution(fg('platform_editor_blocks_patch_3'));
|
|
472
479
|
syncBlockIds.forEach(Ids => {
|
|
473
480
|
var _this$fireAnalyticsEv12;
|
|
474
481
|
this.setPendingDeletion(Ids, false);
|
|
475
|
-
(_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, deleteErrorPayload(error.message, Ids.resourceId, getSourceProductFromResourceIdSafe(Ids.resourceId)));
|
|
482
|
+
(_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, deleteErrorPayload(error.message, Ids.resourceId, getSourceProductFromResourceIdSafe(Ids.resourceId), attribution));
|
|
476
483
|
});
|
|
477
484
|
logException(error, {
|
|
478
485
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|