shifro 1.2.1 → 1.2.2

package/README.md

@@ -67,11 +67,11 @@ import {
   Input,
   Output,
   decryptBytes,
-  type EncryptedBytes,
+  type EncryptedPacket,
 } from 'shifro';
 
 // Decrypt bytes with your DRM library
-async function decryptProtectedData({ scheme, data, iv }: EncryptedBytes) {
+async function decryptProtectedData({ scheme, data, iv }: EncryptedPacket) {
   // Your decryption logic here
 }
 

package/dist/cli.mjs

@@ -3,7 +3,7 @@ import { parseArgs } from "node:util";
 import { ALL_FORMATS, Conversion, EncodedPacket, FilePathSource, FilePathTarget, Input, Mp4OutputFormat, Output } from "mediabunny";
 //#region package.json
 var name = "shifro";
-var version = "1.2.1";
+var version = "1.2.2";
 var author = "Vitaly Gashkov <vitalygashkov@vk.com>";
 //#endregion
 //#region src/mediabunny-isobmff.ts

package/dist/index.d.mts

@@ -13,6 +13,15 @@ type EncryptionPattern = {
   /** Number of consecutive 16-byte blocks that are encrypted in each pattern step. */cryptByteBlock: number; /** Number of consecutive 16-byte blocks that are skipped in each pattern step. */
   skipByteBlock: number;
 };
+type EncryptionInfo = {
+  /** Key ID from the track encryption metadata. */keyId: string; /** PSSH boxes associated with this key/sample and useful for DRM-specific key resolution. */
+  psshBoxes: PsshBox[]; /** Sample encryption scheme. */
+  scheme: EncryptionScheme; /** Per-sample IV resolved from container metadata. */
+  iv: Uint8Array; /** Presentation timestamp of the sample in microseconds. */
+  timestamp: number; /** Subsample layout describing which parts of `data` are clear vs protected, or `null` for whole-sample encryption. */
+  subsamples: SubsampleEncryption[] | null; /** Pattern encryption parameters, or `null` when no pattern is used. */
+  pattern: EncryptionPattern | null;
+};
 /**
  * Options passed to {@link DecryptSample}.
  *
@@ -23,18 +32,17 @@ type EncryptionPattern = {
  * that cannot be safely represented as a single flattened protected-byte stream, such as patterned `cbcs`
  * subsample encryption.
  */
-type EncryptedSample = {
-  /** Full sample bytes as stored in the container. Clear and protected regions are both present in this buffer. */data: Uint8Array; /** Key ID from the track encryption metadata. */
-  keyId: string; /** PSSH boxes associated with this key/sample and useful for DRM-specific key resolution. */
-  psshBoxes: PsshBox[]; /** Sample encryption scheme. */
-  scheme: EncryptionScheme; /** Per-sample IV resolved from container metadata. */
-  iv: Uint8Array; /** Presentation timestamp of the sample in microseconds. */
-  timestamp: number; /** Subsample layout describing which parts of `data` are clear vs protected, or `null` for whole-sample encryption. */
-  subsamples: SubsampleEncryption[] | null; /** Pattern encryption parameters, or `null` when no pattern is used. */
-  pattern: EncryptionPattern | null;
+type EncryptedSample = EncryptionInfo & {
+  /** Full sample bytes as stored in the container. Clear and protected regions are both present in this buffer. */data: Uint8Array;
 };
-/** Options passed to {@link decryptBytes}. */
-type EncryptedBytes = Omit<EncryptedSample, 'data'> & {
+/**
+ * Options passed to {@link decryptBytes}.
+ *
+ * `data` contains only the bytes that still need decryption. When the helper has flattened clear or skipped regions
+ * out of the original sample, `subsamples` and `pattern` are normalized to describe this callback buffer instead of
+ * the original sample layout.
+ */
+type EncryptedPacket = EncryptionInfo & {
   /** Only the encrypted bytes that should be decrypted. Clear sample bytes are not included. */data: Uint8Array;
 };
 /**
@@ -46,7 +54,7 @@ type EncryptedBytes = Omit<EncryptedSample, 'data'> & {
  */
 type DecryptSample = (options: EncryptedSample) => MaybePromise<Uint8Array>;
 /** Raw byte decryption callback used by {@link decryptBytes}. */
-type DecryptBytesCallback = (options: EncryptedBytes) => MaybePromise<Uint8Array>;
+type DecryptBytesCallback = (options: EncryptedPacket) => MaybePromise<Uint8Array>;
 declare const decryptBytes: (decryptBytesCallback: DecryptBytesCallback) => DecryptSample;
 //#endregion
 //#region src/index.d.ts
@@ -101,4 +109,4 @@ declare class Output extends Output$1 {
   });
 }
 //#endregion
-export { type DecryptBytesCallback, type DecryptSample, Conversion as Decryption, type EncryptedBytes, type EncryptedSample, type EncryptionPattern, FilePathSource, FilePathTarget, Input, type MediabunnyInputOptions as InputOptions, type Key, type KeyId, type KeyMap, MkvOutputFormat, MovOutputFormat, Mp3OutputFormat, Mp4OutputFormat, Output, type OutputFormat, type OutputOptions, ReadableStreamSource, ShifroInputOptions, StreamSource, type StreamSourceOptions, StreamTarget, type StreamTargetOptions, type SubsampleEncryption, UrlSource, decryptBytes };
+export { type DecryptBytesCallback, type DecryptSample, Conversion as Decryption, type EncryptedPacket, type EncryptedSample, type EncryptionPattern, FilePathSource, FilePathTarget, Input, type MediabunnyInputOptions as InputOptions, type Key, type KeyId, type KeyMap, MkvOutputFormat, MovOutputFormat, Mp3OutputFormat, Mp4OutputFormat, Output, type OutputFormat, type OutputOptions, ReadableStreamSource, ShifroInputOptions, StreamSource, type StreamSourceOptions, StreamTarget, type StreamTargetOptions, type SubsampleEncryption, UrlSource, decryptBytes };

package/dist/index.mjs

@@ -2,18 +2,18 @@ import { ALL_FORMATS, Conversion, EncodedPacket, FilePathSource, FilePathTarget,
 //#region src/decrypt-sample.ts
 const AES_BLOCK_SIZE = 16;
 const isUint8Array$1 = (value) => value instanceof Uint8Array;
-const cloneSubsamples$1 = (subsamples) => {
+const normalizeSubsamples = (subsamples, protectedLength) => {
 	if (!subsamples) return null;
-	return subsamples.map((subsample) => ({
-		clearLen: subsample.clearLen,
-		protectedLen: subsample.protectedLen
-	}));
+	return [{
+		clearLen: 0,
+		protectedLen: protectedLength
+	}];
 };
-const clonePattern = (pattern) => {
-	if (!pattern) return null;
+const normalizePattern = (scheme, pattern) => {
+	if (!pattern || scheme !== "cbcs") return null;
 	return {
-		cryptByteBlock: pattern.cryptByteBlock,
-		skipByteBlock: pattern.skipByteBlock
+		cryptByteBlock: 1,
+		skipByteBlock: 0
 	};
 };
 const collectProtectedRanges = (offset, protectedLen, pattern, fullBlocksOnly) => {
@@ -109,8 +109,8 @@ const decryptGroups = async (options, groups, decryptBytesCallback) => {
 			scheme: options.scheme,
 			iv: group.iv.slice(),
 			timestamp: options.timestamp,
-			subsamples: cloneSubsamples$1(options.subsamples),
-			pattern: clonePattern(options.pattern)
+			subsamples: normalizeSubsamples(options.subsamples, encryptedData.byteLength),
+			pattern: normalizePattern(options.scheme, options.pattern)
 		});
 		if (!isUint8Array$1(decryptedData)) throw new TypeError("decryptBytes callback must return a Uint8Array.");
 		if (decryptedData.byteLength !== encryptedData.byteLength) throw new Error("decryptBytes callback must return the same number of bytes as the encrypted input.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shifro",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "A lightweight library and command-line tool for decrypting MP4 files",
   "files": [
     "dist"