@placeos/ts-client 4.2.5 → 4.2.7

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.2.5",
+    "version": "4.2.7",
     "license": "MIT",
     "name": "@placeos/ts-client",
     "author": "Alex Sorafumo <alex@place.tech>",

package/src/api.ts

@@ -11,7 +11,11 @@ export type {
     MockHttpRequestHandler,
     MockHttpRequestHandlerOptions,
 } from './http/interfaces';
-export { deregisterMockEndpoint, registerMockEndpoint } from './http/mock';
+export {
+    deregisterMockEndpoint,
+    registerMockEndpoint,
+    setMockNotFoundHandler,
+} from './http/mock';
 
 export { PlaceApplication } from './applications/application';
 export {

package/src/http/mock.ts

@@ -1,4 +1,4 @@
-import { from, Observable } from 'rxjs';
+import { from, Observable, throwError } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
 import { convertPairStringToMap, log } from '../utilities/general';
@@ -15,6 +15,27 @@ import {
  */
 const _handlers: HashMap<MockHttpRequestHandler> = {};
 
+let _error_handler: (
+    method: HttpVerb,
+    url: string,
+) => Observable<never> | null = (method: HttpVerb, url: string) => {
+    const error = new Error(`Mock endpoint not found: ${method} ${url}`);
+    (error as any).status = 404;
+    log('HTTP(M)', `404 ${method}:`, url);
+    return throwError(error);
+};
+
+/**
+ * Change the handler for not found endpoints
+ * Return `null` if you want to make the real request
+ * @param handler_fn Function to handle not found mocked endpoints
+ */
+export function setMockNotFoundHandler(
+    handler_fn: (method: HttpVerb, url: string) => Observable<never> | null,
+) {
+    _error_handler = handler_fn;
+}
+
 /**
  * Register handler for http endpoint
  * @param path URL to be handled
@@ -30,7 +51,7 @@ export function registerMockEndpoint<T>(
     deregisterMockEndpoint(handler_ops.method, handler_ops.path, handler_map);
     const key = `${handler_ops.method}|${handler_ops.path}`;
     const path_parts = handler_ops.path
-        .replace(/(http|https):\/\/[a-zA-Z0-9.]*:?([0-9]*)?/g, '') // Remove URL origin
+        .replace(/(http|https):\/\/[a-zA-Z0-9.-]*:?([0-9]*)?/g, '') // Remove URL origin
         .replace(/^\//, '')
         .split('/');
     const handler: MockHttpRequestHandler<T> = {
@@ -80,7 +101,7 @@ export function clearMockEndpoints(
 /**
  * @private
  * Perform mock request for the given method and URL.
- * Returns `null` if no handler for URL and method
+ * Returns a 404 error if no handler for URL and method
  * @param method Http Verb for request
  * @param url URL to perform request on
  * @param handler_map Handler map to query for the request handler.
@@ -92,15 +113,13 @@ export function mockRequest(
     body?: any,
     handler_map: HashMap<MockHttpRequestHandler> = _handlers,
 ): Observable<HashMap | string | void> | null {
-    if (window.debug) {
-        console.log('Resolving request:', method, url, body);
-    }
     const handler = findRequestHandler(method, url, handler_map);
     if (handler) {
         const request = processRequest(url, handler, body);
         return onMockRequest(handler, request);
     }
-    return null;
+    // Return 404 error when no handler is found
+    return _error_handler(method, url);
 }
 
 /**
@@ -116,7 +135,7 @@ export function findRequestHandler(
     handler_map: HashMap<MockHttpRequestHandler> = _handlers,
 ): MockHttpRequestHandler | null {
     const path = url
-        .replace(/(http|https):\/\/[a-zA-Z0-9.]*:?([0-9]*)?/g, '')
+        .replace(/(http|https):\/\/[a-zA-Z0-9.-]*:?([0-9]*)?/g, '')
         .replace(/^\//, '')
         .split('?')[0];
     const route_parts = path.split('/');
@@ -162,7 +181,7 @@ export function processRequest<T = any>(
     body?: any,
 ): MockHttpRequest {
     const parts = url
-        .replace(/(http|https):\/\/[a-zA-Z0-9.]*:?([0-9]*)?/g, '')
+        .replace(/(http|https):\/\/[a-zA-Z0-9.-]*:?([0-9]*)?/g, '')
         .split('?');
     const path = parts[0].replace(/^\//, '');
     const query = parts[1] || '';