io.appium.settings 7.0.27 → 7.1.0
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 +13 -0
- package/apks/settings_apk-debug.apk +0 -0
- package/build/lib/client.js +2 -2
- package/build/lib/client.js.map +1 -1
- package/build/lib/commands/geolocation.d.ts.map +1 -1
- package/build/lib/commands/geolocation.js +21 -9
- package/build/lib/commands/geolocation.js.map +1 -1
- package/build/lib/commands/media-projection.d.ts.map +1 -1
- package/build/lib/commands/media-projection.js +10 -10
- package/build/lib/commands/media-projection.js.map +1 -1
- package/build/lib/logger.d.ts +1 -1
- package/build/lib/logger.d.ts.map +1 -1
- package/build/lib/logger.js +1 -8
- package/build/lib/logger.js.map +1 -1
- package/lib/client.ts +2 -2
- package/lib/commands/geolocation.ts +24 -11
- package/lib/commands/media-projection.ts +11 -14
- package/lib/logger.ts +1 -9
- package/package.json +2 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
## [7.1.0](https://github.com/appium/io.appium.settings/compare/v7.0.28...v7.1.0) (2026-05-09)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Ditch bluabird ([#288](https://github.com/appium/io.appium.settings/issues/288)) ([95389dc](https://github.com/appium/io.appium.settings/commit/95389dcca8fc0a2e4c439fd26191ce206698a323))
|
|
6
|
+
|
|
7
|
+
## [7.0.28](https://github.com/appium/io.appium.settings/compare/v7.0.27...v7.0.28) (2026-05-06)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* **deps-dev:** bump sinon from 21.1.2 to 22.0.0 ([#286](https://github.com/appium/io.appium.settings/issues/286)) ([ea406e9](https://github.com/appium/io.appium.settings/commit/ea406e99044cb290fef4f2d15df3674b646854c8))
|
|
12
|
+
* **deps:** bump com.android.tools.build:gradle from 9.2.0 to 9.2.1 ([#287](https://github.com/appium/io.appium.settings/issues/287)) ([5bf7a61](https://github.com/appium/io.appium.settings/commit/5bf7a6133dacf21f6b11ffa15cf9baf905b79ecd))
|
|
13
|
+
|
|
1
14
|
## [7.0.27](https://github.com/appium/io.appium.settings/compare/v7.0.26...v7.0.27) (2026-05-02)
|
|
2
15
|
|
|
3
16
|
### Miscellaneous Chores
|
|
Binary file
|
package/build/lib/client.js
CHANGED
|
@@ -86,7 +86,7 @@ class SettingsApp {
|
|
|
86
86
|
await this.adb.activateApp(appPackage);
|
|
87
87
|
}
|
|
88
88
|
catch (e) {
|
|
89
|
-
|
|
89
|
+
this.log.warn(logger_1.LOG_PREFIX, `The current application can not be restored: ${e.message}`);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
return this;
|
|
@@ -154,7 +154,7 @@ class SettingsApp {
|
|
|
154
154
|
return JSON.parse(jsonStr);
|
|
155
155
|
}
|
|
156
156
|
catch {
|
|
157
|
-
|
|
157
|
+
this.log.debug(logger_1.LOG_PREFIX, jsonStr);
|
|
158
158
|
throw new Error(`Cannot parse ${entityName} from the resulting data string. ` +
|
|
159
159
|
'Check the server log for more details');
|
|
160
160
|
}
|
package/build/lib/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../lib/client.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AACzC,uCAA0C;AAC1C,2CAA8E;AAC9E,oDAAuD;AACvD,oDAAkF;AAClF,oDAAkD;AAClD,wDAA+F;AAC/F,8CAAwE;AACxE,4CAA2C;AAC3C,gDAA8D;AAC9D,4DAA0F;AAC1F,wCAA0C;AAC1C,8CAAmE;AACnE,kEAGqC;AAiBrC,MAAa,WAAW;IACb,GAAG,CAAM;IACT,GAAG,CAAS;IAErB,iBAAiB,GAAG,6BAAiB,CAAC;IAEtC,iBAAiB,GAAG,6BAAiB,CAAC;IACtC,yBAAyB,GAAG,qCAAyB,CAAC;IAEtD,YAAY,GAAG,wBAAY,CAAC;IAE5B,cAAc,GAAG,4BAAc,CAAC;IAChC,cAAc,GAAG,4BAAc,CAAC;IAChC,uBAAuB,GAAG,qCAAuB,CAAC;IAElD,oBAAoB,GAAG,6BAAoB,CAAC;IAC5C,eAAe,GAAG,wBAAe,CAAC;IAElC,SAAS,GAAG,iBAAS,CAAC;IAEtB,YAAY,GAAG,sBAAY,CAAC;IAC5B,YAAY,GAAG,sBAAY,CAAC;IAE5B,gBAAgB,GAAG,gCAAgB,CAAC;IACpC,8BAA8B,GAAG,8CAA8B,CAAC;IAChE,UAAU,GAAG,gBAAU,CAAC;IAExB,mBAAmB,GAAG,4BAAmB,CAAC;IAC1C,WAAW,GAAG,oBAAW,CAAC;IAE1B,2BAA2B,GAAG,8CAA2B,CAAC;IAC1D,uCAAuC,GAAG,0DAAuC,CAAC;IAElF,YAAY,IAAqB;QAC/B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,IAAI,CAAC,GAAG,GAAG,YAAG,CAAC;IACjB,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,cAAc,CAAC,OAAkC,EAAE;QACvD,MAAM,EAAC,OAAO,GAAG,IAAI,EAAE,uBAAuB,GAAG,KAAK,EAAE,YAAY,GAAG,KAAK,EAAC,GAAG,IAAI,CAAC;QAErF,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,8BAAkB,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,MAAM,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAU,EAAE,8BAA8B,CAAC,CAAC;QAC3D,IAAI,UAA8B,CAAC;QACnC,IAAI,uBAAuB,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC;gBAC7D,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS,CAAC;YAC9C,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAU,EAAE,gDAAgD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YACtB,GAAG,EAAE,8BAAkB;YACvB,QAAQ,EAAE,yCAA6B;YACvC,MAAM,EAAE,4BAA4B;YACpC,QAAQ,EAAE,kCAAkC;YAC5C,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,IAAI,CAAC;YACH,MAAM,IAAA,2BAAgB,EAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,qBAAqB,EAAE,EAAE;gBACrE,MAAM,EAAE,OAAO;gBACf,UAAU,EAAE,GAAG;aAChB,CAAC,CAAC;YACH,IAAI,uBAAuB,IAAI,UAAU,EAAE,CAAC;gBAC1C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACzC,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../lib/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geolocation.d.ts","sourceRoot":"","sources":["../../../lib/commands/geolocation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geolocation.d.ts","sourceRoot":"","sources":["../../../lib/commands/geolocation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAYtC;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,QAAQ,EAClB,UAAU,UAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CA0Ff;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkBzE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEjG"}
|
|
@@ -1,14 +1,10 @@
|
|
|
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.setGeoLocation = setGeoLocation;
|
|
7
4
|
exports.getGeoLocation = getGeoLocation;
|
|
8
5
|
exports.refreshGeoLocationCache = refreshGeoLocationCache;
|
|
9
6
|
const constants_1 = require("../constants");
|
|
10
7
|
const teen_process_1 = require("teen_process");
|
|
11
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
12
8
|
const logger_1 = require("../logger");
|
|
13
9
|
const DEFAULT_SATELLITES_COUNT = 12;
|
|
14
10
|
const DEFAULT_ALTITUDE = 0.0;
|
|
@@ -159,14 +155,30 @@ async function refreshGeoLocationCache(timeoutMs = 20000) {
|
|
|
159
155
|
`Also, it is required that the device has Google Play Services installed or is running ` +
|
|
160
156
|
`Android 10+ otherwise.`;
|
|
161
157
|
const monitor = logcatMonitor;
|
|
162
|
-
monitoringPromise = new
|
|
163
|
-
setTimeout(() =>
|
|
164
|
-
|
|
165
|
-
|
|
158
|
+
monitoringPromise = new Promise((resolve, reject) => {
|
|
159
|
+
const timer = setTimeout(() => {
|
|
160
|
+
cleanup();
|
|
161
|
+
reject(new Error(timeoutErrorMsg));
|
|
162
|
+
}, timeoutMs);
|
|
163
|
+
const onExit = () => {
|
|
164
|
+
cleanup();
|
|
165
|
+
reject(new Error(timeoutErrorMsg));
|
|
166
|
+
};
|
|
167
|
+
const onLines = (lines) => {
|
|
166
168
|
if (lines.some((line) => GPS_CACHE_REFRESHED_LOGS.some((x) => line.includes(x)))) {
|
|
169
|
+
cleanup();
|
|
167
170
|
resolve();
|
|
168
171
|
}
|
|
169
|
-
}
|
|
172
|
+
};
|
|
173
|
+
const cleanup = () => {
|
|
174
|
+
clearTimeout(timer);
|
|
175
|
+
monitor.off('exit', onExit);
|
|
176
|
+
monitor.off('lines-stderr', onLines);
|
|
177
|
+
monitor.off('lines-stdout', onLines);
|
|
178
|
+
};
|
|
179
|
+
monitor.on('exit', onExit);
|
|
180
|
+
monitor.on('lines-stderr', onLines);
|
|
181
|
+
monitor.on('lines-stdout', onLines);
|
|
170
182
|
});
|
|
171
183
|
await logcatMonitor.start(0);
|
|
172
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/commands/geolocation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/commands/geolocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-projection.d.ts","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"media-projection.d.ts","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAC,iCAAiC,EAAC,MAAM,SAAS,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,WAAW,GAAG,uBAAuB,CAEtF;AAED;;;;;GAKG;AACH,wBAAsB,uCAAuC,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAMjG;AAMD;;;;GAIG;AACH,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAE1B;;;;OAIG;gBACS,GAAG,EAAE,GAAG;IAIpB;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAUnC;;;;;;;OAOG;IACG,KAAK,CAAC,IAAI,GAAE,iCAAsC,GAAG,OAAO,CAAC,OAAO,CAAC;IA0C3E;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAe1C;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;CA0B/B"}
|
|
@@ -7,7 +7,6 @@ exports.MediaProjectionRecorder = void 0;
|
|
|
7
7
|
exports.makeMediaProjectionRecorder = makeMediaProjectionRecorder;
|
|
8
8
|
exports.adjustMediaProjectionServicePermissions = adjustMediaProjectionServicePermissions;
|
|
9
9
|
const asyncbox_1 = require("asyncbox");
|
|
10
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
11
10
|
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
12
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
13
12
|
const constants_1 = require("../constants");
|
|
@@ -98,15 +97,16 @@ class MediaProjectionRecorder {
|
|
|
98
97
|
args.push('--es', 'resolution', resolution);
|
|
99
98
|
}
|
|
100
99
|
await this.adb.shell(args);
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
}
|
|
109
|
-
|
|
100
|
+
try {
|
|
101
|
+
await (0, asyncbox_1.waitForCondition)(async () => await this.isRunning(), {
|
|
102
|
+
waitMs: RECORDING_STARTUP_TIMEOUT_MS,
|
|
103
|
+
intervalMs: 500,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
catch {
|
|
107
|
+
throw new Error(`The media projection recording is not running after ${RECORDING_STARTUP_TIMEOUT_MS}ms. ` +
|
|
108
|
+
`Please check the logcat output for more details.`);
|
|
109
|
+
}
|
|
110
110
|
return true;
|
|
111
111
|
}
|
|
112
112
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-projection.js","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"media-projection.js","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":"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"}
|
package/build/lib/logger.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,gBAAgB,CAAC;AAExC,eAAO,MAAM,GAAG,4CAAe,CAAC"}
|
package/build/lib/logger.js
CHANGED
|
@@ -6,12 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.log = exports.LOG_PREFIX = void 0;
|
|
7
7
|
const logger_1 = __importDefault(require("@appium/logger"));
|
|
8
8
|
exports.LOG_PREFIX = 'SettingsApp';
|
|
9
|
-
|
|
10
|
-
const logger = global._global_npmlog || logger_1.default;
|
|
11
|
-
if (!logger.debug) {
|
|
12
|
-
logger.addLevel('debug', 1000, { fg: 'blue', bg: 'black' }, 'dbug');
|
|
13
|
-
}
|
|
14
|
-
return logger;
|
|
15
|
-
}
|
|
16
|
-
exports.log = getLogger();
|
|
9
|
+
exports.log = logger_1.default;
|
|
17
10
|
//# sourceMappingURL=logger.js.map
|
package/build/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA0C;AAE7B,QAAA,UAAU,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA0C;AAE7B,QAAA,UAAU,GAAG,aAAa,CAAC;AAE3B,QAAA,GAAG,GAAG,gBAAY,CAAC"}
|
package/lib/client.ts
CHANGED
|
@@ -113,7 +113,7 @@ export class SettingsApp {
|
|
|
113
113
|
try {
|
|
114
114
|
await this.adb.activateApp(appPackage);
|
|
115
115
|
} catch (e: any) {
|
|
116
|
-
log.warn(`The current application can not be restored: ${e.message}`);
|
|
116
|
+
this.log.warn(LOG_PREFIX, `The current application can not be restored: ${e.message}`);
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
return this;
|
|
@@ -189,7 +189,7 @@ export class SettingsApp {
|
|
|
189
189
|
try {
|
|
190
190
|
return JSON.parse(jsonStr);
|
|
191
191
|
} catch {
|
|
192
|
-
log.debug(jsonStr);
|
|
192
|
+
this.log.debug(LOG_PREFIX, jsonStr);
|
|
193
193
|
throw new Error(
|
|
194
194
|
`Cannot parse ${entityName} from the resulting data string. ` +
|
|
195
195
|
'Check the server log for more details',
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {LOCATION_SERVICE, LOCATION_RECEIVER, LOCATION_RETRIEVAL_ACTION} from '../constants';
|
|
2
2
|
import {SubProcess} from 'teen_process';
|
|
3
|
-
import B from 'bluebird';
|
|
4
3
|
import {LOG_PREFIX} from '../logger';
|
|
5
4
|
import type {SettingsApp} from '../client';
|
|
6
5
|
import type {Location} from './types';
|
|
@@ -171,17 +170,31 @@ export async function refreshGeoLocationCache(this: SettingsApp, timeoutMs = 200
|
|
|
171
170
|
`Also, it is required that the device has Google Play Services installed or is running ` +
|
|
172
171
|
`Android 10+ otherwise.`;
|
|
173
172
|
const monitor = logcatMonitor;
|
|
174
|
-
monitoringPromise = new
|
|
175
|
-
setTimeout(() =>
|
|
173
|
+
monitoringPromise = new Promise<void>((resolve, reject) => {
|
|
174
|
+
const timer = setTimeout(() => {
|
|
175
|
+
cleanup();
|
|
176
|
+
reject(new Error(timeoutErrorMsg));
|
|
177
|
+
}, timeoutMs);
|
|
178
|
+
const onExit = () => {
|
|
179
|
+
cleanup();
|
|
180
|
+
reject(new Error(timeoutErrorMsg));
|
|
181
|
+
};
|
|
182
|
+
const onLines = (lines: string[]) => {
|
|
183
|
+
if (lines.some((line) => GPS_CACHE_REFRESHED_LOGS.some((x) => line.includes(x)))) {
|
|
184
|
+
cleanup();
|
|
185
|
+
resolve();
|
|
186
|
+
}
|
|
187
|
+
};
|
|
188
|
+
const cleanup = () => {
|
|
189
|
+
clearTimeout(timer);
|
|
190
|
+
monitor.off('exit', onExit);
|
|
191
|
+
monitor.off('lines-stderr', onLines);
|
|
192
|
+
monitor.off('lines-stdout', onLines);
|
|
193
|
+
};
|
|
176
194
|
|
|
177
|
-
monitor.on('exit',
|
|
178
|
-
(
|
|
179
|
-
|
|
180
|
-
if (lines.some((line) => GPS_CACHE_REFRESHED_LOGS.some((x) => line.includes(x)))) {
|
|
181
|
-
resolve();
|
|
182
|
-
}
|
|
183
|
-
}),
|
|
184
|
-
);
|
|
195
|
+
monitor.on('exit', onExit);
|
|
196
|
+
monitor.on('lines-stderr', onLines);
|
|
197
|
+
monitor.on('lines-stdout', onLines);
|
|
185
198
|
});
|
|
186
199
|
await logcatMonitor.start(0);
|
|
187
200
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {waitForCondition} from 'asyncbox';
|
|
2
|
-
import B from 'bluebird';
|
|
3
2
|
import fs from 'node:fs/promises';
|
|
4
3
|
import path from 'node:path';
|
|
5
4
|
import {
|
|
@@ -107,19 +106,17 @@ export class MediaProjectionRecorder {
|
|
|
107
106
|
args.push('--es', 'resolution', resolution);
|
|
108
107
|
}
|
|
109
108
|
await this.adb.shell(args);
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
}, RECORDING_STARTUP_TIMEOUT_MS);
|
|
122
|
-
});
|
|
109
|
+
try {
|
|
110
|
+
await waitForCondition(async () => await this.isRunning(), {
|
|
111
|
+
waitMs: RECORDING_STARTUP_TIMEOUT_MS,
|
|
112
|
+
intervalMs: 500,
|
|
113
|
+
});
|
|
114
|
+
} catch {
|
|
115
|
+
throw new Error(
|
|
116
|
+
`The media projection recording is not running after ${RECORDING_STARTUP_TIMEOUT_MS}ms. ` +
|
|
117
|
+
`Please check the logcat output for more details.`,
|
|
118
|
+
);
|
|
119
|
+
}
|
|
123
120
|
return true;
|
|
124
121
|
}
|
|
125
122
|
|
package/lib/logger.ts
CHANGED
|
@@ -2,12 +2,4 @@ import appiumLogger from '@appium/logger';
|
|
|
2
2
|
|
|
3
3
|
export const LOG_PREFIX = 'SettingsApp';
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
const logger = global._global_npmlog || appiumLogger;
|
|
7
|
-
if (!logger.debug) {
|
|
8
|
-
logger.addLevel('debug', 1000, {fg: 'blue', bg: 'black'}, 'dbug');
|
|
9
|
-
}
|
|
10
|
-
return logger;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export const log = getLogger();
|
|
5
|
+
export const log = appiumLogger;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "io.appium.settings",
|
|
3
|
-
"version": "7.0
|
|
3
|
+
"version": "7.1.0",
|
|
4
4
|
"description": "App for dealing with Android settings",
|
|
5
5
|
"main": "./build/lib/index.js",
|
|
6
6
|
"types": "./build/lib/index.d.ts",
|
|
@@ -50,7 +50,6 @@
|
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@appium/logger": "^2.0.0-rc.1",
|
|
52
52
|
"asyncbox": "^6.0.1",
|
|
53
|
-
"bluebird": "^3.5.1",
|
|
54
53
|
"semver": "^7.5.4",
|
|
55
54
|
"teen_process": "^4.0.4"
|
|
56
55
|
},
|
|
@@ -60,7 +59,6 @@
|
|
|
60
59
|
"@appium/types": "^1.0.0-rc.1",
|
|
61
60
|
"@semantic-release/changelog": "^6.0.1",
|
|
62
61
|
"@semantic-release/git": "^10.0.1",
|
|
63
|
-
"@types/bluebird": "^3.5.38",
|
|
64
62
|
"@types/chai": "^5.2.3",
|
|
65
63
|
"@types/chai-as-promised": "^8.0.2",
|
|
66
64
|
"@types/mocha": "^10.0.10",
|
|
@@ -73,7 +71,7 @@
|
|
|
73
71
|
"mocha": "^11.0.1",
|
|
74
72
|
"prettier": "^3.0.0",
|
|
75
73
|
"semantic-release": "^25.0.2",
|
|
76
|
-
"sinon": "^
|
|
74
|
+
"sinon": "^22.0.0",
|
|
77
75
|
"ts-node": "^10.9.1",
|
|
78
76
|
"typescript": "^6.0.3"
|
|
79
77
|
},
|