Moved OdinBlob to each individual file;

homebase-id · Dec 15, 2023 · 47f1559 · 47f1559
1 parent ecec422
commit 47f1559
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 39 deletions.
diff --git a/packages/js-lib/src/core/DriveData/SecurityHelpers.ts b/packages/js-lib/src/core/DriveData/SecurityHelpers.ts
@@ -11,7 +11,8 @@ import {
   mergeByteArrays,
 } from '../../helpers/DataUtil';
 import { EncryptedKeyHeader, FileMetadata, KeyHeader } from './File/DriveFileTypes';
-import { OdinBlob } from '../OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 /// Encryption
 export const encryptKeyHeader = async (

diff --git a/packages/js-lib/src/core/DriveData/Upload/DriveFileUploadProvider.ts b/packages/js-lib/src/core/DriveData/Upload/DriveFileUploadProvider.ts
@@ -19,7 +19,8 @@ import {
 } from './UploadHelpers';
 import { getFileHeader, getPayloadBytes, getThumbBytes } from '../File/DriveFileProvider';
 import { getRandom16ByteArray } from '../../../helpers/DataUtil';
-import { OdinBlob } from '../../OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 const isDebug = hasDebugFlag();
 

diff --git a/packages/js-lib/src/core/DriveData/Upload/UploadHelpers.ts b/packages/js-lib/src/core/DriveData/Upload/UploadHelpers.ts
@@ -21,7 +21,9 @@ import {
   getRandom16ByteArray,
 } from '../../../helpers/DataUtil';
 import { ThumbnailFile, SystemFileType, PayloadFile, KeyHeader } from '../File/DriveFileTypes';
-import { OdinBlob } from '../../OdinBlob';
+
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 const EMPTY_KEY_HEADER: KeyHeader = {
   iv: new Uint8Array(Array(16).fill(0)),

diff --git a/packages/js-lib/src/core/OdinBlob.ts b/packages/js-lib/src/core/OdinBlob.ts
diff --git a/packages/js-lib/src/global.d.ts b/packages/js-lib/src/global.d.ts
diff --git a/packages/js-lib/src/helpers/DataUtil.ts b/packages/js-lib/src/helpers/DataUtil.ts
@@ -2,7 +2,8 @@ import { Guid } from 'guid-typescript';
 
 import md5 from './md5/md5';
 import { AccessControlList, EncryptedKeyHeader, PayloadDescriptor } from '../core/core';
-import { OdinBlob } from '../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 export const getRandom16ByteArray = (): Uint8Array => {
   return crypto.getRandomValues(new Uint8Array(16));

diff --git a/packages/js-lib/src/helpers/ImageMerger.ts b/packages/js-lib/src/helpers/ImageMerger.ts
@@ -1,6 +1,7 @@
 import { base64ToUint8Array, uint8ArrayToBase64 } from './DataUtil';
 import { EmbeddedThumb } from '../core/DriveData/File/DriveFileTypes';
-import { OdinBlob } from '../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 const GRID_PIXEL_SIZE = 40;
 const IMAGE_SIZE = GRID_PIXEL_SIZE / 2;

diff --git a/packages/js-lib/src/media/Video/VideoSegmenter.tsx b/packages/js-lib/src/media/Video/VideoSegmenter.tsx
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { mergeByteArrays } from '../../helpers/helpers';
 import { SegmentedVideoMetadata } from '../MediaTypes';
 

diff --git a/packages/js-lib/src/media/VideoProvider.ts b/packages/js-lib/src/media/VideoProvider.ts
@@ -23,7 +23,8 @@ import {
 } from '../core/core';
 import { PlainVideoMetadata, SegmentedVideoMetadata, VideoUploadResult } from './MediaTypes';
 import { createThumbnails } from './Thumbs/ThumbnailProvider';
-import { OdinBlob } from '../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 export type VideoContentType = 'video/mp4';
 

diff --git a/packages/js-lib/src/peer/peerData/ExternalVideoProvider.ts b/packages/js-lib/src/peer/peerData/ExternalVideoProvider.ts
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { DotYouClient } from '../../core/DotYouClient';
 import { SystemFileType, TargetDrive } from '../../core/core';
 import { stringifyToQueryParams, tryJsonParse } from '../../helpers/helpers';

diff --git a/packages/js-lib/src/profile/AttributeData/AttributeDataProvider.ts b/packages/js-lib/src/profile/AttributeData/AttributeDataProvider.ts
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { DotYouClient } from '../../core/DotYouClient';
 import { DEFAULT_PAYLOAD_KEY } from '../../core/DriveData/Upload/UploadHelpers';
 import {

diff --git a/packages/js-lib/src/profile/ProfileData/ProfileDefinitionProvider.ts b/packages/js-lib/src/profile/ProfileData/ProfileDefinitionProvider.ts
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { DotYouClient } from '../../core/DotYouClient';
 import { DEFAULT_PAYLOAD_KEY } from '../../core/DriveData/Upload/UploadHelpers';
 import {

diff --git a/packages/js-lib/src/public/file/ProfileCardProvider.ts b/packages/js-lib/src/public/file/ProfileCardProvider.ts
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { DotYouClient } from '../../core/DotYouClient';
 import { DriveSearchResult, SecurityGroupType } from '../../core/DriveData/File/DriveFileTypes';
 import { getDecryptedImageData } from '../../media/ImageProvider';

diff --git a/packages/js-lib/src/public/posts/PostDefinitionProvider.ts b/packages/js-lib/src/public/posts/PostDefinitionProvider.ts
@@ -1,4 +1,5 @@
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 import { DotYouClient } from '../../core/DotYouClient';
 import { DEFAULT_PAYLOAD_KEY } from '../../core/DriveData/Upload/UploadHelpers';
 import {

diff --git a/packages/js-lib/src/public/posts/PostReactionProvider.ts b/packages/js-lib/src/public/posts/PostReactionProvider.ts
@@ -37,7 +37,8 @@ import { uploadFileOverPeer } from '../../peer/peerData/Upload/PeerUploadProvide
 import { deleteFileOverPeer } from '../../peer/peerData/File/PeerFileManageProvider';
 import { queryBatchOverPeer } from '../../peer/peerData/Query/PeerDriveQueryProvider';
 import { getContentFromHeaderOrPayloadOverPeer } from '../../peer/peerData/File/PeerFileProvider';
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 const COMMENT_MEDIA_PAYLOAD = 'cmmnt_md';
 

diff --git a/packages/js-lib/src/public/posts/PostUploadProvider.ts b/packages/js-lib/src/public/posts/PostUploadProvider.ts
@@ -44,7 +44,8 @@ import {
 import { makeGrid } from '../../helpers/ImageMerger';
 import { processVideoFile } from '../../media/Video/VideoProcessor';
 import { createThumbnails } from '../../media/media';
-import { OdinBlob } from '../../core/OdinBlob';
+const OdinBlob: typeof Blob =
+  (typeof window !== 'undefined' && (window as any)?.CustomBlob) || Blob;
 
 const POST_MEDIA_PAYLOAD_KEY = 'pst_mdi';