@atlaskit/collab-provider 8.1.0 → 8.2.0

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 (57) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/analytics/index.js +2 -11
  3. package/dist/cjs/analytics/performance.js +2 -16
  4. package/dist/cjs/channel.js +63 -114
  5. package/dist/cjs/disconnected-reason-mapper.js +0 -2
  6. package/dist/cjs/emitter.js +3 -11
  7. package/dist/cjs/error-code-mapper.js +4 -17
  8. package/dist/cjs/feature-flags/__test__/index.unit.js +0 -1
  9. package/dist/cjs/feature-flags/index.js +5 -15
  10. package/dist/cjs/feature-flags/types.js +2 -0
  11. package/dist/cjs/helpers/const.js +2 -8
  12. package/dist/cjs/helpers/utils.js +0 -12
  13. package/dist/cjs/index.js +0 -1
  14. package/dist/cjs/provider/catchup.js +38 -42
  15. package/dist/cjs/provider/index.js +150 -281
  16. package/dist/cjs/socket-io-provider.js +2 -12
  17. package/dist/cjs/types.js +0 -1
  18. package/dist/cjs/version-wrapper.js +1 -3
  19. package/dist/cjs/version.json +1 -1
  20. package/dist/es2019/analytics/index.js +2 -3
  21. package/dist/es2019/analytics/performance.js +2 -13
  22. package/dist/es2019/channel.js +54 -64
  23. package/dist/es2019/disconnected-reason-mapper.js +1 -2
  24. package/dist/es2019/emitter.js +3 -8
  25. package/dist/es2019/error-code-mapper.js +4 -12
  26. package/dist/es2019/feature-flags/index.js +2 -5
  27. package/dist/es2019/feature-flags/types.js +2 -0
  28. package/dist/es2019/helpers/const.js +2 -8
  29. package/dist/es2019/helpers/utils.js +0 -2
  30. package/dist/es2019/provider/catchup.js +33 -17
  31. package/dist/es2019/provider/index.js +116 -187
  32. package/dist/es2019/socket-io-provider.js +4 -2
  33. package/dist/es2019/types.js +1 -1
  34. package/dist/es2019/version-wrapper.js +1 -1
  35. package/dist/es2019/version.json +1 -1
  36. package/dist/esm/analytics/index.js +2 -6
  37. package/dist/esm/analytics/performance.js +2 -13
  38. package/dist/esm/channel.js +65 -107
  39. package/dist/esm/disconnected-reason-mapper.js +1 -2
  40. package/dist/esm/emitter.js +3 -6
  41. package/dist/esm/error-code-mapper.js +4 -12
  42. package/dist/esm/feature-flags/index.js +5 -10
  43. package/dist/esm/feature-flags/types.js +2 -0
  44. package/dist/esm/helpers/const.js +2 -8
  45. package/dist/esm/helpers/utils.js +0 -3
  46. package/dist/esm/provider/catchup.js +38 -35
  47. package/dist/esm/provider/index.js +150 -283
  48. package/dist/esm/socket-io-provider.js +2 -5
  49. package/dist/esm/types.js +1 -1
  50. package/dist/esm/version-wrapper.js +1 -1
  51. package/dist/esm/version.json +1 -1
  52. package/dist/types/channel.d.ts +1 -0
  53. package/dist/types/error-code-mapper.d.ts +1 -1
  54. package/dist/types/helpers/const.d.ts +16 -3
  55. package/dist/types/types.d.ts +3 -1
  56. package/package.json +7 -5
  57. package/report.api.md +6 -0
@@ -1,18 +1,15 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
-
3
2
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
4
-
5
3
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
-
7
4
  import { Provider } from './provider';
8
5
  import { io } from 'socket.io-client';
9
6
  import { getProduct, getSubProduct } from './helpers/utils';
10
7
  import { SOCKET_IO_OPTIONS } from './config';
11
8
  export function createSocketIOSocket(url, auth, productInfo) {
12
9
  var _URL = new URL(url),
13
- pathname = _URL.pathname; // to limit the reconnection flooding towards collab service, here we set the reconnectionDelayMax to 128s.
14
-
10
+ pathname = _URL.pathname;
15
11
 
12
+ // to limit the reconnection flooding towards collab service, here we set the reconnectionDelayMax to 128s.
16
13
  return io(url, {
17
14
  reconnectionDelayMax: SOCKET_IO_OPTIONS.RECONNECTION_DELAY_MAX,
18
15
  reconnectionDelay: SOCKET_IO_OPTIONS.RECONNECTION_DELAY,
package/dist/esm/types.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // Channel
2
- export var AcknowledgementResponseTypes;
3
2
 
3
+ export var AcknowledgementResponseTypes;
4
4
  (function (AcknowledgementResponseTypes) {
5
5
  AcknowledgementResponseTypes["SUCCESS"] = "SUCCESS";
6
6
  AcknowledgementResponseTypes["ERROR"] = "ERROR";
@@ -1,5 +1,5 @@
1
1
  export var name = "@atlaskit/collab-provider";
2
- export var version = "8.1.0";
2
+ export var version = "8.2.0";
3
3
  export var nextMajorVersion = function nextMajorVersion() {
4
4
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
5
5
  };
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/collab-provider",
3
- "version": "8.1.0",
3
+ "version": "8.2.0",
4
4
  "sideEffects": false
5
5
  }
@@ -15,6 +15,7 @@ export declare class Channel extends Emitter<ChannelEvent> {
15
15
  * Connect to collab service using websockets
16
16
  */
17
17
  connect(): void;
18
+ private onConnectError;
18
19
  private onConnect;
19
20
  private onReceiveData;
20
21
  fetchCatchup(fromVersion: number): Promise<CatchupResponse>;
@@ -29,4 +29,4 @@ export declare const ErrorCodeMapper: {
29
29
  message: string;
30
30
  };
31
31
  };
32
- export declare const errorCodeMapper: (error: ErrorPayload) => CollabErrorPayload | undefined;
32
+ export declare const errorCodeMapper: (error: ErrorPayload) => CollabErrorPayload;
@@ -1,4 +1,4 @@
1
- import { ErrorPayload } from '../types';
1
+ import { CollabErrorPayload, ErrorPayload } from '../types';
2
2
  export declare const EVENT_SUBJECT = "collab";
3
3
  export declare enum COLLAB_SERVICE {
4
4
  NCS = "ncs",
@@ -12,7 +12,9 @@ export declare enum EVENT_ACTION {
12
12
  CONVERT_PM_TO_ADF = "convertPMToADF",
13
13
  UPDATE_PARTICIPANTS = "updateParticipants",
14
14
  COMMIT_UNCONFIRMED_STEPS = "commitUnconfirmedSteps",
15
- REINITIALISE_DOCUMENT = "reinitialiseDocument"
15
+ REINITIALISE_DOCUMENT = "reinitialiseDocument",
16
+ INIT_PROVIDER = "initProvider",
17
+ ERROR = "error"
16
18
  }
17
19
  export declare enum EVENT_STATUS {
18
20
  SUCCESS = "SUCCESS",
@@ -45,6 +47,17 @@ declare type AddStepsFailureAnalyticsEvent = {
45
47
  error: ErrorPayload;
46
48
  };
47
49
  };
50
+ declare type ErrorAnalyticsEvent = {
51
+ eventAction: EVENT_ACTION.ERROR;
52
+ attributes: {
53
+ attemptedAction?: EVENT_ACTION;
54
+ documentAri: string;
55
+ mappedError?: CollabErrorPayload;
56
+ };
57
+ nonPrivacySafeAttributes: {
58
+ error: ErrorPayload;
59
+ };
60
+ };
48
61
  export declare type AnalyticsEvent = {
49
62
  eventAction: EVENT_ACTION.CONNECTION | EVENT_ACTION.CATCHUP | EVENT_ACTION.DOCUMENT_INIT | EVENT_ACTION.CONVERT_PM_TO_ADF | EVENT_ACTION.UPDATE_PARTICIPANTS | EVENT_ACTION.COMMIT_UNCONFIRMED_STEPS | EVENT_ACTION.REINITIALISE_DOCUMENT;
50
63
  attributes: {
@@ -58,7 +71,7 @@ export declare type AnalyticsEvent = {
58
71
  requiredPageRecovery?: boolean;
59
72
  ttlEnabled?: boolean;
60
73
  };
61
- } | AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent;
74
+ } | AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent | ErrorAnalyticsEvent;
62
75
  export declare const ACK_MAX_TRY = 30;
63
76
  export declare const CONFLUENCE = "confluence";
64
77
  export {};
@@ -1,6 +1,6 @@
1
1
  import type { Transaction } from 'prosemirror-state';
2
2
  import type { Step } from 'prosemirror-transform';
3
- import type { CollabParticipant, CollabEventTelepointerData, CollabEventConnectionData, CollabEventInitData, CollabEventRemoteData, CollabEventPresenceData } from '@atlaskit/editor-common/collab';
3
+ import type { CollabParticipant, CollabEventTelepointerData, CollabEventConnectionData, CollabEventInitData, CollabEventRemoteData, CollabEventPresenceData, CollabEventConnectingData } from '@atlaskit/editor-common/collab';
4
4
  import type { AnalyticsWebClient } from '@atlaskit/analytics-listeners';
5
5
  import type { Manager } from 'socket.io-client';
6
6
  import type { DisconnectReason } from './disconnected-reason-mapper';
@@ -42,6 +42,7 @@ export interface Lifecycle {
42
42
  on(event: LifecycleEvents, handler: EventHandler): void;
43
43
  }
44
44
  export declare type CollabConnectedPayload = CollabEventConnectionData;
45
+ export declare type CollabConnectingPayload = CollabEventConnectingData;
45
46
  export interface CollabDisconnectedPayload {
46
47
  reason: DisconnectReason;
47
48
  sid: string;
@@ -81,6 +82,7 @@ export interface CollabEvents {
81
82
  'local-steps': CollabLocalStepsPayload;
82
83
  error: CollabErrorPayload;
83
84
  entity: any;
85
+ connecting: CollabConnectingPayload;
84
86
  }
85
87
  export interface Metadata {
86
88
  [key: string]: string | number | boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/collab-provider",
3
- "version": "8.1.0",
3
+ "version": "8.2.0",
4
4
  "description": "A provider for collaborative editing.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -21,9 +21,9 @@
21
21
  "releaseModel": "scheduled"
22
22
  },
23
23
  "dependencies": {
24
- "@atlaskit/analytics-gas-types": "5.0.9",
24
+ "@atlaskit/analytics-gas-types": "5.0.10",
25
25
  "@atlaskit/analytics-listeners": "^8.5.0",
26
- "@atlaskit/editor-common": "^72.2.0",
26
+ "@atlaskit/editor-common": "^72.4.0",
27
27
  "@atlaskit/editor-json-transformer": "^8.8.0",
28
28
  "@atlaskit/prosemirror-collab": "^0.1.0",
29
29
  "@atlaskit/ufo": "^0.1.4",
@@ -40,14 +40,16 @@
40
40
  },
41
41
  "@repo/internal": {
42
42
  "deprecation": "no-deprecated-imports",
43
- "theming": "tokens",
43
+ "design-tokens": [
44
+ "color"
45
+ ],
44
46
  "styling": [
45
47
  "emotion"
46
48
  ]
47
49
  }
48
50
  },
49
51
  "devDependencies": {
50
- "@atlaskit/adf-schema": "^25.1.0",
52
+ "@atlaskit/adf-schema": "^25.2.0",
51
53
  "@atlaskit/analytics-gas-types": "^5.0.9",
52
54
  "@atlaskit/analytics-listeners": "^8.5.0",
53
55
  "@atlaskit/editor-test-helpers": "^18.0.0",
package/report.api.md CHANGED
@@ -17,6 +17,7 @@
17
17
  ```ts
18
18
  import type { AnalyticsWebClient } from '@atlaskit/analytics-listeners';
19
19
  import type { CollabEditProvider } from '@atlaskit/editor-common/collab';
20
+ import type { CollabEventConnectingData } from '@atlaskit/editor-common/collab';
20
21
  import type { CollabEventConnectionData } from '@atlaskit/editor-common/collab';
21
22
  import type { CollabEventInitData } from '@atlaskit/editor-common/collab';
22
23
  import type { CollabEventPresenceData } from '@atlaskit/editor-common/collab';
@@ -39,6 +40,9 @@ type BaseEvents = Pick<
39
40
  // @public (undocumented)
40
41
  export type CollabConnectedPayload = CollabEventConnectionData;
41
42
 
43
+ // @public (undocumented)
44
+ type CollabConnectingPayload = CollabEventConnectingData;
45
+
42
46
  // @public (undocumented)
43
47
  export interface CollabDataPayload extends CollabEventRemoteData {
44
48
  // (undocumented)
@@ -78,6 +82,8 @@ export interface CollabEvents {
78
82
  // (undocumented)
79
83
  connected: CollabConnectedPayload;
80
84
  // (undocumented)
85
+ connecting: CollabConnectingPayload;
86
+ // (undocumented)
81
87
  data: CollabDataPayload;
82
88
  // (undocumented)
83
89
  disconnected: CollabDisconnectedPayload;