http-request-manager 18.5.10 → 18.5.11

package/fesm2022/http-request-manager.mjs

@@ -2934,9 +2934,9 @@ class HTTPManagerStateService extends ComponentStore {
                 console.warn('Database storage requires dataType to be ARRAY');
             if (!this.apiOptions.adapter)
                 console.warn('Database storage requires an adapter to define the data shape');
-            if (this.database && this.database?.table === '')
+            if (this.databaseOptions && this.databaseOptions?.table === '')
                 console.warn('Database storage requires a table name');
-        }), filter(() => this.dataType === DataType.ARRAY && !!this.apiOptions.adapter && !!this.database?.table), switchMap(() => {
+        }), filter(() => this.dataType === DataType.ARRAY && !!this.apiOptions.adapter && !!this.databaseOptions?.table), switchMap(() => {
             const sampleData = this.apiOptions.adapter?.({}) || {};
             const schemaKeys = Object.keys(sampleData).filter(key => sampleData[key] !== undefined);
             let schema = '++id';
@@ -2947,7 +2947,7 @@ class HTTPManagerStateService extends ComponentStore {
                 }
             }
             const tableDef = TableSchemaDef.adapt({
-                table: this.database?.table,
+                table: this.databaseOptions?.table,
                 schema: schema
             });
             return this.dbManagerService.createDatabaseTable(tableDef);
@@ -3033,11 +3033,11 @@ class HTTPManagerStateService extends ComponentStore {
                 this.setData$({});
             }
         }), concatMap(() => {
-            if (this.hasDatabase && this.database?.table) {
+            if (this.hasDatabase && this.databaseOptions?.table) {
                 const currentData = this.get()?.data;
                 const idsToDelete = Array.isArray(currentData) ? currentData.map((r) => r.id) : [];
                 if (idsToDelete.length > 0) {
-                    return this.dbManagerService.deleteTableRecords(this.database.table, idsToDelete);
+                    return this.dbManagerService.deleteTableRecords(this.databaseOptions.table, idsToDelete);
                 }
             }
             return of(null);
@@ -3053,39 +3053,39 @@ class HTTPManagerStateService extends ComponentStore {
                     data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
                     this.setData$(data);
                 }), concatMap((data) => {
-                    if (this.hasDatabase && this.database?.table && Array.isArray(data) && data.length > 0) {
+                    if (this.hasDatabase && this.databaseOptions?.table && Array.isArray(data) && data.length > 0) {
                         this.localStorageManagerService.updateStore({
-                            name: this.database.table,
-                            data: { ...this.database, ...{ expires: this.utils.expires(this.database.expiresIn) } }
+                            name: this.databaseOptions.table,
+                            data: { ...this.databaseOptions, ...{ expires: this.utils.expires(this.databaseOptions.expiresIn) } }
                         });
-                        return this.dbManagerService.createTableRecords(this.database.table, data);
+                        return this.dbManagerService.createTableRecords(this.databaseOptions.table, data);
                     }
                     return of(data);
                 }));
             };
-            if (this.hasDatabase && this.database?.table) {
+            if (this.hasDatabase && this.databaseOptions?.table) {
                 return this.dbManagerService.databaseExists().pipe(switchMap((dbExists) => {
                     if (!dbExists) {
                         const initObs = this.initDBStorageAsync();
                         return initObs.pipe(switchMap(() => fetchFromAPI()));
                     }
-                    return this.dbManagerService.hasDatabaseTable(this.database.table).pipe(switchMap((tableExists) => {
+                    return this.dbManagerService.hasDatabaseTable(this.databaseOptions.table).pipe(switchMap((tableExists) => {
                         if (!tableExists) {
                             const initObs = this.initDBStorageAsync();
                             return initObs.pipe(switchMap(() => fetchFromAPI()));
                         }
-                        return this.localStorageManagerService.store$(this.database.table).pipe(take(1), switchMap((storeData) => {
+                        return this.localStorageManagerService.store$(this.databaseOptions.table).pipe(take(1), switchMap((storeData) => {
                             const expires = storeData?.expires || 0;
                             const hasExpired = expires > 0 && this.utils.hasExpired(expires);
                             if (hasExpired) {
-                                return this.dbManagerService.clearTable(this.database.table).pipe(switchMap(() => fetchFromAPI()), tap(() => {
+                                return this.dbManagerService.clearTable(this.databaseOptions.table).pipe(switchMap(() => fetchFromAPI()), tap(() => {
                                     this.localStorageManagerService.updateStore({
-                                        name: this.database.table,
-                                        data: { ...this.database, ...{ expires: this.utils.expires(this.database.expiresIn) } }
+                                        name: this.databaseOptions.table,
+                                        data: { ...this.databaseOptions, ...{ expires: this.utils.expires(this.databaseOptions.expiresIn) } }
                                     });
                                 }));
                             }
-                            return this.dbManagerService.getTableRecords(this.database.table).pipe(switchMap((dbData) => {
+                            return this.dbManagerService.getTableRecords(this.databaseOptions.table).pipe(switchMap((dbData) => {
                                 if (Array.isArray(dbData) && dbData.length > 0) {
                                     this.setData$(dbData);
                                     return of(dbData);
@@ -3113,14 +3113,14 @@ class HTTPManagerStateService extends ComponentStore {
                 if (method === 'CREATE')
                     this.addData$(data);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.database?.table) {
+                if (this.hasDatabase && this.databaseOptions?.table) {
                     const id = options.path?.length ? options.path[options.path.length - 1] : null;
                     if (method === 'DELETE' && id)
-                        return this.dbManagerService.deleteTableRecord(this.database.table, id);
+                        return this.dbManagerService.deleteTableRecord(this.databaseOptions.table, id);
                     if (method === 'UPDATE' && data)
-                        return this.dbManagerService.updateTableRecord(this.database.table, data);
+                        return this.dbManagerService.updateTableRecord(this.databaseOptions.table, data);
                     if (method === 'CREATE' && data)
-                        return this.dbManagerService.createTableRecord(this.database.table, data);
+                        return this.dbManagerService.createTableRecord(this.databaseOptions.table, data);
                 }
                 return of(data);
             }));
@@ -3136,8 +3136,8 @@ class HTTPManagerStateService extends ComponentStore {
                 if (this.wsConnection)
                     this.wsCommunication('CREATE', [...options?.path || [], data.id]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.database?.table && data?.id) {
-                    return this.dbManagerService.createTableRecord(this.database.table, data);
+                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
+                    return this.dbManagerService.createTableRecord(this.databaseOptions.table, data);
                 }
                 return of(data);
             }));
@@ -3153,8 +3153,8 @@ class HTTPManagerStateService extends ComponentStore {
                 if (this.wsConnection)
                     this.wsCommunication('UPDATE', [...options?.path || []]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.database?.table && data?.id) {
-                    return this.dbManagerService.updateTableRecord(this.database.table, data);
+                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
+                    return this.dbManagerService.updateTableRecord(this.databaseOptions.table, data);
                 }
                 return of(data);
             }));
@@ -3170,8 +3170,8 @@ class HTTPManagerStateService extends ComponentStore {
                 if (this.wsConnection)
                     this.wsCommunication('DELETE', [...options?.path || []]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.database?.table && data?.id) {
-                    return this.dbManagerService.deleteTableRecord(this.database.table, data.id);
+                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
+                    return this.dbManagerService.deleteTableRecord(this.databaseOptions.table, data.id);
                 }
                 return of(data);
             }));
@@ -3221,16 +3221,17 @@ class HTTPManagerStateService extends ComponentStore {
                 }
             }));
         })));
+        this.databaseOptions = database;
         this.maxRetries = this.apiOptions.ws?.retry?.times || 3;
         this.retryDelay = (this.apiOptions.ws?.retry?.delay && this.apiOptions.ws.retry.delay * 1000) || 5 * 1000;
         this.wsNextRetry = new BehaviorSubject(this.retryDelay);
         this.wsNextRetry$ = this.wsNextRetry.asObservable();
         this.setApiRequestOptions(apiOptions, dataType, database);
         this.status$ = this.setupConnectionStatus();
-        if (this.database && this.database.table) {
+        if (this.databaseOptions && this.databaseOptions.table) {
             this.localStorageManagerService.createStore({
-                name: this.database.table,
-                data: { ...this.database, ...{ expires: this.utils.expires(this.database.expiresIn) } },
+                name: this.databaseOptions.table,
+                data: { ...this.databaseOptions, ...{ expires: this.utils.expires(this.databaseOptions.expiresIn) } },
                 options: SettingOptions.adapt({
                     storage: StorageType.GLOBAL,
                     encrypted: false,
@@ -3241,15 +3242,18 @@ class HTTPManagerStateService extends ComponentStore {
     setApiRequestOptions(apiOptions, dataType, database) {
         this.apiOptions = ApiRequest.adapt(apiOptions);
         this.dataType = (dataType) ? dataType : DataType.ARRAY;
-        this.hasDatabase = (this.database?.table) ? true : false;
-        this.database = (this.hasDatabase) ? DatabaseStorage.adapt(database) : undefined;
+        // Only update database options if a database parameter is explicitly provided
+        if (database !== undefined) {
+            this.hasDatabase = (database?.table) ? true : false;
+            this.databaseOptions = (this.hasDatabase) ? DatabaseStorage.adapt(database) : undefined;
+        }
         // Update WebSocket retry settings when options change
         if (this.apiOptions.ws?.retry) {
             this.maxRetries = this.apiOptions.ws.retry.times || 3;
             this.retryDelay = (this.apiOptions.ws.retry.delay && this.apiOptions.ws.retry.delay * 1000) || 5 * 1000;
             this.wsNextRetry.next(this.retryDelay);
         }
-        if (this.database)
+        if (this.databaseOptions)
             this.initDBStorage();
         if (this.apiOptions.ws)
             this.initWS(this.apiOptions.ws);
@@ -3346,7 +3350,7 @@ class HTTPManagerStateService extends ComponentStore {
             console.warn('Database storage requires an adapter to define the data shape');
             return of(null);
         }
-        if (!this.database?.table) {
+        if (!this.databaseOptions?.table) {
             console.warn('Database storage requires a table name');
             return of(null);
         }
@@ -3360,7 +3364,7 @@ class HTTPManagerStateService extends ComponentStore {
             }
         }
         const tableDef = TableSchemaDef.adapt({
-            table: this.database?.table,
+            table: this.databaseOptions?.table,
             schema: schema
         });
         return this.dbManagerService.createDatabaseTable(tableDef);