lim 0.30.2 → 0.31.0

package/dist/commands/ios/tunnel/index.js

@@ -1,15 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const fs_1 = __importDefault(require("fs"));
 const core_1 = require("@oclif/core");
-const api_1 = require("@limrun/api");
 const base_command_1 = require("../../../base-command");
 const instance_client_factory_1 = require("../../../lib/instance-client-factory");
-const ios_tunnel_process_1 = require("../../../lib/ios-tunnel-process");
+const tunnel_command_1 = require("../../../lib/tunnel-command");
+const tunnel_process_1 = require("../../../lib/tunnel-process");
 class IosTunnel extends base_command_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(IosTunnel);
@@ -17,259 +12,54 @@ class IosTunnel extends base_command_1.BaseCommand {
         if (flags.detach && flags.serve) {
             this.error('--detach cannot be combined with internal --serve mode.');
         }
-        const routes = flags.route.map(ios_tunnel_process_1.parseTunnelRoute);
+        const selectors = (0, tunnel_process_1.parseTunnelSelectors)(flags.selector, { allowDomains: false });
         if (flags.serve) {
             const owner = flags['tunnel-owner'];
             if (!owner)
                 this.error('--serve requires --tunnel-owner.');
             await this.withAuth(async () => {
                 const resolvedInstance = this.resolveIosInstance(flags.id);
-                await this.serveDetached(resolvedInstance.id, owner, routes);
+                await (0, tunnel_command_1.serveTunnelDetached)(this.tunnelContext(resolvedInstance.id, selectors, flags.verbose ? 'debug' : 'info'), owner);
             });
             return;
         }
         await this.withAuth(async () => {
             const resolvedInstance = this.resolveIosInstance(flags.id);
             if (flags.detach) {
-                await this.startDetached(resolvedInstance.id, routes, flags['api-key']);
+                await (0, tunnel_command_1.startTunnelDetached)({
+                    ...this.tunnelContext(resolvedInstance.id, selectors, 'info', flags['api-key']),
+                    verbose: flags.verbose,
+                });
             }
             else {
-                await this.runForeground(resolvedInstance.id, routes);
-            }
-        });
-    }
-    async runForeground(instanceId, routes) {
-        const resolvedInstance = this.resolveIosInstance(instanceId);
-        const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
-        let tunnel;
-        try {
-            tunnel = await client.startTunnel({
-                routes,
-                logLevel: this.shouldSuppressInfo() ? 'none' : 'info',
-            });
-            this.printReady(instanceId, tunnel.tunnelId, false);
-            await this.awaitTunnel(tunnel, false);
-        }
-        finally {
-            tunnel?.close();
-            disconnect();
-        }
-    }
-    async serveDetached(instanceId, owner, routes) {
-        const ownershipDeadline = Date.now() + 2000;
-        let starting = (0, ios_tunnel_process_1.loadTunnelProcess)(instanceId, owner);
-        while (starting?.pid !== process.pid && Date.now() < ownershipDeadline) {
-            await (0, api_1.defaultSleep)(25);
-            starting = (0, ios_tunnel_process_1.loadTunnelProcess)(instanceId, owner);
-        }
-        if (!starting || starting.pid !== process.pid) {
-            this.error('Detached tunnel ownership handshake failed.');
-        }
-        const resolvedInstance = this.resolveIosInstance(instanceId);
-        const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
-        let tunnel;
-        const capLogs = setInterval(() => (0, ios_tunnel_process_1.capTunnelLog)(starting.logPath), 30000);
-        try {
-            tunnel = await client.startTunnel({ routes, logLevel: 'info' });
-            (0, ios_tunnel_process_1.updateTunnelProcess)({
-                ...starting,
-                status: 'ready',
-                tunnelId: tunnel.tunnelId,
-            }, owner);
-            await this.awaitTunnel(tunnel, true);
-        }
-        finally {
-            clearInterval(capLogs);
-            (0, ios_tunnel_process_1.capTunnelLog)(starting.logPath);
-            tunnel?.close();
-            disconnect();
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-        }
-    }
-    async startDetached(instanceId, routes, apiKey) {
-        await this.assertNoActiveTunnel(instanceId);
-        this.clearDeadOwners(instanceId);
-        const liveOwner = (0, ios_tunnel_process_1.listTunnelProcesses)(instanceId).find((state) => {
-            if (state.status === 'starting' && !(0, ios_tunnel_process_1.tunnelProcessStartingLeaseExpired)(state)) {
-                return true;
-            }
-            const identity = (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state);
-            return identity === 'match' || identity === 'unknown';
-        });
-        if (liveOwner) {
-            this.error(`A local tunnel process is already ${liveOwner.status} for ${instanceId} (PID ${liveOwner.pid}). ` +
-                `Run \`lim ios tunnel status --id ${instanceId}\` or stop it first.`);
-        }
-        const owner = (0, ios_tunnel_process_1.newTunnelOwner)();
-        const paths = (0, ios_tunnel_process_1.tunnelProcessPaths)(instanceId, owner);
-        const starting = {
-            owner,
-            pid: 0,
-            instanceId,
-            status: 'starting',
-            routes,
-            startedAt: new Date().toISOString(),
-            logPath: paths.log,
-        };
-        if (!(0, ios_tunnel_process_1.claimTunnelProcess)(starting)) {
-            this.error('Failed to claim detached tunnel process state.');
-        }
-        const scriptPath = process.argv[1];
-        if (!scriptPath) {
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-            this.error('Cannot locate the lim CLI entrypoint for detached startup.');
-        }
-        const logDescriptor = (0, ios_tunnel_process_1.prepareTunnelLog)(paths.log);
-        let child;
-        try {
-            child = (0, child_process_1.spawn)(process.execPath, (0, ios_tunnel_process_1.buildTunnelServeArgs)({
-                scriptPath,
-                instanceId,
-                owner,
-                routes,
-            }), {
-                detached: true,
-                windowsHide: true,
-                stdio: ['ignore', logDescriptor, logDescriptor],
-                env: (0, ios_tunnel_process_1.tunnelChildEnvironment)(apiKey),
-            });
-        }
-        catch (error) {
-            fs_1.default.closeSync(logDescriptor);
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-            throw error;
-        }
-        fs_1.default.closeSync(logDescriptor);
-        child.unref();
-        const pid = child.pid;
-        if (!pid) {
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-            this.error('Failed to spawn the detached tunnel process.');
-        }
-        (0, ios_tunnel_process_1.updateTunnelProcess)({ ...starting, pid }, owner);
-        const readiness = await (0, ios_tunnel_process_1.waitForTunnelProcessReady)({
-            load: () => (0, ios_tunnel_process_1.loadTunnelProcess)(instanceId, owner),
-            isAlive: () => (0, ios_tunnel_process_1.isSpawnedTunnelProcessAlive)(child, pid),
-            sleep: api_1.defaultSleep,
-        });
-        if (readiness.outcome === 'ready') {
-            const state = readiness.state;
-            this.printReady(instanceId, state.tunnelId, true, { pid, logPath: paths.log });
-            return;
-        }
-        if (readiness.outcome === 'exited') {
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-            this.error(`Detached tunnel exited during startup.\n${(0, ios_tunnel_process_1.readTunnelLogTail)(paths.log)}\nLogs: ${paths.log}`);
-        }
-        child.kill('SIGTERM');
-        let exited = await this.waitForProcessExit(child, pid, 20);
-        if (!exited) {
-            child.kill('SIGKILL');
-            exited = await this.waitForProcessExit(child, pid, 20);
-        }
-        if (exited) {
-            (0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, owner);
-        }
-        const retainedOwnership = exited ? '' : ` and PID ${pid} did not exit; its ownership record was retained`;
-        this.error(`Detached tunnel did not become ready within 30s${retainedOwnership}.\n` +
-            `${(0, ios_tunnel_process_1.readTunnelLogTail)(paths.log)}\nLogs: ${paths.log}`);
-    }
-    async assertNoActiveTunnel(instanceId) {
-        const resolvedInstance = this.resolveIosInstance(instanceId);
-        const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
-        try {
-            const status = await client.getTunnelStatus();
-            if (status.active) {
-                this.error(`Tunnel ${status.active.tunnelId} is already ${status.active.state}. ` +
-                    `Run \`lim ios tunnel status --id ${instanceId}\` or stop it first.`);
-            }
-        }
-        finally {
-            disconnect();
-        }
-    }
-    clearDeadOwners(instanceId) {
-        for (const state of (0, ios_tunnel_process_1.listTunnelProcesses)(instanceId)) {
-            const identity = (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state);
-            if (identity === 'unknown') {
-                this.error(`Cannot verify local tunnel owner PID ${state.pid}; ownership state was retained at ${state.logPath}.`);
-            }
-            if (identity === 'match')
-                continue;
-            if (state.status === 'starting' && !(0, ios_tunnel_process_1.tunnelProcessStartingLeaseExpired)(state))
-                continue;
-            if (!(0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, state.owner)) {
-                this.error(`Cannot clean local tunnel owner PID ${state.pid}; stop it before starting another tunnel.`);
+                await (0, tunnel_command_1.runTunnelForeground)(this.tunnelContext(resolvedInstance.id, selectors, flags.verbose ? 'debug'
+                    : this.shouldSuppressInfo() ? 'none'
+                        : 'info'));
             }
-        }
-    }
-    async awaitTunnel(tunnel, remoteStopIsClean) {
-        await new Promise((resolve, reject) => {
-            const keepAlive = setInterval(() => { }, 1 << 30);
-            let stopping = false;
-            let unsubscribe = () => { };
-            const cleanup = () => {
-                clearInterval(keepAlive);
-                unsubscribe();
-                process.off('SIGINT', shutdown);
-                process.off('SIGTERM', shutdown);
-            };
-            const shutdown = () => {
-                stopping = true;
-                cleanup();
-                resolve();
-            };
-            process.once('SIGINT', shutdown);
-            process.once('SIGTERM', shutdown);
-            unsubscribe = (0, ios_tunnel_process_1.subscribeTunnelDisconnect)(tunnel, () => {
-                if (stopping)
-                    return;
-                cleanup();
-                if (remoteStopIsClean) {
-                    resolve();
-                }
-                else {
-                    reject(new Error('Destination tunnel disconnected unexpectedly'));
-                }
-            });
         });
     }
-    async waitForProcessExit(child, pid, attempts) {
-        for (let attempt = 0; attempt < attempts; attempt++) {
-            if (child.exitCode !== null || child.signalCode !== null || !(0, ios_tunnel_process_1.isProcessAlive)(pid)) {
-                return true;
-            }
-            await (0, api_1.defaultSleep)(100);
-        }
-        return !(0, ios_tunnel_process_1.isProcessAlive)(pid);
-    }
-    printReady(instanceId, tunnelId, detached, processInfo) {
-        const ready = {
+    tunnelContext(instanceId, selectors, logLevel, apiKey) {
+        return {
+            product: 'ios',
             instanceId,
-            tunnelId,
-            state: 'ready',
-            detached,
-            ...processInfo,
+            selectors,
+            apiKey,
+            reconnect: false,
+            inspect: false,
+            connect: async () => {
+                const resolvedInstance = this.resolveIosInstance(instanceId);
+                const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
+                return (0, tunnel_command_1.tunnelClientFacade)(client, disconnect, logLevel);
+            },
+            io: this.tunnelCommandIO(),
         };
-        if (this.isJsonEnabled()) {
-            this.outputJson(ready);
-            return;
-        }
-        this.output(`Tunnel ID: ${ready.tunnelId}`);
-        if (detached) {
-            this.output(`Logs: ${processInfo?.logPath}`);
-            this.output(`Stop: lim ios tunnel stop --id ${instanceId}`);
-        }
-        else {
-            this.info('Tunnel started. Press Ctrl+C to stop.');
-        }
     }
 }
 IosTunnel.summary = 'Expose declared local TCP destinations to the simulator';
-IosTunnel.description = 'Start one transparent destination tunnel with exact localhost:port or literal IP:port routes. Use --detach to keep it running after this command returns.';
+IosTunnel.description = 'Start one transparent destination tunnel with exact localhost:port or literal IP:port selectors. Use --detach to keep it running after this command returns.';
 IosTunnel.examples = [
-    '<%= config.bin %> ios tunnel --route localhost:3000 --id <instance-ID>',
-    '<%= config.bin %> ios tunnel --route 10.20.30.40:443 --route 10.20.30.41:8081 --detach',
+    '<%= config.bin %> ios tunnel --selector localhost:3000 --id <instance-ID>',
+    '<%= config.bin %> ios tunnel --selector 10.20.30.40:443 --selector 10.20.30.41:8081 --detach',
     '<%= config.bin %> ios tunnel status --id <instance-ID>',
     '<%= config.bin %> ios tunnel stop --id <instance-ID>',
 ];
@@ -278,8 +68,8 @@ IosTunnel.flags = {
     id: core_1.Flags.string({
         description: 'iOS instance ID to target. Defaults to the last created iOS instance, but --id is recommended for scripts and agents.',
     }),
-    route: core_1.Flags.string({
-        description: 'Exact client-side TCP destination as localhost:port, IPv4:port, or [IPv6]:port. Repeat for more routes.',
+    selector: core_1.Flags.string({
+        description: 'Exact client-side TCP destination as localhost:port, IPv4:port, or [IPv6]:port. Repeat for more selectors.',
         multiple: true,
         required: true,
     }),
@@ -287,6 +77,10 @@ IosTunnel.flags = {
         description: 'Run in a detached background process and return after READY.',
         default: false,
     }),
+    verbose: core_1.Flags.boolean({
+        description: 'Log every forwarded connection and dial failure. With --detach, the lines go to the tunnel log file (see tunnel status).',
+        default: false,
+    }),
     serve: core_1.Flags.boolean({
         description: 'Internal: own the detached tunnel transport.',
         default: false,

package/dist/commands/ios/tunnel/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/ios/tunnel/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AASpD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IACtD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SACoF;IACtG,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAYV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsD3B"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,WAAW;IACtD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SACoF;IACtG,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAYV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2B3B"}

package/dist/commands/ios/tunnel/status.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../../base-command");
 const instance_client_factory_1 = require("../../../lib/instance-client-factory");
-const ios_tunnel_process_1 = require("../../../lib/ios-tunnel-process");
+const tunnel_command_1 = require("../../../lib/tunnel-command");
 class IosTunnelStatus extends base_command_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(IosTunnelStatus);
@@ -13,47 +13,23 @@ class IosTunnelStatus extends base_command_1.BaseCommand {
         }
         await this.withAuth(async () => {
             const resolvedInstance = this.resolveIosInstance(flags.id);
-            const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
-            try {
-                const status = await client.getTunnelStatus();
-                const owners = (0, ios_tunnel_process_1.listTunnelProcesses)(resolvedInstance.id).map((state) => ({
-                    owner: state.owner,
-                    pid: state.pid,
-                    status: state.status,
-                    tunnelId: state.tunnelId,
-                    logPath: state.logPath,
-                    process: (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state),
-                }));
-                if (this.isJsonEnabled()) {
-                    this.outputJson({
-                        instanceId: resolvedInstance.id,
-                        ...status,
-                        localOwners: owners,
-                    });
-                    return;
-                }
-                if (status.active) {
-                    this.output(`Tunnel ${status.active.tunnelId}: ${status.active.state}`);
-                    for (const route of status.active.routes) {
-                        this.output(`Route: ${(0, ios_tunnel_process_1.formatTunnelRoute)(route)}`);
+            await (0, tunnel_command_1.runTunnelStatus)({
+                instanceId: resolvedInstance.id,
+                connect: async () => {
+                    const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
+                    return {
+                        getTunnelStatus: () => client.getTunnelStatus(),
+                        stopTunnel: (tunnelId) => client.stopTunnel(tunnelId),
+                        disconnect,
+                    };
+                },
+                io: this.tunnelCommandIO(),
+                renderActive: (active, io) => {
+                    for (const selector of active.selectors) {
+                        io.output(`Selector: ${selector.value}`);
                     }
-                }
-                else {
-                    this.output('No active destination tunnel.');
-                }
-                if (status.lastFailure) {
-                    this.output(`Last failure: ${status.lastFailure.tunnelId} (${status.lastFailure.code})`);
-                }
-                if (status.lastDialFailure) {
-                    this.output((0, ios_tunnel_process_1.formatTunnelDialFailure)(status.lastDialFailure));
-                }
-                for (const owner of owners) {
-                    this.output(`Local owner: PID ${owner.pid} (${owner.process}, ${owner.status})${owner.logPath ? `, logs: ${owner.logPath}` : ''}`);
-                }
-            }
-            finally {
-                disconnect();
-            }
+                },
+            });
         });
     }
 }

package/dist/commands/ios/tunnel/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/status.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,wDAAoD;AACpD,kFAA4E;AAC5E,gEAA8D;AAE9D,MAAqB,eAAgB,SAAQ,0BAAW;IAuBtD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAA,gCAAe,EAAC;gBACpB,UAAU,EAAE,gBAAgB,CAAC,EAAE;gBAC/B,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;oBACzF,OAAO;wBACL,eAAe,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;wBAC/C,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;wBAC7D,UAAU;qBACX,CAAC;gBACJ,CAAC;gBACD,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE;gBAC1B,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;oBAC3B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;wBACxC,EAAE,CAAC,MAAM,CAAC,aAAa,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;oBAC3C,CAAC;gBACH,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;;AAhDM,uBAAO,GAAG,oCAAoC,CAAC;AAC/C,2BAAW,GAChB,mGAAmG,CAAC;AAC/F,wBAAQ,GAAG;IAChB,wDAAwD;IACxD,+DAA+D;CAChE,CAAC;AAEK,qBAAK,GAAG;IACb,GAAG,0BAAW,CAAC,SAAS;IACxB,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EACT,8FAA8F;QAChG,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;KACb,CAAC;IACF,EAAE,EAAE,YAAK,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,sEAAsE;KACpF,CAAC;CACH,CAAC;kBArBiB,eAAe"}

package/dist/commands/ios/tunnel/stop.d.ts

@@ -13,9 +13,5 @@ export default class IosTunnelStop extends BaseCommand {
         daemon: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    private stopRemoteTunnel;
-    private stopLocalOwners;
-    private signalOwnerAndRefreshIdentity;
-    private waitForPIDExit;
 }
 //# sourceMappingURL=stop.d.ts.map

package/dist/commands/ios/tunnel/stop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/stop.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAmBpD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IACpD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SAC+H;IACjJ,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAWV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAkCZ,gBAAgB;YAoBhB,eAAe;YAuDf,6BAA6B;YAW7B,cAAc;CAK7B"}
+{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/stop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IACpD,MAAM,CAAC,OAAO,SAAwC;IACtD,MAAM,CAAC,WAAW,SAC+H;IACjJ,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;MAWV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsB3B"}

package/dist/commands/ios/tunnel/stop.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const api_1 = require("@limrun/api");
 const base_command_1 = require("../../../base-command");
 const instance_client_factory_1 = require("../../../lib/instance-client-factory");
-const ios_tunnel_process_1 = require("../../../lib/ios-tunnel-process");
+const tunnel_command_1 = require("../../../lib/tunnel-command");
 class IosTunnelStop extends base_command_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(IosTunnelStop);
@@ -14,117 +13,20 @@ class IosTunnelStop extends base_command_1.BaseCommand {
         }
         await this.withAuth(async () => {
             const resolvedInstance = this.resolveIosInstance(flags.id);
-            const ownerSnapshot = (0, ios_tunnel_process_1.listTunnelProcesses)(resolvedInstance.id);
-            const remote = await this.stopRemoteTunnel(resolvedInstance);
-            const expectedTunnelId = remote.outcome === 'none' ? undefined : remote.tunnelId;
-            const owners = (0, ios_tunnel_process_1.selectTunnelOwnersForStop)(ownerSnapshot, expectedTunnelId);
-            const local = await this.stopLocalOwners(resolvedInstance.id, owners, remote);
-            if (this.isJsonEnabled()) {
-                this.outputJson({
-                    instanceId: resolvedInstance.id,
-                    ...(remote.outcome === 'none' ? {} : { tunnelId: remote.tunnelId }),
-                    outcome: remote.outcome,
-                    localProcessesStopped: local.processesStopped,
-                    localRecordsCleaned: local.recordsCleaned,
-                });
-            }
-            else if (remote.outcome === 'stopped') {
-                this.output(`Stopped destination tunnel ${remote.tunnelId}.`);
-            }
-            else if (remote.outcome === 'gone') {
-                this.output(`Destination tunnel ${remote.tunnelId} was already gone.`);
-            }
-            else if (local.processesStopped > 0 || local.recordsCleaned > 0) {
-                this.output('Cleaned local destination tunnel ownership.');
-            }
-            else {
-                this.output('No active destination tunnel.');
-            }
+            await (0, tunnel_command_1.runTunnelStop)({
+                instanceId: resolvedInstance.id,
+                connect: async () => {
+                    const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
+                    return {
+                        getTunnelStatus: () => client.getTunnelStatus(),
+                        stopTunnel: (tunnelId) => client.stopTunnel(tunnelId),
+                        disconnect,
+                    };
+                },
+                io: this.tunnelCommandIO(),
+            });
         });
     }
-    async stopRemoteTunnel(resolvedInstance) {
-        const { client, disconnect } = await (0, instance_client_factory_1.getIosInstanceClient)(this.client, resolvedInstance);
-        try {
-            const status = await client.getTunnelStatus();
-            if (!status.active)
-                return { outcome: 'none' };
-            const tunnelId = status.active.tunnelId;
-            try {
-                await client.stopTunnel(tunnelId);
-            }
-            catch (error) {
-                if ((0, ios_tunnel_process_1.stopTunnelErrorIsNotFound)(error)) {
-                    return { outcome: 'gone', tunnelId };
-                }
-                throw error;
-            }
-            return { outcome: 'stopped', tunnelId };
-        }
-        finally {
-            disconnect();
-        }
-    }
-    async stopLocalOwners(instanceId, owners, remote) {
-        const expectedTunnelId = remote.outcome === 'none' ? undefined : remote.tunnelId;
-        let processesStopped = 0;
-        let recordsCleaned = 0;
-        const retainedOwners = [];
-        for (const snapshot of owners) {
-            let state = (0, ios_tunnel_process_1.loadTunnelProcess)(instanceId, snapshot.owner) ?? snapshot;
-            let identity = (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state);
-            const wasRunning = identity === 'match';
-            if (identity === 'match' && remote.outcome === 'stopped') {
-                await this.waitForPIDExit(state.pid, 50);
-            }
-            state = (0, ios_tunnel_process_1.loadTunnelProcess)(instanceId, state.owner) ?? state;
-            identity = (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state);
-            if (!(0, ios_tunnel_process_1.tunnelOwnerRemainsSelectedForStop)(snapshot, state, expectedTunnelId)) {
-                if (identity === 'missing' || identity === 'mismatch') {
-                    if ((0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, state.owner)) {
-                        recordsCleaned++;
-                    }
-                    else {
-                        retainedOwners.push(state);
-                    }
-                }
-                continue;
-            }
-            if (identity === 'match') {
-                identity = await this.signalOwnerAndRefreshIdentity(state, 'SIGTERM', 20);
-            }
-            if (identity === 'match') {
-                identity = await this.signalOwnerAndRefreshIdentity(state, 'SIGKILL', 20);
-            }
-            if (identity === 'match' || identity === 'unknown') {
-                retainedOwners.push(state);
-                continue;
-            }
-            if (!(0, ios_tunnel_process_1.clearTunnelProcess)(instanceId, state.owner)) {
-                retainedOwners.push(state);
-                continue;
-            }
-            recordsCleaned++;
-            if (wasRunning)
-                processesStopped++;
-        }
-        if (retainedOwners.length > 0) {
-            this.error(`Could not verify that ${retainedOwners.length} local tunnel process(es) exited. ` +
-                `Ownership records were retained: ${retainedOwners.map((state) => state.logPath).join(', ')}`);
-        }
-        return { processesStopped, recordsCleaned };
-    }
-    async signalOwnerAndRefreshIdentity(state, signal, attempts) {
-        const result = (0, ios_tunnel_process_1.signalTunnelOwner)(state, signal);
-        if (result !== 'signaled')
-            return result;
-        await this.waitForPIDExit(state.pid, attempts);
-        return (0, ios_tunnel_process_1.tunnelOwnerProcessIdentity)(state);
-    }
-    async waitForPIDExit(pid, attempts) {
-        for (let attempt = 0; attempt < attempts && (0, ios_tunnel_process_1.isProcessAlive)(pid); attempt++) {
-            await (0, api_1.defaultSleep)(100);
-        }
-    }
 }
 IosTunnelStop.summary = 'Stop the active destination tunnel';
 IosTunnelStop.description = 'Stop the instance-authoritative tunnel by its current ID, then gracefully stop and, if necessary, force-stop verified local detached owners.';

package/dist/commands/ios/tunnel/stop.js.map

@@ -1 +1 @@
-{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/stop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../src/commands/ios/tunnel/stop.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,wDAAoD;AACpD,kFAA4E;AAC5E,gEAA4D;AAE5D,MAAqB,aAAc,SAAQ,0BAAW;IAsBpD,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;QAC3B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAA,8BAAa,EAAC;gBAClB,UAAU,EAAE,gBAAgB,CAAC,EAAE;gBAC/B,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,8CAAoB,EAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;oBACzF,OAAO;wBACL,eAAe,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;wBAC/C,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;wBAC7D,UAAU;qBACX,CAAC;gBACJ,CAAC;gBACD,EAAE,EAAE,IAAI,CAAC,eAAe,EAAE;aAC3B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;;AA1CM,qBAAO,GAAG,oCAAoC,CAAC;AAC/C,yBAAW,GAChB,8IAA8I,CAAC;AAC1I,sBAAQ,GAAG;IAChB,sDAAsD;IACtD,6DAA6D;CAC9D,CAAC;AAEK,mBAAK,GAAG;IACb,GAAG,0BAAW,CAAC,SAAS;IACxB,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EAAE,oFAAoF;QACjG,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;KACb,CAAC;IACF,EAAE,EAAE,YAAK,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,qEAAqE;KACnF,CAAC;CACH,CAAC;kBApBiB,aAAa"}

package/dist/commands/xcode/build.d.ts

@@ -31,6 +31,7 @@ export default class XcodeBuild extends BaseCommand {
         'provisioning-profile': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'signing-method': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'team-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        entitlements: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'upload-to-appstore': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'asc-key-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'asc-issuer-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;