lim 0.34.0 → 0.35.1
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 +9 -15
- package/dist/base-command.d.ts.map +1 -1
- package/dist/base-command.js +37 -107
- package/dist/base-command.js.map +1 -1
- package/dist/base-command.xcode-selection.test.js +0 -20
- package/dist/base-command.xcode-selection.test.js.map +1 -1
- package/dist/commands/android/create.d.ts.map +1 -1
- package/dist/commands/android/create.js +3 -2
- package/dist/commands/android/create.js.map +1 -1
- package/dist/commands/android/tunnel/index.d.ts +6 -7
- package/dist/commands/android/tunnel/index.d.ts.map +1 -1
- package/dist/commands/android/tunnel/index.js +8 -64
- package/dist/commands/android/tunnel/index.js.map +1 -1
- package/dist/commands/android/tunnel/index.test.js +12 -45
- package/dist/commands/android/tunnel/index.test.js.map +1 -1
- package/dist/commands/android/tunnel/status.d.ts.map +1 -1
- package/dist/commands/android/tunnel/status.js +0 -2
- package/dist/commands/android/tunnel/status.js.map +1 -1
- package/dist/commands/ios/attach-xcode.d.ts.map +1 -1
- package/dist/commands/ios/attach-xcode.js +1 -1
- package/dist/commands/ios/attach-xcode.js.map +1 -1
- package/dist/commands/ios/create.d.ts.map +1 -1
- package/dist/commands/ios/create.js +2 -4
- package/dist/commands/ios/create.js.map +1 -1
- package/dist/commands/ios/get.d.ts.map +1 -1
- package/dist/commands/ios/get.js +0 -3
- package/dist/commands/ios/get.js.map +1 -1
- package/dist/commands/ios/maestro.d.ts.map +1 -1
- package/dist/commands/ios/maestro.js +2 -1
- package/dist/commands/ios/maestro.js.map +1 -1
- package/dist/commands/ios/tunnel/index.d.ts +7 -2
- package/dist/commands/ios/tunnel/index.d.ts.map +1 -1
- package/dist/commands/ios/tunnel/index.js +19 -6
- package/dist/commands/ios/tunnel/index.js.map +1 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +15 -13
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/session/start.d.ts.map +1 -1
- package/dist/commands/session/start.js +3 -3
- package/dist/commands/session/start.js.map +1 -1
- package/dist/commands/session/status.d.ts.map +1 -1
- package/dist/commands/session/status.js +0 -7
- package/dist/commands/session/status.js.map +1 -1
- package/dist/commands/xcode/attach-simulator.d.ts.map +1 -1
- package/dist/commands/xcode/attach-simulator.js +1 -1
- package/dist/commands/xcode/attach-simulator.js.map +1 -1
- package/dist/commands/xcode/build.d.ts +0 -1
- package/dist/commands/xcode/build.d.ts.map +1 -1
- package/dist/commands/xcode/build.js +5 -27
- package/dist/commands/xcode/build.js.map +1 -1
- package/dist/commands/xcode/delete.d.ts.map +1 -1
- package/dist/commands/xcode/delete.js +1 -3
- package/dist/commands/xcode/delete.js.map +1 -1
- package/dist/commands/xcode/get.d.ts.map +1 -1
- package/dist/commands/xcode/get.js +0 -24
- package/dist/commands/xcode/get.js.map +1 -1
- package/dist/commands/xcode/logs.d.ts.map +1 -1
- package/dist/commands/xcode/logs.js +2 -16
- package/dist/commands/xcode/logs.js.map +1 -1
- package/dist/commands/xcode/logs.test.js +3 -12
- package/dist/commands/xcode/logs.test.js.map +1 -1
- package/dist/commands/xcode/rbe/index.d.ts.map +1 -1
- package/dist/commands/xcode/rbe/index.js +3 -4
- package/dist/commands/xcode/rbe/index.js.map +1 -1
- package/dist/commands/xcode/set-instance.d.ts.map +1 -1
- package/dist/commands/xcode/set-instance.js +2 -2
- package/dist/commands/xcode/set-instance.js.map +1 -1
- package/dist/commands/xcode/sync.d.ts.map +1 -1
- package/dist/commands/xcode/sync.js +2 -2
- package/dist/commands/xcode/sync.js.map +1 -1
- package/dist/lib/config.d.ts +3 -6
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +12 -84
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/instance-client-factory.d.ts.map +1 -1
- package/dist/lib/instance-client-factory.js +3 -3
- package/dist/lib/instance-client-factory.js.map +1 -1
- package/dist/lib/tunnel-command.d.ts +5 -14
- package/dist/lib/tunnel-command.d.ts.map +1 -1
- package/dist/lib/tunnel-command.js +13 -13
- package/dist/lib/tunnel-command.js.map +1 -1
- package/dist/lib/tunnel-command.test.js +1 -0
- package/dist/lib/tunnel-command.test.js.map +1 -1
- package/dist/lib/tunnel-inspection-flags.d.ts +33 -0
- package/dist/lib/tunnel-inspection-flags.d.ts.map +1 -0
- package/dist/lib/tunnel-inspection-flags.js +64 -0
- package/dist/lib/tunnel-inspection-flags.js.map +1 -0
- package/dist/lib/tunnel-process.d.ts.map +1 -1
- package/dist/lib/tunnel-process.js +6 -17
- package/dist/lib/tunnel-process.js.map +1 -1
- package/dist/lib/tunnel-process.test.js +14 -2
- package/dist/lib/tunnel-process.test.js.map +1 -1
- package/dist/lib/xcode-version.js +1 -1
- package/dist/lib/xcode-version.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/xcode-sandbox.d.ts +0 -2
- package/dist/lib/xcode-sandbox.d.ts.map +0 -1
- package/dist/lib/xcode-sandbox.js +0 -7
- package/dist/lib/xcode-sandbox.js.map +0 -1
package/dist/commands/ios/get.js
CHANGED
|
@@ -29,9 +29,6 @@ class IosGet extends base_command_1.BaseCommand {
|
|
|
29
29
|
this.output(`Console URL: ${this.consoleStreamUrl(instance.metadata.id)}`);
|
|
30
30
|
if (instance.status.apiUrl)
|
|
31
31
|
this.output(`API URL: ${instance.status.apiUrl}`);
|
|
32
|
-
if (instance.status.sandbox?.xcode?.url) {
|
|
33
|
-
this.output(`Xcode Sandbox URL: ${instance.status.sandbox.xcode.url}`);
|
|
34
|
-
}
|
|
35
32
|
if (signedStreamUrl)
|
|
36
33
|
this.output(`Signed Stream URL: ${signedStreamUrl}`);
|
|
37
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/ios/get.ts"],"names":[],"mappings":";;AAAA,sCAAmC;AACnC,qDAAiD;AACjD,6CAAuD;AAEvD,MAAqB,MAAO,SAAQ,0BAAW;IAgB7C,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAA,4BAAmB,GAAE,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACzE,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC5D,IAAI,CAAC,MAAM,CAAC,WAAW,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/C,IAAI,QAAQ,CAAC,MAAM,CAAC,iBAAiB;oBACnC,IAAI,CAAC,MAAM,CAAC,uBAAuB,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC3E,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM;oBAAE,IAAI,CAAC,MAAM,CAAC,YAAY,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC9E,IAAI,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/ios/get.ts"],"names":[],"mappings":";;AAAA,sCAAmC;AACnC,qDAAiD;AACjD,6CAAuD;AAEvD,MAAqB,MAAO,SAAQ,0BAAW;IAgB7C,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAA,4BAAmB,GAAE,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACzE,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC5D,IAAI,CAAC,MAAM,CAAC,WAAW,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/C,IAAI,CAAC,MAAM,CAAC,UAAU,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/C,IAAI,QAAQ,CAAC,MAAM,CAAC,iBAAiB;oBACnC,IAAI,CAAC,MAAM,CAAC,uBAAuB,QAAQ,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC3E,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM;oBAAE,IAAI,CAAC,MAAM,CAAC,YAAY,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC9E,IAAI,eAAe;oBAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,eAAe,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AA3CM,cAAO,GAAG,yCAAyC,CAAC;AACpD,kBAAW,GAChB,gPAAgP,CAAC;AAC5O,eAAQ,GAAG,CAAC,2BAA2B,EAAE,uCAAuC,CAAC,CAAC;AAElF,WAAI,GAAG;IACZ,EAAE,EAAE,WAAI,CAAC,MAAM,CAAC;QACd,WAAW,EACT,mHAAmH;QACrH,QAAQ,EAAE,KAAK;KAChB,CAAC;CACH,CAAC;AAEK,YAAK,GAAG,EAAE,GAAG,0BAAW,CAAC,SAAS,EAAE,CAAC;kBAdzB,MAAM"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maestro.d.ts","sourceRoot":"","sources":["../../../src/commands/ios/maestro.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"maestro.d.ts","sourceRoot":"","sources":["../../../src/commands/ios/maestro.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKjD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAC,OAAO,SAAsD;IACpE,MAAM,CAAC,WAAW,SAI2F;IAC7G,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,MAAM,UAAS;IAEtB,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,KAAK;;;;;;;;MAKV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA8F3B"}
|
|
@@ -5,6 +5,7 @@ const core_1 = require("@oclif/core");
|
|
|
5
5
|
const api_1 = require("@limrun/api");
|
|
6
6
|
const base_command_1 = require("../../base-command");
|
|
7
7
|
const instance_client_factory_1 = require("../../lib/instance-client-factory");
|
|
8
|
+
const instance_token_1 = require("@limrun/api/instance-token");
|
|
8
9
|
const maestro_1 = require("../../lib/maestro");
|
|
9
10
|
class IosMaestro extends base_command_1.BaseCommand {
|
|
10
11
|
async run() {
|
|
@@ -30,7 +31,7 @@ class IosMaestro extends base_command_1.BaseCommand {
|
|
|
30
31
|
if (!targetHttpPortUrlPrefix || !token) {
|
|
31
32
|
const instance = await this.client.iosInstances.get(id);
|
|
32
33
|
targetHttpPortUrlPrefix = instance.status.targetHttpPortUrlPrefix;
|
|
33
|
-
token = instance
|
|
34
|
+
token = (0, instance_token_1.instanceToken)(instance);
|
|
34
35
|
// Forward the fresh endpoints so getIosInstanceClient connects directly
|
|
35
36
|
// instead of fetching the instance a second time.
|
|
36
37
|
resolvedInstance.apiUrl = instance.status.apiUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maestro.js","sourceRoot":"","sources":["../../../src/commands/ios/maestro.ts"],"names":[],"mappings":";;AAAA,2DAA2C;AAE3C,sCAAoC;AACpC,qCAOqB;AACrB,qDAAiD;AACjD,+EAAyE;AACzE,+CAAsF;AAEtF,MAAqB,UAAW,SAAQ,0BAAW;IAwBjD,KAAK,CAAC,GAAG;QACP,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAiB,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,CAAC,KAA4B,CAAC;QAClD,MAAM,OAAO,GAAI,MAAM,CAAC,IAAiB,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,CACR,mFAAmF;oBACjF,0CAA0C,CAC7C,CAAC;YACJ,CAAC;YACD,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACzC,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnC,IAAI,QAAQ,IAAI,gCAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,KAAK,CAAC,GAAG,QAAQ,qEAAqE,CAAC,CAAC;gBAC/F,CAAC;YACH,CAAC;YAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,EAAE,GAAG,gBAAgB,CAAC,EAAE,CAAC;YAE/B,IAAI,EAAE,uBAAuB,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC;YAC1D,IAAI,CAAC,uBAAuB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACxD,uBAAuB,GAAG,QAAQ,CAAC,MAAM,CAAC,uBAAuB,CAAC;gBAClE,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"maestro.js","sourceRoot":"","sources":["../../../src/commands/ios/maestro.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,17 @@ export default class IosTunnel extends BaseCommand {
|
|
|
4
4
|
static description: string;
|
|
5
5
|
static examples: string[];
|
|
6
6
|
static flags: {
|
|
7
|
+
serve: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
8
|
+
'tunnel-owner': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
9
|
+
inspect: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
|
+
har: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
11
|
+
persist: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
|
+
ttl: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
13
|
+
'har-body-limit': import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
7
14
|
id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
8
15
|
selector: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
9
16
|
detach: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
17
|
verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
|
-
serve: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
|
-
'tunnel-owner': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
13
18
|
'api-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
|
|
14
19
|
json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
15
20
|
quiet: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAkBpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,MAAM,CAAC,OAAO,SAA6D;IAC3E,MAAM,CAAC,WAAW,SASsE;IACxF,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;MAiCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiD1B,OAAO,CAAC,aAAa;CAsBtB"}
|
|
@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
|
|
|
4
4
|
const base_command_1 = require("../../../base-command");
|
|
5
5
|
const instance_client_factory_1 = require("../../../lib/instance-client-factory");
|
|
6
6
|
const tunnel_command_1 = require("../../../lib/tunnel-command");
|
|
7
|
+
const tunnel_inspection_flags_1 = require("../../../lib/tunnel-inspection-flags");
|
|
7
8
|
const tunnel_process_1 = require("../../../lib/tunnel-process");
|
|
8
9
|
class IosTunnel extends base_command_1.BaseCommand {
|
|
9
10
|
async run() {
|
|
@@ -12,6 +13,13 @@ class IosTunnel extends base_command_1.BaseCommand {
|
|
|
12
13
|
if (flags.detach && flags.serve) {
|
|
13
14
|
this.error('--detach cannot be combined with internal --serve mode.');
|
|
14
15
|
}
|
|
16
|
+
let inspection;
|
|
17
|
+
try {
|
|
18
|
+
inspection = (0, tunnel_inspection_flags_1.tunnelInspectionContext)(flags);
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
this.error(error instanceof Error ? error.message : String(error));
|
|
22
|
+
}
|
|
15
23
|
const selectors = (0, tunnel_process_1.parseTunnelSelectors)(flags.selector);
|
|
16
24
|
if (flags.serve) {
|
|
17
25
|
const owner = flags['tunnel-owner'];
|
|
@@ -19,7 +27,7 @@ class IosTunnel extends base_command_1.BaseCommand {
|
|
|
19
27
|
this.error('--serve requires --tunnel-owner.');
|
|
20
28
|
await this.withAuth(async () => {
|
|
21
29
|
const resolvedInstance = this.resolveIosInstance(flags.id);
|
|
22
|
-
await (0, tunnel_command_1.serveTunnelDetached)(this.tunnelContext(resolvedInstance.id, selectors, flags.verbose ? 'debug' : 'info'), owner);
|
|
30
|
+
await (0, tunnel_command_1.serveTunnelDetached)(this.tunnelContext(resolvedInstance.id, selectors, flags.verbose ? 'debug' : 'info', inspection), owner);
|
|
23
31
|
});
|
|
24
32
|
return;
|
|
25
33
|
}
|
|
@@ -27,25 +35,25 @@ class IosTunnel extends base_command_1.BaseCommand {
|
|
|
27
35
|
const resolvedInstance = this.resolveIosInstance(flags.id);
|
|
28
36
|
if (flags.detach) {
|
|
29
37
|
await (0, tunnel_command_1.startTunnelDetached)({
|
|
30
|
-
...this.tunnelContext(resolvedInstance.id, selectors, 'info', flags['api-key']),
|
|
38
|
+
...this.tunnelContext(resolvedInstance.id, selectors, 'info', inspection, flags['api-key']),
|
|
31
39
|
verbose: flags.verbose,
|
|
32
40
|
});
|
|
33
41
|
}
|
|
34
42
|
else {
|
|
35
43
|
await (0, tunnel_command_1.runTunnelForeground)(this.tunnelContext(resolvedInstance.id, selectors, flags.verbose ? 'debug'
|
|
36
44
|
: this.shouldSuppressInfo() ? 'none'
|
|
37
|
-
: 'info'));
|
|
45
|
+
: 'info', inspection));
|
|
38
46
|
}
|
|
39
47
|
});
|
|
40
48
|
}
|
|
41
|
-
tunnelContext(instanceId, selectors, logLevel, apiKey) {
|
|
49
|
+
tunnelContext(instanceId, selectors, logLevel, inspection, apiKey) {
|
|
42
50
|
return {
|
|
43
51
|
product: 'ios',
|
|
44
52
|
instanceId,
|
|
45
53
|
selectors,
|
|
46
54
|
apiKey,
|
|
47
55
|
reconnect: false,
|
|
48
|
-
|
|
56
|
+
...inspection,
|
|
49
57
|
connect: async () => {
|
|
50
58
|
const resolvedInstance = this.resolveIosInstance(instanceId);
|
|
51
59
|
const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
|
|
@@ -59,13 +67,17 @@ IosTunnel.summary = 'Expose declared local TCP destinations to the simulator';
|
|
|
59
67
|
IosTunnel.description = 'Start one transparent destination tunnel. Exact --selector destinations (localhost:port or ' +
|
|
60
68
|
'literal IP:port) become listeners reachable from the simulator. Domain selectors are ' +
|
|
61
69
|
'intercepted transparently on the instance and dialed from this machine, whether or not ' +
|
|
62
|
-
'the name resolves on public DNS
|
|
70
|
+
'the name resolves on public DNS. HTTP and HTTPS through the tunnel are inspected with a ' +
|
|
71
|
+
'certificate the simulator trusts; use --no-inspect to keep TLS end to end. ' +
|
|
63
72
|
'Use --detach to keep the tunnel running after this command returns. ' +
|
|
73
|
+
'Start the tunnel before launching your app: connections opened earlier keep their original ' +
|
|
74
|
+
'route until they close. ' +
|
|
64
75
|
'Note: apps that resolve DNS themselves over HTTPS (DoH) bypass domain interception.';
|
|
65
76
|
IosTunnel.examples = [
|
|
66
77
|
'<%= config.bin %> ios tunnel --selector localhost:3000 --id <instance-ID>',
|
|
67
78
|
'<%= config.bin %> ios tunnel --selector "*.corp.example" --detach',
|
|
68
79
|
'<%= config.bin %> ios tunnel --selector 10.20.30.40:443 --selector 10.20.30.41:8081 --detach',
|
|
80
|
+
'<%= config.bin %> ios tunnel --selector "*.api.example" --har ./traffic.har',
|
|
69
81
|
'<%= config.bin %> ios tunnel status --id <instance-ID>',
|
|
70
82
|
'<%= config.bin %> ios tunnel stop --id <instance-ID>',
|
|
71
83
|
];
|
|
@@ -88,6 +100,7 @@ IosTunnel.flags = {
|
|
|
88
100
|
description: 'Log every forwarded connection and dial failure. With --detach, the lines go to the tunnel log file (see tunnel status).',
|
|
89
101
|
default: false,
|
|
90
102
|
}),
|
|
103
|
+
...tunnel_inspection_flags_1.tunnelInspectionFlags,
|
|
91
104
|
serve: core_1.Flags.boolean({
|
|
92
105
|
description: 'Internal: own the detached tunnel transport.',
|
|
93
106
|
default: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AAEpC,wDAAoD;AACpD,kFAA4E;AAC5E,gEAQqC;AACrC,gEAAmE;AAEnE,MAAqB,SAAU,SAAQ,0BAAW;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAkD9C,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW;IAC1C,MAAM,CAAC,SAAS,EAGA,OAAO,WAAW,CAAC,SAAS,CAAC;IAC7C,MAAM,CAAC,KAAK;;MAKV;IACF,MAAM,CAAC,aAAa,WAAU;IAC9B,MAAM,CAAC,OAAO,SAA6B;IAC3C,MAAM,CAAC,WAAW,SAAmF;IACrG,MAAM,CAAC,QAAQ,WAA0E;IACzF,OAAO,CAAC,QAAQ,CAAyD;IACzE,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,aAAa,CAAqB;IAEpC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAqE1B,OAAO,CAAC,sBAAsB;YAchB,oBAAoB;YAuCpB,wBAAwB;IAyBtC,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAWZ,gBAAgB;YAwBhB,aAAa;YAoCb,qBAAqB;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAkD9C,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW;IAC1C,MAAM,CAAC,SAAS,EAGA,OAAO,WAAW,CAAC,SAAS,CAAC;IAC7C,MAAM,CAAC,KAAK;;MAKV;IACF,MAAM,CAAC,aAAa,WAAU;IAC9B,MAAM,CAAC,OAAO,SAA6B;IAC3C,MAAM,CAAC,WAAW,SAAmF;IACrG,MAAM,CAAC,QAAQ,WAA0E;IACzF,OAAO,CAAC,QAAQ,CAAyD;IACzE,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,aAAa,CAAqB;IAEpC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAqE1B,OAAO,CAAC,sBAAsB;YAchB,oBAAoB;YAuCpB,wBAAwB;IAyBtC,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAWZ,gBAAgB;YAwBhB,aAAa;YAoCb,qBAAqB;IAwHnC,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,eAAe;CAQxB"}
|
package/dist/commands/run.js
CHANGED
|
@@ -220,9 +220,10 @@ class Run extends base_command_1.BaseCommand {
|
|
|
220
220
|
let recoveryPrinted = false;
|
|
221
221
|
try {
|
|
222
222
|
return await this.withAuth(async () => {
|
|
223
|
-
//
|
|
224
|
-
//
|
|
225
|
-
|
|
223
|
+
// Resolve a supplied simulator before allocating a builder. New simulators
|
|
224
|
+
// are still created after a successful build to avoid idle billed devices.
|
|
225
|
+
this.runFailureStage = 'simulator_attach';
|
|
226
|
+
let simulator = this.iosInstanceId ? await this.client.iosInstances.get(this.iosInstanceId) : undefined;
|
|
226
227
|
this.runFailureStage = 'instance_create';
|
|
227
228
|
const sandbox = await this.reporter.withProgress('Preparing a Limrun Xcode build sandbox', () => this.client.xcodeInstances.create({
|
|
228
229
|
wait: true,
|
|
@@ -234,6 +235,12 @@ class Run extends base_command_1.BaseCommand {
|
|
|
234
235
|
}));
|
|
235
236
|
(0, config_1.registerCreatedInstance)(sandbox);
|
|
236
237
|
const xcode = await this.client.xcodeInstances.createClient({ instance: sandbox });
|
|
238
|
+
if (simulator) {
|
|
239
|
+
this.runFailureStage = 'simulator_attach';
|
|
240
|
+
await this.reporter.withProgress('Attaching your iOS simulator before building', () => xcode.attachSimulator(simulator));
|
|
241
|
+
// An installError here belongs to an older build on a reused sandbox.
|
|
242
|
+
// The new build will install again; validate its result after building.
|
|
243
|
+
}
|
|
237
244
|
this.runFailureStage = 'sync';
|
|
238
245
|
await this.reporter.withProgress('Syncing project to the sandbox', () => xcode.sync(projectRoot, { watch: false }));
|
|
239
246
|
this.runFailureStage = 'build';
|
|
@@ -262,12 +269,8 @@ class Run extends base_command_1.BaseCommand {
|
|
|
262
269
|
this.runFailureStage = 'simulator_attach';
|
|
263
270
|
this.reporter.start('Launching app in a Limrun iOS simulator');
|
|
264
271
|
const launchStart = Date.now();
|
|
265
|
-
let simulator;
|
|
266
272
|
try {
|
|
267
|
-
if (
|
|
268
|
-
simulator = await this.client.iosInstances.get(this.iosInstanceId);
|
|
269
|
-
}
|
|
270
|
-
else {
|
|
273
|
+
if (!simulator) {
|
|
271
274
|
simulator = await this.client.iosInstances.create({
|
|
272
275
|
wait: true,
|
|
273
276
|
reuseIfExists: true,
|
|
@@ -289,10 +292,9 @@ class Run extends base_command_1.BaseCommand {
|
|
|
289
292
|
}
|
|
290
293
|
catch (err) {
|
|
291
294
|
this.reporter.stop('failure');
|
|
292
|
-
//
|
|
293
|
-
//
|
|
294
|
-
|
|
295
|
-
if (simulator) {
|
|
295
|
+
// Only clean up this workflow's simulator. A supplied device belongs
|
|
296
|
+
// to the caller and must remain available for another build attempt.
|
|
297
|
+
if (simulator && !this.iosInstanceId) {
|
|
296
298
|
await this.client.iosInstances.delete(simulator.metadata.id).catch(() => { });
|
|
297
299
|
}
|
|
298
300
|
throw err;
|
|
@@ -333,7 +335,7 @@ Run.baseFlags = {
|
|
|
333
335
|
};
|
|
334
336
|
Run.flags = {
|
|
335
337
|
'ios-id': core_1.Flags.string({
|
|
336
|
-
description: '
|
|
338
|
+
description: 'Attach this existing iOS simulator before building, so the console can stream build output live.',
|
|
337
339
|
}),
|
|
338
340
|
};
|
|
339
341
|
Run.hiddenAliases = ['go'];
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/session/start.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/session/start.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAKjD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IACnD,MAAM,CAAC,OAAO,SAA4D;IAC1E,MAAM,CAAC,WAAW,SAG2K;IAE7L,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,KAAK;;;;;;;;MAMV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0E3B"}
|
|
@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
|
|
|
4
4
|
const base_command_1 = require("../../base-command");
|
|
5
5
|
const daemon_1 = require("../../lib/daemon");
|
|
6
6
|
const config_1 = require("../../lib/config");
|
|
7
|
+
const instance_token_1 = require("@limrun/api/instance-token");
|
|
7
8
|
class SessionStart extends base_command_1.BaseCommand {
|
|
8
9
|
async run() {
|
|
9
10
|
const { flags } = await this.parse(SessionStart);
|
|
@@ -29,7 +30,7 @@ class SessionStart extends base_command_1.BaseCommand {
|
|
|
29
30
|
const instance = await this.client.androidInstances.get(id);
|
|
30
31
|
apiUrl = instance.status.apiUrl;
|
|
31
32
|
adbUrl = instance.status.adbWebSocketUrl;
|
|
32
|
-
token = instance
|
|
33
|
+
token = (0, instance_token_1.instanceToken)(instance);
|
|
33
34
|
(0, config_1.saveInstanceCache)(instance.metadata.id, {
|
|
34
35
|
apiUrl,
|
|
35
36
|
adbWebSocketUrl: adbUrl,
|
|
@@ -49,7 +50,7 @@ class SessionStart extends base_command_1.BaseCommand {
|
|
|
49
50
|
else {
|
|
50
51
|
const instance = await this.client.iosInstances.get(id);
|
|
51
52
|
apiUrl = instance.status.apiUrl;
|
|
52
|
-
token = instance
|
|
53
|
+
token = (0, instance_token_1.instanceToken)(instance);
|
|
53
54
|
(0, config_1.saveInstanceCache)(instance.metadata.id, {
|
|
54
55
|
apiUrl,
|
|
55
56
|
token,
|
|
@@ -57,7 +58,6 @@ class SessionStart extends base_command_1.BaseCommand {
|
|
|
57
58
|
mcpUrl: instance.status.mcpUrl,
|
|
58
59
|
signedStreamUrl: instance.status.signedStreamUrl,
|
|
59
60
|
targetHttpPortUrlPrefix: instance.status.targetHttpPortUrlPrefix,
|
|
60
|
-
sandboxXcodeUrl: instance.status.sandbox?.xcode?.url,
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/session/start.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,qDAAiD;AACjD,6CAA0F;AAC1F,6CAAqD;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/session/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/session/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/session/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IACpD,MAAM,CAAC,OAAO,SAA0B;IACxC,MAAM,CAAC,WAAW,SACuK;IACzL,MAAM,CAAC,QAAQ,WAAmF;IAElG,MAAM,CAAC,KAAK;;;;;;;MAAgC;IAEtC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA+C3B"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const base_command_1 = require("../../base-command");
|
|
4
4
|
const daemon_1 = require("../../lib/daemon");
|
|
5
5
|
const daemon_client_1 = require("../../lib/daemon-client");
|
|
6
|
-
const config_1 = require("../../lib/config");
|
|
7
6
|
class SessionStatus extends base_command_1.BaseCommand {
|
|
8
7
|
async run() {
|
|
9
8
|
const { flags } = await this.parse(SessionStatus);
|
|
@@ -13,7 +12,6 @@ class SessionStatus extends base_command_1.BaseCommand {
|
|
|
13
12
|
const details = [];
|
|
14
13
|
for (const s of sessions) {
|
|
15
14
|
const state = (0, daemon_1.loadState)(s.instanceId);
|
|
16
|
-
const cache = (0, config_1.loadIosInstanceCache)(s.instanceId);
|
|
17
15
|
let connected = false;
|
|
18
16
|
try {
|
|
19
17
|
const status = (await (0, daemon_client_1.sendCommand)(s.instanceId, 'status'));
|
|
@@ -25,7 +23,6 @@ class SessionStatus extends base_command_1.BaseCommand {
|
|
|
25
23
|
pid: s.pid,
|
|
26
24
|
type: state?.instanceType,
|
|
27
25
|
connected,
|
|
28
|
-
xcodeSandbox: cache?.sandboxXcodeUrl || null,
|
|
29
26
|
});
|
|
30
27
|
}
|
|
31
28
|
this.outputJson(details);
|
|
@@ -44,10 +41,6 @@ class SessionStatus extends base_command_1.BaseCommand {
|
|
|
44
41
|
if (state) {
|
|
45
42
|
this.log(` Type: ${state.instanceType}`);
|
|
46
43
|
}
|
|
47
|
-
const cache = (0, config_1.loadIosInstanceCache)(s.instanceId);
|
|
48
|
-
if (cache?.sandboxXcodeUrl) {
|
|
49
|
-
this.log(` Xcode: ${cache.sandboxXcodeUrl}`);
|
|
50
|
-
}
|
|
51
44
|
try {
|
|
52
45
|
const status = (await (0, daemon_client_1.sendCommand)(s.instanceId, 'status'));
|
|
53
46
|
this.log(` Connected: ${status.connected}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/session/status.ts"],"names":[],"mappings":";;AAAA,qDAAiD;AACjD,6CAAiE;AACjE,2DAAsD;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/commands/session/status.ts"],"names":[],"mappings":";;AAAA,qDAAiD;AACjD,6CAAiE;AACjE,2DAAsD;AAEtD,MAAqB,aAAc,SAAQ,0BAAW;IAQpD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,IAAA,2BAAkB,GAAE,CAAC;QAEtC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACzB,MAAM,KAAK,GAAG,IAAA,kBAAS,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBACtC,IAAI,SAAS,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,2BAAW,EAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAQ,CAAC;oBAClE,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBAC/B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC;oBACX,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,GAAG,EAAE,CAAC,CAAC,GAAG;oBACV,IAAI,EAAE,KAAK,EAAE,YAAY;oBACzB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,uBAAuB,CAAC,CAAC;QACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,IAAA,kBAAS,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/B,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,2BAAW,EAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAQ,CAAC;gBAClE,IAAI,CAAC,GAAG,CAAC,kBAAkB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YACjD,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,CAAC;IACH,CAAC;;AArDM,qBAAO,GAAG,sBAAsB,CAAC;AACjC,yBAAW,GAChB,sLAAsL,CAAC;AAClL,sBAAQ,GAAG,CAAC,kCAAkC,EAAE,yCAAyC,CAAC,CAAC;AAE3F,mBAAK,GAAG,EAAE,GAAG,0BAAW,CAAC,SAAS,EAAE,CAAC;kBANzB,aAAa"}
|
|
@@ -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;AAIjD,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,WAAW;IAC3D,MAAM,CAAC,OAAO,SAAkD;IAChE,MAAM,CAAC,WAAW,SAGqE;IAEvF,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,IAAI;;MAMT;IAEF,MAAM,CAAC,KAAK;;;;;;;;
|
|
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,SAGqE;IAEvF,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,IAAI;;MAMT;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAUV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkC3B"}
|
|
@@ -62,7 +62,7 @@ XcodeAttachSimulator.flags = {
|
|
|
62
62
|
allowNo: true,
|
|
63
63
|
}),
|
|
64
64
|
id: core_1.Flags.string({
|
|
65
|
-
description: 'Xcode instance ID to attach to
|
|
65
|
+
description: 'Xcode instance ID to attach to. Defaults to the most recently created Xcode target.',
|
|
66
66
|
}),
|
|
67
67
|
};
|
|
68
68
|
exports.default = XcodeAttachSimulator;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IAiC3D,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,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE/D,iEAAiE;YACjE,mEAAmE;YACnE,wDAAwD;YACxD,IAAI,WAA8D,CAAC;YACnE,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACtC,WAAW,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAClE,IAAA,gCAAuB,EAAC,SAAS,CAAC,CAAC;gBACnC,WAAW,GAAG,SAAS,CAAC;YAC1B,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,uBAAuB,QAAQ,CAAC,EAAE,oBAAoB,eAAe,KAAK,CAAC,CAAC;YACtF,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;YAE9D,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,UAAU,CAAC,IAAA,sCAAmB,EAAC,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7E,CAAC;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAA,8CAA2B,EAAC,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAjEM,4BAAO,GAAG,8CAA8C,CAAC;AACzD,gCAAW,GAChB,4GAA4G;IAC5G,uGAAuG;IACvG,oFAAoF,CAAC;AAEhF,6BAAQ,GAAG;IAChB,0CAA0C;IAC1C,4DAA4D;IAC5D,qFAAqF;CACtF,CAAC;AAEK,yBAAI,GAAG;IACZ,WAAW,EAAE,WAAI,CAAC,MAAM,CAAC;QACvB,WAAW,EACT,iGAAiG;QACnG,QAAQ,EAAE,KAAK;KAChB,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,EAAE,qFAAqF;KACnG,CAAC;CACH,CAAC;kBA/BiB,oBAAoB"}
|
|
@@ -65,7 +65,6 @@ export default class XcodeBuild extends BaseCommand {
|
|
|
65
65
|
private buildCloudSigningOptions;
|
|
66
66
|
private readFileBase64;
|
|
67
67
|
private buildAppStoreOptions;
|
|
68
|
-
private resolveIosSignedStreamUrl;
|
|
69
68
|
private resolveSimulatorStreamUrl;
|
|
70
69
|
}
|
|
71
70
|
//# sourceMappingURL=build.d.ts.map
|
|
@@ -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;AAgDjD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SACoU;IAEtV,MAAM,CAAC,QAAQ,WAiCb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/build.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAgDjD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAAW;IACjD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SACoU;IAEtV,MAAM,CAAC,QAAQ,WAiCb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA+JV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgSZ,mBAAmB;YAgBnB,wBAAwB;YA8BxB,cAAc;YAQd,oBAAoB;YAapB,yBAAyB;CAkBxC"}
|
|
@@ -248,13 +248,9 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
248
248
|
this.output('App Store Connect: upload status could not be read; check App Store Connect.');
|
|
249
249
|
}
|
|
250
250
|
if (flags.ios) {
|
|
251
|
-
const signedStreamUrl = await this.resolveSimulatorStreamUrl(
|
|
252
|
-
if (signedStreamUrl)
|
|
251
|
+
const signedStreamUrl = await this.resolveSimulatorStreamUrl(xcodeClient);
|
|
252
|
+
if (signedStreamUrl)
|
|
253
253
|
this.output(`Signed Stream URL: ${signedStreamUrl}`);
|
|
254
|
-
}
|
|
255
|
-
else if (target.type === 'ios') {
|
|
256
|
-
this.output(`iOS Simulator URL: ${this.consoleStreamUrl(target.id)}`);
|
|
257
|
-
}
|
|
258
254
|
}
|
|
259
255
|
if (flags.upload && result.signedDownloadUrl) {
|
|
260
256
|
this.output(`Artifact download URL: ${result.signedDownloadUrl}`);
|
|
@@ -262,9 +258,7 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
262
258
|
// Nudge toward the attach flow after simulator builds on a bare Xcode
|
|
263
259
|
// instance: an attached simulator receives this build and every next
|
|
264
260
|
// one automatically.
|
|
265
|
-
if (!this.isJsonEnabled() &&
|
|
266
|
-
target.type === 'xcode' &&
|
|
267
|
-
(!settings.sdk || settings.sdk === 'iphonesimulator')) {
|
|
261
|
+
if (!this.isJsonEnabled() && (!settings.sdk || settings.sdk === 'iphonesimulator')) {
|
|
268
262
|
// Assume attached when the status can't be read (old servers have
|
|
269
263
|
// no /simulator endpoint); a wrong hint is worse than none.
|
|
270
264
|
let attached = true;
|
|
@@ -340,23 +334,7 @@ class XcodeBuild extends base_command_1.BaseCommand {
|
|
|
340
334
|
...(flags['auto-build-number'] && { autoIncrementBuildNumber: true }),
|
|
341
335
|
};
|
|
342
336
|
}
|
|
343
|
-
async
|
|
344
|
-
const cached = target.signedStreamUrl ?? this.signedStreamUrl(target.status);
|
|
345
|
-
if (cached) {
|
|
346
|
-
return cached;
|
|
347
|
-
}
|
|
348
|
-
try {
|
|
349
|
-
const instance = await this.client.iosInstances.get(target.id);
|
|
350
|
-
return this.signedStreamUrl(instance.status);
|
|
351
|
-
}
|
|
352
|
-
catch {
|
|
353
|
-
return undefined;
|
|
354
|
-
}
|
|
355
|
-
}
|
|
356
|
-
async resolveSimulatorStreamUrl(target, xcodeClient) {
|
|
357
|
-
if (target.type === 'ios') {
|
|
358
|
-
return this.resolveIosSignedStreamUrl(target);
|
|
359
|
-
}
|
|
337
|
+
async resolveSimulatorStreamUrl(xcodeClient) {
|
|
360
338
|
try {
|
|
361
339
|
const status = await xcodeClient.getSimulator();
|
|
362
340
|
const iosInstanceId = status.simulator?.iosInstanceId;
|
|
@@ -425,7 +403,7 @@ XcodeBuild.flags = {
|
|
|
425
403
|
...xcode_project_flags_1.xcodeProjectFlags,
|
|
426
404
|
...sync_flags_1.syncFlags,
|
|
427
405
|
id: core_1.Flags.string({
|
|
428
|
-
description: 'Xcode instance ID to build on
|
|
406
|
+
description: 'Xcode instance ID to build on. Defaults to the most recent standalone Xcode target.',
|
|
429
407
|
}),
|
|
430
408
|
'inactivity-timeout': core_1.Flags.string({
|
|
431
409
|
description: 'Inactivity timeout for the instance created by this build (for example 3s, 1m). Forces a fresh instance and cannot be combined with --id. The timeout is measured from the last server-reported activity, so it does not interrupt an active build.',
|