mobilewright 0.0.38 → 0.0.41
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/dist/config.d.ts +3 -3
- package/dist/config.d.ts.map +1 -1
- package/dist/device-pool/adapters/mobilenext-allocator.d.ts +13 -0
- package/dist/device-pool/adapters/mobilenext-allocator.d.ts.map +1 -0
- package/dist/device-pool/adapters/{mobile-use-allocator.js → mobilenext-allocator.js} +6 -6
- package/dist/device-pool/adapters/mobilenext-allocator.js.map +1 -0
- package/dist/device-pool/allocator-factory.d.ts.map +1 -1
- package/dist/device-pool/allocator-factory.js +7 -7
- package/dist/device-pool/allocator-factory.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/launchers.js +4 -4
- package/dist/launchers.js.map +1 -1
- package/package.json +5 -5
- package/dist/device-pool/adapters/mobile-use-allocator.d.ts +0 -13
- package/dist/device-pool/adapters/mobile-use-allocator.d.ts.map +0 -1
- package/dist/device-pool/adapters/mobile-use-allocator.js.map +0 -1
package/dist/config.d.ts
CHANGED
|
@@ -35,12 +35,12 @@ export interface MobilewrightProjectConfig {
|
|
|
35
35
|
export interface DriverConfigMobilecli {
|
|
36
36
|
type: 'mobilecli';
|
|
37
37
|
}
|
|
38
|
-
export interface
|
|
39
|
-
type: 'mobile-use';
|
|
38
|
+
export interface DriverConfigMobileNext {
|
|
39
|
+
type: 'mobilenext' | 'mobile-use';
|
|
40
40
|
region?: string;
|
|
41
41
|
apiKey?: string;
|
|
42
42
|
}
|
|
43
|
-
export type DriverConfig = DriverConfigMobilecli |
|
|
43
|
+
export type DriverConfig = DriverConfigMobilecli | DriverConfigMobileNext;
|
|
44
44
|
export interface MobilewrightConfig {
|
|
45
45
|
/** Default platform. */
|
|
46
46
|
platform?: 'ios' | 'android';
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAC7B,kCAAkC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wFAAwF;IACxF,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,yBAAyB;IACxC,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,GAAG,CAAC,EAAE,sBAAsB,CAAC;IAC7B,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACrD,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtD,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6CAA6C;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAID,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { MobileNextDriverOptions } from '@mobilewright/driver-mobilenext';
|
|
2
|
+
import type { AllocationCriteria, AllocateResult, DeviceAllocator } from '../application/ports.js';
|
|
3
|
+
export interface MobileNextAllocatorOptions {
|
|
4
|
+
driverOptions: MobileNextDriverOptions;
|
|
5
|
+
}
|
|
6
|
+
export declare class MobileNextAllocator implements DeviceAllocator {
|
|
7
|
+
private readonly driverOptions;
|
|
8
|
+
private readonly activeDrivers;
|
|
9
|
+
constructor(options: MobileNextAllocatorOptions);
|
|
10
|
+
allocate(criteria: AllocationCriteria): Promise<AllocateResult>;
|
|
11
|
+
release(deviceId: string): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=mobilenext-allocator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mobilenext-allocator.d.ts","sourceRoot":"","sources":["../../../src/device-pool/adapters/mobilenext-allocator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAInG,MAAM,WAAW,0BAA0B;IACzC,aAAa,EAAE,uBAAuB,CAAC;CACxC;AAED,qBAAa,mBAAoB,YAAW,eAAe;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;gBAEzD,OAAO,EAAE,0BAA0B;IAIzC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAc/D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/C"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import createDebug from 'debug';
|
|
2
|
-
import {
|
|
3
|
-
const debug = createDebug('mw:device-pool:
|
|
4
|
-
export class
|
|
2
|
+
import { MobileNextDriver } from '@mobilewright/driver-mobilenext';
|
|
3
|
+
const debug = createDebug('mw:device-pool:mobilenext');
|
|
4
|
+
export class MobileNextAllocator {
|
|
5
5
|
constructor(options) {
|
|
6
6
|
this.activeDrivers = new Map();
|
|
7
7
|
this.driverOptions = options.driverOptions;
|
|
8
8
|
}
|
|
9
9
|
async allocate(criteria) {
|
|
10
10
|
debug('allocating device (criteria=%o)', criteria);
|
|
11
|
-
const driver = new
|
|
11
|
+
const driver = new MobileNextDriver(this.driverOptions);
|
|
12
12
|
const session = await driver.connect({
|
|
13
13
|
platform: criteria.platform ?? 'ios',
|
|
14
14
|
deviceName: criteria.deviceNamePattern ? new RegExp(criteria.deviceNamePattern) : undefined,
|
|
@@ -17,7 +17,7 @@ export class MobileUseAllocator {
|
|
|
17
17
|
this.activeDrivers.set(session.deviceId, driver);
|
|
18
18
|
debug('allocated device %s (platform=%s)', session.deviceId, session.platform);
|
|
19
19
|
const info = driver.deviceInfo;
|
|
20
|
-
return { deviceId: session.deviceId, platform: session.platform, driver: '
|
|
20
|
+
return { deviceId: session.deviceId, platform: session.platform, driver: 'mobilenext', model: info?.model, osVersion: info?.osVersion, type: info?.type };
|
|
21
21
|
}
|
|
22
22
|
async release(deviceId) {
|
|
23
23
|
debug('releasing device %s', deviceId);
|
|
@@ -29,4 +29,4 @@ export class MobileUseAllocator {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
//# sourceMappingURL=
|
|
32
|
+
//# sourceMappingURL=mobilenext-allocator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mobilenext-allocator.js","sourceRoot":"","sources":["../../../src/device-pool/adapters/mobilenext-allocator.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAInE,MAAM,KAAK,GAAG,WAAW,CAAC,2BAA2B,CAAC,CAAC;AAMvD,MAAM,OAAO,mBAAmB;IAI9B,YAAY,OAAmC;QAF9B,kBAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;QAGnE,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAA4B;QACzC,KAAK,CAAC,iCAAiC,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK;YACpC,UAAU,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS;YAC3F,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,KAAK,CAAC,mCAAmC,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;QAC/B,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC5J,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB;QAC5B,KAAK,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allocator-factory.d.ts","sourceRoot":"","sources":["../../src/device-pool/allocator-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"allocator-factory.d.ts","sourceRoot":"","sources":["../../src/device-pool/allocator-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAA0B,MAAM,cAAc,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,eAAe,CAAC;IAC3B,aAAa,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CACtC;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CAsB1F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DEFAULT_URL, MobilecliDriver } from '@mobilewright/driver-mobilecli';
|
|
2
2
|
import { ensureMobilecliReachable } from '../server.js';
|
|
3
3
|
import { MobilecliAllocator } from './adapters/mobilecli-allocator.js';
|
|
4
|
-
import {
|
|
4
|
+
import { MobileNextAllocator } from './adapters/mobilenext-allocator.js';
|
|
5
5
|
export async function createAllocator(config) {
|
|
6
6
|
const driverType = config.driver?.type ?? 'mobilecli';
|
|
7
7
|
if (driverType === 'mobilecli') {
|
|
@@ -10,16 +10,16 @@ export async function createAllocator(config) {
|
|
|
10
10
|
const allocator = new MobilecliAllocator({ driver: new MobilecliDriver({ url }) });
|
|
11
11
|
return { allocator, serverProcess: ensured.serverProcess ?? undefined };
|
|
12
12
|
}
|
|
13
|
-
if (driverType === 'mobile-use') {
|
|
14
|
-
const
|
|
15
|
-
const allocator = new
|
|
13
|
+
if (driverType === 'mobilenext' || driverType === 'mobile-use') {
|
|
14
|
+
const mobileNextConfig = config.driver;
|
|
15
|
+
const allocator = new MobileNextAllocator({
|
|
16
16
|
driverOptions: {
|
|
17
|
-
region:
|
|
18
|
-
apiKey:
|
|
17
|
+
region: mobileNextConfig.region,
|
|
18
|
+
apiKey: mobileNextConfig.apiKey,
|
|
19
19
|
},
|
|
20
20
|
});
|
|
21
21
|
return { allocator };
|
|
22
22
|
}
|
|
23
|
-
throw new Error(`Unsupported driver type: "${driverType}". Supported types: "mobilecli", "
|
|
23
|
+
throw new Error(`Unsupported driver type: "${driverType}". Supported types: "mobilecli", "mobilenext".`);
|
|
24
24
|
}
|
|
25
25
|
//# sourceMappingURL=allocator-factory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allocator-factory.js","sourceRoot":"","sources":["../../src/device-pool/allocator-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"allocator-factory.js","sourceRoot":"","sources":["../../src/device-pool/allocator-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AASzE,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAA0B;IAC9D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,WAAW,CAAC;IAEtD,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC;QACtC,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7F,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC,EAAE,MAAM,EAAE,IAAI,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACnF,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC;IAC1E,CAAC;IAED,IAAI,UAAU,KAAK,YAAY,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAC/D,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAgC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,mBAAmB,CAAC;YACxC,aAAa,EAAE;gBACb,MAAM,EAAE,gBAAgB,CAAC,MAAM;gBAC/B,MAAM,EAAE,gBAAgB,CAAC,MAAM;aAChC;SACF,CAAC,CAAC;QACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,UAAU,gDAAgD,CAAC,CAAC;AAC3G,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { ios, android, type LaunchOptions } from './launchers.js';
|
|
2
2
|
export { expect } from '@mobilewright/core';
|
|
3
3
|
export { Device, Screen, Locator } from '@mobilewright/core';
|
|
4
|
-
export { defineConfig, loadConfig, type MobilewrightConfig, type MobilewrightProjectConfig, type MobilewrightUseOptions, type DriverConfig, type DriverConfigMobilecli, type
|
|
4
|
+
export { defineConfig, loadConfig, type MobilewrightConfig, type MobilewrightProjectConfig, type MobilewrightUseOptions, type DriverConfig, type DriverConfigMobilecli, type DriverConfigMobileNext } from './config.js';
|
|
5
5
|
export { MobilewrightError } from './errors.js';
|
|
6
6
|
export { createDevicePoolClient } from './device-pool/client-factory.js';
|
|
7
7
|
export { connectDevice, installAndLaunchApps } from './launchers.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,KAAK,sBAAsB,EAAE,KAAK,YAAY,EAAE,KAAK,qBAAqB,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,KAAK,sBAAsB,EAAE,KAAK,YAAY,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGzN,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,GAAG,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AAElE,aAAa;AACb,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,kCAAkC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7D,gBAAgB;AAChB,OAAO,EAAE,YAAY,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,GAAG,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AAElE,aAAa;AACb,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,kCAAkC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7D,gBAAgB;AAChB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAoK,MAAM,aAAa,CAAC;AAEzN,SAAS;AACT,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,8EAA8E;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/launchers.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Device } from '@mobilewright/core';
|
|
2
2
|
import { MobilecliDriver, DEFAULT_URL } from '@mobilewright/driver-mobilecli';
|
|
3
|
-
import {
|
|
3
|
+
import { MobileNextDriver } from '@mobilewright/driver-mobilenext';
|
|
4
4
|
import { ensureMobilecliReachable } from './server.js';
|
|
5
5
|
import { toArray } from './config.js';
|
|
6
6
|
export function createDriver(driverConfig, url) {
|
|
7
|
-
if (driverConfig?.type === 'mobile-use') {
|
|
8
|
-
return new
|
|
7
|
+
if (driverConfig?.type === 'mobilenext' || driverConfig?.type === 'mobile-use') {
|
|
8
|
+
return new MobileNextDriver({
|
|
9
9
|
region: driverConfig.region,
|
|
10
10
|
apiKey: driverConfig.apiKey,
|
|
11
11
|
});
|
|
@@ -14,7 +14,7 @@ export function createDriver(driverConfig, url) {
|
|
|
14
14
|
}
|
|
15
15
|
export async function connectDevice(params) {
|
|
16
16
|
// URL is baked into the driver at construction time; don't override it here.
|
|
17
|
-
// Passing mobilecli's default URL into
|
|
17
|
+
// Passing mobilecli's default URL into MobileNextDriver.connect() would send
|
|
18
18
|
// requests to the wrong server.
|
|
19
19
|
const driver = createDriver(params.driverConfig, params.url);
|
|
20
20
|
const device = new Device(driver);
|
package/dist/launchers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchers.js","sourceRoot":"","sources":["../src/launchers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"launchers.js","sourceRoot":"","sources":["../src/launchers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAqCtC,MAAM,UAAU,YAAY,CAAC,YAA2B,EAAE,GAAY;IACpE,IAAI,YAAY,EAAE,IAAI,KAAK,YAAY,IAAI,YAAY,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/E,OAAO,IAAI,gBAAgB,CAAC;YAC1B,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAA2B;IAC7D,6EAA6E;IAC7E,6EAA6E;IAC7E,gCAAgC;IAChC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,MAAM,CAAC,OAAO,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAAc,EAAE,IAAmB;IAC5E,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChD,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;QACpC,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;QAClD,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,MAAwB;IACvD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAExE,MAAM,KAAK,GAAG,OAAO;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC;SACnC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC;SAC3D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACnE,EAAE,CAAC,CAAC,CAAC,CAAC;IAET,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,aAAa,MAAM,CAAC,QAAQ,eAAe,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,QAAkB;IACxC,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,OAAsB,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;YACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,WAAW,CAAC;YAEpC,IAAI,aAA+C,CAAC;YACpD,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACvD,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC;gBAC3F,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,SAAS,CAAC;YACrD,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC;gBAC7B,QAAQ;gBACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY;gBACZ,GAAG;aACJ,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;gBACjC,QAAQ;gBACR,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,YAAY;gBACZ,GAAG;gBACH,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YAEH,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,IAAI,GAAG,aAAa,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAC3E,CAAC;YAED,MAAM,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,CAAC,OAAO;YACX,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YACrC,OAAO,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1C,CAAC;KACF,CAAC;AACJ,CAAC;AAED,4BAA4B;AAC5B,MAAM,CAAC,MAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;AAEzC,gCAAgC;AAChC,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mobilewright",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.41",
|
|
4
4
|
"description": "Mobile device automation framework inspired by Playwright",
|
|
5
5
|
"homepage": "https://mobilewright.dev",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"templates"
|
|
35
35
|
],
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@mobilewright/core": "^0.0.
|
|
38
|
-
"@mobilewright/driver-mobilecli": "^0.0.
|
|
39
|
-
"@mobilewright/driver-
|
|
40
|
-
"@mobilewright/protocol": "^0.0.
|
|
37
|
+
"@mobilewright/core": "^0.0.41",
|
|
38
|
+
"@mobilewright/driver-mobilecli": "^0.0.41",
|
|
39
|
+
"@mobilewright/driver-mobilenext": "^0.0.41",
|
|
40
|
+
"@mobilewright/protocol": "^0.0.41",
|
|
41
41
|
"commander": "^14.0.3",
|
|
42
42
|
"debug": "^4.4.3",
|
|
43
43
|
"playwright": "1.58.2",
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import type { MobileUseDriverOptions } from '@mobilewright/driver-mobile-use';
|
|
2
|
-
import type { AllocationCriteria, AllocateResult, DeviceAllocator } from '../application/ports.js';
|
|
3
|
-
export interface MobileUseAllocatorOptions {
|
|
4
|
-
driverOptions: MobileUseDriverOptions;
|
|
5
|
-
}
|
|
6
|
-
export declare class MobileUseAllocator implements DeviceAllocator {
|
|
7
|
-
private readonly driverOptions;
|
|
8
|
-
private readonly activeDrivers;
|
|
9
|
-
constructor(options: MobileUseAllocatorOptions);
|
|
10
|
-
allocate(criteria: AllocationCriteria): Promise<AllocateResult>;
|
|
11
|
-
release(deviceId: string): Promise<void>;
|
|
12
|
-
}
|
|
13
|
-
//# sourceMappingURL=mobile-use-allocator.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-use-allocator.d.ts","sourceRoot":"","sources":["../../../src/device-pool/adapters/mobile-use-allocator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAInG,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,sBAAsB,CAAC;CACvC;AAED,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;gBAExD,OAAO,EAAE,yBAAyB;IAIxC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAc/D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/C"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-use-allocator.js","sourceRoot":"","sources":["../../../src/device-pool/adapters/mobile-use-allocator.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,MAAM,KAAK,GAAG,WAAW,CAAC,2BAA2B,CAAC,CAAC;AAMvD,MAAM,OAAO,kBAAkB;IAI7B,YAAY,OAAkC;QAF7B,kBAAa,GAAG,IAAI,GAAG,EAA2B,CAAC;QAGlE,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAA4B;QACzC,KAAK,CAAC,iCAAiC,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK;YACpC,UAAU,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS;YAC3F,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,KAAK,CAAC,mCAAmC,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;QAC/B,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC5J,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB;QAC5B,KAAK,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CACF"}
|