appium-remote-debugger 8.12.0 → 9.0.0

package/lib/atoms.js

@@ -1,4 +1,4 @@
-import { fs } from 'appium-support';
+import { fs } from '@appium/support';
 import path from 'path';
 import _ from 'lodash';
 import log from './logger';

package/lib/logger.js

@@ -1,4 +1,4 @@
-import { logger } from 'appium-support';
+import { logger } from '@appium/support';
 
 
 const log = logger.getLogger('RemoteDebugger');

package/lib/mixins/connect.js

@@ -2,7 +2,7 @@ import log from '../logger';
 import { appInfoFromDict, pageArrayFromDict, getDebuggerAppKey,
          getPossibleDebuggerAppKeys, simpleStringify, deferredPromise } from '../utils';
 import events from './events';
-import { timing } from 'appium-support';
+import { timing } from '@appium/support';
 import { retryInterval, waitForCondition } from 'asyncbox';
 import _ from 'lodash';
 

package/lib/mixins/execute.js

@@ -1,8 +1,8 @@
 import log from '../logger';
-import { errors } from 'appium-base-driver';
+import { errors } from '@appium/base-driver';
 import { checkParams, simpleStringify, convertResult, RESPONSE_LOG_LENGTH } from '../utils';
 import { getScriptForAtom } from '../atoms';
-import { util, timing } from 'appium-support';
+import { util, timing } from '@appium/support';
 import { retryInterval } from 'asyncbox';
 import _ from 'lodash';
 
@@ -10,12 +10,19 @@ import _ from 'lodash';
 /* How many milliseconds to wait for webkit to return a response before timing out */
 const RPC_RESPONSE_TIMEOUT_MS = 5000;
 
+/**
+ * Execute a Selenium atom in Safari
+ * @param {string} atom Name of Selenium atom (see atoms/ directory)
+ * @param {Array<*>} args Arguments passed to the atom
+ * @param {Array<string>} frames
+ * @returns {string} The result received from the atom
+ */
 async function executeAtom (atom, args, frames) {
   if (!this.rpcClient.isConnected) {
     throw new Error('Remote debugger is not connected');
   }
 
-  log.debug(`Executing atom '${atom}'`);
+  log.debug(`Executing atom '${atom}' with 'args=${JSON.stringify(args)}; frames=${frames}'`);
   const script = await getScriptForAtom(atom, args, frames);
   const value = await this.execute(script, true);
   log.debug(`Received result for atom '${atom}' execution: ${_.truncate(simpleStringify(value), {length: RESPONSE_LOG_LENGTH})}`);

package/lib/mixins/navigate.js

@@ -1,7 +1,7 @@
 import log from '../logger';
 import { checkParams } from '../utils';
 import events from './events';
-import { timing, util } from 'appium-support';
+import { timing, util } from '@appium/support';
 import _ from 'lodash';
 import B from 'bluebird';
 

package/lib/remote-debugger-real-device.js

@@ -23,6 +23,7 @@ export default class RemoteDebuggerRealDevice extends RemoteDebugger {
       logAllCommunication: this.logAllCommunication,
       logAllCommunicationHexDump: this.logAllCommunicationHexDump,
       socketChunkSize: this.socketChunkSize,
+      webInspectorMaxFrameLength: this.webInspectorMaxFrameLength,
       udid: this.udid
     });
   }

package/lib/remote-debugger.js

@@ -39,6 +39,8 @@ class RemoteDebugger extends EventEmitter {
    *   - logAllCommunication - log plists sent and received from Web Inspector
    *   - logAllCommunicationHexDump - log communication from Web Inspector as hex dump
    *   - socketChunkSize - size, in bytes, of chunks of data sent to Web Inspector (real device only)
+   *   - webInspectorMaxFrameLength - The maximum size in bytes of a single data frame
+   *                                  in the device communication protocol
    */
   constructor (opts = {}) {
     super();
@@ -64,6 +66,7 @@ class RemoteDebugger extends EventEmitter {
       logFullResponse = false,
       logAllCommunication = false,
       logAllCommunicationHexDump = false,
+      webInspectorMaxFrameLength,
       socketChunkSize,
       fullPageInitialization,
     } = opts;
@@ -89,6 +92,10 @@ class RemoteDebugger extends EventEmitter {
     this.logAllCommunicationHexDump = logAllCommunicationHexDump;
     this.socketChunkSize = socketChunkSize;
 
+    if (_.isInteger(webInspectorMaxFrameLength)) {
+      this.webInspectorMaxFrameLength = webInspectorMaxFrameLength;
+    }
+
     this.fullPageInitialization = fullPageInitialization;
 
     this._lock = new AsyncLock();
@@ -133,6 +140,7 @@ class RemoteDebugger extends EventEmitter {
       logAllCommunication: this.logAllCommunication,
       logAllCommunicationHexDump: this.logAllCommunicationHexDump,
       fullPageInitialization: this.fullPageInitialization,
+      webInspectorMaxFrameLength: this.webInspectorMaxFrameLength,
     });
   }
 

package/lib/rpc/rpc-client-real-device.js

@@ -23,6 +23,7 @@ export default class RpcClientRealDevice extends RpcClient {
       verbose: this.logAllCommunication,
       verboseHexDump: this.logAllCommunicationHexDump,
       socketChunkSize: this.socketChunkSize,
+      maxFrameLength: this.webInspectorMaxFrameLength,
     });
 
     this.service.listenMessage(this.receive.bind(this));

package/lib/rpc/rpc-client-simulator.js

@@ -79,6 +79,7 @@ export default class RpcClientSimulator extends RpcClient {
       osVersion: this.platformVersion,
       verbose: this.logAllCommunication,
       verboseHexDump: this.logAllCommunicationHexDump,
+      maxFrameLength: this.webInspectorMaxFrameLength,
     });
     this.service.listenMessage(this.receive.bind(this));
 

package/lib/rpc/rpc-client.js

@@ -4,7 +4,7 @@ import log from '../logger';
 import _ from 'lodash';
 import B from 'bluebird';
 import RpcMessageHandler from './rpc-message-handler';
-import { util, timing } from 'appium-support';
+import { util, timing } from '@appium/support';
 
 
 const DATA_LOG_LENGTH = {length: 200};
@@ -38,6 +38,7 @@ export default class RpcClient {
       isSafari = true,
       logAllCommunication = false,
       logAllCommunicationHexDump = false,
+      webInspectorMaxFrameLength,
       socketChunkSize,
       fullPageInitialization = false,
     } = opts;
@@ -52,6 +53,7 @@ export default class RpcClient {
     this.logAllCommunication = logAllCommunication;
     this.logAllCommunicationHexDump = logAllCommunicationHexDump;
     this.socketChunkSize = socketChunkSize;
+    this.webInspectorMaxFrameLength = webInspectorMaxFrameLength;
 
     this.fullPageInitialization = fullPageInitialization;
 
@@ -172,12 +174,16 @@ export default class RpcClient {
       }
       return await this.sendToDevice(command, opts, waitForResponse);
     } catch (err) {
-      if (err.message.includes(`'Target' domain was not found`)) {
-        log.info('The target device does not support Target basde communication. ' +
+      let { message = '' } = err;
+      message = message.toLowerCase();
+      if (message.includes(`'target' domain was not found`)) {
+        log.info('The target device does not support Target based communication. ' +
           'Will follow non-target based communication.');
         this.isTargetBased = false;
         return await this.sendToDevice(command, opts, waitForResponse);
-      } else if (err.message.includes(`domain was not found`) || err.message.includes(`Some arguments of method`)) {
+      } else if (message.includes(`domain was not found`) ||
+          message.includes(`some arguments of method`) ||
+          message.includes(`missing target`)) {
         this.isTargetBased = true;
         await this.waitForTarget(appIdKey, pageIdKey);
         return await this.sendToDevice(command, opts, waitForResponse);

package/lib/rpc/rpc-message-handler.js

@@ -1,6 +1,6 @@
 import log from '../logger';
 import _ from 'lodash';
-import { util } from 'appium-support';
+import { util } from '@appium/support';
 import EventEmitters from 'events';
 
 

package/lib/utils.js

@@ -1,8 +1,8 @@
 import log from './logger';
 import _ from 'lodash';
 import B from 'bluebird';
-import { errorFromMJSONWPStatusCode } from 'appium-base-driver';
-import { util } from 'appium-support';
+import { errorFromMJSONWPStatusCode } from '@appium/base-driver';
+import { util } from '@appium/support';
 
 
 const WEB_CONTENT_BUNDLE_ID = 'com.apple.WebKit.WebContent';

package/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "appium"
   ],
-  "version": "8.12.0",
+  "version": "9.0.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -30,15 +30,15 @@
     "atoms"
   ],
   "dependencies": {
+    "@appium/base-driver": "^8.0.0",
+    "@appium/support": "^2.55.3",
     "@babel/runtime": "^7.0.0",
-    "appium-base-driver": "^7.0.0",
-    "appium-ios-device": "^1.2.1",
-    "appium-support": "^2.41.0",
+    "appium-ios-device": "^2.0.0",
     "async-lock": "^1.2.2",
     "asyncbox": "^2.6.0",
     "bluebird": "^3.4.7",
     "lodash": "^4.17.11",
-    "source-map-support": "^0.5.5"
+    "source-map-support": "^0.x"
   },
   "scripts": {
     "prepare": "gulp prepublish",
@@ -63,18 +63,20 @@
     "precommit-test"
   ],
   "devDependencies": {
-    "ajv": "^6.5.3",
-    "appium-gulp-plugins": "^5.1.0",
-    "appium-ios-simulator": "^3.10.0",
+    "@appium/gulp-plugins": "^6.0.0",
+    "@appium/eslint-config-appium": "^5.0.0",
+    "appium-ios-simulator": "^4.0.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
-    "eslint-config-appium": "^4.5.0",
-    "fancy-log": "^1.3.3",
+    "fancy-log": "^2.0.0",
     "finalhandler": "^1.1.2",
     "gulp": "^4.0.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.0.0",
+    "mocha-junit-reporter": "^2.0.0",
+    "mocha-multi-reporters": "^1.5.1",
     "node-simctl": "^6.0.2",
     "pre-commit": "^1.1.3",
-    "serve-static": "^1.14.1"
+    "serve-static": "^1.14.1",
+    "sinon": "^12.0.0"
   }
 }