@appium/base-driver 10.0.0-beta.0 → 10.0.0-beta.1

package/lib/protocol/routes.js

@@ -1,26 +1,13 @@
-// @ts-check
-
 import _ from 'lodash';
-import {util} from '@appium/support';
-import {PROTOCOLS, DEFAULT_BASE_PATH} from '../constants';
+import {DEFAULT_BASE_PATH} from '../constants';
 import {match} from 'path-to-regexp';
-import { LRUCache } from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 
 /** @type {LRUCache<string, string>} */
 const COMMAND_NAMES_CACHE = new LRUCache({
   max: 1024,
 });
 
-const SET_ALERT_TEXT_PAYLOAD_PARAMS = {
-  validate: (jsonObj) =>
-    !util.hasValue(jsonObj.value) &&
-    !util.hasValue(jsonObj.text) &&
-    'either "text" or "value" must be set',
-  optional: ['value', 'text'],
-  // Prefer 'value' since it's more backward-compatible.
-  makeArgs: (jsonObj) => [jsonObj.value || jsonObj.text],
-};
-
 /**
  * define the routes, mapping of HTTP methods to particular driver commands, and
  * any parameters that are expected in a request parameters can be `required` or
@@ -30,7 +17,7 @@ const SET_ALERT_TEXT_PAYLOAD_PARAMS = {
 export const METHOD_MAP = /** @type {const} */ ({
 
   //
-  // W3C WebDriver (and deprecated MJSONWP that will be removed in Appium 3)
+  // W3C WebDriver
   // https://www.w3.org/TR/webdriver1/
   // https://www.w3.org/TR/webdriver2/
   //
@@ -41,41 +28,26 @@ export const METHOD_MAP = /** @type {const} */ ({
     POST: {
       command: 'createSession',
       payloadParams: {
-        // TODO: Appium 3 will accept only 'capabilities'.
-        validate: (jsonObj) =>
-          !jsonObj.capabilities &&
-          !jsonObj.desiredCapabilities &&
-          'we require one of "desiredCapabilities" or "capabilities" object',
-        optional: ['desiredCapabilities', 'requiredCapabilities', 'capabilities'],
+        optional: ['capabilities', 'capabilities', 'capabilities'],
       },
     },
   },
   '/session/:sessionId': {
+    // TODO: Decide on the future of this route later
     GET: {command: 'getSession', deprecated: true},
     DELETE: {command: 'deleteSession'},
   },
   '/session/:sessionId/timeouts': {
-    GET: {command: 'getTimeouts'}, // W3C route
+    GET: {command: 'getTimeouts'},
     POST: {
       command: 'timeouts',
       payloadParams: {
-        validate: (jsonObj, protocolName) => {
-          if (protocolName === PROTOCOLS.W3C) {
-            if (
-              !util.hasValue(jsonObj.script) &&
-              !util.hasValue(jsonObj.pageLoad) &&
-              !util.hasValue(jsonObj.implicit)
-            ) {
-              return 'W3C protocol expects any of script, pageLoad or implicit to be set';
-            }
-          } else {
-            // TODO: Remove in Appium 3
-            if (!util.hasValue(jsonObj.type) || !util.hasValue(jsonObj.ms)) {
-              return 'MJSONWP protocol requires type and ms';
-            }
+        validate: ({script, pageLoad, implicit}) => {
+          if ([script, pageLoad, implicit].every(_.isNil)) {
+            return 'W3C protocol expects any of script, pageLoad or implicit to be set';
           }
         },
-        optional: ['type', 'ms', 'script', 'pageLoad', 'implicit'],
+        optional: ['script', 'pageLoad', 'implicit'],
       },
     },
   },
@@ -110,22 +82,7 @@ export const METHOD_MAP = /** @type {const} */ ({
     POST: {
       command: 'setWindow',
       payloadParams: {
-        // TODO: Appium 3 will only accept 'handle'. 'name' will be ginored.
-        optional: ['name', 'handle'],
-        // Return both values to match W3C and JSONWP protocols
-        makeArgs: (jsonObj) => {
-          if (util.hasValue(jsonObj.handle) && !util.hasValue(jsonObj.name)) {
-            return [jsonObj.handle, jsonObj.handle];
-          }
-          if (util.hasValue(jsonObj.name) && !util.hasValue(jsonObj.handle)) {
-            return [jsonObj.name, jsonObj.name];
-          }
-          return [jsonObj.name, jsonObj.handle];
-        },
-        validate: (jsonObj) =>
-          !util.hasValue(jsonObj.name) &&
-          !util.hasValue(jsonObj.handle) &&
-          'we require one of "name" or "handle" to be set',
+        required: ['handle'],
       },
     },
     DELETE: {command: 'closeWindow'},
@@ -170,8 +127,7 @@ export const METHOD_MAP = /** @type {const} */ ({
     },
   },
   '/session/:sessionId/element/active': {
-    GET: {command: 'active'}, // W3C: https://w3c.github.io/webdriver/webdriver-spec.html#dfn-get-active-element
-    POST: {command: 'active', deprecated: true},
+    GET: {command: 'active'},
   },
   '/session/:sessionId/element/:elementId': {
     GET: {},
@@ -198,18 +154,7 @@ export const METHOD_MAP = /** @type {const} */ ({
     POST: {
       command: 'setValue',
       payloadParams: {
-        validate: (jsonObj) =>
-          !util.hasValue(jsonObj.value) &&
-          !util.hasValue(jsonObj.text) &&
-          'we require one of "text" or "value" params',
-        // TODO: Appium 3 will accept only 'value'.
-        optional: ['value', 'text'],
-        // override the default argument constructor because of the special
-        // logic here. Basically we want to accept either a value (old JSONWP)
-        // or a text (new W3C) parameter, but only send one of them to the
-        // command (not both). Prefer 'value' since it's more
-        // backward-compatible.
-        makeArgs: (jsonObj) => [jsonObj.value || jsonObj.text],
+        required: ['text'],
       },
     },
   },
@@ -268,7 +213,9 @@ export const METHOD_MAP = /** @type {const} */ ({
     GET: {command: 'getAlertText'},
     POST: {
       command: 'setAlertText',
-      payloadParams: SET_ALERT_TEXT_PAYLOAD_PARAMS,
+      payloadParams: {
+        required: ['text'],
+      },
     },
   },
   '/session/:sessionId/alert/accept': {
@@ -304,19 +251,23 @@ export const METHOD_MAP = /** @type {const} */ ({
   // Appium specific
   //
   '/session/:sessionId/ime/available_engines': {
-    GET: {command: 'availableIMEEngines'},
+    GET: {command: 'availableIMEEngines', deprecated: true},
   },
   '/session/:sessionId/ime/active_engine': {
-    GET: {command: 'getActiveIMEEngine'},
+    GET: {command: 'getActiveIMEEngine', deprecated: true},
   },
   '/session/:sessionId/ime/activated': {
-    GET: {command: 'isIMEActivated'},
+    GET: {command: 'isIMEActivated', deprecated: true},
   },
   '/session/:sessionId/ime/deactivate': {
-    POST: {command: 'deactivateIMEEngine'},
+    POST: {command: 'deactivateIMEEngine', deprecated: true},
   },
   '/session/:sessionId/ime/activate': {
-    POST: {command: 'activateIMEEngine', payloadParams: {required: ['engine']}},
+    POST: {
+      command: 'activateIMEEngine',
+      payloadParams: {required: ['engine']},
+      deprecated: true,
+    },
   },
   '/session/:sessionId/rotation': {
     GET: {command: 'getRotation'},
@@ -341,16 +292,18 @@ export const METHOD_MAP = /** @type {const} */ ({
     GET: {command: 'getContexts'},
   },
   '/session/:sessionId/network_connection': {
-    GET: {command: 'getNetworkConnection'},
+    GET: {command: 'getNetworkConnection', deprecated: true},
     POST: {
       command: 'setNetworkConnection',
       payloadParams: {unwrap: 'parameters', required: ['type']},
+      deprecated: true,
     },
   },
   '/session/:sessionId/receive_async_response': {
     POST: {
       command: 'receiveAsyncResponse',
       payloadParams: {required: ['status', 'value']},
+      deprecated: true,
     },
   },
   '/appium/sessions': {
@@ -360,7 +313,7 @@ export const METHOD_MAP = /** @type {const} */ ({
     GET: {command: 'getAppiumSessionCapabilities'}
   },
   '/session/:sessionId/appium/device/system_time': {
-    GET: {command: 'getDeviceTime', payloadParams: {optional: ['format']}},
+    GET: {command: 'getDeviceTime'},
     POST: {command: 'getDeviceTime', payloadParams: {optional: ['format']}},
   },
   // #region Applications Management
@@ -409,18 +362,11 @@ export const METHOD_MAP = /** @type {const} */ ({
     },
   },
   '/session/:sessionId/appium/device/app_state': {
-    GET: {
-      command: 'queryAppState',
-      payloadParams: {
-        required: [['appId'], ['bundleId']],
-      },
-    },
     POST: {
       command: 'queryAppState',
       payloadParams: {
         required: [['appId'], ['bundleId']],
       },
-      deprecated: true,
     },
   },
   // #endregion
@@ -524,419 +470,6 @@ export const METHOD_MAP = /** @type {const} */ ({
     },
   },
   // #endregion
-
-  //
-  // Endpoints deprecated entirely
-  //
-  // #region MJSONWP
-  '/sessions': {
-    GET: {command: 'getSessions', deprecated: true},
-  },
-  '/session/:sessionId/timeouts/async_script': {
-    POST: {command: 'asyncScriptTimeout', payloadParams: {required: ['ms']}, deprecated: true},
-  },
-  '/session/:sessionId/timeouts/implicit_wait': {
-    POST: {command: 'implicitWait', payloadParams: {required: ['ms']}, deprecated: true},
-  },
-  '/session/:sessionId/window_handle': {
-    GET: {command: 'getWindowHandle', deprecated: true},
-  },
-  // Only 'window/handles' exists in W3C WebDriver spec.
-  '/session/:sessionId/window/handle': {
-    GET: {command: 'getWindowHandle', deprecated: true},
-  },
-  '/session/:sessionId/window_handles': {
-    GET: {command: 'getWindowHandles', deprecated: true},
-  },
-  '/session/:sessionId/execute': {
-    POST: {
-      command: 'execute',
-      payloadParams: {required: ['script', 'args']},
-      deprecated: true
-    },
-  },
-  '/session/:sessionId/execute_async': {
-    POST: {
-      command: 'executeAsync',
-      payloadParams: {required: ['script', 'args']},
-      deprecated: true
-    },
-  },
-  '/session/:sessionId/window/:windowhandle/size': {
-    GET: {command: 'getWindowSize', deprecated: true},
-  },
-  '/session/:sessionId/window/:windowhandle/position': {
-    POST: {deprecated: true},
-    GET: {deprecated: true},
-  },
-  '/session/:sessionId/window/:windowhandle/maximize': {
-    POST: {command: 'maximizeWindow', deprecated: true},
-  },
-  '/session/:sessionId/element/:elementId/submit': {
-    POST: {command: 'submit', deprecated: true},
-  },
-  '/session/:sessionId/keys': {
-    POST: {command: 'keys', payloadParams: {required: ['value']}, deprecated: true},
-  },
-  '/session/:sessionId/element/:elementId/equals/:otherId': {
-    GET: {command: 'equalsElement', deprecated: true},
-  },
-  '/session/:sessionId/element/:elementId/location': {
-    GET: {command: 'getLocation', deprecated: true},
-  },
-  '/session/:sessionId/element/:elementId/location_in_view': {
-    GET: {command: 'getLocationInView', deprecated: true},
-  },
-  '/session/:sessionId/element/:elementId/size': {
-    GET: {command: 'getSize', deprecated: true},
-  },
-  '/session/:sessionId/moveto': {
-    POST: {
-      command: 'moveTo',
-      payloadParams: {optional: ['element', 'xoffset', 'yoffset']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/click': {
-    POST: {command: 'clickCurrent', payloadParams: {optional: ['button']}, deprecated: true},
-  },
-  '/session/:sessionId/buttondown': {
-    POST: {command: 'buttonDown', payloadParams: {optional: ['button']}, deprecated: true},
-  },
-  '/session/:sessionId/buttonup': {
-    POST: {command: 'buttonUp', payloadParams: {optional: ['button']}, deprecated: true},
-  },
-  '/session/:sessionId/doubleclick': {
-    POST: {command: 'doubleClick', deprecated: true},
-  },
-  '/session/:sessionId/touch/click': {
-    POST: {command: 'click', payloadParams: {required: ['element']}, deprecated: true},
-  },
-  '/session/:sessionId/touch/down': {
-    POST: {command: 'touchDown', payloadParams: {required: ['x', 'y']}, deprecated: true},
-  },
-  '/session/:sessionId/touch/up': {
-    POST: {command: 'touchUp', payloadParams: {required: ['x', 'y']}, deprecated: true},
-  },
-  '/session/:sessionId/touch/move': {
-    POST: {command: 'touchMove', payloadParams: {required: ['x', 'y']}, deprecated: true},
-  },
-  '/session/:sessionId/touch/scroll': {
-    POST: {deprecated: true},
-  },
-  '/session/:sessionId/touch/doubleclick': {
-    POST: {deprecated: true},
-  },
-  '/session/:sessionId/touch/longclick': {
-    POST: {
-      command: 'touchLongClick',
-      payloadParams: {required: ['elements']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/touch/flick': {
-    POST: {
-      command: 'flick',
-      payloadParams: {
-        optional: ['element', 'xspeed', 'yspeed', 'xoffset', 'yoffset', 'speed'],
-      },
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/local_storage': {
-    GET: {deprecated: true},
-    POST: {deprecated: true},
-    DELETE: {deprecated: true},
-  },
-  '/session/:sessionId/local_storage/key/:key': {
-    GET: {deprecated: true},
-    DELETE: {deprecated: true},
-  },
-  '/session/:sessionId/local_storage/size': {
-    GET: {deprecated: true},
-  },
-  '/session/:sessionId/session_storage': {
-    GET: {deprecated: true},
-    POST: {deprecated: true},
-    DELETE: {deprecated: true},
-  },
-  '/session/:sessionId/session_storage/key/:key': {
-    GET: {deprecated: true},
-    DELETE: {deprecated: true},
-  },
-  '/session/:sessionId/session_storage/size': {
-    GET: {deprecated: true},
-  },
-  '/session/:sessionId/application_cache/status': {
-    GET: {deprecated: true},
-  },
-  '/session/:sessionId/alert_text': {
-    GET: {command: 'getAlertText', deprecated: true},
-    POST: {
-      command: 'setAlertText',
-      payloadParams: SET_ALERT_TEXT_PAYLOAD_PARAMS,
-      deprecated: true
-    },
-  },
-  '/session/:sessionId/accept_alert': {
-    POST: {command: 'postAcceptAlert', deprecated: true},
-  },
-  '/session/:sessionId/dismiss_alert': {
-    POST: {command: 'postDismissAlert', deprecated: true},
-  },
-  // Pre-W3C endpoint for element screenshot
-  '/session/:sessionId/screenshot/:elementId': {
-    GET: {command: 'getElementScreenshot', deprecated: true},
-  },
-  // #endregion
-  // #region Appium specific
-  '/session/:sessionId/element/:elementId/pageIndex': {
-    GET: {command: 'getPageIndex', deprecated: true},
-  },
-  '/session/:sessionId/touch/perform': {
-    POST: {
-      command: 'performTouch',
-      payloadParams: {wrap: 'actions', required: ['actions']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/touch/multi/perform': {
-    POST: {
-      command: 'performMultiAction',
-      payloadParams: {required: ['actions'], optional: ['elementId']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/shake': {
-    POST: {command: 'mobileShake', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/lock': {
-    POST: {command: 'lock', payloadParams: {optional: ['seconds']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/device/unlock': {
-    POST: {command: 'unlock', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/is_locked': {
-    POST: {command: 'isLocked', deprecated: true},
-  },
-  '/session/:sessionId/appium/start_recording_screen': {
-    POST: {
-      command: 'startRecordingScreen',
-      payloadParams: {optional: ['options']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/stop_recording_screen': {
-    POST: {
-      command: 'stopRecordingScreen',
-      payloadParams: {optional: ['options']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/performanceData/types': {
-    POST: {command: 'getPerformanceDataTypes', deprecated: true},
-  },
-  '/session/:sessionId/appium/getPerformanceData': {
-    POST: {
-      command: 'getPerformanceData',
-      payloadParams: {
-        required: ['packageName', 'dataType'],
-        optional: ['dataReadTimeout'],
-      },
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/press_keycode': {
-    POST: {
-      command: 'pressKeyCode',
-      payloadParams: {required: ['keycode'], optional: ['metastate', 'flags']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/long_press_keycode': {
-    POST: {
-      command: 'longPressKeyCode',
-      payloadParams: {required: ['keycode'], optional: ['metastate', 'flags']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/finger_print': {
-    POST: {
-      command: 'fingerprint',
-      payloadParams: {required: ['fingerprintId']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/send_sms': {
-    POST: {
-      command: 'sendSMS',
-      payloadParams: {required: ['phoneNumber', 'message']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/gsm_call': {
-    POST: {
-      command: 'gsmCall',
-      payloadParams: {required: ['phoneNumber', 'action']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/gsm_signal': {
-    POST: {
-      command: 'gsmSignal',
-      payloadParams: {required: ['signalStrength']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/gsm_voice': {
-    POST: {command: 'gsmVoice', payloadParams: {required: ['state']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/device/power_capacity': {
-    POST: {command: 'powerCapacity', payloadParams: {required: ['percent']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/device/power_ac': {
-    POST: {command: 'powerAC', payloadParams: {required: ['state']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/device/network_speed': {
-    POST: {command: 'networkSpeed', payloadParams: {required: ['netspeed']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/device/keyevent': {
-    POST: {
-      command: 'keyevent',
-      payloadParams: {required: ['keycode'], optional: ['metastate']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/current_activity': {
-    GET: {command: 'getCurrentActivity', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/current_package': {
-    GET: {command: 'getCurrentPackage', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/toggle_airplane_mode': {
-    POST: {command: 'toggleFlightMode', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/toggle_data': {
-    POST: {command: 'toggleData', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/toggle_wifi': {
-    POST: {command: 'toggleWiFi', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/toggle_location_services': {
-    POST: {command: 'toggleLocationServices', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/open_notifications': {
-    POST: {command: 'openNotifications', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/start_activity': {
-    POST: {
-      command: 'startActivity',
-      payloadParams: {
-        required: ['appPackage', 'appActivity'],
-        optional: [
-          'appWaitPackage',
-          'appWaitActivity',
-          'intentAction',
-          'intentCategory',
-          'intentFlags',
-          'optionalIntentArguments',
-          'dontStopAppOnReset',
-        ],
-      },
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/system_bars': {
-    GET: {command: 'getSystemBars', deprecated: true},
-  },
-  '/session/:sessionId/appium/device/display_density': {
-    GET: {command: 'getDisplayDensity', deprecated: true},
-  },
-  '/session/:sessionId/appium/simulator/touch_id': {
-    POST: {command: 'touchId', payloadParams: {required: ['match']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/simulator/toggle_touch_id_enrollment': {
-    POST: {
-      command: 'toggleEnrollTouchId',
-      payloadParams: {optional: ['enabled']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/app/launch': {
-    POST: {command: 'launchApp', deprecated: true},
-  },
-  '/session/:sessionId/appium/app/close': {
-    POST: {command: 'closeApp', deprecated: true},
-  },
-  '/session/:sessionId/appium/app/reset': {
-    POST: {command: 'reset', deprecated: true},
-  },
-  '/session/:sessionId/appium/app/background': {
-    POST: {command: 'background', payloadParams: {required: ['seconds']}, deprecated: true},
-  },
-  '/session/:sessionId/appium/app/end_test_coverage': {
-    POST: {
-      command: 'endCoverage',
-      payloadParams: {required: ['intent', 'path']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/app/strings': {
-    POST: {
-      command: 'getStrings',
-      payloadParams: {optional: ['language', 'stringFile']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/element/:elementId/value': {
-    POST: {
-      command: 'setValueImmediate',
-      payloadParams: {required: ['text']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/element/:elementId/replace_value': {
-    POST: {
-      command: 'replaceValue',
-      payloadParams: {required: ['text']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/receive_async_response': {
-    POST: {
-      command: 'receiveAsyncResponse',
-      payloadParams: {required: ['response']},
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/set_clipboard': {
-    POST: {
-      command: 'setClipboard',
-      payloadParams: {
-        required: ['content'],
-        optional: ['contentType', 'label'],
-      },
-      deprecated: true,
-    },
-  },
-  '/session/:sessionId/appium/device/get_clipboard': {
-    POST: {
-      command: 'getClipboard',
-      payloadParams: {
-        optional: ['contentType'],
-      },
-      deprecated: true,
-    },
-  },
-  // #endregion
-  // #region JSONWP
-  '/session/:sessionId/log': {
-    POST: {command: 'getLog', payloadParams: {required: ['type']}, deprecated: true},
-  },
-  '/session/:sessionId/log/types': {
-    GET: {command: 'getLogTypes', deprecated: true},
-  },
-  // #endregion
 });
 
 // driver command names
@@ -1008,4 +541,4 @@ function toCommandNameCacheKey(endpoint, method) {
 }
 
 // driver commands that do not require a session to already exist
-export const NO_SESSION_ID_COMMANDS = ['createSession', 'getStatus', 'getSessions', 'getAppiumSessions'];
+export const NO_SESSION_ID_COMMANDS = ['createSession', 'getStatus', 'getAppiumSessions'];

package/lib/protocol/validators.ts

@@ -0,0 +1,19 @@
+import _ from 'lodash';
+
+export const validators = {
+  setUrl: (url: any) => {
+    // either an `xyz://`, `about:`, or `data:` scheme is allowed
+    if (!url || !url.match(/^([a-zA-Z0-9_+.-]+:\/\/)|(about:)|(data:)/)) {
+      throw new Error('Url or Uri must start with <scheme>://');
+    }
+  },
+  setNetworkConnection: (type: any) => {
+    if (!isNumber(type) || [0, 1, 2, 4, 6].indexOf(type) === -1) {
+      throw new Error('Network type must be one of 0, 1, 2, 4, 6');
+    }
+  },
+};
+
+function isNumber(o: any): o is number {
+  return _.isNumber(o) || !_.isNaN(parseInt(o, 10)) || !_.isNaN(parseFloat(o));
+}