fix: Catch a handleRequest error and return as a failed server response

Author: wardbell

CHANGELOG.md

@@ -1,5 +1,9 @@
 # "angular-in-memory-web-api" versions
 
+<a name="0.1.10"></a>
+## 0.1.10 (2016-10-19)
+* Catch a `handleRequest` error and return as a failed server response.
+
 <a name="0.1.9"></a>
 ## 0.1.9 (2016-10-18)
 * Restore delay option, issue #53.

in-memory-backend.service.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-in-memory-web-api",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "An in-memory web api for Angular demos and tests",
   "main":"index.js",
   "jsnext:main": "esm/index.js",

in-memory-backend.service.js.map

@@ -235,9 +235,15 @@ export class InMemoryBackendService {
     this.setPassThruBackend();
   }
 
-
   createConnection(req: Request): Connection {
-    const response = this.handleRequest(req);
+    let response: Observable<Response>;
+    try {
+      response = this.handleRequest(req);
+    } catch (error) {
+      const err = error.message || error;
+      const options = createErrorResponse(STATUS.INTERNAL_SERVER_ERROR, `${err}`);
+      response = this.createDelayedObservableResponse(options);
+    }
     return {
       readyState: ReadyState.Done,
       request: req,
@@ -294,40 +300,32 @@ export class InMemoryBackendService {
     const reqMethodName = RequestMethod[req.method || 0].toLowerCase();
     let resOptions: ResponseOptions;
 
-    try {
-      if ('commands' === reqInfo.base.toLowerCase()) {
-        return this.commands(reqInfo);
-
-      } else if (this.inMemDbService[reqMethodName]) {
-        // If service has an interceptor for an HTTP method, call it
-        const interceptorArgs: HttpMethodInterceptorArgs = {
-          requestInfo: reqInfo,
-          db: this.db,
-          config: this.config,
-          passThruBackend: this.passThruBackend
-        };
-        // The result which must be Observable<Response>
-        return this.addDelay(this.inMemDbService[reqMethodName](interceptorArgs));
-
-      } else if (reqInfo.collection) {
-        return this.collectionHandler(reqInfo);
-
-      } else if (this.passThruBackend) {
-        // Passes request thru to a "real" backend which returns an Observable<Response>
-        // BAIL OUT with this Observable<Response>
-        return this.passThruBackend.createConnection(req).response;
+    if ('commands' === reqInfo.base.toLowerCase()) {
+      return this.commands(reqInfo);
 
-      } else {
-        resOptions = createErrorResponse(STATUS.NOT_FOUND, `Collection '${collectionName}' not found`);
-        return this.createDelayedObservableResponse(resOptions);
-      }
+    } else if (this.inMemDbService[reqMethodName]) {
+      // If service has an interceptor for an HTTP method, call it
+      const interceptorArgs: HttpMethodInterceptorArgs = {
+        requestInfo: reqInfo,
+        db: this.db,
+        config: this.config,
+        passThruBackend: this.passThruBackend
+      };
+      // The result which must be Observable<Response>
+      return this.addDelay(this.inMemDbService[reqMethodName](interceptorArgs));
 
-    } catch (error) {
-      const err = error.message || error;
-      resOptions = createErrorResponse(STATUS.INTERNAL_SERVER_ERROR, `${err}`);
+    } else if (reqInfo.collection) {
+      return this.collectionHandler(reqInfo);
+
+    } else if (this.passThruBackend) {
+      // Passes request thru to a "real" backend which returns an Observable<Response>
+      // BAIL OUT with this Observable<Response>
+      return this.passThruBackend.createConnection(req).response;
+
+    } else {
+      resOptions = createErrorResponse(STATUS.NOT_FOUND, `Collection '${collectionName}' not found`);
       return this.createDelayedObservableResponse(resOptions);
     }
-
   }
 
   /**