lim 0.11.3 → 0.11.4
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/base-command.d.ts +2 -2
- package/dist/base-command.d.ts.map +1 -1
- package/dist/base-command.js +26 -11
- package/dist/base-command.js.map +1 -1
- package/dist/commands/ios/create.d.ts +4 -0
- package/dist/commands/ios/create.d.ts.map +1 -1
- package/dist/commands/ios/create.js +58 -13
- package/dist/commands/ios/create.js.map +1 -1
- package/dist/commands/xcode/attach-simulator.d.ts.map +1 -1
- package/dist/commands/xcode/attach-simulator.js +6 -6
- package/dist/commands/xcode/attach-simulator.js.map +1 -1
- package/dist/commands/xcode/build.d.ts +1 -0
- package/dist/commands/xcode/build.d.ts.map +1 -1
- package/dist/commands/xcode/build.js +28 -4
- package/dist/commands/xcode/build.js.map +1 -1
- package/dist/commands/xcode/create.d.ts +2 -0
- package/dist/commands/xcode/create.d.ts.map +1 -1
- package/dist/commands/xcode/create.js +55 -10
- package/dist/commands/xcode/create.js.map +1 -1
- package/dist/lib/simulator-attach.d.ts +13 -0
- package/dist/lib/simulator-attach.d.ts.map +1 -0
- package/dist/lib/simulator-attach.js +33 -0
- package/dist/lib/simulator-attach.js.map +1 -0
- package/package.json +2 -2
package/dist/base-command.d.ts
CHANGED
|
@@ -37,7 +37,8 @@ export declare abstract class BaseCommand extends Command {
|
|
|
37
37
|
protected resolveDeviceInstance(providedId: string | undefined): LastAndroidInstance | LastIosInstance;
|
|
38
38
|
protected resolveXcodeTarget(providedId: string | undefined): Promise<XcodeTarget>;
|
|
39
39
|
protected resolveXcodeTargetOrCreate(providedId: string | undefined): Promise<XcodeTarget>;
|
|
40
|
-
protected
|
|
40
|
+
protected resolveSimulatorBackedXcodeTargetOrCreate(providedId: string | undefined): Promise<XcodeTarget>;
|
|
41
|
+
private xcodeTargetHasAttachedSimulator;
|
|
41
42
|
private findMissingInstanceId;
|
|
42
43
|
private isMissingDefaultInstanceError;
|
|
43
44
|
private isCachedXcodeClientNotFound;
|
|
@@ -45,7 +46,6 @@ export declare abstract class BaseCommand extends Command {
|
|
|
45
46
|
private createReplacementInstance;
|
|
46
47
|
private getCommandParts;
|
|
47
48
|
private xcodeTargetFromId;
|
|
48
|
-
private iosXcodeTargetFromId;
|
|
49
49
|
private androidInstanceFromId;
|
|
50
50
|
private iosInstanceFromId;
|
|
51
51
|
private xcodeTargetFromRecord;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAC7C,OAAO,MAA8C,MAAM,aAAa,CAAC;AACzE,OAAO,EAWL,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AAQtB,KAAK,WAAW,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEvD,8BAAsB,WAAY,SAAQ,OAAO;IAC/C,MAAM,CAAC,SAAS;;;;;MAoBd;IAEF,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,SAAS,KAAK,MAAM,IAAI,MAAM,CAc7B;IAED,OAAO,CAAC,YAAY,CAAC,CAA0B;IAC/C,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,yBAAyB,CAAC,CAA8B;IAChE,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,iBAAiB,CAAK;IAE9B,SAAS,KAAK,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAE/D;IAED,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAI9D,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,SAAS,CAAC,cAAc,IAAI,OAAO;IAInC,SAAS,CAAC,kBAAkB,IAAI,OAAO;IAIvC,SAAS,CAAC,IAAI,CAAC,OAAO,SAAK,GAAG,IAAI;IAMlC,SAAS,CAAC,MAAM,CAAC,OAAO,SAAK,GAAG,IAAI;cAIpB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IA2C7D,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI;IAgBhE,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAIzC,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAKtD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAKjD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;cAI/E,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW;IAkE/D,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB;IAqBrF,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAqB7E,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB,GAAG,eAAe;cAgCtF,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;cA0BxE,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;cAoBhF,
|
|
1
|
+
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAC7C,OAAO,MAA8C,MAAM,aAAa,CAAC;AACzE,OAAO,EAWL,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AAQtB,KAAK,WAAW,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEvD,8BAAsB,WAAY,SAAQ,OAAO;IAC/C,MAAM,CAAC,SAAS;;;;;MAoBd;IAEF,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,SAAS,KAAK,MAAM,IAAI,MAAM,CAc7B;IAED,OAAO,CAAC,YAAY,CAAC,CAA0B;IAC/C,OAAO,CAAC,uBAAuB,CAAC,CAAS;IACzC,OAAO,CAAC,yBAAyB,CAAC,CAA8B;IAChE,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,iBAAiB,CAAK;IAE9B,SAAS,KAAK,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAE/D;IAED,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAI9D,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,SAAS,CAAC,cAAc,IAAI,OAAO;IAInC,SAAS,CAAC,kBAAkB,IAAI,OAAO;IAIvC,SAAS,CAAC,IAAI,CAAC,OAAO,SAAK,GAAG,IAAI;IAMlC,SAAS,CAAC,MAAM,CAAC,OAAO,SAAK,GAAG,IAAI;cAIpB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IA2C7D,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI;IAgBhE,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAIzC,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAKtD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAKjD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;cAI/E,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW;IAkE/D,SAAS,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB;IAqBrF,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAqB7E,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB,GAAG,eAAe;cAgCtF,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;cA0BxE,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;cAoBhF,yCAAyC,CACvD,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,WAAW,CAAC;YAqCT,+BAA+B;IAiB7C,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,6BAA6B;IAIrC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,0BAA0B;YAmBpB,yBAAyB;IA+BvC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,qBAAqB;YASf,sBAAsB;CAgBrC"}
|
package/dist/base-command.js
CHANGED
|
@@ -304,11 +304,14 @@ class BaseCommand extends core_1.Command {
|
|
|
304
304
|
return target;
|
|
305
305
|
}
|
|
306
306
|
}
|
|
307
|
-
async
|
|
307
|
+
async resolveSimulatorBackedXcodeTargetOrCreate(providedId) {
|
|
308
308
|
this._lastResolvedExpectedType = 'xcode';
|
|
309
309
|
const id = this._overrideInstanceId ?? providedId;
|
|
310
310
|
if (id) {
|
|
311
|
-
const target = this.
|
|
311
|
+
const target = this.xcodeTargetFromId(id);
|
|
312
|
+
if (target.type === 'xcode' && !(await this.xcodeTargetHasAttachedSimulator(target, false))) {
|
|
313
|
+
throw new Error(`--ios requires an iOS-backed Xcode target or an Xcode instance with an attached simulator, got ${id}`);
|
|
314
|
+
}
|
|
312
315
|
this._lastResolvedInstanceId = target.id;
|
|
313
316
|
return target;
|
|
314
317
|
}
|
|
@@ -317,15 +320,33 @@ class BaseCommand extends core_1.Command {
|
|
|
317
320
|
this._lastResolvedInstanceId = target.id;
|
|
318
321
|
return target;
|
|
319
322
|
}
|
|
323
|
+
if (target?.type === 'xcode' && (await this.xcodeTargetHasAttachedSimulator(target, true))) {
|
|
324
|
+
this._lastResolvedInstanceId = target.id;
|
|
325
|
+
return target;
|
|
326
|
+
}
|
|
320
327
|
if (!this.shouldAutoCreateOnNotFound()) {
|
|
321
328
|
throw new Error('No simulator-backed Xcode target found.\n' +
|
|
322
|
-
'Create one first with: lim xcode create --ios
|
|
329
|
+
'Create one first with: lim xcode create --ios or lim xcode create --attach --simulator-id <ios-instance-ID>, or rerun without --no-create.');
|
|
323
330
|
}
|
|
324
331
|
const replacement = await this.createIosXcodeInstance();
|
|
325
332
|
this.info(`No recent simulator-backed Xcode target found. Created instance ${replacement.id}.`);
|
|
326
333
|
this._lastResolvedInstanceId = replacement.id;
|
|
327
334
|
return replacement;
|
|
328
335
|
}
|
|
336
|
+
async xcodeTargetHasAttachedSimulator(target, clearIfMissing) {
|
|
337
|
+
try {
|
|
338
|
+
const xcodeClient = await this.resolveXcodeClient(target);
|
|
339
|
+
const status = await xcodeClient.getSimulator();
|
|
340
|
+
return status.attached;
|
|
341
|
+
}
|
|
342
|
+
catch (err) {
|
|
343
|
+
if (clearIfMissing && (err instanceof api_1.NotFoundError || this.isCachedXcodeClientNotFound(err))) {
|
|
344
|
+
(0, config_1.clearLastInstanceId)(target.id);
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
throw err;
|
|
348
|
+
}
|
|
349
|
+
}
|
|
329
350
|
findMissingInstanceId(err) {
|
|
330
351
|
const match = err.message.match(INSTANCE_ID_PATTERN);
|
|
331
352
|
if (match) {
|
|
@@ -337,7 +358,8 @@ class BaseCommand extends core_1.Command {
|
|
|
337
358
|
return err instanceof Error && err.message.startsWith('No instance ID provided and no recent');
|
|
338
359
|
}
|
|
339
360
|
isCachedXcodeClientNotFound(err) {
|
|
340
|
-
return err instanceof Error &&
|
|
361
|
+
return (err instanceof Error &&
|
|
362
|
+
(err.message.includes('GET /info failed: 404') || err.message.includes('GET /simulator failed: 404')));
|
|
341
363
|
}
|
|
342
364
|
shouldAutoCreateOnNotFound() {
|
|
343
365
|
if (this.parsedFlags?.create === false) {
|
|
@@ -399,13 +421,6 @@ class BaseCommand extends core_1.Command {
|
|
|
399
421
|
}
|
|
400
422
|
throw new Error(`Expected an iOS or Xcode target, got ${id}`);
|
|
401
423
|
}
|
|
402
|
-
iosXcodeTargetFromId(id) {
|
|
403
|
-
const target = this.xcodeTargetFromId(id);
|
|
404
|
-
if (target.type === 'ios') {
|
|
405
|
-
return target;
|
|
406
|
-
}
|
|
407
|
-
throw new Error(`--ios requires an iOS instance ID, got ${id}`);
|
|
408
|
-
}
|
|
409
424
|
androidInstanceFromId(id) {
|
|
410
425
|
const type = (0, instance_client_factory_1.detectInstanceType)(id);
|
|
411
426
|
if (type !== 'android') {
|
package/dist/base-command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,9 @@ export default class IosCreate extends BaseCommand {
|
|
|
3
3
|
static summary: string;
|
|
4
4
|
static description: string;
|
|
5
5
|
static examples: string[];
|
|
6
|
+
static args: {
|
|
7
|
+
xcodeId: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
|
|
8
|
+
};
|
|
6
9
|
static flags: {
|
|
7
10
|
rm: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
8
11
|
'display-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
@@ -15,6 +18,7 @@ export default class IosCreate extends BaseCommand {
|
|
|
15
18
|
'install-asset': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
16
19
|
install: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
17
20
|
xcode: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
21
|
+
attach: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
18
22
|
'api-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
19
23
|
json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
20
24
|
quiet: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/ios/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/ios/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,MAAM,CAAC,OAAO,SAA+B;IAC7C,MAAM,CAAC,WAAW,SACiK;IAEnL,MAAM,CAAC,QAAQ,WAMb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;MA2CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuI3B"}
|
|
@@ -9,12 +9,23 @@ const base_command_1 = require("../../base-command");
|
|
|
9
9
|
const formatting_1 = require("../../lib/formatting");
|
|
10
10
|
const config_1 = require("../../lib/config");
|
|
11
11
|
const xcode_sandbox_1 = require("../../lib/xcode-sandbox");
|
|
12
|
+
const simulator_attach_1 = require("../../lib/simulator-attach");
|
|
12
13
|
class IosCreate extends base_command_1.BaseCommand {
|
|
13
14
|
async run() {
|
|
14
|
-
const { flags } = await this.parse(IosCreate);
|
|
15
|
+
const { args, flags } = await this.parse(IosCreate);
|
|
15
16
|
this.setParsedFlags(flags);
|
|
17
|
+
if (flags.attach && flags.xcode) {
|
|
18
|
+
this.error('Use either --attach or --xcode, not both.');
|
|
19
|
+
}
|
|
20
|
+
if (args.xcodeId && !flags.attach) {
|
|
21
|
+
this.error('Xcode target argument requires --attach.');
|
|
22
|
+
}
|
|
16
23
|
await this.withAuth(async () => {
|
|
17
|
-
|
|
24
|
+
const attachTarget = flags.attach ? await this.resolveXcodeTarget(args.xcodeId) : undefined;
|
|
25
|
+
if (attachTarget && attachTarget.type !== 'xcode') {
|
|
26
|
+
this.error('--attach requires a standalone Xcode instance. Create one with `lim xcode create`, then rerun with its ID.');
|
|
27
|
+
}
|
|
28
|
+
const attachClient = attachTarget ? await this.resolveXcodeClient(attachTarget) : undefined;
|
|
18
29
|
const assetNames = [...(flags['install-asset'] || [])];
|
|
19
30
|
if (flags.install) {
|
|
20
31
|
for (const filePath of flags.install) {
|
|
@@ -26,7 +37,6 @@ class IosCreate extends base_command_1.BaseCommand {
|
|
|
26
37
|
}
|
|
27
38
|
this.info(`Successfully uploaded ${flags.install.length} file(s)`);
|
|
28
39
|
}
|
|
29
|
-
// Build params
|
|
30
40
|
const params = {
|
|
31
41
|
wait: true,
|
|
32
42
|
reuseIfExists: flags['reuse-if-exists'] || undefined,
|
|
@@ -65,6 +75,28 @@ class IosCreate extends base_command_1.BaseCommand {
|
|
|
65
75
|
const xcodeSandboxUrl = instance.status.sandbox?.xcode?.url;
|
|
66
76
|
const xcodeSandboxId = xcodeSandboxUrl ? (0, xcode_sandbox_1.xcodeSandboxIdFromUrl)(xcodeSandboxUrl) : undefined;
|
|
67
77
|
(0, config_1.registerCreatedInstance)(instance, flags.xcode ? ['xcode'] : []);
|
|
78
|
+
const cleanup = async () => {
|
|
79
|
+
try {
|
|
80
|
+
await this.client.iosInstances.delete(instance.metadata.id);
|
|
81
|
+
this.info(`${instance.metadata.id} is deleted`);
|
|
82
|
+
}
|
|
83
|
+
catch (e) {
|
|
84
|
+
this.info(`Failed to delete instance: ${e}`);
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
let attachResult;
|
|
88
|
+
if (attachClient) {
|
|
89
|
+
try {
|
|
90
|
+
attachResult = await attachClient.attachSimulator(instance);
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
this.info(`Created iOS instance ${instance.metadata.id}, but attach failed.`);
|
|
94
|
+
if (flags.rm) {
|
|
95
|
+
await cleanup();
|
|
96
|
+
}
|
|
97
|
+
throw err;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
68
100
|
this.info(`Created a new iOS instance in ${((Date.now() - start) / 1000).toFixed(1)}s`);
|
|
69
101
|
this.info('iOS Instance:');
|
|
70
102
|
this.info(` ID: ${instance.metadata.id}`);
|
|
@@ -81,22 +113,24 @@ class IosCreate extends base_command_1.BaseCommand {
|
|
|
81
113
|
}
|
|
82
114
|
this.info(` URL: ${xcodeSandboxUrl}`);
|
|
83
115
|
}
|
|
116
|
+
if (attachResult && attachTarget) {
|
|
117
|
+
this.info((0, simulator_attach_1.formatSimulatorAttachResult)(instance.metadata.id, attachTarget.id, attachResult));
|
|
118
|
+
}
|
|
84
119
|
if (flags.json) {
|
|
85
|
-
|
|
120
|
+
if (attachResult && attachTarget) {
|
|
121
|
+
this.outputJson({
|
|
122
|
+
...instance,
|
|
123
|
+
attach: (0, simulator_attach_1.simulatorAttachJson)(instance.metadata.id, attachTarget.id, attachResult),
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
this.outputJson(instance);
|
|
128
|
+
}
|
|
86
129
|
}
|
|
87
130
|
else if (this.isQuietEnabled()) {
|
|
88
131
|
this.output(instance.metadata.id);
|
|
89
132
|
}
|
|
90
133
|
if (flags.rm) {
|
|
91
|
-
const cleanup = async () => {
|
|
92
|
-
try {
|
|
93
|
-
await this.client.iosInstances.delete(instance.metadata.id);
|
|
94
|
-
this.info(`${instance.metadata.id} is deleted`);
|
|
95
|
-
}
|
|
96
|
-
catch (e) {
|
|
97
|
-
this.info(`Failed to delete instance: ${e}`);
|
|
98
|
-
}
|
|
99
|
-
};
|
|
100
134
|
this.info('Instance running. Press Ctrl+C to stop and delete.');
|
|
101
135
|
await new Promise((resolve) => {
|
|
102
136
|
const keepAlive = setInterval(() => { }, 1 << 30);
|
|
@@ -119,7 +153,14 @@ IosCreate.examples = [
|
|
|
119
153
|
'<%= config.bin %> ios create --rm --model ipad',
|
|
120
154
|
'<%= config.bin %> ios create --region us-west --install-asset my-app.ipa',
|
|
121
155
|
'<%= config.bin %> ios create --install ./MyApp.ipa --xcode',
|
|
156
|
+
'<%= config.bin %> ios create --attach <xcode-instance-ID>',
|
|
122
157
|
];
|
|
158
|
+
IosCreate.args = {
|
|
159
|
+
xcodeId: core_1.Args.string({
|
|
160
|
+
description: 'Xcode target to attach to. Defaults to the most recently created Xcode target.',
|
|
161
|
+
required: false,
|
|
162
|
+
}),
|
|
163
|
+
};
|
|
123
164
|
IosCreate.flags = {
|
|
124
165
|
...base_command_1.BaseCommand.baseFlags,
|
|
125
166
|
rm: core_1.Flags.boolean({
|
|
@@ -158,6 +199,10 @@ IosCreate.flags = {
|
|
|
158
199
|
description: 'Enable an attached Xcode sandbox for build and sync workflows',
|
|
159
200
|
default: false,
|
|
160
201
|
}),
|
|
202
|
+
attach: core_1.Flags.boolean({
|
|
203
|
+
description: 'Attach the created simulator to an existing Xcode target',
|
|
204
|
+
default: false,
|
|
205
|
+
}),
|
|
161
206
|
};
|
|
162
207
|
exports.default = IosCreate;
|
|
163
208
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/ios/create.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/ios/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach-simulator.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/attach-simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"attach-simulator.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/attach-simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,WAAW;IAC3D,MAAM,CAAC,OAAO,SAAkD;IAChE,MAAM,CAAC,WAAW,SAC4F;IAE9G,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;MAWV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB3B"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const core_1 = require("@oclif/core");
|
|
4
4
|
const base_command_1 = require("../../base-command");
|
|
5
|
+
const config_1 = require("../../lib/config");
|
|
6
|
+
const simulator_attach_1 = require("../../lib/simulator-attach");
|
|
5
7
|
class XcodeAttachSimulator extends base_command_1.BaseCommand {
|
|
6
8
|
async run() {
|
|
7
9
|
const { args, flags } = await this.parse(XcodeAttachSimulator);
|
|
@@ -12,18 +14,16 @@ class XcodeAttachSimulator extends base_command_1.BaseCommand {
|
|
|
12
14
|
const simulator = await this.client.iosInstances.get(args.simulatorId);
|
|
13
15
|
const xcodeClient = await this.resolveXcodeClient(xcodeTarget);
|
|
14
16
|
this.info(`Attaching simulator ${args.simulatorId} to Xcode target ${xcodeInstanceId}...`);
|
|
15
|
-
await xcodeClient.attachSimulator(simulator);
|
|
17
|
+
const result = await xcodeClient.attachSimulator(simulator);
|
|
18
|
+
(0, config_1.registerCreatedInstance)(simulator);
|
|
16
19
|
if (flags.json) {
|
|
17
|
-
this.outputJson(
|
|
18
|
-
xcodeInstanceId,
|
|
19
|
-
simulatorInstanceId: simulator.metadata.id,
|
|
20
|
-
});
|
|
20
|
+
this.outputJson((0, simulator_attach_1.simulatorAttachJson)(simulator.metadata.id, xcodeInstanceId, result));
|
|
21
21
|
}
|
|
22
22
|
else if (this.isQuietEnabled()) {
|
|
23
23
|
this.output(simulator.metadata.id);
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
this.output(
|
|
26
|
+
this.output((0, simulator_attach_1.formatSimulatorAttachResult)(simulator.metadata.id, xcodeInstanceId, result));
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach-simulator.js","sourceRoot":"","sources":["../../../src/commands/xcode/attach-simulator.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,qDAAiD;
|
|
1
|
+
{"version":3,"file":"attach-simulator.js","sourceRoot":"","sources":["../../../src/commands/xcode/attach-simulator.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,qDAAiD;AACjD,6CAA2D;AAC3D,iEAA8F;AAE9F,MAAqB,oBAAqB,SAAQ,0BAAW;IA8B3D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/D,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5D,MAAM,eAAe,GAAG,WAAW,CAAC,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACvE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE/D,IAAI,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,WAAW,oBAAoB,eAAe,KAAK,CAAC,CAAC;YAC3F,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC5D,IAAA,gCAAuB,EAAC,SAAS,CAAC,CAAC;YAEnC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,UAAU,CAAC,IAAA,sCAAmB,EAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;YACvF,CAAC;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAA,8CAA2B,EAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;YAC3F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAnDM,4BAAO,GAAG,8CAA8C,CAAC;AACzD,gCAAW,GAChB,2GAA2G,CAAC;AAEvG,6BAAQ,GAAG;IAChB,4DAA4D;IAC5D,qFAAqF;CACtF,CAAC;AAEK,yBAAI,GAAG;IACZ,WAAW,EAAE,WAAI,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,qCAAqC;QAClD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;AAEK,0BAAK,GAAG;IACb,GAAG,0BAAW,CAAC,SAAS;IACxB,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IACF,EAAE,EAAE,YAAK,CAAC,MAAM,CAAC;QACf,WAAW,EACT,2IAA2I;KAC9I,CAAC;CACH,CAAC;kBA5BiB,oBAAoB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAejD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SAC8L;IAEhN,MAAM,CAAC,QAAQ,WAiBb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;MA+DV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgHZ,mBAAmB;YA2BnB,yBAAyB;YAazB,yBAAyB;CAwBxC"}
|
|
@@ -6,6 +6,7 @@ const base_command_1 = require("../../base-command");
|
|
|
6
6
|
const ignore_patterns_1 = require("../../lib/ignore-patterns");
|
|
7
7
|
const duration_1 = require("../../lib/duration");
|
|
8
8
|
const additional_files_1 = require("../../lib/additional-files");
|
|
9
|
+
const config_1 = require("../../lib/config");
|
|
9
10
|
const DEVICE_SDKS = new Set(['iphoneos', 'watchos']);
|
|
10
11
|
const SIMULATOR_SDKS = new Set(['iphonesimulator', 'watchsimulator']);
|
|
11
12
|
class XcodeBuild extends base_command_1.BaseCommand {
|
|
@@ -23,7 +24,7 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
23
24
|
}
|
|
24
25
|
await this.withAuth(async () => {
|
|
25
26
|
const target = flags.ios ?
|
|
26
|
-
await this.
|
|
27
|
+
await this.resolveSimulatorBackedXcodeTargetOrCreate(flags.id)
|
|
27
28
|
: await this.resolveXcodeTargetOrCreate(flags.id);
|
|
28
29
|
const id = target.id;
|
|
29
30
|
const syncPath = args.path ?? process.cwd();
|
|
@@ -98,12 +99,12 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
98
99
|
this.error(`xcodebuild failed with exit code ${result.exitCode}`, { exit: result.exitCode });
|
|
99
100
|
}
|
|
100
101
|
this.output(`\nBuild succeeded (exit code ${result.exitCode})`);
|
|
101
|
-
if (flags.ios
|
|
102
|
-
const signedStreamUrl = await this.
|
|
102
|
+
if (flags.ios) {
|
|
103
|
+
const signedStreamUrl = await this.resolveSimulatorStreamUrl(target, xcodeClient);
|
|
103
104
|
if (signedStreamUrl) {
|
|
104
105
|
this.output(`Signed Stream URL: ${signedStreamUrl}`);
|
|
105
106
|
}
|
|
106
|
-
else {
|
|
107
|
+
else if (target.type === 'ios') {
|
|
107
108
|
this.output(`iOS Simulator URL: ${this.consoleStreamUrl(target.id)}`);
|
|
108
109
|
}
|
|
109
110
|
}
|
|
@@ -141,6 +142,29 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
141
142
|
return undefined;
|
|
142
143
|
}
|
|
143
144
|
}
|
|
145
|
+
async resolveSimulatorStreamUrl(target, xcodeClient) {
|
|
146
|
+
if (target.type === 'ios') {
|
|
147
|
+
return this.resolveIosSignedStreamUrl(target);
|
|
148
|
+
}
|
|
149
|
+
try {
|
|
150
|
+
const status = await xcodeClient.getSimulator();
|
|
151
|
+
const iosInstanceId = status.simulator?.iosInstanceId;
|
|
152
|
+
if (!iosInstanceId) {
|
|
153
|
+
return undefined;
|
|
154
|
+
}
|
|
155
|
+
try {
|
|
156
|
+
const simulator = await this.client.iosInstances.get(iosInstanceId);
|
|
157
|
+
(0, config_1.registerCreatedInstance)(simulator);
|
|
158
|
+
return this.signedStreamUrl(simulator.status) ?? this.consoleStreamUrl(iosInstanceId);
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
return this.consoleStreamUrl(iosInstanceId);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
catch {
|
|
165
|
+
return undefined;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
144
168
|
}
|
|
145
169
|
XcodeBuild.summary = 'Run xcodebuild on an Xcode sandbox';
|
|
146
170
|
XcodeBuild.description = 'Sync a local project path once (or the current working directory if omitted), then trigger a remote xcodebuild with streaming output. Use `--ios` to build and run on an iOS simulator-backed Xcode target.';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/xcode/build.ts"],"names":[],"mappings":";;AAAA,+CAA4C;AAC5C,sCAA0C;AAC1C,qDAAiD;AACjD,+DAAkE;AAClE,iDAAsD;AACtD,iEAAsE;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/xcode/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export default class XcodeCreate extends BaseCommand {
|
|
|
12
12
|
label: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
13
13
|
'reuse-if-exists': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
14
14
|
ios: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
15
|
+
attach: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
16
|
+
'simulator-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
15
17
|
'api-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
16
18
|
json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
17
19
|
quiet: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/create.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/create.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AASjD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW;IAClD,MAAM,CAAC,OAAO,SAAiC;IAC/C,MAAM,CAAC,WAAW,SACoK;IAEtL,MAAM,CAAC,QAAQ,WAMb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;MAkCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmL3B"}
|
|
@@ -5,10 +5,20 @@ const base_command_1 = require("../../base-command");
|
|
|
5
5
|
const formatting_1 = require("../../lib/formatting");
|
|
6
6
|
const config_1 = require("../../lib/config");
|
|
7
7
|
const xcode_sandbox_1 = require("../../lib/xcode-sandbox");
|
|
8
|
+
const simulator_attach_1 = require("../../lib/simulator-attach");
|
|
8
9
|
class XcodeCreate extends base_command_1.BaseCommand {
|
|
9
10
|
async run() {
|
|
10
11
|
const { flags } = await this.parse(XcodeCreate);
|
|
11
12
|
this.setParsedFlags(flags);
|
|
13
|
+
if (flags.attach && flags.ios) {
|
|
14
|
+
this.error('Use either --attach or --ios, not both.');
|
|
15
|
+
}
|
|
16
|
+
if (flags.attach && !flags['simulator-id']) {
|
|
17
|
+
this.error('--attach requires --simulator-id.');
|
|
18
|
+
}
|
|
19
|
+
if (flags['simulator-id'] && !flags.attach) {
|
|
20
|
+
this.error('--simulator-id requires --attach.');
|
|
21
|
+
}
|
|
12
22
|
await this.withAuth(async () => {
|
|
13
23
|
const labels = (0, formatting_1.parseLabels)(flags.label);
|
|
14
24
|
if (flags.ios) {
|
|
@@ -85,6 +95,7 @@ class XcodeCreate extends base_command_1.BaseCommand {
|
|
|
85
95
|
}
|
|
86
96
|
return;
|
|
87
97
|
}
|
|
98
|
+
const simulator = flags.attach ? await this.client.iosInstances.get(flags['simulator-id']) : undefined;
|
|
88
99
|
const params = {
|
|
89
100
|
wait: true,
|
|
90
101
|
reuseIfExists: flags['reuse-if-exists'] || undefined,
|
|
@@ -108,6 +119,29 @@ class XcodeCreate extends base_command_1.BaseCommand {
|
|
|
108
119
|
const consoleUrl = this.consoleStreamUrl(instance.metadata.id);
|
|
109
120
|
const signedStreamUrl = this.signedStreamUrl(instance.status);
|
|
110
121
|
(0, config_1.registerCreatedInstance)(instance);
|
|
122
|
+
const cleanup = async () => {
|
|
123
|
+
try {
|
|
124
|
+
await this.client.xcodeInstances.delete(instance.metadata.id);
|
|
125
|
+
this.info(`${instance.metadata.id} is deleted`);
|
|
126
|
+
}
|
|
127
|
+
catch (e) {
|
|
128
|
+
this.info(`Failed to delete instance: ${e}`);
|
|
129
|
+
}
|
|
130
|
+
};
|
|
131
|
+
let attachResult;
|
|
132
|
+
if (flags.attach && simulator) {
|
|
133
|
+
try {
|
|
134
|
+
const xcodeClient = await this.client.xcodeInstances.createClient({ instance });
|
|
135
|
+
attachResult = await xcodeClient.attachSimulator(simulator);
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
this.info(`Created Xcode instance ${instance.metadata.id}, but attach failed.`);
|
|
139
|
+
if (flags.rm) {
|
|
140
|
+
await cleanup();
|
|
141
|
+
}
|
|
142
|
+
throw err;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
111
145
|
this.info(`Created a new Xcode instance in ${((Date.now() - start) / 1000).toFixed(1)}s`);
|
|
112
146
|
this.info('Xcode Instance:');
|
|
113
147
|
this.info(` ID: ${instance.metadata.id}`);
|
|
@@ -117,22 +151,25 @@ class XcodeCreate extends base_command_1.BaseCommand {
|
|
|
117
151
|
}
|
|
118
152
|
this.info(` Region: ${instance.spec.region}`);
|
|
119
153
|
this.info(` State: ${instance.status.state}`);
|
|
154
|
+
if (attachResult && simulator) {
|
|
155
|
+
(0, config_1.registerCreatedInstance)(simulator);
|
|
156
|
+
this.info((0, simulator_attach_1.formatSimulatorAttachResult)(simulator.metadata.id, instance.metadata.id, attachResult));
|
|
157
|
+
}
|
|
120
158
|
if (flags.json) {
|
|
121
|
-
|
|
159
|
+
if (attachResult && simulator) {
|
|
160
|
+
this.outputJson({
|
|
161
|
+
...instance,
|
|
162
|
+
attach: (0, simulator_attach_1.simulatorAttachJson)(simulator.metadata.id, instance.metadata.id, attachResult),
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
this.outputJson(instance);
|
|
167
|
+
}
|
|
122
168
|
}
|
|
123
169
|
else if (this.isQuietEnabled()) {
|
|
124
170
|
this.output(instance.metadata.id);
|
|
125
171
|
}
|
|
126
172
|
if (flags.rm) {
|
|
127
|
-
const cleanup = async () => {
|
|
128
|
-
try {
|
|
129
|
-
await this.client.xcodeInstances.delete(instance.metadata.id);
|
|
130
|
-
this.info(`${instance.metadata.id} is deleted`);
|
|
131
|
-
}
|
|
132
|
-
catch (e) {
|
|
133
|
-
this.info(`Failed to delete instance: ${e}`);
|
|
134
|
-
}
|
|
135
|
-
};
|
|
136
173
|
this.info('Instance running. Press Ctrl+C to stop and delete.');
|
|
137
174
|
await new Promise((resolve) => {
|
|
138
175
|
const keepAlive = setInterval(() => { }, 1 << 30);
|
|
@@ -153,6 +190,7 @@ XcodeCreate.description = 'Create a new cloud Xcode sandbox for remote sync and
|
|
|
153
190
|
XcodeCreate.examples = [
|
|
154
191
|
'<%= config.bin %> xcode create',
|
|
155
192
|
'<%= config.bin %> xcode create --ios',
|
|
193
|
+
'<%= config.bin %> xcode create --attach --simulator-id <ios-instance-ID>',
|
|
156
194
|
'<%= config.bin %> xcode create --rm --region us-west',
|
|
157
195
|
'<%= config.bin %> xcode create --label env=dev --display-name ci-builder',
|
|
158
196
|
];
|
|
@@ -182,6 +220,13 @@ XcodeCreate.flags = {
|
|
|
182
220
|
description: 'Create an iOS instance with an attached Xcode sandbox instead of a standalone Xcode sandbox',
|
|
183
221
|
default: false,
|
|
184
222
|
}),
|
|
223
|
+
attach: core_1.Flags.boolean({
|
|
224
|
+
description: 'Attach an existing iOS simulator to the created standalone Xcode instance',
|
|
225
|
+
default: false,
|
|
226
|
+
}),
|
|
227
|
+
'simulator-id': core_1.Flags.string({
|
|
228
|
+
description: 'Existing iOS simulator instance ID to attach when --attach is used',
|
|
229
|
+
}),
|
|
185
230
|
};
|
|
186
231
|
exports.default = XcodeCreate;
|
|
187
232
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/xcode/create.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,qDAAiD;AACjD,qDAAmD;AACnD,6CAA2D;AAC3D,2DAAgE;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/commands/xcode/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type SimulatorAttachResult, type SimulatorBuildStatus } from '@limrun/api/resources/xcode-instances-helpers';
|
|
2
|
+
export declare function formatSimulatorAttachResult(simulatorInstanceId: string, xcodeInstanceId: string, result: SimulatorAttachResult): string;
|
|
3
|
+
export declare function simulatorAttachJson(simulatorInstanceId: string, xcodeInstanceId: string, result: SimulatorAttachResult): {
|
|
4
|
+
attached: boolean;
|
|
5
|
+
alreadyAttached: boolean;
|
|
6
|
+
installedLastBuild: boolean;
|
|
7
|
+
simulator?: import("@limrun/api/resources/xcode-instances-helpers").SimulatorAttachment;
|
|
8
|
+
latestBuild?: SimulatorBuildStatus;
|
|
9
|
+
installError?: string;
|
|
10
|
+
xcodeInstanceId: string;
|
|
11
|
+
simulatorInstanceId: string;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=simulator-attach.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"simulator-attach.d.ts","sourceRoot":"","sources":["../../src/lib/simulator-attach.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,+CAA+C,CAAC;AAEvD,wBAAgB,2BAA2B,CACzC,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,qBAAqB,GAC5B,MAAM,CAkBR;AAED,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,MAAM,EAC3B,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,qBAAqB;;;;;;;;;EAO9B"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatSimulatorAttachResult = formatSimulatorAttachResult;
|
|
4
|
+
exports.simulatorAttachJson = simulatorAttachJson;
|
|
5
|
+
function formatSimulatorAttachResult(simulatorInstanceId, xcodeInstanceId, result) {
|
|
6
|
+
const prefix = result.alreadyAttached ?
|
|
7
|
+
`Simulator ${simulatorInstanceId} is already attached to Xcode target ${xcodeInstanceId}`
|
|
8
|
+
: `Attached simulator ${simulatorInstanceId} to Xcode target ${xcodeInstanceId}`;
|
|
9
|
+
if (result.installedLastBuild && result.latestBuild) {
|
|
10
|
+
return `${prefix}; installed and launched latest build ${formatBuild(result.latestBuild)}`;
|
|
11
|
+
}
|
|
12
|
+
if (result.installError) {
|
|
13
|
+
return `${prefix}; failed to install latest build: ${result.installError}`;
|
|
14
|
+
}
|
|
15
|
+
if (!result.latestBuild) {
|
|
16
|
+
return `${prefix}; no installable simulator build found`;
|
|
17
|
+
}
|
|
18
|
+
if (result.latestBuild.installState === 'installedOnAttachedSimulator') {
|
|
19
|
+
return `${prefix}; latest build ${formatBuild(result.latestBuild)} is already installed`;
|
|
20
|
+
}
|
|
21
|
+
return prefix;
|
|
22
|
+
}
|
|
23
|
+
function simulatorAttachJson(simulatorInstanceId, xcodeInstanceId, result) {
|
|
24
|
+
return {
|
|
25
|
+
xcodeInstanceId,
|
|
26
|
+
simulatorInstanceId,
|
|
27
|
+
...result,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function formatBuild(build) {
|
|
31
|
+
return build.bundleId ? `${build.buildId} (${build.bundleId})` : build.buildId;
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=simulator-attach.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"simulator-attach.js","sourceRoot":"","sources":["../../src/lib/simulator-attach.ts"],"names":[],"mappings":";;AAKA,kEAsBC;AAED,kDAUC;AAlCD,SAAgB,2BAA2B,CACzC,mBAA2B,EAC3B,eAAuB,EACvB,MAA6B;IAE7B,MAAM,MAAM,GACV,MAAM,CAAC,eAAe,CAAC,CAAC;QACtB,aAAa,mBAAmB,wCAAwC,eAAe,EAAE;QAC3F,CAAC,CAAC,sBAAsB,mBAAmB,oBAAoB,eAAe,EAAE,CAAC;IACnF,IAAI,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACpD,OAAO,GAAG,MAAM,yCAAyC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;IAC7F,CAAC;IACD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,OAAO,GAAG,MAAM,qCAAqC,MAAM,CAAC,YAAY,EAAE,CAAC;IAC7E,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO,GAAG,MAAM,wCAAwC,CAAC;IAC3D,CAAC;IACD,IAAI,MAAM,CAAC,WAAW,CAAC,YAAY,KAAK,8BAA8B,EAAE,CAAC;QACvE,OAAO,GAAG,MAAM,kBAAkB,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC;IAC3F,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,mBAAmB,CACjC,mBAA2B,EAC3B,eAAuB,EACvB,MAA6B;IAE7B,OAAO;QACL,eAAe;QACf,mBAAmB;QACnB,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAA2B;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;AACjF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "lim",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.4",
|
|
4
4
|
"description": "Use remote XCode, iOS Simulator, Android Emulator and more to build and test apps from Linux, Windows or macOS.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"lim": "./bin/run.js"
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"test": "jest"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@limrun/api": "0.28.
|
|
27
|
+
"@limrun/api": "0.28.9",
|
|
28
28
|
"@oclif/core": "^4",
|
|
29
29
|
"cli-progress": "^3.12.0",
|
|
30
30
|
"cli-table3": "^0.6.5",
|