@atlaskit/media-client 33.4.0 → 33.4.1

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 (13) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/cjs/utils/createCopyIntentRegisterationBatcher.js +2 -2
  3. package/dist/cjs/utils/createFileDataLoader.js +2 -2
  4. package/dist/cjs/utils/request/helpers.js +1 -1
  5. package/dist/es2019/utils/createCopyIntentRegisterationBatcher.js +3 -3
  6. package/dist/es2019/utils/createFileDataLoader.js +3 -3
  7. package/dist/es2019/utils/request/helpers.js +2 -2
  8. package/dist/esm/utils/createCopyIntentRegisterationBatcher.js +3 -3
  9. package/dist/esm/utils/createFileDataLoader.js +3 -3
  10. package/dist/esm/utils/request/helpers.js +2 -2
  11. package/dist/types/client/media-store/MediaStore.d.ts +1 -1
  12. package/dist/types-ts4.5/client/media-store/MediaStore.d.ts +1 -1
  13. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/media-client
2
2
 
3
+ ## 33.4.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#169848](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/169848)
8
+ [`0c2daefdb5712`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0c2daefdb5712) -
9
+ Standardise generation of telemetry IDs across media packages.
10
+ - Updated dependencies
11
+
3
12
  ## 33.4.0
4
13
 
5
14
  ### Minor Changes
package/dist/cjs/utils/createCopyIntentRegisterationBatcher.js CHANGED
@@ -51,8 +51,8 @@ function createBatchCopyIntentRegisterationFunc(mediaStore) {
51
51
  while (1) switch (_context.prev = _context.next) {
52
52
  case 0:
53
53
  metadataTraceContext = {
54
- traceId: (0, _mediaCommon.getRandomHex)(8),
55
- spanId: (0, _mediaCommon.getRandomHex)(8)
54
+ traceId: (0, _mediaCommon.getRandomTelemetryId)(),
55
+ spanId: (0, _mediaCommon.getRandomTelemetryId)()
56
56
  };
57
57
  files = keysByToken[batchKey].map(function (key) {
58
58
  return {
package/dist/cjs/utils/createFileDataLoader.js CHANGED
@@ -101,8 +101,8 @@ function createBatchLoadingFunc(mediaStore) {
101
101
  while (1) switch (_context.prev = _context.next) {
102
102
  case 0:
103
103
  metadataTraceContext = {
104
- traceId: (0, _mediaCommon.getRandomHex)(8),
105
- spanId: (0, _mediaCommon.getRandomHex)(8)
104
+ traceId: (0, _mediaCommon.getRandomTelemetryId)(),
105
+ spanId: (0, _mediaCommon.getRandomTelemetryId)()
106
106
  };
107
107
  fileIds = fileIdsByCollection[collectionNameKey];
108
108
  includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
package/dist/cjs/utils/request/helpers.js CHANGED
@@ -56,7 +56,7 @@ function isRateLimitedError(error) {
56
56
  }
57
57
  var extendTraceContext = exports.extendTraceContext = function extendTraceContext(traceContext) {
58
58
  return traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
59
- spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || (0, _mediaCommon.getRandomHex)(8)
59
+ spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || (0, _mediaCommon.getRandomTelemetryId)()
60
60
  }) : undefined;
61
61
  };
62
62
  var ZipkinHeaderKeys = exports.ZipkinHeaderKeys = {
package/dist/es2019/utils/createCopyIntentRegisterationBatcher.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import Dataloader from 'dataloader';
2
- import { getRandomHex } from '@atlaskit/media-common';
2
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
3
3
  export const MAX_BATCH_SIZE = 100;
4
4
  /**
5
5
  * Returns a function that, given Array<DataloaderKey>, resolves to an array of same length containing either DataloaderResult or Error.
@@ -29,8 +29,8 @@ function createBatchCopyIntentRegisterationFunc(mediaStore) {
29
29
  const items = [];
30
30
  await Promise.all(Object.keys(keysByToken).map(async batchKey => {
31
31
  const metadataTraceContext = {
32
- traceId: getRandomHex(8),
33
- spanId: getRandomHex(8)
32
+ traceId: getRandomTelemetryId(),
33
+ spanId: getRandomTelemetryId()
34
34
  };
35
35
  const files = keysByToken[batchKey].map(key => ({
36
36
  id: key.id,
package/dist/es2019/utils/createFileDataLoader.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import Dataloader from 'dataloader';
2
- import { getRandomHex } from '@atlaskit/media-common';
2
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
3
3
  export const MAX_BATCH_SIZE = 100;
4
4
  const isBatchLoadingErrorResult = result => {
5
5
  return result.error instanceof Error;
@@ -77,8 +77,8 @@ export function createBatchLoadingFunc(mediaStore) {
77
77
  const items = [];
78
78
  await Promise.all(Object.keys(fileIdsByCollection).map(async collectionNameKey => {
79
79
  const metadataTraceContext = {
80
- traceId: getRandomHex(8),
81
- spanId: getRandomHex(8)
80
+ traceId: getRandomTelemetryId(),
81
+ spanId: getRandomTelemetryId()
82
82
  };
83
83
  const fileIds = fileIdsByCollection[collectionNameKey];
84
84
  const includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
package/dist/es2019/utils/request/helpers.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { isClientBasedAuth } from '@atlaskit/media-core';
2
- import { getRandomHex } from '@atlaskit/media-common';
2
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
3
3
  import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
4
4
  import { RequestError, isRequestError } from './errors';
5
5
  const getStatusCode = error => {
@@ -23,7 +23,7 @@ export function isRateLimitedError(error) {
23
23
  }
24
24
  export const extendTraceContext = traceContext => traceContext ? {
25
25
  ...traceContext,
26
- spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(8)
26
+ spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomTelemetryId()
27
27
  } : undefined;
28
28
  export const ZipkinHeaderKeys = {
29
29
  traceId: 'x-b3-traceid',
package/dist/esm/utils/createCopyIntentRegisterationBatcher.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
2
2
  import _regeneratorRuntime from "@babel/runtime/regenerator";
3
3
  import Dataloader from 'dataloader';
4
- import { getRandomHex } from '@atlaskit/media-common';
4
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
5
5
  export var MAX_BATCH_SIZE = 100;
6
6
  /**
7
7
  * Returns a function that, given Array<DataloaderKey>, resolves to an array of same length containing either DataloaderResult or Error.
@@ -43,8 +43,8 @@ function createBatchCopyIntentRegisterationFunc(mediaStore) {
43
43
  while (1) switch (_context.prev = _context.next) {
44
44
  case 0:
45
45
  metadataTraceContext = {
46
- traceId: getRandomHex(8),
47
- spanId: getRandomHex(8)
46
+ traceId: getRandomTelemetryId(),
47
+ spanId: getRandomTelemetryId()
48
48
  };
49
49
  files = keysByToken[batchKey].map(function (key) {
50
50
  return {
package/dist/esm/utils/createFileDataLoader.js CHANGED
@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
5
5
  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; }
6
6
  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) { _defineProperty(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; }
7
7
  import Dataloader from 'dataloader';
8
- import { getRandomHex } from '@atlaskit/media-common';
8
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
9
9
  export var MAX_BATCH_SIZE = 100;
10
10
  var isBatchLoadingErrorResult = function isBatchLoadingErrorResult(result) {
11
11
  return result.error instanceof Error;
@@ -91,8 +91,8 @@ export function createBatchLoadingFunc(mediaStore) {
91
91
  while (1) switch (_context.prev = _context.next) {
92
92
  case 0:
93
93
  metadataTraceContext = {
94
- traceId: getRandomHex(8),
95
- spanId: getRandomHex(8)
94
+ traceId: getRandomTelemetryId(),
95
+ spanId: getRandomTelemetryId()
96
96
  };
97
97
  fileIds = fileIdsByCollection[collectionNameKey];
98
98
  includeHashForDuplicateFiles = includeHashByCollection[collectionNameKey];
package/dist/esm/utils/request/helpers.js CHANGED
@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
6
6
  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; }
7
7
  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) { _defineProperty(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; }
8
8
  import { isClientBasedAuth } from '@atlaskit/media-core';
9
- import { getRandomHex } from '@atlaskit/media-common';
9
+ import { getRandomTelemetryId } from '@atlaskit/media-common';
10
10
  import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
11
11
  import { RequestError, isRequestError } from './errors';
12
12
  var getStatusCode = function getStatusCode(error) {
@@ -32,7 +32,7 @@ export function isRateLimitedError(error) {
32
32
  }
33
33
  export var extendTraceContext = function extendTraceContext(traceContext) {
34
34
  return traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
35
- spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomHex(8)
35
+ spanId: (traceContext === null || traceContext === void 0 ? void 0 : traceContext.spanId) || getRandomTelemetryId()
36
36
  }) : undefined;
37
37
  };
38
38
  export var ZipkinHeaderKeys = {
package/dist/types/client/media-store/MediaStore.d.ts CHANGED
@@ -4,7 +4,7 @@ import { type MediaFileArtifacts } from '@atlaskit/media-state';
4
4
  import type { ItemsPayload, ImageMetadata, MediaStoreResponse, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, RejectedTouchFile, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, TouchedFiles, MediaApi, CopyFileParams } from './types';
5
5
  import { type MediaFile, type MediaUpload } from '../../models/media';
6
6
  import { ChunkHashAlgorithm } from '@atlaskit/media-core';
7
- import { GetDocumentPageImage, type DocumentPageRangeContent, type GetDocumentContentOptions } from '../../models/document';
7
+ import { type GetDocumentPageImage, type DocumentPageRangeContent, type GetDocumentContentOptions } from '../../models/document';
8
8
  export declare class MediaStore implements MediaApi {
9
9
  private readonly config;
10
10
  private readonly _chunkHashAlgorithm;
package/dist/types-ts4.5/client/media-store/MediaStore.d.ts CHANGED
@@ -4,7 +4,7 @@ import { type MediaFileArtifacts } from '@atlaskit/media-state';
4
4
  import type { ItemsPayload, ImageMetadata, MediaStoreResponse, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, RejectedTouchFile, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, TouchedFiles, MediaApi, CopyFileParams } from './types';
5
5
  import { type MediaFile, type MediaUpload } from '../../models/media';
6
6
  import { ChunkHashAlgorithm } from '@atlaskit/media-core';
7
- import { GetDocumentPageImage, type DocumentPageRangeContent, type GetDocumentContentOptions } from '../../models/document';
7
+ import { type GetDocumentPageImage, type DocumentPageRangeContent, type GetDocumentContentOptions } from '../../models/document';
8
8
  export declare class MediaStore implements MediaApi {
9
9
  private readonly config;
10
10
  private readonly _chunkHashAlgorithm;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/media-client",
3
- "version": "33.4.0",
3
+ "version": "33.4.1",
4
4
  "description": "Media API Web Client Library",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@atlaskit/chunkinator": "^7.0.0",
38
- "@atlaskit/media-common": "^12.1.0",
38
+ "@atlaskit/media-common": "^12.2.0",
39
39
  "@atlaskit/platform-feature-flags": "^1.1.0",
40
40
  "@babel/runtime": "^7.0.0",
41
41
  "dataloader": "^2.1.0",
@@ -57,7 +57,7 @@
57
57
  "@atlaskit/media-core": "^36.1.0",
58
58
  "@atlaskit/media-state": "^1.6.0",
59
59
  "@atlaskit/ssr": "workspace:^",
60
- "@atlaskit/tokens": "^5.1.0",
60
+ "@atlaskit/tokens": "^5.2.0",
61
61
  "@atlassian/feature-flags-test-utils": "^0.3.0",
62
62
  "@emotion/react": "^11.7.1",
63
63
  "@types/deep-equal": "^1.0.1",