✨ 💯 cache time

Author: MarkPieszak

Client/app/api.ts

@@ -23,47 +23,23 @@ export function hashCode(str) {
 
 @Injectable()
 export class ApiService {
-    constructor(public _http: Http) {
 
-    }
+    constructor(public _http: Http, public _cache: CacheService) {
 
-    /**
-     * whatever domain/feature method name
-     */
-    get(url: string, options?: any) {
-        return this._http.get(url, options)
-            .map(res => res.json())
-            .catch(err => {
-                console.log('Error: ', err);
-                return Observable.throw(err);
-            });
     }
-
-}
-
-@Injectable()
-export class ModelService {
-
-    constructor(public _api: ApiService, public _cache: CacheService) {
-
-    }
-
-    /**
-     * whatever domain/feature method name
-     */
-    get(url) {
-        // you want to return the cache if there is a response in it. This would cache the first response so if your API isn't idempotent you probably want to remove the item from the cache after you use it. LRU of 1
+    // whatever domain/feature method name
+    getModel(url) {
+        // you want to return the cache if there is a response in it. This would cache the first response so if your API isn't idempotent you probably want to remove the item from the cache after you use it. LRU of 1 
         let key = url;
-
         if (this._cache.has(key)) {
             return Observable.of(this._cache.get(key));
         }
         // you probably shouldn't .share() and you should write the correct logic
-        return this._api.get(url)
+        return this._http.get(url)
+            .map(res => res.json())
             .do(json => {
                 this._cache.set(key, json);
             })
             .share();
     }
-
 }

Client/app/app.browser.module.ts

@@ -7,7 +7,7 @@ import { UniversalModule, isBrowser, isNode } from 'angular2-universal/browser';
 
 // Universal : XHR Cache
 import { CacheService } from './universal-cache';
-import { ApiService, ModelService } from './api';
+import { ApiService } from './api';
 export const UNIVERSAL_KEY = 'UNIVERSAL_CACHE';
 
 // Bootstrap (non-jQuery implementation)
@@ -45,8 +45,7 @@ import { SocketConnectionService, WebSocketService } from 'app-shared';
         { provide: 'isBrowser', useValue: isBrowser },
         { provide: 'isNode', useValue: isNode },
         CacheService,
-        ApiService,
-        ModelService
+        ApiService
     ],
     imports: [
         UniversalModule, // Must be first import. This automatically imports BrowserModule, HttpModule, and JsonpModule too.
@@ -68,12 +67,15 @@ export class AppModule {
     }
 
     doRehydrate() {
+        console.log('DO REHYDRATE');
         let defaultValue = {};
         let serverCache = this._getCacheValue(CacheService.KEY, defaultValue);
         this.cache.rehydrate(serverCache);
     }
 
     _getCacheValue(key: string, defaultValue: any): any {
+        console.log('_getCacheValue for ' + key)
+        console.log(window[UNIVERSAL_KEY]);
         // browser
         const win: any = window;
         if (win[UNIVERSAL_KEY] && win[UNIVERSAL_KEY][key]) {

Client/app/app.server.module.ts

@@ -7,7 +7,7 @@ import { UniversalModule, isBrowser, isNode } from 'angular2-universal/node';
 
 // Universal : XHR Cache
 import { CacheService } from './universal-cache';
-import { ApiService, ModelService } from './api';
+import { ApiService } from './api';
 
 // Bootstrap (non-jQuery implementation)
 import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap';
@@ -44,8 +44,7 @@ import { SocketConnectionService, WebSocketService } from 'app-shared';
         { provide: 'isBrowser', useValue: isBrowser },
         { provide: 'isNode', useValue: isNode },
         CacheService,
-        ApiService,
-        ModelService
+        ApiService
     ],
     imports: [
         UniversalModule, // Must be first import. This automatically imports NodeModule, NodeHttpModule, and NodeJsonpModule too.
@@ -70,6 +69,7 @@ export class AppModule {
      * in Universal for now until it's fixed
      */
     universalDoDehydrate = (universalCache) => {
+        console.log('universalDoDehydrate ****');
         universalCache[CacheService.KEY] = JSON.stringify(this.cache.dehydrate());
     }
 

Client/containers/rest-test/rest-test.component.ts

@@ -1,16 +1,22 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Http } from '@angular/http';
 
+import { ApiService } from '../../app/api';
+
 @Component({
     selector: 'rest-test',
     template: require('./rest-test.component.html')
 })
-export class RestTestComponent {
+export class RestTestComponent implements OnInit {
     public users: IUser[];
 
-    constructor(private http: Http) {
-        this.http.get('/api/test/users').subscribe(result => {
-            this.users = result.json();
+    constructor(private _apiService: ApiService) { }
+
+    ngOnInit() {
+        this._apiService.getModel('/api/test/users').subscribe(result => {
+            console.log('AFTER SUBSCRIBE');
+            console.log(result);
+            this.users = result;
         });
     }
 }