roku-debug 0.23.16 → 0.24.0

package/dist/RokuECP.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rokuECP = exports.AppState = exports.EcpStatus = exports.RokuECP = void 0;
 const util_1 = require("./util");
+const roku_deploy_1 = require("roku-deploy");
 class RokuECP {
+    /**
+     * Send a raw ECP request through roku-deploy's `sendEcpRequest()` transport, which routes a local device
+     * over plain HTTP and a Roku Cloud Emulator device through its instance's ECP proxy.
+     */
     async doRequest(route, options, method = 'get') {
         var _a;
-        const url = `http://${options.host}:${(_a = options.remotePort) !== null && _a !== void 0 ? _a : 8060}/${route.replace(/^\//, '')}`;
-        if (method === 'post') {
-            return util_1.util.httpPost(url, options.requestOptions);
-        }
-        else {
-            return util_1.util.httpGet(url, options.requestOptions);
-        }
+        return roku_deploy_1.rokuDeploy.sendEcpRequest(options.device, route, {
+            method: method === 'post' ? 'POST' : 'GET',
+            ecpPort: options.remotePort,
+            timeout: (_a = options.requestOptions) === null || _a === void 0 ? void 0 : _a.timeout
+        });
     }
     /**
      * Enables perfetto tracing for the specified channel
@@ -20,7 +23,7 @@ class RokuECP {
      */
     async enablePerfettoTracing(options) {
         const response = await this.doRequest(`/perfetto/enable/${options.channelId}`, options, 'post');
-        return this.parseResponse(response, 'perfetto-enable', (parsed, status) => {
+        return this.parseResponse(response.body, 'perfetto-enable', (parsed, status) => {
             var _a, _b, _c, _d, _e;
             return {
                 enabledChannels: (_c = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed['enabled-channels']) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.channel) !== null && _c !== void 0 ? _c : [],
@@ -37,7 +40,7 @@ class RokuECP {
      */
     async captureHeapSnapshot(options) {
         const response = await this.doRequest(`/perfetto/heapgraph/trigger/${options.channelId}`, options, 'post');
-        return this.parseResponse(response, 'perfetto-heapgraph-trigger', (parsed, status) => {
+        return this.parseResponse(response.body, 'perfetto-heapgraph-trigger', (parsed, status) => {
             var _a, _b;
             return {
                 timestamp: Number((_a = parsed === null || parsed === void 0 ? void 0 : parsed.timestamp) === null || _a === void 0 ? void 0 : _a[0]),
@@ -50,80 +53,63 @@ class RokuECP {
         var _a, _b, _c, _d;
         return (_d = EcpStatus[(_c = (_b = (_a = response === null || response === void 0 ? void 0 : response[rootKey]) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.toLowerCase()]) !== null && _d !== void 0 ? _d : EcpStatus.failed;
     }
-    async parseResponse(response, rootKey, callback) {
-        var _a, _b, _c, _d;
-        if (typeof response.body === 'string') {
+    async parseResponse(body, rootKey, callback) {
+        var _a, _b, _c;
+        if (typeof body === 'string') {
             let parsed;
             try {
-                parsed = await util_1.util.parseXml(response.body);
+                parsed = await util_1.util.parseXml(body);
             }
-            catch (_e) {
+            catch (_d) {
                 //if the response is not xml, just return the body as-is
-                throw new Error((_a = response.body) !== null && _a !== void 0 ? _a : 'Unknown error');
+                throw new Error(body !== null && body !== void 0 ? body : 'Unknown error');
             }
             const status = this.getEcpStatus(parsed, rootKey);
             if (status === EcpStatus.ok) {
                 return callback(parsed === null || parsed === void 0 ? void 0 : parsed[rootKey], status);
             }
             else {
-                throw new Error((_d = (_c = (_b = parsed === null || parsed === void 0 ? void 0 : parsed[rootKey]) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 'Unknown error');
+                throw new Error((_c = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed[rootKey]) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : 'Unknown error');
             }
         }
     }
     async getRegistry(options) {
-        let result = await this.doRequest(`query/registry/${options.appId}`, options);
-        return this.processRegistry(result);
-    }
-    async processRegistry(response) {
-        return this.parseResponse(response, 'plugin-registry', (parsed, status) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            const registry = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.registry) === null || _a === void 0 ? void 0 : _a[0];
-            let sections = {};
-            for (const section of (_d = (_c = (_b = registry === null || registry === void 0 ? void 0 : registry.sections) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.section) !== null && _d !== void 0 ? _d : []) {
-                if (typeof section === 'string') {
-                    continue;
-                }
-                let sectionName = section.name[0];
-                for (const item of section.items[0].item) {
-                    (_e = sections[sectionName]) !== null && _e !== void 0 ? _e : (sections[sectionName] = {});
-                    sections[sectionName][item.key[0]] = item.value[0];
-                }
-            }
-            return {
-                devId: (_f = registry === null || registry === void 0 ? void 0 : registry['dev-id']) === null || _f === void 0 ? void 0 : _f[0],
-                plugins: (_h = (_g = registry === null || registry === void 0 ? void 0 : registry.plugins) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.split(','),
-                sections: sections,
-                spaceAvailable: (_j = registry === null || registry === void 0 ? void 0 : registry['space-available']) === null || _j === void 0 ? void 0 : _j[0],
-                status: status
-            };
+        const registry = await roku_deploy_1.rokuDeploy.queryRegistry({
+            device: options.device,
+            appId: options.appId,
+            ecpPort: options.remotePort
         });
+        return {
+            devId: registry.devId,
+            plugins: registry.plugins,
+            sections: registry.sections,
+            spaceAvailable: registry.spaceAvailable,
+            status: EcpStatus.ok
+        };
     }
     async getAppState(options) {
-        let result = await this.doRequest(`query/app-state/${options.appId}`, options);
-        return this.processAppState(result);
-    }
-    async processAppState(response) {
-        return this.parseResponse(response, 'app-state', (parsed, status) => {
-            var _a, _b, _c, _d, _e, _f, _g;
-            const state = (_c = AppState[(_b = (_a = parsed.state) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toLowerCase()]) !== null && _c !== void 0 ? _c : AppState.unknown;
-            return {
-                appId: (_d = parsed['app-id']) === null || _d === void 0 ? void 0 : _d[0],
-                appDevId: (_e = parsed['app-dev-id']) === null || _e === void 0 ? void 0 : _e[0],
-                appTitle: (_f = parsed['app-title']) === null || _f === void 0 ? void 0 : _f[0],
-                appVersion: (_g = parsed['app-version']) === null || _g === void 0 ? void 0 : _g[0],
-                state: state,
-                status: status
-            };
+        var _a;
+        const appState = await roku_deploy_1.rokuDeploy.queryAppState({
+            device: options.device,
+            appId: options.appId,
+            ecpPort: options.remotePort
         });
+        return {
+            appId: appState.appId,
+            appDevId: appState.appDevId,
+            appTitle: appState.appTitle,
+            appVersion: appState.appVersion,
+            state: (_a = AppState[appState.state]) !== null && _a !== void 0 ? _a : AppState.unknown,
+            status: EcpStatus.ok
+        };
     }
     async exitApp(options) {
-        let result = await this.doRequest(`exit-app/${options.appId}`, options, 'post');
-        return this.processExitApp(result);
-    }
-    async processExitApp(response) {
-        return this.parseResponse(response, 'exit-app', (parsed, status) => {
-            return { status: status };
+        await roku_deploy_1.rokuDeploy.exitApp({
+            device: options.device,
+            appId: options.appId,
+            ecpPort: options.remotePort
         });
+        return { status: EcpStatus.ok };
     }
 }
 exports.RokuECP = RokuECP;

package/dist/RokuECP.js.map

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

package/dist/SceneGraphDebugCommandController.d.ts

@@ -1,6 +1,10 @@
+import type { DeviceConfig, RokuDeploySocket, SocketOptions } from 'roku-deploy';
 export declare class SceneGraphDebugCommandController {
-    host: string;
-    constructor(host: string, port?: number);
+    constructor(device: DeviceConfig, port?: number);
+    /**
+     * The roku-deploy device config for the target device
+     */
+    private device;
     private connection;
     private shellPrompt;
     private echoLines;
@@ -9,10 +13,32 @@ export declare class SceneGraphDebugCommandController {
     private port;
     private maxBufferLength;
     private logger;
+    /**
+     * Create the transport used to reach the SceneGraph debug server. Extracted to a protected
+     * method so tests can substitute a fake socket.
+     */
+    protected createRokuDeploySocket(options: SocketOptions): RokuDeploySocket;
     connect(options?: {
         execTimeout?: number;
         timeout?: number;
     }): Promise<void>;
+    /**
+     * Waits for the transport-level connection to establish (the tcp handshake for a local device,
+     * or the websocket handshake for an RCE device), racing its 'connect' event against 'error' and
+     * a manual timeout. An injected sock bypasses telnet-client's own connect timeout entirely
+     * (telnet-client resolves immediately for an injected sock, before its timeout is even armed),
+     * so this is the only thing enforcing one here.
+     */
+    private waitForSocketConnect;
+    /**
+     * Waits for the connection greeting (a bare `>` shell prompt) to arrive and consumes it before
+     * the socket is handed to telnet-client. This mirrors the prompt wait telnet-client performs
+     * when it owns the socket, which it skips entirely for an injected sock (it treats one as
+     * already `'ready'`); without it the greeting would instead arrive mid-exec, where its prompt
+     * would prematurely terminate the first command's response. Rejects if the prompt does not
+     * arrive within `timeoutMs`.
+     */
+    private waitForConnectPrompt;
     private removeConnection;
     /**
      * executes the different bsprof commands used for brightscript profiling.

package/dist/SceneGraphDebugCommandController.js

@@ -1,46 +1,142 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SceneGraphDebugCommandController = void 0;
+const roku_deploy_1 = require("roku-deploy");
 const logging_1 = require("./logging");
 // eslint-disable-next-line
 const Telnet = require('telnet-client');
 class SceneGraphDebugCommandController {
-    constructor(host, port) {
-        this.host = host;
+    constructor(device, port) {
         this.shellPrompt = /^>$/img;
         this.echoLines = 0;
         this.timeout = 5000;
         this.execTimeout = 2000;
         this.maxBufferLength = 5242880;
         this.logger = logging_1.logger.createLogger(`[${SceneGraphDebugCommandController.name}]`);
+        this.device = device;
         this.port = port !== null && port !== void 0 ? port : 8080;
     }
+    /**
+     * Create the transport used to reach the SceneGraph debug server. Extracted to a protected
+     * method so tests can substitute a fake socket.
+     */
+    createRokuDeploySocket(options) {
+        return (0, roku_deploy_1.createRokuDeploySocket)(options);
+    }
     async connect(options = {}) {
+        var _a;
         this.removeConnection();
+        const timeoutMs = (_a = options.timeout) !== null && _a !== void 0 ? _a : this.timeout;
+        let socket;
         try {
+            socket = this.createRokuDeploySocket({
+                device: this.device,
+                port: this.port
+            });
+            //keep an error listener attached for the socket's whole life: waitForConnectPrompt and
+            //telnet-client each remove or narrow theirs at various points, and a socket 'error'
+            //emitted while no listener is attached would crash the whole process
+            socket.on('error', (error) => {
+                this.logger.debug('SceneGraph debug server socket error', error);
+            });
+            await this.waitForSocketConnect(socket, timeoutMs);
+            //an injected sock skips telnet-client's own prompt wait entirely (see the comment on
+            //waitForConnectPrompt below), so the greeting has to be consumed here first or it would
+            //otherwise arrive mid-exec and prematurely terminate the first command's response
+            await this.waitForConnectPrompt(socket, timeoutMs);
             // Make a new telnet connections object
             let connection = new Telnet();
             connection.on('close', () => {
                 this.removeConnection();
             });
             const config = {
-                host: this.host,
                 port: this.port,
                 shellPrompt: this.shellPrompt,
                 echoLines: this.echoLines,
                 timeout: this.timeout,
                 execTimeout: this.execTimeout,
                 maxBufferLength: this.maxBufferLength,
-                ...options
+                ...options,
+                sock: socket
             };
             this.logger.debug('Establishing telnet connection', config);
             await connection.connect(config);
             this.connection = connection;
         }
         catch (e) {
+            //the socket was created but never became the live connection, so nothing else will ever
+            //destroy it. Leaving it dangling would leak an open socket or websocket.
+            socket === null || socket === void 0 ? void 0 : socket.destroy();
             throw new Error(e.message);
         }
     }
+    /**
+     * Waits for the transport-level connection to establish (the tcp handshake for a local device,
+     * or the websocket handshake for an RCE device), racing its 'connect' event against 'error' and
+     * a manual timeout. An injected sock bypasses telnet-client's own connect timeout entirely
+     * (telnet-client resolves immediately for an injected sock, before its timeout is even armed),
+     * so this is the only thing enforcing one here.
+     */
+    waitForSocketConnect(socket, timeoutMs) {
+        return new Promise((resolve, reject) => {
+            const cleanup = () => {
+                clearTimeout(timeoutHandle);
+                socket.removeListener('connect', onConnect);
+                socket.removeListener('error', onError);
+            };
+            const onConnect = () => {
+                cleanup();
+                resolve();
+            };
+            const onError = (error) => {
+                cleanup();
+                reject(error);
+            };
+            const timeoutHandle = setTimeout(() => {
+                cleanup();
+                reject(new Error(`Timed out connecting to the SceneGraph debug server after ${timeoutMs}ms`));
+            }, timeoutMs);
+            socket.once('connect', onConnect);
+            socket.once('error', onError);
+            socket.connect();
+        });
+    }
+    /**
+     * Waits for the connection greeting (a bare `>` shell prompt) to arrive and consumes it before
+     * the socket is handed to telnet-client. This mirrors the prompt wait telnet-client performs
+     * when it owns the socket, which it skips entirely for an injected sock (it treats one as
+     * already `'ready'`); without it the greeting would instead arrive mid-exec, where its prompt
+     * would prematurely terminate the first command's response. Rejects if the prompt does not
+     * arrive within `timeoutMs`.
+     */
+    waitForConnectPrompt(socket, timeoutMs) {
+        return new Promise((resolve, reject) => {
+            let accumulatedText = '';
+            //a fresh non-global copy avoids a stateful lastIndex across calls, since
+            //this.shellPrompt carries the 'g' flag
+            const nonGlobalShellPrompt = new RegExp(this.shellPrompt.source, this.shellPrompt.flags.replace('g', ''));
+            const finish = (error) => {
+                socket.removeListener('data', onData);
+                clearTimeout(timeoutHandle);
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve();
+                }
+            };
+            const onData = (chunk) => {
+                accumulatedText += chunk.toString('utf8');
+                if (nonGlobalShellPrompt.test(accumulatedText)) {
+                    finish();
+                }
+            };
+            const timeoutHandle = setTimeout(() => {
+                finish(new Error(`Timed out after ${timeoutMs}ms waiting for the SceneGraph debug server's shell prompt`));
+            }, timeoutMs);
+            socket.on('data', onData);
+        });
+    }
     removeConnection() {
         this.connection = null;
     }

package/dist/SceneGraphDebugCommandController.js.map

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

package/dist/adapters/DebugProtocolAdapter.d.ts

@@ -1,3 +1,4 @@
+import type { RokuDeploySocket, SocketOptions } from 'roku-deploy';
 import type { BSDebugDiagnostic } from '../CompileErrorProcessor';
 import type { RendezvousHistory, RendezvousTracker } from '../RendezvousTracker';
 import type { ChanperfData } from '../ChanperfTracker';
@@ -128,6 +129,11 @@ export declare class DebugProtocolAdapter {
      * Resolves when the first connection to the client is established
      */
     onReady(): Promise<void>;
+    /**
+     * Create the transport used to reach the device's BrightScript console. Extracted to a
+     * protected method so tests can substitute a fake socket.
+     */
+    protected createRokuDeploySocket(options: SocketOptions): RokuDeploySocket;
     /**
      * Connect to the telnet session. This should be called before the channel is launched.
      */

package/dist/adapters/DebugProtocolAdapter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyType = exports.EventName = exports.DebugProtocolAdapter = void 0;
 const EventEmitter = require("events");
-const net_1 = require("net");
+const roku_deploy_1 = require("roku-deploy");
 const brighterscript_1 = require("brighterscript");
 const CompileErrorProcessor_1 = require("../CompileErrorProcessor");
 const ChanperfTracker_1 = require("../ChanperfTracker");
@@ -197,6 +197,13 @@ class DebugProtocolAdapter {
     onReady() {
         return this.firstConnectDeferred.promise;
     }
+    /**
+     * Create the transport used to reach the device's BrightScript console. Extracted to a
+     * protected method so tests can substitute a fake socket.
+     */
+    createRokuDeploySocket(options) {
+        return (0, roku_deploy_1.createRokuDeploySocket)(options);
+    }
     /**
      * Connect to the telnet session. This should be called before the channel is launched.
      */
@@ -287,7 +294,7 @@ class DebugProtocolAdapter {
             });
             //handle when the device verifies breakpoints
             this.client.on('breakpoints-verified', (event) => {
-                var _a;
+                var _a, _b;
                 let unverifiableDeviceIds = [];
                 //mark the breakpoints as verified
                 for (let breakpoint of (_a = event === null || event === void 0 ? void 0 : event.breakpoints) !== null && _a !== void 0 ? _a : []) {
@@ -299,7 +306,7 @@ class DebugProtocolAdapter {
                 //if there were any unsuccessful breakpoint verifications, we need to ask the device to delete those breakpoints as they've gone missing on our side
                 if (unverifiableDeviceIds.length > 0) {
                     this.logger.warn('Could not find breakpoints to verify. Removing from device:', { deviceBreakpointIds: unverifiableDeviceIds });
-                    void this.client.removeBreakpoints(unverifiableDeviceIds);
+                    void ((_b = this.client) === null || _b === void 0 ? void 0 : _b.removeBreakpoints(unverifiableDeviceIds));
                 }
                 this.emit('breakpoints-verified', event);
             });
@@ -315,7 +322,16 @@ class DebugProtocolAdapter {
                 this.emit('diagnostics', diagnostics);
             });
             await this.client.connect();
-            this.logger.log(`Connected to device`, { host: this.options.host, connected: this.connected });
+            //the client can be torn down while the connect above is still settling (its 'close'
+            //handler clears `this.client` - for example the device immediately killing the session
+            //it accepted). Everything below configures a client that no longer exists, so bail and
+            //leave the queued breakpoint state for the next connection instead of crashing.
+            if (!this.client) {
+                this.logger.warn('Debug protocol client closed before setup completed; waiting for a new connection');
+                deferred.resolve();
+                return await deferred.promise;
+            }
+            this.logger.log(`Connected to device`, { device: util_1.util.getDeviceLabel(this.options.device), connected: this.connected });
             this.connected = true;
             this.isAppRunning = true;
             this.handleStartupIfReady();
@@ -364,7 +380,10 @@ class DebugProtocolAdapter {
         this.processingTelnetOutput = true;
         let deferred = (0, util_1.defer)();
         try {
-            this.compileClient = new net_1.Socket({ allowHalfOpen: false });
+            //normalizeAdapterOptions guarantees `device` is a concrete device config
+            const device = this.options.device;
+            const deviceLabel = util_1.util.getDeviceLabel(device);
+            this.compileClient = this.createRokuDeploySocket({ device: device, port: this.options.brightScriptConsolePort });
             util_1.util.registerSocketLogging(this.compileClient, this.logger, 'CompileClient');
             this.compileErrorProcessor.on('diagnostics', (errors) => {
                 this.compileClient.end();
@@ -378,20 +397,20 @@ class DebugProtocolAdapter {
             //After a successful connection the deferred is already resolved, so a post-connection
             //socket error (e.g. ECONNRESET on device disconnect) must not crash the process.
             this.compileClient.on('error', (err) => {
-                deferred.tryReject(new Error(`Error with connection to: ${this.options.host}:${this.options.brightScriptConsolePort} \n\n ${err.message} `));
+                deferred.tryReject(new Error(`Error with connection to: ${deviceLabel}:${this.options.brightScriptConsolePort} \n\n ${err.message} `));
             });
-            this.logger.info('Connecting via telnet to gather compile info', { host: this.options.host, port: this.options.brightScriptConsolePort });
-            this.compileClient.connect(this.options.brightScriptConsolePort, this.options.host, () => {
-                this.logger.log(`CONNECTED via telnet to gather compile info`, { host: this.options.host, port: this.options.brightScriptConsolePort });
+            this.logger.info('Connecting via telnet to gather compile info', { device: deviceLabel, port: this.options.brightScriptConsolePort });
+            this.compileClient.connect(() => {
+                this.logger.log(`CONNECTED via telnet to gather compile info`, { device: deviceLabel, port: this.options.brightScriptConsolePort });
             });
             this.logger.debug('Waiting for the compile client to settle');
             const settledLogs = await this.settleCompileClient(this.compileClient);
             this.logger.debug('Compile client has settled');
             this.logger.trace('Settled logs:', settledLogs);
             if (settledLogs.trim().startsWith('Console connection is already in use.')) {
-                throw new Exceptions_1.SocketConnectionInUseError(`Telnet connection ${this.options.host}:${this.options.brightScriptConsolePort} already is use`, {
+                throw new Exceptions_1.SocketConnectionInUseError(`Telnet connection ${deviceLabel}:${this.options.brightScriptConsolePort} already is use`, {
                     port: this.options.brightScriptConsolePort,
-                    host: this.options.host
+                    host: deviceLabel
                 });
             }
             let lastPartialLine = '';