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

package/lib/jsonwp-proxy/proxy.js

@@ -11,7 +11,7 @@ import {
 import {isSessionCommand, routeToCommandName} from '../protocol';
 import {MAX_LOG_BODY_LENGTH, DEFAULT_BASE_PATH, PROTOCOLS} from '../constants';
 import ProtocolConverter from './protocol-converter';
-import {formatResponseValue, formatStatus} from '../protocol/helpers';
+import {formatResponseValue, ensureW3cResponse} from '../protocol/helpers';
 import http from 'http';
 import https from 'https';
 import { match as pathToRegexMatch } from 'path-to-regexp';
@@ -290,37 +290,6 @@ export class JWProxy {
     }
   }
 
-  /**
-   * @deprecated This method is not used anymore and will be removed
-   *
-   * @param {string} url
-   * @param {import('@appium/types').HTTPMethod} method
-   * @returns {string|undefined}
-   */
-  requestToCommandName(url, method) {
-    /**
-     *
-     * @param {RegExp} pattern
-     * @returns {string|undefined}
-     */
-    const extractCommandName = (pattern) => {
-      const pathMatch = pattern.exec(url);
-      if (pathMatch) {
-        return routeToCommandName(pathMatch[1], method, this.reqBasePath);
-      }
-    };
-    let commandName = routeToCommandName(url, method, this.reqBasePath);
-    if (!commandName && _.includes(url, `${this.reqBasePath}/session/`)) {
-      commandName = extractCommandName(
-        new RegExp(`${_.escapeRegExp(this.reqBasePath)}/session/[^/]+(.+)`)
-      );
-    }
-    if (!commandName && _.includes(url, this.reqBasePath)) {
-      commandName = extractCommandName(new RegExp(`${_.escapeRegExp(this.reqBasePath)}(/.+)`));
-    }
-    return commandName;
-  }
-
   /**
    *
    * @param {string} url
@@ -428,18 +397,13 @@ export class JWProxy {
         /** @type {import('@appium/types').HTTPMethod} */ (req.method),
         req.body
       );
-      for (const [name, value] of _.toPairs(response.headers)) {
-        if (!_.isNil(value)) {
-          res.setHeader(name, _.isBoolean(value) ? String(value) : value);
-        }
-      }
       statusCode = response.statusCode;
     } catch (err) {
       [statusCode, resBodyObj] = getResponseForW3CError(
         isErrorType(err, errors.ProxyRequestError) ? err.getActualError() : err
       );
     }
-    res.set('content-type', 'application/json; charset=utf-8');
+    res.setHeader('content-type', 'application/json; charset=utf-8');
     if (!_.isPlainObject(resBodyObj)) {
       const error = new errors.UnknownError(
         `The downstream server response with the status code ${statusCode} is not a valid JSON object: ` +
@@ -462,7 +426,7 @@ export class JWProxy {
       }
     }
     resBodyObj.value = formatResponseValue(resBodyObj.value);
-    res.status(statusCode).send(JSON.stringify(formatStatus(resBodyObj)));
+    res.status(statusCode).json(ensureW3cResponse(resBodyObj));
   }
 
   /**
@@ -503,12 +467,11 @@ export class JWProxy {
         pathname = pathname.replace('/wd/hub', '');
       }
     }
-    return _.trimEnd(
-      match && _.isArray(match.params?.command)
-        ? `/${match.params.command.join('/')}`
-        : pathname,
-      '/'
-    );
+    let result = pathname;
+    if (match) {
+      result = _.isArray(match.params?.command) ? `/${match.params.command.join('/')}` : '';
+    }
+    return _.trimEnd(result, '/');
   }
 }