appium-remote-debugger 15.2.12 → 15.2.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/build/lib/atoms.d.ts +16 -10
- package/build/lib/atoms.d.ts.map +1 -1
- package/build/lib/atoms.js +27 -16
- package/build/lib/atoms.js.map +1 -1
- package/build/lib/logger.d.ts +1 -2
- package/build/lib/logger.d.ts.map +1 -1
- package/build/lib/logger.js +2 -2
- package/build/lib/logger.js.map +1 -1
- package/build/lib/remote-debugger.js +2 -2
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/rpc-client-real-device.js +2 -5
- package/build/lib/rpc/rpc-client-real-device.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +10 -10
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.js +50 -50
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/rpc/rpc-message-handler.js +6 -6
- package/build/lib/rpc/rpc-message-handler.js.map +1 -1
- package/build/lib/utils.d.ts +54 -34
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +58 -39
- package/build/lib/utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/atoms.ts +98 -0
- package/lib/logger.ts +3 -0
- package/lib/remote-debugger.ts +1 -1
- package/lib/rpc/rpc-client-real-device.js +1 -1
- package/lib/rpc/rpc-client-simulator.js +1 -1
- package/lib/rpc/rpc-client.js +1 -1
- package/lib/rpc/rpc-message-handler.js +1 -1
- package/lib/{utils.js → utils.ts} +72 -51
- package/package.json +1 -1
- package/lib/atoms.js +0 -84
- package/lib/logger.js +0 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [15.2.13](https://github.com/appium/appium-remote-debugger/compare/v15.2.12...v15.2.13) (2026-01-22)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Migrate various modules to typescript ([#468](https://github.com/appium/appium-remote-debugger/issues/468)) ([ff96233](https://github.com/appium/appium-remote-debugger/commit/ff96233dda3d76f4894d8a2e36dfaef99457933c))
|
|
6
|
+
|
|
1
7
|
## [15.2.12](https://github.com/appium/appium-remote-debugger/compare/v15.2.11...v15.2.12) (2026-01-21)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
package/build/lib/atoms.d.ts
CHANGED
|
@@ -1,17 +1,23 @@
|
|
|
1
|
-
export default getAtom;
|
|
2
1
|
/**
|
|
2
|
+
* Loads an atom script from the atoms directory and caches it.
|
|
3
|
+
* If the atom has been loaded before, returns the cached version.
|
|
3
4
|
*
|
|
4
|
-
* @param
|
|
5
|
-
* @returns
|
|
5
|
+
* @param atomName - The name of the atom to load (without the .js extension).
|
|
6
|
+
* @returns A promise that resolves to the atom script as a Buffer.
|
|
7
|
+
* @throws Error if the atom file cannot be loaded.
|
|
6
8
|
*/
|
|
7
|
-
export function getAtom(atomName: string): Promise<Buffer>;
|
|
9
|
+
export declare function getAtom(atomName: string): Promise<Buffer>;
|
|
8
10
|
/**
|
|
11
|
+
* Generates a complete script string for executing a Selenium atom.
|
|
12
|
+
* Handles frame contexts and optional async callbacks.
|
|
9
13
|
*
|
|
10
|
-
* @param
|
|
11
|
-
* @param
|
|
12
|
-
* @param
|
|
13
|
-
*
|
|
14
|
-
* @
|
|
14
|
+
* @param atom - The name of the atom to execute.
|
|
15
|
+
* @param args - Arguments to pass to the atom function. Defaults to empty array.
|
|
16
|
+
* @param frames - Array of frame identifiers to execute the atom in nested frames.
|
|
17
|
+
* Defaults to empty array (executes in default context).
|
|
18
|
+
* @param asyncCallBack - Optional callback function string for async execution.
|
|
19
|
+
* If provided, the atom will be called with this callback.
|
|
20
|
+
* @returns A promise that resolves to the complete script string ready for execution.
|
|
15
21
|
*/
|
|
16
|
-
export function getScriptForAtom(atom: string, args?: any[], frames?: string[], asyncCallBack?: string | null): Promise<string>;
|
|
22
|
+
export declare function getScriptForAtom(atom: string, args?: any[], frames?: string[], asyncCallBack?: string | null): Promise<string>;
|
|
17
23
|
//# sourceMappingURL=atoms.d.ts.map
|
package/build/lib/atoms.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atoms.d.ts","sourceRoot":"","sources":["../../lib/atoms.
|
|
1
|
+
{"version":3,"file":"atoms.d.ts","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":"AAqBA;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY/D;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,GAAG,EAAO,EAChB,MAAM,GAAE,MAAM,EAAO,EACrB,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,MAAM,CAAC,CAsBjB"}
|
package/build/lib/atoms.js
CHANGED
|
@@ -8,12 +8,14 @@ exports.getScriptForAtom = getScriptForAtom;
|
|
|
8
8
|
const support_1 = require("@appium/support");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
|
-
const logger_1 =
|
|
11
|
+
const logger_1 = require("./logger");
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
13
|
const ATOMS_CACHE = {};
|
|
14
14
|
/**
|
|
15
|
-
*
|
|
16
|
-
*
|
|
15
|
+
* Converts a value to a JSON string, handling undefined values specially.
|
|
16
|
+
*
|
|
17
|
+
* @param obj - The value to stringify.
|
|
18
|
+
* @returns A JSON string representation of the value, or 'undefined' if the value is undefined.
|
|
17
19
|
*/
|
|
18
20
|
function atomsStringify(obj) {
|
|
19
21
|
if (typeof obj === 'undefined') {
|
|
@@ -22,9 +24,12 @@ function atomsStringify(obj) {
|
|
|
22
24
|
return JSON.stringify(obj);
|
|
23
25
|
}
|
|
24
26
|
/**
|
|
27
|
+
* Loads an atom script from the atoms directory and caches it.
|
|
28
|
+
* If the atom has been loaded before, returns the cached version.
|
|
25
29
|
*
|
|
26
|
-
* @param
|
|
27
|
-
* @returns
|
|
30
|
+
* @param atomName - The name of the atom to load (without the .js extension).
|
|
31
|
+
* @returns A promise that resolves to the atom script as a Buffer.
|
|
32
|
+
* @throws Error if the atom file cannot be loaded.
|
|
28
33
|
*/
|
|
29
34
|
async function getAtom(atomName) {
|
|
30
35
|
// check if we have already loaded and cached this atom
|
|
@@ -40,23 +45,30 @@ async function getAtom(atomName) {
|
|
|
40
45
|
return ATOMS_CACHE[atomName];
|
|
41
46
|
}
|
|
42
47
|
/**
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
48
|
+
* Wraps a script to execute it within a specific frame context.
|
|
49
|
+
* Uses the get_element_from_cache atom to access the frame element.
|
|
50
|
+
*
|
|
51
|
+
* @param script - The script to wrap.
|
|
52
|
+
* @param frame - The frame identifier to execute the script in.
|
|
53
|
+
* @returns A promise that resolves to the wrapped script string.
|
|
46
54
|
*/
|
|
47
55
|
async function wrapScriptForFrame(script, frame) {
|
|
48
|
-
logger_1.
|
|
56
|
+
logger_1.log.debug(`Wrapping script for frame '${frame}'`);
|
|
49
57
|
const elFromCache = await getAtom('get_element_from_cache');
|
|
50
58
|
return `(function (window) { var document = window.document; ` +
|
|
51
59
|
`return (${script}); })((${elFromCache.toString('utf8')})(${atomsStringify(frame)}))`;
|
|
52
60
|
}
|
|
53
61
|
/**
|
|
62
|
+
* Generates a complete script string for executing a Selenium atom.
|
|
63
|
+
* Handles frame contexts and optional async callbacks.
|
|
54
64
|
*
|
|
55
|
-
* @param
|
|
56
|
-
* @param
|
|
57
|
-
* @param
|
|
58
|
-
*
|
|
59
|
-
* @
|
|
65
|
+
* @param atom - The name of the atom to execute.
|
|
66
|
+
* @param args - Arguments to pass to the atom function. Defaults to empty array.
|
|
67
|
+
* @param frames - Array of frame identifiers to execute the atom in nested frames.
|
|
68
|
+
* Defaults to empty array (executes in default context).
|
|
69
|
+
* @param asyncCallBack - Optional callback function string for async execution.
|
|
70
|
+
* If provided, the atom will be called with this callback.
|
|
71
|
+
* @returns A promise that resolves to the complete script string ready for execution.
|
|
60
72
|
*/
|
|
61
73
|
async function getScriptForAtom(atom, args = [], frames = [], asyncCallBack = null) {
|
|
62
74
|
const atomSrc = (await getAtom(atom)).toString('utf8');
|
|
@@ -68,7 +80,7 @@ async function getScriptForAtom(atom, args = [], frames = [], asyncCallBack = nu
|
|
|
68
80
|
}
|
|
69
81
|
}
|
|
70
82
|
else {
|
|
71
|
-
logger_1.
|
|
83
|
+
logger_1.log.debug(`Executing '${atom}' atom in default context`);
|
|
72
84
|
script = `(${atomSrc})`;
|
|
73
85
|
}
|
|
74
86
|
// add the arguments, as strings
|
|
@@ -81,5 +93,4 @@ async function getScriptForAtom(atom, args = [], frames = [], asyncCallBack = nu
|
|
|
81
93
|
}
|
|
82
94
|
return script;
|
|
83
95
|
}
|
|
84
|
-
exports.default = getAtom;
|
|
85
96
|
//# sourceMappingURL=atoms.js.map
|
package/build/lib/atoms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atoms.js","sourceRoot":"","sources":["../../lib/atoms.
|
|
1
|
+
{"version":3,"file":"atoms.js","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":";;;;;AA6BA,0BAYC;AA6BD,4CA2BC;AAjGD,6CAAqC;AACrC,gDAAwB;AACxB,oDAAuB;AACvB,qCAA+B;AAC/B,mCAAwC;AAExC,MAAM,WAAW,GAA2B,EAAE,CAAC;AAE/C;;;;;GAKG;AACH,SAAS,cAAc,CAAC,GAAQ;IAC9B,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,OAAO,CAAC,QAAgB;IAC5C,uDAAuD;IACvD,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,IAAA,qBAAa,GAAE,EAAE,OAAO,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;QAC9E,IAAI,CAAC;YACH,WAAW,CAAC,QAAQ,CAAC,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,gBAAgB,YAAY,GAAG,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC7D,YAAG,CAAC,KAAK,CAAC,8BAA8B,KAAK,GAAG,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC5D,OAAO,uDAAuD;QAC5D,WAAW,MAAM,UAAU,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC;AAC1F,CAAC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,gBAAgB,CACpC,IAAY,EACZ,OAAc,EAAE,EAChB,SAAmB,EAAE,EACrB,gBAA+B,IAAI;IAEnC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,GAAG,OAAO,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,YAAG,CAAC,KAAK,CAAC,cAAc,IAAI,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,OAAO,GAAG,CAAC;IAC1B,CAAC;IAED,gCAAgC;IAChC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,aAAa,SAAS,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/build/lib/logger.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,sCAAqC,CAAC"}
|
package/build/lib/logger.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.log = void 0;
|
|
3
4
|
const support_1 = require("@appium/support");
|
|
4
|
-
|
|
5
|
-
exports.default = log;
|
|
5
|
+
exports.log = support_1.logger.getLogger('RemoteDebugger');
|
|
6
6
|
//# sourceMappingURL=logger.js.map
|
package/build/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAE5B,QAAA,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.RemoteDebugger = exports.REMOTE_DEBUGGER_PORT = void 0;
|
|
40
40
|
const events_1 = require("events");
|
|
41
|
-
const logger_1 =
|
|
41
|
+
const logger_1 = require("./logger");
|
|
42
42
|
const rpc_1 = require("./rpc");
|
|
43
43
|
const utils_1 = require("./utils");
|
|
44
44
|
const connectMixins = __importStar(require("./mixins/connect"));
|
|
@@ -130,7 +130,7 @@ class RemoteDebugger extends events_1.EventEmitter {
|
|
|
130
130
|
frameDetached = navigationMixins.frameDetached;
|
|
131
131
|
constructor(opts = {}) {
|
|
132
132
|
super();
|
|
133
|
-
this._log = opts.log ?? logger_1.
|
|
133
|
+
this._log = opts.log ?? logger_1.log;
|
|
134
134
|
this.log.info(`Remote Debugger version ${MODULE_VERSION}`);
|
|
135
135
|
const { bundleId, additionalBundleIds = [], platformVersion, isSafari = true, includeSafari = false, pageLoadMs, host, port = exports.REMOTE_DEBUGGER_PORT, socketPath, pageReadyTimeout = PAGE_READY_TIMEOUT_MS, remoteDebugProxy, garbageCollectOnExecute = false, logFullResponse = false, logAllCommunication = false, logAllCommunicationHexDump = false, webInspectorMaxFrameLength, socketChunkSize, fullPageInitialization, pageLoadStrategy, } = opts;
|
|
136
136
|
this._bundleId = bundleId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.RpcClientRealDevice = void 0;
|
|
7
|
-
const logger_1 =
|
|
4
|
+
const logger_1 = require("../logger");
|
|
8
5
|
const rpc_client_1 = require("./rpc-client");
|
|
9
6
|
const appium_ios_device_1 = require("appium-ios-device");
|
|
10
7
|
class RpcClientRealDevice extends rpc_client_1.RpcClient {
|
|
@@ -36,7 +33,7 @@ class RpcClientRealDevice extends rpc_client_1.RpcClient {
|
|
|
36
33
|
if (!this.isConnected) {
|
|
37
34
|
return;
|
|
38
35
|
}
|
|
39
|
-
logger_1.
|
|
36
|
+
logger_1.log.debug('Disconnecting from remote debugger');
|
|
40
37
|
await super.disconnect();
|
|
41
38
|
this.service.close();
|
|
42
39
|
this.isConnected = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-real-device.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc-client-real-device.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device.js"],"names":[],"mappings":";;;AAAA,sCAAgC;AAChC,6CAAyC;AACzC,yDAA6C;AAG7C,MAAa,mBAAoB,SAAQ,sBAAS;IAChD;;OAEG;IACH,YAAa,IAAI,GAAG,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,OAAO,GAAG,MAAM,4BAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE;YAChE,SAAS,EAAE,IAAI,CAAC,eAAe;YAC/B,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,IAAI,CAAC,mBAAmB;YACjC,cAAc,EAAE,IAAI,CAAC,0BAA0B;YAC/C,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,cAAc,EAAE,IAAI,CAAC,0BAA0B;SAChD,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,YAAG,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAChD,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAE,GAAG;QACpB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAE,IAAI;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QACD,iDAAiD;QACjD,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CACF;AAxDD,kDAwDC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.RpcClientSimulator = void 0;
|
|
7
|
-
const logger_1 =
|
|
7
|
+
const logger_1 = require("../logger");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
9
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
10
|
const net_1 = __importDefault(require("net"));
|
|
@@ -42,11 +42,11 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
42
42
|
if (this.socketPath) {
|
|
43
43
|
if (this.messageProxy) {
|
|
44
44
|
// unix domain socket via proxy
|
|
45
|
-
logger_1.
|
|
45
|
+
logger_1.log.debug(`Connecting to remote debugger via proxy through unix domain socket: '${this.messageProxy}'`);
|
|
46
46
|
this.socket = net_1.default.connect(this.messageProxy);
|
|
47
47
|
// Forward the actual socketPath to the proxy
|
|
48
48
|
this.socket.once('connect', () => {
|
|
49
|
-
logger_1.
|
|
49
|
+
logger_1.log.debug(`Forwarding the actual web inspector socket to the proxy: '${this.socketPath}'`);
|
|
50
50
|
// @ts-ignore socket must be efined here
|
|
51
51
|
this.socket.write(JSON.stringify({
|
|
52
52
|
socketPath: this.socketPath
|
|
@@ -55,7 +55,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
57
|
// unix domain socket
|
|
58
|
-
logger_1.
|
|
58
|
+
logger_1.log.debug(`Connecting to remote debugger through unix domain socket: '${this.socketPath}'`);
|
|
59
59
|
this.socket = net_1.default.connect(this.socketPath);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -65,7 +65,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
65
65
|
this.port = this.messageProxy;
|
|
66
66
|
}
|
|
67
67
|
// tcp socket
|
|
68
|
-
logger_1.
|
|
68
|
+
logger_1.log.debug(`Connecting to remote debugger ${this.messageProxy ? 'via proxy ' : ''}through TCP: ${this.host}:${this.port}`);
|
|
69
69
|
this.socket = new net_1.default.Socket();
|
|
70
70
|
this.socket.connect(/** @type {number} */ (this.port), /** @type {String} */ (this.host));
|
|
71
71
|
}
|
|
@@ -73,7 +73,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
73
73
|
this.socket.setKeepAlive(true);
|
|
74
74
|
this.socket.on('close', () => {
|
|
75
75
|
if (this.isConnected) {
|
|
76
|
-
logger_1.
|
|
76
|
+
logger_1.log.debug('Debugger socket disconnected');
|
|
77
77
|
}
|
|
78
78
|
this.isConnected = false;
|
|
79
79
|
this.socket = null;
|
|
@@ -95,14 +95,14 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
95
95
|
// only resolve this function when we are actually connected
|
|
96
96
|
// @ts-ignore socket must be defined here
|
|
97
97
|
this.socket.on('connect', () => {
|
|
98
|
-
logger_1.
|
|
98
|
+
logger_1.log.debug(`Debugger socket connected`);
|
|
99
99
|
this.isConnected = true;
|
|
100
100
|
resolve();
|
|
101
101
|
});
|
|
102
102
|
// @ts-ignore socket must be defined here
|
|
103
103
|
this.socket.on('error', (err) => {
|
|
104
104
|
if (this.isConnected) {
|
|
105
|
-
logger_1.
|
|
105
|
+
logger_1.log.error(`Socket error: ${err.message}`);
|
|
106
106
|
this.isConnected = false;
|
|
107
107
|
}
|
|
108
108
|
// the connection was refused, so reject the connect promise
|
|
@@ -117,7 +117,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
117
117
|
if (!this.isConnected) {
|
|
118
118
|
return;
|
|
119
119
|
}
|
|
120
|
-
logger_1.
|
|
120
|
+
logger_1.log.debug('Disconnecting from remote debugger');
|
|
121
121
|
await super.disconnect();
|
|
122
122
|
this.service.close();
|
|
123
123
|
this.isConnected = false;
|
|
@@ -130,7 +130,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
130
130
|
return await new bluebird_1.default((resolve, reject) => {
|
|
131
131
|
// handle socket problems
|
|
132
132
|
onSocketError = (err) => {
|
|
133
|
-
logger_1.
|
|
133
|
+
logger_1.log.error(`Socket error: ${err.message}`);
|
|
134
134
|
// the connection was refused, so reject the connect promise
|
|
135
135
|
reject(err);
|
|
136
136
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":"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"}
|