@pixzle/browser 0.0.29 → 0.1.0

package/README.md

@@ -10,17 +10,40 @@ npm i @pixzle/browser
 
 ## Usage
 
+### Restore multiple images
+
+```typescript
+import pixzle from '@pixzle/browser';
+
+const restoredBitmaps = await pixzle.restore({
+  images: ['https://example.com/fragment1.png', 'https://example.com/fragment2.png'],
+  manifest: 'https://example.com/manifest.json',
+});
+
+// Draw each restored image to canvas
+restoredBitmaps.forEach((bitmap) => {
+  const canvas = document.createElement('canvas');
+  canvas.width = bitmap.width;
+  canvas.height = bitmap.height;
+  const ctx = canvas.getContext('2d');
+  ctx.drawImage(bitmap, 0, 0);
+  document.body.appendChild(canvas);
+});
+```
+
+### Restore a single image
+
 ```typescript
-import { BrowserImageRestorer } from '@pixzle/browser';
+import pixzle, { fetchManifest } from '@pixzle/browser';
 
-const restorer = new BrowserImageRestorer();
+const manifest = await fetchManifest('https://example.com/manifest.json');
 
-const restoredBitmap = await restorer.restoreImage(
-  'path/to/fragmented/image.png', // or URL, Blob, HTMLImageElement, ImageBitmap
-  8, // blockSize
-  72411, // seed
-  { w: 500, h: 500 } // imageInfo
-);
+const restoredBitmap = await pixzle.restoreImage({
+  image: 'https://example.com/fragment.png', // or Blob, HTMLImageElement, ImageBitmap
+  blockSize: manifest.config.blockSize,
+  seed: manifest.config.seed,
+  imageInfo: manifest.images[0],
+});
 
 // Draw to canvas
 const canvas = document.createElement('canvas');

package/dist/block.d.ts

@@ -5,4 +5,13 @@ export declare function splitImageToBlocks(image: HTMLImageElement | ImageBitmap
 /**
  * Create an ImageBitmap from blocks
  */
-export declare function blocksToImage(blocks: Uint8Array[], width: number, height: number, blockSize: number): Promise<ImageBitmap>;
+export declare function blocksToImageBitmap(blocks: Uint8Array[], width: number, height: number, blockSize: number): Promise<ImageBitmap>;
+/**
+ * Process blocks per image using a provided function (shuffle/unshuffle)
+ * @param allBlocks - All blocks to process
+ * @param fragmentBlocksCount - Number of blocks per fragment
+ * @param seed - Seed for the processing function
+ * @param processFunc - Function to apply to blocks (shuffle or unshuffle)
+ * @returns Processed blocks
+ */
+export declare function blocksPerImage(allBlocks: Uint8Array[], fragmentBlocksCount: number[], seed: number | string, processFunc: (blocks: Uint8Array[], seed: number | string) => Uint8Array[]): Uint8Array[];

package/dist/block.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitImageToBlocks = splitImageToBlocks;
-exports.blocksToImage = blocksToImage;
+exports.blocksToImageBitmap = blocksToImageBitmap;
+exports.blocksPerImage = blocksPerImage;
 const core_1 = require("@pixzle/core");
 /**
  * Split an image (HTMLImageElement or ImageBitmap) into blocks
@@ -27,10 +28,29 @@ function splitImageToBlocks(image, blockSize) {
 /**
  * Create an ImageBitmap from blocks
  */
-async function blocksToImage(blocks, width, height, blockSize) {
+async function blocksToImageBitmap(blocks, width, height, blockSize) {
     const buffer = (0, core_1.blocksToImageBuffer)(blocks, width, height, blockSize);
     // Create ImageData
     const imageData = new ImageData(new Uint8ClampedArray(buffer.buffer, buffer.byteOffset, buffer.byteLength), width, height);
     return createImageBitmap(imageData);
 }
+/**
+ * Process blocks per image using a provided function (shuffle/unshuffle)
+ * @param allBlocks - All blocks to process
+ * @param fragmentBlocksCount - Number of blocks per fragment
+ * @param seed - Seed for the processing function
+ * @param processFunc - Function to apply to blocks (shuffle or unshuffle)
+ * @returns Processed blocks
+ */
+function blocksPerImage(allBlocks, fragmentBlocksCount, seed, processFunc) {
+    const processedBlocks = [];
+    let offset = 0;
+    for (const blockCount of fragmentBlocksCount) {
+        const imageBlocks = allBlocks.slice(offset, offset + blockCount);
+        const processed = processFunc(imageBlocks, seed);
+        processedBlocks.push(...processed);
+        offset += blockCount;
+    }
+    return processedBlocks;
+}
 //# sourceMappingURL=block.js.map

package/dist/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../src/block.ts"],"names":[],"mappings":";;AAQA,gDA6BC;AAKD,sCAoBC;AA9DD,uCAGsB;AAEtB;;GAEG;AACH,SAAgB,kBAAkB,CAChC,KAAqC,EACrC,SAAiB;IAEjB,MAAM,KAAK,GACT,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IACvE,MAAM,MAAM,GACV,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzE,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEtD,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAExD,0DAA0D;IAC1D,+FAA+F;IAC/F,0BAA0B;IAC1B,6CAA6C;IAC7C,MAAM,MAAM,GAAG,IAAI,UAAU,CAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EACrB,SAAS,CAAC,IAAI,CAAC,UAAU,EACzB,SAAS,CAAC,IAAI,CAAC,UAAU,CAC1B,CAAC;IAEF,OAAO,IAAA,yBAAsB,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAClE,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,aAAa,CACjC,MAAoB,EACpB,KAAa,EACb,MAAc,EACd,SAAiB;IAEjB,MAAM,MAAM,GAAG,IAAA,0BAAuB,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEzE,mBAAmB;IACnB,MAAM,SAAS,GAAG,IAAI,SAAS,CAC7B,IAAI,iBAAiB,CACnB,MAAM,CAAC,MAAqB,EAC5B,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,UAAU,CAClB,EACD,KAAK,EACL,MAAM,CACP,CAAC;IAEF,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../src/block.ts"],"names":[],"mappings":";;AAQA,gDA6BC;AAKD,kDAoBC;AAUD,wCAiBC;AAzFD,uCAGsB;AAEtB;;GAEG;AACH,SAAgB,kBAAkB,CAChC,KAAqC,EACrC,SAAiB;IAEjB,MAAM,KAAK,GACT,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IACvE,MAAM,MAAM,GACV,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzE,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEtD,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAExD,0DAA0D;IAC1D,+FAA+F;IAC/F,0BAA0B;IAC1B,6CAA6C;IAC7C,MAAM,MAAM,GAAG,IAAI,UAAU,CAC3B,SAAS,CAAC,IAAI,CAAC,MAAM,EACrB,SAAS,CAAC,IAAI,CAAC,UAAU,EACzB,SAAS,CAAC,IAAI,CAAC,UAAU,CAC1B,CAAC;IAEF,OAAO,IAAA,yBAAsB,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAClE,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAAoB,EACpB,KAAa,EACb,MAAc,EACd,SAAiB;IAEjB,MAAM,MAAM,GAAG,IAAA,0BAAuB,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEzE,mBAAmB;IACnB,MAAM,SAAS,GAAG,IAAI,SAAS,CAC7B,IAAI,iBAAiB,CACnB,MAAM,CAAC,MAAqB,EAC5B,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,UAAU,CAClB,EACD,KAAK,EACL,MAAM,CACP,CAAC;IAEF,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC5B,SAAuB,EACvB,mBAA6B,EAC7B,IAAqB,EACrB,WAA0E;IAE1E,MAAM,eAAe,GAAiB,EAAE,CAAC;IACzC,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACjD,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QACnC,MAAM,IAAI,UAAU,CAAC;IACvB,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,40 @@
-export * from "./restorer";
-export * from "./block";
+import type { ImageInfo, ManifestData } from "@pixzle/core";
+import { ImageRestorer, type ImageSource } from "./restorer";
+export { ImageRestorer, type ImageSource };
+export interface BrowserRestoreOptions {
+    /** Image sources - URLs, Blobs, HTMLImageElements, or ImageBitmaps */
+    images: ImageSource[];
+    /** Manifest source - URL string (e.g., "https://example.com/manifest.json") */
+    manifest?: string;
+    /** Manifest data object (alternative to manifest) */
+    manifestData?: ManifestData;
+}
+export interface BrowserRestoreImageOptions {
+    /** Image source - URL, Blob, HTMLImageElement, or ImageBitmap */
+    image: ImageSource;
+    /** Block size used for fragmentation */
+    blockSize: number;
+    /** Seed used for shuffling */
+    seed: number;
+    /** Information about the original image (dimensions) */
+    imageInfo: ImageInfo;
+}
+/**
+ * Fetch JSON from a URL
+ * @param url The URL to fetch JSON from
+ * @returns Promise resolving to the parsed JSON
+ */
+export declare function fetchJson<T>(url: string): Promise<T>;
+/**
+ * Fetch manifest data from a URL
+ * @param url The URL to fetch manifest from
+ * @returns Promise resolving to ManifestData
+ */
+export declare function fetchManifest(url: string): Promise<ManifestData>;
+declare function restore(options: BrowserRestoreOptions): Promise<ImageBitmap[]>;
+declare function restoreImage(options: BrowserRestoreImageOptions): Promise<ImageBitmap>;
+declare const pixzle: {
+    restore: typeof restore;
+    restoreImage: typeof restoreImage;
+};
+export default pixzle;

package/dist/index.js

@@ -1,19 +1,89 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImageRestorer = void 0;
+exports.fetchJson = fetchJson;
+exports.fetchManifest = fetchManifest;
+const restorer_1 = require("./restorer");
+Object.defineProperty(exports, "ImageRestorer", { enumerable: true, get: function () { return restorer_1.ImageRestorer; } });
+/**
+ * Fetch JSON from a URL
+ * @param url The URL to fetch JSON from
+ * @returns Promise resolving to the parsed JSON
+ */
+async function fetchJson(url) {
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch: ${response.status} ${response.statusText}`);
+    }
+    return response.json();
+}
+/**
+ * Fetch manifest data from a URL
+ * @param url The URL to fetch manifest from
+ * @returns Promise resolving to ManifestData
+ */
+async function fetchManifest(url) {
+    return fetchJson(url);
+}
+function validateFragmentImageCount(fragmentImages, manifest) {
+    const manifestImageCount = manifest.images.length;
+    const fragmentImageCount = fragmentImages.length;
+    if (manifestImageCount !== fragmentImageCount) {
+        throw new Error(`Fragment image count mismatch: expected ${manifestImageCount} but got ${fragmentImageCount}`);
+    }
+}
+async function restore(options) {
+    const { images, manifest: manifestSource, manifestData, } = validateRestoreOptions(options);
+    let manifest;
+    if (manifestData) {
+        manifest = manifestData;
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+    else if (manifestSource) {
+        manifest = await fetchManifest(manifestSource);
+    }
+    else {
+        throw new Error("Manifest not provided");
+    }
+    validateFragmentImageCount(images, manifest);
+    const restorer = new restorer_1.ImageRestorer();
+    return await restorer.restoreImages(images, manifest);
+}
+async function restoreImage(options) {
+    const { image, blockSize, seed, imageInfo } = validateRestoreImageOptions(options);
+    const restorer = new restorer_1.ImageRestorer();
+    return await restorer.restoreImage(image, blockSize, seed, imageInfo);
+}
+const pixzle = {
+    restore,
+    restoreImage,
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./restorer"), exports);
-__exportStar(require("./block"), exports);
+exports.default = pixzle;
+function validateRestoreOptions(options) {
+    if (!options)
+        throw new Error("[restore] Options object is required.");
+    const { images, manifest, manifestData } = options;
+    if (!images || !Array.isArray(images) || images.length === 0)
+        throw new Error("[restore] images must be a non-empty array.");
+    if (!manifest && !manifestData)
+        throw new Error("[restore] Either manifest or manifestData is required.");
+    if (manifest && typeof manifest !== "string")
+        throw new Error("[restore] manifest must be a string.");
+    return options;
+}
+function validateRestoreImageOptions(options) {
+    if (!options)
+        throw new Error("[restoreImage] Options object is required.");
+    const { image, blockSize, seed, imageInfo } = options;
+    if (!image)
+        throw new Error("[restoreImage] image is required.");
+    if (typeof blockSize !== "number" || blockSize <= 0)
+        throw new Error("[restoreImage] blockSize must be a positive number.");
+    if (typeof seed !== "number")
+        throw new Error("[restoreImage] seed must be a number.");
+    if (!imageInfo ||
+        typeof imageInfo.w !== "number" ||
+        typeof imageInfo.h !== "number")
+        throw new Error("[restoreImage] imageInfo with valid w and h is required.");
+    return options;
+}
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/restorer.d.ts

@@ -1,5 +1,13 @@
-import { type ImageInfo } from "@pixzle/core";
-export declare class BrowserImageRestorer {
+import { type ImageInfo, type ManifestData } from "@pixzle/core";
+export type ImageSource = string | URL | Blob | HTMLImageElement | ImageBitmap;
+export declare class ImageRestorer {
+    /**
+     * Restore multiple images from shuffled fragments
+     * @param fragments Array of fragment sources (URLs, Blobs, HTMLImageElements, or ImageBitmaps)
+     * @param manifest The manifest data containing restoration information
+     * @returns Promise resolving to an array of restored ImageBitmaps
+     */
+    restoreImages(fragments: ImageSource[], manifest: ManifestData): Promise<ImageBitmap[]>;
     /**
      * Restore a single image from a shuffled source
      * @param imageSource The shuffled image (URL, Blob, HTMLImageElement, or ImageBitmap)
@@ -8,6 +16,10 @@ export declare class BrowserImageRestorer {
      * @param imageInfo Information about the original image (dimensions)
      * @returns Promise resolving to the restored ImageBitmap
      */
-    restoreImage(imageSource: string | URL | Blob | HTMLImageElement | ImageBitmap, blockSize: number, seed: number | string, imageInfo: ImageInfo): Promise<ImageBitmap>;
+    restoreImage(imageSource: ImageSource, blockSize: number, seed: number, imageInfo: ImageInfo): Promise<ImageBitmap>;
     private _loadImage;
+    private _prepareData;
+    private _readBlocksFromFragment;
+    private _readBlocks;
+    private _reconstructImages;
 }

package/dist/restorer.js

@@ -1,10 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserImageRestorer = void 0;
+exports.ImageRestorer = void 0;
 const core_1 = require("@pixzle/core");
 const seeded_shuffle_1 = require("@tuki0918/seeded-shuffle");
 const block_1 = require("./block");
-class BrowserImageRestorer {
+class ImageRestorer {
+    /**
+     * Restore multiple images from shuffled fragments
+     * @param fragments Array of fragment sources (URLs, Blobs, HTMLImageElements, or ImageBitmaps)
+     * @param manifest The manifest data containing restoration information
+     * @returns Promise resolving to an array of restored ImageBitmaps
+     */
+    async restoreImages(fragments, manifest) {
+        const { blocks, blockCountsPerImage } = await this._prepareData(fragments, manifest);
+        const restored = manifest.config.crossImageShuffle
+            ? (0, seeded_shuffle_1.unshuffle)(blocks, manifest.config.seed)
+            : (0, block_1.blocksPerImage)(blocks, blockCountsPerImage, manifest.config.seed, seeded_shuffle_1.unshuffle);
+        return await this._reconstructImages(restored, manifest);
+    }
     /**
      * Restore a single image from a shuffled source
      * @param imageSource The shuffled image (URL, Blob, HTMLImageElement, or ImageBitmap)
@@ -14,13 +27,9 @@ class BrowserImageRestorer {
      * @returns Promise resolving to the restored ImageBitmap
      */
     async restoreImage(imageSource, blockSize, seed, imageInfo) {
-        const image = await this._loadImage(imageSource);
-        // Split the fragment image into blocks and take only the expected number
-        // The fragment image may have extra padding blocks due to its square-ish layout
-        const allBlocks = (0, block_1.splitImageToBlocks)(image, blockSize);
-        const blocks = (0, core_1.extractExpectedBlocks)(allBlocks, imageInfo.w, imageInfo.h, blockSize);
-        const restoredBlocks = (0, seeded_shuffle_1.unshuffle)(blocks, seed);
-        return (0, block_1.blocksToImage)(restoredBlocks, imageInfo.w, imageInfo.h, blockSize);
+        const manifest = (0, core_1.createSingleImageManifest)({ blockSize, seed, imageInfo });
+        const [restoredImage] = await this.restoreImages([imageSource], manifest);
+        return restoredImage;
     }
     async _loadImage(sourceInput) {
         let source = sourceInput;
@@ -53,6 +62,35 @@ class BrowserImageRestorer {
         }
         throw new Error("Unsupported image source");
     }
+    async _prepareData(fragments, manifest) {
+        const totalBlocks = (0, core_1.calculateTotalBlocks)(manifest.images, manifest.config.blockSize);
+        const blockCountsForCrossImages = (0, core_1.calculateBlockCountsForCrossImages)(totalBlocks, fragments.length);
+        // Calculate actual block counts per image for per-image unshuffle
+        const blockCountsPerImage = (0, core_1.calculateBlockCountsPerImage)(manifest.images, manifest.config.blockSize);
+        // Use blockCountsPerImage when crossImageShuffle is false
+        const blockCounts = manifest.config.crossImageShuffle
+            ? blockCountsForCrossImages
+            : blockCountsPerImage;
+        const blocks = await this._readBlocks(fragments, manifest, blockCounts);
+        return { blocks, blockCountsPerImage };
+    }
+    async _readBlocksFromFragment(fragment, manifest, expectedCount) {
+        const image = await this._loadImage(fragment);
+        const blocks = (0, block_1.splitImageToBlocks)(image, manifest.config.blockSize);
+        return (0, core_1.takeBlocks)(blocks, expectedCount);
+    }
+    async _readBlocks(fragments, manifest, blockCounts) {
+        const blockGroups = await Promise.all(fragments.map((fragment, i) => this._readBlocksFromFragment(fragment, manifest, blockCounts[i])));
+        return blockGroups.flat();
+    }
+    async _reconstructImages(blocks, manifest) {
+        const blockCountsPerImage = (0, core_1.calculateBlockCountsPerImage)(manifest.images, manifest.config.blockSize);
+        return await Promise.all(manifest.images.map(async (imageInfo, index) => {
+            const { start, end } = (0, core_1.calculateBlockRange)(blockCountsPerImage, index);
+            const imageBlocks = blocks.slice(start, end);
+            return await (0, block_1.blocksToImageBitmap)(imageBlocks, imageInfo.w, imageInfo.h, manifest.config.blockSize);
+        }));
+    }
 }
-exports.BrowserImageRestorer = BrowserImageRestorer;
+exports.ImageRestorer = ImageRestorer;
 //# sourceMappingURL=restorer.js.map

package/dist/restorer.js.map

@@ -1 +1 @@
-{"version":3,"file":"restorer.js","sourceRoot":"","sources":["../src/restorer.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AACrE,6DAAqD;AACrD,mCAA4D;AAE5D,MAAa,oBAAoB;IAC/B;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAChB,WAAiE,EACjE,SAAiB,EACjB,IAAqB,EACrB,SAAoB;QAEpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEjD,yEAAyE;QACzE,gFAAgF;QAChF,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAClC,SAAS,EACT,SAAS,CAAC,CAAC,EACX,SAAS,CAAC,CAAC,EACX,SAAS,CACV,CAAC;QAEF,MAAM,cAAc,GAAG,IAAA,0BAAS,EAAC,MAAM,EAAE,IAAI,CAAiB,CAAC;QAE/D,OAAO,IAAA,qBAAa,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,WAAiE;QAEjE,IAAI,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI,OAAO,GAAG,KAAK,WAAW,IAAI,MAAM,YAAY,GAAG,EAAE,CAAC;YACxD,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC;QAED,IACE,OAAO,gBAAgB,KAAK,WAAW;YACvC,MAAM,YAAY,gBAAgB,EAClC,CAAC;YACD,IAAI,MAAM,CAAC,QAAQ;gBAAE,OAAO,MAAM,CAAC;YACnC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACpC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC;gBACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,OAAO,WAAW,KAAK,WAAW,IAAI,MAAM,YAAY,WAAW,EAAE,CAAC;YACxE,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,MAAM,YAAY,IAAI,EAAE,CAAC;YAC1D,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACnE,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;CACF;AAzED,oDAyEC"}
+{"version":3,"file":"restorer.js","sourceRoot":"","sources":["../src/restorer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixzle/browser",
-  "version": "0.0.29",
+  "version": "0.1.0",
   "description": "Browser implementation of image fragmentation and restoration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@tuki0918/seeded-shuffle": "^1.0.0",
-    "@pixzle/core": "0.0.29"
+    "@pixzle/core": "0.1.0"
   },
   "devDependencies": {
     "happy-dom": "^20.0.11",