@redseat/api 0.2.8 → 0.3.0

package/client.md

@@ -458,13 +458,15 @@ client.medias$.subscribe(event => {
 });
 ```
 
-#### `mediasProgress$: Observable<SSEMediasProgressEvent>`
+#### `uploadProgress$: Observable<SSEUploadProgressEvent>`
 
-Emits media processing progress updates.
+Emits upload progress updates including download, transfer, and analysis stages.
 
 ```typescript
-client.mediasProgress$.subscribe(event => {
-    console.log(`Media ${event.mediaId}: ${event.progress}%`);
+client.uploadProgress$.subscribe(event => {
+    const { progress } = event;
+    const percent = progress.total ? Math.round((progress.current ?? 0) / progress.total * 100) : 0;
+    console.log(`Upload ${progress.id} (${progress.type}): ${percent}% - ${progress.filename}`);
 });
 ```
 

package/dist/client.d.ts

@@ -2,7 +2,7 @@ import { Method, AxiosRequestConfig } from 'axios';
 import { Observable } from 'rxjs';
 import { IToken } from './auth.js';
 import { IServer } from './interfaces.js';
-import { SSEConnectionState, SSEConnectionOptions, SSEConnectionError, SSELibraryEvent, SSELibraryStatusEvent, SSEMediasEvent, SSEMediasProgressEvent, SSEConvertProgressEvent, SSEEpisodesEvent, SSESeriesEvent, SSEMoviesEvent, SSEPeopleEvent, SSETagsEvent, SSEBackupsEvent, SSEBackupFilesEvent } from './sse-types.js';
+import { SSEConnectionState, SSEConnectionOptions, SSEConnectionError, SSELibraryEvent, SSELibraryStatusEvent, SSEMediasEvent, SSEUploadProgressEvent, SSEConvertProgressEvent, SSEEpisodesEvent, SSESeriesEvent, SSEMoviesEvent, SSEPeopleEvent, SSETagsEvent, SSEBackupsEvent, SSEBackupFilesEvent } from './sse-types.js';
 export interface ClientOptions {
     server: IServer;
     getIdToken: () => Promise<string>;
@@ -33,7 +33,7 @@ export declare class RedseatClient {
     readonly library$: Observable<SSELibraryEvent>;
     readonly libraryStatus$: Observable<SSELibraryStatusEvent>;
     readonly medias$: Observable<SSEMediasEvent>;
-    readonly mediasProgress$: Observable<SSEMediasProgressEvent>;
+    readonly uploadProgress$: Observable<SSEUploadProgressEvent>;
     readonly convertProgress$: Observable<SSEConvertProgressEvent>;
     readonly episodes$: Observable<SSEEpisodesEvent>;
     readonly series$: Observable<SSESeriesEvent>;
@@ -43,7 +43,8 @@ export declare class RedseatClient {
     readonly backups$: Observable<SSEBackupsEvent>;
     readonly backupFiles$: Observable<SSEBackupFilesEvent>;
     /**
-     * Creates a typed observable for a specific SSE event type
+     * Creates a typed observable for a specific SSE event type.
+     * Unwraps the nested data structure from the server (e.g., {uploadProgress: {...}} -> {...})
      */
     private createEventStream;
     constructor(options: ClientOptions);

package/dist/client.js

@@ -3,10 +3,27 @@ import { BehaviorSubject, Subject, filter, map } from 'rxjs';
 import { fetchServerToken } from './auth.js';
 export class RedseatClient {
     /**
-     * Creates a typed observable for a specific SSE event type
+     * Creates a typed observable for a specific SSE event type.
+     * Unwraps the nested data structure from the server (e.g., {uploadProgress: {...}} -> {...})
      */
     createEventStream(eventName) {
-        return this._sseEvents.pipe(filter((event) => event.event === eventName), map(event => event.data));
+        // Map event names to their wrapper property names (snake_case -> camelCase)
+        const wrapperMap = {
+            'upload_progress': 'uploadProgress',
+            'convert_progress': 'convertProgress',
+            'media_progress': 'mediaProgress',
+            'library-status': 'libraryStatus',
+            'backups-files': 'backupsFiles',
+        };
+        const wrapperKey = wrapperMap[eventName];
+        return this._sseEvents.pipe(filter((event) => event.event === eventName), map(event => {
+            // If there's a wrapper, unwrap it; otherwise return data as-is
+            const data = event.data;
+            if (wrapperKey && data && typeof data === 'object' && wrapperKey in data) {
+                return data[wrapperKey];
+            }
+            return event.data;
+        }));
     }
     constructor(options) {
         this.sseReconnectAttempts = 0;
@@ -22,7 +39,7 @@ export class RedseatClient {
         this.library$ = this.createEventStream('library');
         this.libraryStatus$ = this.createEventStream('library-status');
         this.medias$ = this.createEventStream('medias');
-        this.mediasProgress$ = this.createEventStream('medias_progress');
+        this.uploadProgress$ = this.createEventStream('upload_progress');
         this.convertProgress$ = this.createEventStream('convert_progress');
         this.episodes$ = this.createEventStream('episodes');
         this.series$ = this.createEventStream('series');
@@ -303,6 +320,7 @@ export class RedseatClient {
             }
             const url = this.buildSSEUrl();
             this.sseAbortController = new AbortController();
+            console.log("SSSEEEE URL", url);
             const response = await fetch(url, {
                 method: 'GET',
                 headers: {

package/dist/library.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { IFile, ITag, IPerson, ISerie, IMovie, MediaRequest, IEpisode, ExternalImage, IBackupFile, ILibrary, SerieInMedia, DeletedQuery, RsDeleted, MovieSort, RsSort, SqlOrder, RsRequest, DetectedFaceResult, UnassignFaceResponse, RsGroupDownload } from './interfaces.js';
-import { SSEMediasEvent, SSEMediasProgressEvent, SSEConvertProgressEvent, SSEEpisodesEvent, SSESeriesEvent, SSEMoviesEvent, SSEPeopleEvent, SSETagsEvent, SSELibraryStatusEvent } from './sse-types.js';
+import { SSEMediasEvent, SSEUploadProgressEvent, SSEConvertProgressEvent, SSEEpisodesEvent, SSESeriesEvent, SSEMoviesEvent, SSEPeopleEvent, SSETagsEvent, SSELibraryStatusEvent } from './sse-types.js';
 import { EncryptFileOptions, EncryptedFile } from './encryption.js';
 export interface MediaForUpdate {
     name?: string;
@@ -77,7 +77,7 @@ export interface LibraryHttpClient {
     getFullUrl(path: string, params?: Record<string, string>): string;
     getAuthToken(): string;
     readonly medias$?: Observable<SSEMediasEvent>;
-    readonly mediasProgress$?: Observable<SSEMediasProgressEvent>;
+    readonly uploadProgress$?: Observable<SSEUploadProgressEvent>;
     readonly convertProgress$?: Observable<SSEConvertProgressEvent>;
     readonly episodes$?: Observable<SSEEpisodesEvent>;
     readonly series$?: Observable<SSESeriesEvent>;
@@ -94,7 +94,7 @@ export declare class LibraryApi {
     private keyText?;
     private disposed;
     readonly medias$: Observable<SSEMediasEvent>;
-    readonly mediasProgress$: Observable<SSEMediasProgressEvent>;
+    readonly uploadProgress$: Observable<SSEUploadProgressEvent>;
     readonly convertProgress$: Observable<SSEConvertProgressEvent>;
     readonly episodes$: Observable<SSEEpisodesEvent>;
     readonly series$: Observable<SSESeriesEvent>;

package/dist/library.js

@@ -9,7 +9,7 @@ export class LibraryApi {
         this.library = library;
         // Create library-filtered streams
         this.medias$ = this.createLibraryFilteredStream(client.medias$);
-        this.mediasProgress$ = this.createLibraryFilteredStream(client.mediasProgress$);
+        this.uploadProgress$ = this.createLibraryFilteredStream(client.uploadProgress$);
         this.convertProgress$ = this.createLibraryFilteredStream(client.convertProgress$);
         this.episodes$ = this.createLibraryFilteredStream(client.episodes$);
         this.series$ = this.createLibraryFilteredStream(client.series$);

package/dist/sse-types.d.ts

@@ -35,11 +35,20 @@ export interface SSEMediasEvent {
         media: IFile;
     }[];
 }
-export interface SSEMediasProgressEvent {
+export type RsProgressType = 'download' | 'transfert' | 'analysing' | 'finished' | {
+    duplicate: string;
+};
+export interface RsProgress {
+    id: string;
+    total?: number;
+    current?: number;
+    filename?: string;
+    type: RsProgressType;
+}
+export interface SSEUploadProgressEvent {
     library: string;
-    mediaId: string;
-    progress: number;
-    status?: string;
+    progress: RsProgress;
+    remainingSecondes?: number;
 }
 export interface SSEConvertProgressEvent {
     library: string;
@@ -102,7 +111,7 @@ export interface SSEEventMap {
     'library': SSELibraryEvent;
     'library-status': SSELibraryStatusEvent;
     'medias': SSEMediasEvent;
-    'medias_progress': SSEMediasProgressEvent;
+    'upload_progress': SSEUploadProgressEvent;
     'convert_progress': SSEConvertProgressEvent;
     'episodes': SSEEpisodesEvent;
     'series': SSESeriesEvent;

package/libraries.md

@@ -98,13 +98,15 @@ libraryApi.medias$.subscribe(event => {
 });
 ```
 
-#### `mediasProgress$: Observable<SSEMediasProgressEvent>`
+#### `uploadProgress$: Observable<SSEUploadProgressEvent>`
 
-Emits media processing progress updates for this library.
+Emits upload progress updates for this library, including download, transfer, and analysis stages.
 
 ```typescript
-libraryApi.mediasProgress$.subscribe(event => {
-    console.log(`Media ${event.mediaId}: ${event.progress}%`);
+libraryApi.uploadProgress$.subscribe(event => {
+    const { progress } = event;
+    const percent = progress.total ? Math.round((progress.current ?? 0) / progress.total * 100) : 0;
+    console.log(`Upload ${progress.id} (${progress.type}): ${percent}% - ${progress.filename}`);
 });
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redseat/api",
-    "version": "0.2.8",
+    "version": "0.3.0",
     "description": "TypeScript API client library for interacting with Redseat servers",
     "type": "module",
     "main": "./dist/index.js",