tiny-essentials 1.28.7 → 1.28.8

package/dist/v1/libs/TinyRadioFm.d.mts

@@ -133,10 +133,18 @@ export type RadioConfig = {
      * - Max times a music track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
      */
     musicMaxConsecutive: number;
+    /**
+     * - Min times a music track must repeat consecutively (1 = no mandatory repetition).
+     */
+    musicMinConsecutive: number;
     /**
      * - Max times a voice track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
      */
     voiceMaxConsecutive: number;
+    /**
+     * - Min times a voice track must repeat consecutively (1 = no mandatory repetition).
+     */
+    voiceMinConsecutive: number;
 };
 export type CycleBlockData = MediaContent & {
     cycleStart: number;
@@ -151,6 +159,22 @@ export type CycleBlock = {
      * - Total duration of the cycle block in ms.
      */
     duration: number;
+    /**
+     * - ID of the last music played in this block.
+     */
+    lastMusicId: string | null;
+    /**
+     * - Current consecutive count for music.
+     */
+    musicConsecutiveCount: number;
+    /**
+     * - ID of the last voice played in this block.
+     */
+    lastVoiceId: string | null;
+    /**
+     * - Current consecutive count for voice.
+     */
+    voiceConsecutiveCount: number;
 };
 export type CycleLocation = {
     /**
@@ -264,7 +288,9 @@ export type TinyRadioFmImport = {
  * @property {number} voiceMin - Minimum amount of voice messages to play if voiceAfterMusic is true.
  * @property {number} voiceMax - Maximum amount of voice messages to play.
  * @property {number} musicMaxConsecutive - Max times a music track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
+ * @property {number} musicMinConsecutive - Min times a music track must repeat consecutively (1 = no mandatory repetition).
  * @property {number} voiceMaxConsecutive - Max times a voice track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
+ * @property {number} voiceMinConsecutive - Min times a voice track must repeat consecutively (1 = no mandatory repetition).
  */
 /**
  * An extension of MediaContent that includes temporal boundaries within a generated cycle.
@@ -275,6 +301,10 @@ export type TinyRadioFmImport = {
  * @typedef {Object} CycleBlock
  * @property {CycleBlockData[]} items - Items belonging to this cycle.
  * @property {number} duration - Total duration of the cycle block in ms.
+ * @property {string|null} lastMusicId - ID of the last music played in this block.
+ * @property {number} musicConsecutiveCount - Current consecutive count for music.
+ * @property {string|null} lastVoiceId - ID of the last voice played in this block.
+ * @property {number} voiceConsecutiveCount - Current consecutive count for voice.
  */
 /**
  * Information about the location of a specific cycle within the absolute timeline.
@@ -305,8 +335,8 @@ declare class TinyRadioFm extends EventEmitter {
      * extracting metadata from an audio source.
      *
      * @param {string | HTMLMediaElement} source - A URL string or an existing Audio object.
-     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [defaultMetadata={}] - Optional default metadata that overrides automatic extraction.
-     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [metadata={}] - Optional manual metadata that overrides automatic extraction.
+     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [defaultMetadata={}] - Optional default metadata.
+     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [metadata={}] - Optional manual metadata.
      * @param {ParseMediaContentMetadata} [parseFile] - Private helper to interface with parseFile.
      * @param {Object} [callbacks={}] - Callbacks for monitoring the loading process.
      * @param {(progress: LoadingMediaProgress) => void} [callbacks.onProgress] - Callback triggered on stage changes.
@@ -417,6 +447,30 @@ declare class TinyRadioFm extends EventEmitter {
      * @throws {TypeError|RangeError} If the new configuration is invalid.
      */
     set config(config: RadioConfig);
+    /**
+     * Gets whether Blob URLs for media content
+     * should be converted to Base64 during export and restored during import.
+     * @returns {boolean}
+     */
+    get optimizeMediaMemory(): boolean;
+    /**
+     * Sets whether Blob URLs should be converted to Base64 during export and restored during import.
+     * @param {boolean} value
+     * @throws {TypeError} If value is not a boolean.
+     */
+    set optimizeMediaMemory(value: boolean);
+    /**
+     * Gets whether Blob URLs for pictures
+     * should be converted to Base64 during export and restored during import.
+     * @returns {boolean}
+     */
+    get optimizePictureMemory(): boolean;
+    /**
+     * Sets whether Blob URLs should be converted to Base64 during export and restored during import.
+     * @param {boolean} value
+     * @throws {TypeError} If value is not a boolean.
+     */
+    set optimizePictureMemory(value: boolean);
     /**
      * Initializes the radio system.
      * @param {TinyRadioFmImport|null} [initialData=null] - JSON object to hydrate the radio state.
@@ -424,6 +478,16 @@ declare class TinyRadioFm extends EventEmitter {
      * @throws {TypeError} If initialData is not an object or null, or if seed is not a number.
      */
     constructor(initialData?: TinyRadioFmImport | null, seed?: number);
+    /**
+     * Converts new content base64 instantly to the blob url.
+     * @param {MediaContent} data
+     */
+    _ccBase64ToBlobUrl(data: MediaContent): void;
+    /**
+     * Restores the content blob instantly to the base64 url.
+     * @param {MediaContent} data
+     */
+    _rcblobUrlToBase64(data: MediaContent): Promise<void>;
     /**
      * Adds new content instantly to the radio sequence.
      * @param {'music'|'voice'|'custom'} type - The category of the content.
@@ -477,7 +541,7 @@ declare class TinyRadioFm extends EventEmitter {
      */
     searchCustomPositions(): CustomPosition[];
     /**
-     * Process a content list, waiting to convert the images from Blob URL to Base64.
+     * Process a content list, waiting to convert the images and content URLs from Blob URL to Base64.
      * @param {MediaContent[]} list
      * @returns {Promise<MediaContent[]>}
      * @private

package/dist/v1/libs/TinyRadioFm.mjs

@@ -73,7 +73,9 @@ const checkDestroy = createCheckDestroyed('TinyRadioFm');
  * @property {number} voiceMin - Minimum amount of voice messages to play if voiceAfterMusic is true.
  * @property {number} voiceMax - Maximum amount of voice messages to play.
  * @property {number} musicMaxConsecutive - Max times a music track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
+ * @property {number} musicMinConsecutive - Min times a music track must repeat consecutively (1 = no mandatory repetition).
  * @property {number} voiceMaxConsecutive - Max times a voice track can repeat consecutively (-1 = unlimited, 0 = strictly no repetition).
+ * @property {number} voiceMinConsecutive - Min times a voice track must repeat consecutively (1 = no mandatory repetition).
  */
 //////////////////////////////////////////////////////////////////
 /**
@@ -85,6 +87,10 @@ const checkDestroy = createCheckDestroyed('TinyRadioFm');
  * @typedef {Object} CycleBlock
  * @property {CycleBlockData[]} items - Items belonging to this cycle.
  * @property {number} duration - Total duration of the cycle block in ms.
+ * @property {string|null} lastMusicId - ID of the last music played in this block.
+ * @property {number} musicConsecutiveCount - Current consecutive count for music.
+ * @property {string|null} lastVoiceId - ID of the last voice played in this block.
+ * @property {number} voiceConsecutiveCount - Current consecutive count for voice.
  */
 /**
  * Information about the location of a specific cycle within the absolute timeline.
@@ -116,8 +122,8 @@ class TinyRadioFm extends EventEmitter {
      * extracting metadata from an audio source.
      *
      * @param {string | HTMLMediaElement} source - A URL string or an existing Audio object.
-     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [defaultMetadata={}] - Optional default metadata that overrides automatic extraction.
-     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [metadata={}] - Optional manual metadata that overrides automatic extraction.
+     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [defaultMetadata={}] - Optional default metadata.
+     * @param {Partial<MediaContentBase & MediaContentMetadata> & { id?: string; weight?: number }} [metadata={}] - Optional manual metadata.
      * @param {ParseMediaContentMetadata} [parseFile] - Private helper to interface with parseFile.
      * @param {Object} [callbacks={}] - Callbacks for monitoring the loading process.
      * @param {(progress: LoadingMediaProgress) => void} [callbacks.onProgress] - Callback triggered on stage changes.
@@ -295,7 +301,9 @@ class TinyRadioFm extends EventEmitter {
         voiceMin: 0,
         voiceMax: 1,
         musicMaxConsecutive: 0,
+        musicMinConsecutive: 0,
         voiceMaxConsecutive: 0,
+        voiceMinConsecutive: 0,
     };
     /**
      * Gets a deep clone of the current radio configuration.
@@ -330,7 +338,7 @@ class TinyRadioFm extends EventEmitter {
             throw new TypeError('Configuration must be a valid object.');
         }
         const modes = ['playlist', 'random'];
-        // 1. Type and Bounds Validation
+        // Type and Bounds Validation
         if (config.mode !== undefined && !modes.includes(config.mode)) {
             throw new TypeError(`Invalid mode: "${config.mode}". Must be one of: ${modes.join(', ')}.`);
         }
@@ -348,29 +356,73 @@ class TinyRadioFm extends EventEmitter {
         if (config.voiceAfterMusic !== undefined && typeof config.voiceAfterMusic !== 'boolean') {
             throw new TypeError('voiceAfterMusic must be a boolean.');
         }
-        if (config.voiceMin !== undefined &&
-            (typeof config.voiceMin !== 'number' || config.voiceMin < 0)) {
-            throw new TypeError('voiceMin must be a non-negative number.');
-        }
-        if (config.voiceMax !== undefined &&
-            (typeof config.voiceMax !== 'number' || config.voiceMax < 0)) {
-            throw new TypeError('voiceMax must be a non-negative number.');
-        }
-        if (config.musicMaxConsecutive !== undefined &&
-            (typeof config.musicMaxConsecutive !== 'number' || config.musicMaxConsecutive < -1)) {
-            throw new TypeError('musicMaxConsecutive must be a number >= -1.');
-        }
-        if (config.voiceMaxConsecutive !== undefined &&
-            (typeof config.voiceMaxConsecutive !== 'number' || config.voiceMaxConsecutive < -1)) {
-            throw new TypeError('voiceMaxConsecutive must be a number >= -1.');
+        const checkRange = (/** @type {number | undefined} */ val, /** @type {string} */ minKey) => {
+            if (val !== undefined && (typeof val !== 'number' || val < 0)) {
+                throw new TypeError(`${minKey} must be a non-negative number.`);
+            }
+        };
+        checkRange(config.voiceMin, 'voiceMin');
+        checkRange(config.voiceMax, 'voiceMax');
+        checkRange(config.musicMinConsecutive, 'musicMinConsecutive');
+        checkRange(config.musicMaxConsecutive, 'musicMaxConsecutive');
+        checkRange(config.voiceMinConsecutive, 'voiceMinConsecutive');
+        checkRange(config.voiceMaxConsecutive, 'voiceMaxConsecutive');
+        // Logical cross-field validation
+        const vMin = config.voiceMin ?? this.#config.voiceMin;
+        const vMax = config.voiceMax ?? this.#config.voiceMax;
+        if (vMax < vMin) {
+            throw new RangeError(`Logical error: voiceMax (${vMax}) cannot be less than voiceMin (${vMin}).`);
         }
-        // 2. Logical Cross-Field Validation
-        const min = config.voiceMin ?? this.#config.voiceMin;
-        const max = config.voiceMax ?? this.#config.voiceMax;
-        if (max < min) {
-            throw new RangeError(`Logical error: voiceMax (${max}) cannot be less than voiceMin (${min}).`);
+        const mMin = config.musicMinConsecutive ?? this.#config.musicMinConsecutive;
+        const mMax = config.musicMaxConsecutive ?? this.#config.musicMaxConsecutive;
+        if (mMax !== -1 && mMin > mMax) {
+            throw new RangeError(`Logical error: musicMinConsecutive (${mMin}) cannot be greater than musicMaxConsecutive (${mMax}).`);
         }
     }
+    /** @type {boolean} */
+    #optimizeMediaMemory = true;
+    /**
+     * Gets whether Blob URLs for media content
+     * should be converted to Base64 during export and restored during import.
+     * @returns {boolean}
+     */
+    get optimizeMediaMemory() {
+        checkDestroy(this.#destroyed);
+        return this.#optimizeMediaMemory;
+    }
+    /**
+     * Sets whether Blob URLs should be converted to Base64 during export and restored during import.
+     * @param {boolean} value
+     * @throws {TypeError} If value is not a boolean.
+     */
+    set optimizeMediaMemory(value) {
+        checkDestroy(this.#destroyed);
+        if (typeof value !== 'boolean')
+            throw new TypeError('optimizeMediaMemory must be a boolean.');
+        this.#optimizeMediaMemory = value;
+    }
+    /** @type {boolean} */
+    #optimizePictureMemory = true;
+    /**
+     * Gets whether Blob URLs for pictures
+     * should be converted to Base64 during export and restored during import.
+     * @returns {boolean}
+     */
+    get optimizePictureMemory() {
+        checkDestroy(this.#destroyed);
+        return this.#optimizePictureMemory;
+    }
+    /**
+     * Sets whether Blob URLs should be converted to Base64 during export and restored during import.
+     * @param {boolean} value
+     * @throws {TypeError} If value is not a boolean.
+     */
+    set optimizePictureMemory(value) {
+        checkDestroy(this.#destroyed);
+        if (typeof value !== 'boolean')
+            throw new TypeError('optimizePictureMemory must be a boolean.');
+        this.#optimizePictureMemory = value;
+    }
     /**
      * Initializes the radio system.
      * @param {TinyRadioFmImport|null} [initialData=null] - JSON object to hydrate the radio state.
@@ -393,6 +445,58 @@ class TinyRadioFm extends EventEmitter {
         }
     }
     // --- PUBLIC API ---
+    /**
+     * Converts new content base64 instantly to the blob url.
+     * @param {MediaContent} data
+     */
+    _ccBase64ToBlobUrl(data) {
+        if (this.#optimizeMediaMemory) {
+            // Restores the content url if it is a Base64 string
+            if (typeof data.url === 'string' && data.url.startsWith('data:')) {
+                data.url = convertToBlobUrl(data.url);
+            }
+        }
+        if (data.picture && Array.isArray(data.picture)) {
+            data.picture = data.picture.map((pic) => {
+                if (this.#optimizePictureMemory) {
+                    // Check whether the data is compatible with the Blob structure (Base64 or Binary)
+                    const isBase64 = typeof pic.data === 'string' && pic.data.startsWith('data:');
+                    const isUint8Array = pic.data instanceof Uint8Array;
+                    if (isBase64 || isUint8Array) {
+                        return {
+                            ...pic,
+                            data: convertToBlobUrl(pic.data, pic.format),
+                        };
+                    }
+                }
+                // If memory optimization is disabled or it is a default URL, return as is
+                return pic;
+            });
+        }
+    }
+    /**
+     * Restores the content blob instantly to the base64 url.
+     * @param {MediaContent} data
+     */
+    async _rcblobUrlToBase64(data) {
+        // Optimizes the content url (audio/music) if it is a Blob URL
+        if (this.#optimizeMediaMemory && typeof data.url === 'string' && data.url.startsWith('blob:')) {
+            data.url = await blobUrlToBase64(data.url);
+        }
+        // Optimizes the pictures
+        if (this.#optimizePictureMemory && data.picture && Array.isArray(data.picture)) {
+            data.picture = await Promise.all(data.picture.map(async (pic) => {
+                // Only performs the asynchronous conversion if it really is a Blob URL
+                if (typeof pic.data === 'string' && pic.data.startsWith('blob:')) {
+                    return {
+                        ...pic,
+                        data: await blobUrlToBase64(pic.data),
+                    };
+                }
+                return pic; // Keep intact if it is a standard URL
+            }));
+        }
+    }
     /**
      * Adds new content instantly to the radio sequence.
      * @param {'music'|'voice'|'custom'} type - The category of the content.
@@ -411,19 +515,21 @@ class TinyRadioFm extends EventEmitter {
         if (typeof smartQueue !== 'boolean') {
             throw new TypeError('smartQueue must be a boolean.');
         }
+        const newItem = structuredClone(data);
+        this._ccBase64ToBlobUrl(newItem);
         if (type === 'music') {
-            this.#musicList.push(data);
+            this.#musicList.push(newItem);
             this.#cycleCache.clear();
         }
         else if (type === 'voice') {
-            this.#voiceList.push(data);
+            this.#voiceList.push(newItem);
             this.#cycleCache.clear();
         }
         else if (type === 'custom') {
-            this.#handleCustomInsertion(data, smartQueue);
+            this.#handleCustomInsertion(newItem, smartQueue);
         }
         this.#syncRealTimeState(Date.now());
-        this.emit('contentAdded', { type, data: structuredClone(data) });
+        this.emit('contentAdded', { type, data: structuredClone(newItem) });
     }
     /**
      * Schedules a modification to the base playlists, seamlessly breaking the timeline when activated.
@@ -455,9 +561,8 @@ class TinyRadioFm extends EventEmitter {
             }
         }
         else if (action === 'remove') {
-            if (typeof payload !== 'string') {
+            if (typeof payload !== 'string')
                 throw new TypeError('Payload for "remove" must be a string (the content ID).');
-            }
         }
         else if (action === 'move') {
             if (typeof payload !== 'object' ||
@@ -475,9 +580,8 @@ class TinyRadioFm extends EventEmitter {
             const eventAtTime = this.#getEventAtTime(timestamp, timestamp);
             // If there is, we set the timing of the task to the exact fraction of milliseconds
             // in which this event ends before the next audio begins.
-            if (eventAtTime) {
+            if (eventAtTime)
                 finalTimestamp = eventAtTime.absoluteEnd;
-            }
         }
         /** @type {ScheduledTask} */
         const task = { timestamp: finalTimestamp, action, type, payload };
@@ -564,12 +668,10 @@ class TinyRadioFm extends EventEmitter {
      */
     queryTimeline(targetDate, limit = 10) {
         checkDestroy(this.#destroyed);
-        if (typeof limit !== 'number' || isNaN(limit)) {
-            throw new TypeError(`Invalid query limit value. Ensure it is a number.`);
-        }
-        if (limit > this.#config.queryLimit || limit <= 0) {
+        if (typeof limit !== 'number' || isNaN(limit))
+            throw new TypeError('Invalid query limit value. Ensure it is a number.');
+        if (limit > this.#config.queryLimit || limit <= 0)
             throw new RangeError(`Invalid query limit. Ensure it is > 0 and <= ${this.#config.queryLimit}.`);
-        }
         /**
          * Virtual instance to sandbox the timeline prediction.
          * @type {TinyRadioFm}
@@ -600,7 +702,7 @@ class TinyRadioFm extends EventEmitter {
         return [...this.#customPositions];
     }
     /**
-     * Process a content list, waiting to convert the images from Blob URL to Base64.
+     * Process a content list, waiting to convert the images and content URLs from Blob URL to Base64.
      * @param {MediaContent[]} list
      * @returns {Promise<MediaContent[]>}
      * @private
@@ -608,19 +710,7 @@ class TinyRadioFm extends EventEmitter {
     async _processListForExport(list) {
         return Promise.all(list.map(async (item) => {
             const newItem = structuredClone(item);
-            if (newItem.picture && Array.isArray(newItem.picture)) {
-                newItem.picture = await Promise.all(newItem.picture.map(async (pic) => {
-                    // Only performs the asynchronous conversion if it really is a Blob URL
-                    if (typeof pic.data === 'string' && pic.data.startsWith('blob:')) {
-                        return {
-                            ...pic,
-                            data: await blobUrlToBase64(pic.data),
-                        };
-                    }
-                    // If it is a normal URL, skip the process and keep it as it is
-                    return pic;
-                }));
-            }
+            await this._rcblobUrlToBase64(newItem);
             return newItem;
         }));
     }
@@ -720,14 +810,25 @@ class TinyRadioFm extends EventEmitter {
      * @param {MediaContent[]} list - The source list to sequence.
      * @param {number} currentSeed - Cycle-specific seed.
      * @param {RadioModes} mode - Processing mode.
-     * @param {number} [maxConsecutive=0] - Max consecutive repetitions permitted (-1 = unlimited, 0 = strictly no repeat).
-     * @returns {MediaContent[]} The generated sequence.
+     * @param {number} [minConsecutive=0] - Min times a track must repeat.
+     * @param {number} [maxConsecutive=0] - Max times a track can repeat.
+     * @param {string|null} [initialLastId=null] - Memory of the last played ID.
+     * @param {number} [initialConsecutiveCount=0] - Memory of the consecutive count.
+     * @returns {{ items: MediaContent[], lastId: string|null, consecutiveCount: number }}
      */
-    #buildSequence(list, currentSeed, mode, maxConsecutive = 0) {
-        if (list.length === 0)
-            return [];
-        if (mode !== 'random')
-            return [...list]; // Respects manual indexing/moving
+    #buildSequence(list, currentSeed, mode, minConsecutive = 0, maxConsecutive = 0, initialLastId = null, initialConsecutiveCount = 0) {
+        if (list.length === 0) {
+            return { items: [], lastId: initialLastId, consecutiveCount: initialConsecutiveCount };
+        }
+        if (mode !== 'random') {
+            const items = [...list];
+            const lastItem = items[items.length - 1];
+            return {
+                items,
+                lastId: lastItem.id,
+                consecutiveCount: initialLastId === lastItem.id ? initialConsecutiveCount + 1 : 1,
+            };
+        }
         /**
          * Pool of available items for weighted selection.
          * @type {Array<MediaContent & { weight: number }>}
@@ -740,49 +841,59 @@ class TinyRadioFm extends EventEmitter {
          */
         const sequence = [];
         /** @type {string|null} */
-        let lastId = null;
-        let consecutiveCount = 0;
+        let lastId = initialLastId;
+        let consecutiveCount = initialConsecutiveCount;
         while (pool.length > 0) {
-            let validPool = pool;
-            // If there is a restriction rule and the consecutive limit has been reached
-            if (maxConsecutive !== -1 && lastId !== null && consecutiveCount > maxConsecutive) {
-                // Try filtering the last played to force the rotation
-                validPool = pool.filter((item) => item.id !== lastId);
-                // Self-adjustment: If there is nothing left in the urn (small/no diversity playlist),
-                // we revert to the full pool so as not to stagnate the cycle.
-                if (validPool.length === 0) {
-                    validPool = pool;
-                }
-            }
-            const totalWeight = validPool.reduce((sum, item) => sum + item.weight, 0);
-            // Safety catch if all weights are 0
-            if (totalWeight <= 0) {
-                sequence.push(...validPool);
-                break;
-            }
-            const r = random() * totalWeight;
-            let sum = 0;
             /** @type {MediaContent|null} */
             let selectedItem = null;
             let selectedIndex = -1;
-            // Run the draw on the valid urn
-            for (let i = 0; i < validPool.length; i++) {
-                sum += validPool[i].weight;
-                if (r <= sum) {
-                    selectedItem = validPool[i];
-                    // Find the index in the original pool for correct removal
-                    selectedIndex = pool.findIndex((p) => selectedItem && p.id === selectedItem.id);
-                    break;
+            // 1. Minimum repetition logic
+            if (lastId !== null && consecutiveCount < minConsecutive) {
+                selectedIndex = pool.findIndex((item) => item.id === lastId);
+                if (selectedIndex !== -1) {
+                    selectedItem = pool[selectedIndex];
+                }
+                else if (sequence.length > 0) {
+                    // Duplicates the previous item without consuming from pool
+                    selectedItem = sequence[sequence.length - 1];
                 }
             }
-            // Fallback in case of mathematical failure in floating accuracy
-            if (!selectedItem || selectedIndex === -1) {
-                selectedItem = validPool[0];
-                selectedIndex = pool.findIndex((p) => selectedItem && p.id === selectedItem.id);
+            // 2. Maximum repetition logic and random draw
+            if (!selectedItem) {
+                let validPool = pool;
+                if (lastId !== null && maxConsecutive !== -1 && consecutiveCount >= maxConsecutive) {
+                    validPool = pool.filter((item) => item.id !== lastId);
+                }
+                if (validPool.length === 0) {
+                    validPool = pool;
+                }
+                const totalWeight = validPool.reduce((sum, item) => sum + item.weight, 0);
+                if (totalWeight <= 0) {
+                    selectedItem = validPool[0];
+                    selectedIndex = pool.findIndex((p) => p.id === selectedItem?.id);
+                }
+                else {
+                    const r = random() * totalWeight;
+                    let sum = 0;
+                    for (let i = 0; i < validPool.length; i++) {
+                        sum += validPool[i].weight;
+                        if (r <= sum) {
+                            selectedItem = validPool[i];
+                            selectedIndex = pool.findIndex((p) => p.id === selectedItem?.id);
+                            break;
+                        }
+                    }
+                }
+            }
+            // Safety fallback
+            if (!selectedItem) {
+                selectedItem = pool[0];
+                selectedIndex = 0;
             }
             sequence.push(selectedItem);
-            pool.splice(selectedIndex, 1);
-            // Update counters to the next loop step
+            if (selectedIndex !== -1) {
+                pool.splice(selectedIndex, 1);
+            }
             if (selectedItem.id === lastId) {
                 consecutiveCount++;
             }
@@ -791,7 +902,7 @@ class TinyRadioFm extends EventEmitter {
                 consecutiveCount = 1;
             }
         }
-        return sequence;
+        return { items: sequence, lastId, consecutiveCount };
     }
     /**
      * Generates a structural block representing a single full cycle of the radio.
@@ -801,8 +912,25 @@ class TinyRadioFm extends EventEmitter {
     #buildCycleBlock(loopIndex) {
         const cycleSeed = this.#seed + loopIndex;
         const mixRandom = this._prng(cycleSeed * 10);
-        const musicSeq = this.#buildSequence(this.#musicList, cycleSeed + 1, this.#config.mode, this.#config.musicMaxConsecutive);
-        const voiceSeq = this.#buildSequence(this.#voiceList, cycleSeed + 2, this.#config.voiceMode, this.#config.voiceMaxConsecutive);
+        // Initial memory state
+        let initialLastMusicId = null;
+        let initialMusicConsecutive = 0;
+        let initialLastVoiceId = null;
+        let initialVoiceConsecutive = 0;
+        // Rescues memory from the previous block seamlessly
+        if (loopIndex > 0) {
+            const prevBlock = this.#cycleCache.get(loopIndex - 1);
+            if (prevBlock) {
+                initialLastMusicId = prevBlock.lastMusicId ?? null;
+                initialMusicConsecutive = prevBlock.musicConsecutiveCount ?? 0;
+                initialLastVoiceId = prevBlock.lastVoiceId ?? null;
+                initialVoiceConsecutive = prevBlock.voiceConsecutiveCount ?? 0;
+            }
+        }
+        const musicData = this.#buildSequence(this.#musicList, cycleSeed + 1, this.#config.mode, this.#config.musicMinConsecutive, this.#config.musicMaxConsecutive, initialLastMusicId, initialMusicConsecutive);
+        const musicSeq = musicData.items;
+        const voiceData = this.#buildSequence(this.#voiceList, cycleSeed + 2, this.#config.voiceMode, this.#config.voiceMinConsecutive, this.#config.voiceMaxConsecutive, initialLastVoiceId, initialVoiceConsecutive);
+        const voiceSeq = voiceData.items;
         /**
          * Array containing the positioned items for the current cycle.
          * @type {CycleBlockData[]}
@@ -833,7 +961,14 @@ class TinyRadioFm extends EventEmitter {
                 }
             }
         }
-        return { items: block, duration: cycleDuration };
+        return {
+            items: block,
+            duration: cycleDuration,
+            lastMusicId: musicData.lastId,
+            musicConsecutiveCount: musicData.consecutiveCount,
+            lastVoiceId: voiceData.lastId,
+            voiceConsecutiveCount: voiceData.consecutiveCount,
+        };
     }
     /**
      * Fast-forwards to find the exact cycle encompassing the target absolute timestamp.
@@ -989,9 +1124,8 @@ class TinyRadioFm extends EventEmitter {
             const eventAtTime = this.#getEventAtTime(originalTarget, originalTarget);
             // If there is any content playing (whether music, voice or even other custom),
             // we push the initial target to the exact millisecond where it ends.
-            if (eventAtTime) {
+            if (eventAtTime)
                 originalTarget = eventAtTime.absoluteEnd;
-            }
         }
         const activeCps = [...this.#customPositions].sort((a, b) => a.intendedTimestamp - b.intendedTimestamp);
         let bestSlot = originalTarget;
@@ -1069,8 +1203,7 @@ class TinyRadioFm extends EventEmitter {
                     list.push(/** @type {MediaContent} */ (task.payload));
                 }
                 else if (task.action === 'remove') {
-                    const payloadId = /** @type {string} */ (task.payload);
-                    const idx = list.findIndex((i) => i.id === payloadId);
+                    const idx = list.findIndex((i) => i.id === task.payload);
                     if (idx !== -1) {
                         const [removedItem] = list.splice(idx, 1);
                         revokeContentUrls(removedItem); // Free memory!
@@ -1090,9 +1223,8 @@ class TinyRadioFm extends EventEmitter {
                 this.emit('taskExecuted', structuredClone(task));
             });
         }
-        if (listsMutated) {
+        if (listsMutated)
             this.#cycleCache.clear();
-        }
     }
     /**
      * Hydrates class state from an exported JSON object.
@@ -1111,27 +1243,11 @@ class TinyRadioFm extends EventEmitter {
                 revokeContentUrls(/** @type {MediaContent} */ (task.payload));
             }
         });
-        const processListForImport = (/** @type {MediaContent[]} */ list) => {
-            return list.map((item) => {
-                const newItem = { ...item };
-                if (newItem.picture && Array.isArray(newItem.picture)) {
-                    newItem.picture = newItem.picture.map((pic) => {
-                        // Check whether the data is compatible with the Blob structure (Base64 or Binary)
-                        const isBase64 = typeof pic.data === 'string' && pic.data.startsWith('data:');
-                        const isUint8Array = pic.data instanceof Uint8Array;
-                        if (isBase64 || isUint8Array) {
-                            return {
-                                ...pic,
-                                data: convertToBlobUrl(pic.data, pic.format),
-                            };
-                        }
-                        // If it is a default web URL or local file, use the URL directly
-                        return pic;
-                    });
-                }
-                return newItem;
-            });
-        };
+        const processListForImport = (/** @type {MediaContent[]} */ list) => list.map((item) => {
+            const newItem = structuredClone(item);
+            this._ccBase64ToBlobUrl(newItem);
+            return newItem;
+        });
         this.#musicList = processListForImport(data.music);
         this.#voiceList = processListForImport(data.voice);
         this.#seed = data.seed || 0;