roku-debug 0.8.4 → 0.9.0

package/dist/managers/SourceMapManager.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SourceMapManager = void 0;
 const fsExtra = require("fs-extra");
-const util_1 = require("../util");
 const source_map_1 = require("source-map");
 const FileUtils_1 = require("../FileUtils");
 const path = require("path");
+const logging_1 = require("../logging");
 /**
  * Unifies access to source files across the whole project
  */
 class SourceMapManager {
     constructor() {
+        this.logger = logging_1.logger.createLogger(`[${SourceMapManager.name}]`);
         /**
         * Store all paths in lower case since Roku is case-insensitive.
         * If the file existed, but something failed during parsing, this will be set to null.
@@ -23,7 +25,7 @@ class SourceMapManager {
      * then falls back to the file system if not in the cache
      */
     sourceMapExists(sourceMapPath) {
-        let key = FileUtils_1.standardizePath `${sourceMapPath.toLowerCase()}`;
+        let key = (0, FileUtils_1.standardizePath) `${sourceMapPath.toLowerCase()}`;
         let map = this.cache[key];
         if (map !== undefined && map !== null) {
             return true;
@@ -35,16 +37,15 @@ class SourceMapManager {
      * Get a parsed source map, with all of its paths already resolved
      */
     async getSourceMap(sourceMapPath) {
-        let key = FileUtils_1.standardizePath `${sourceMapPath.toLowerCase()}`;
+        let key = (0, FileUtils_1.standardizePath) `${sourceMapPath.toLowerCase()}`;
         if (this.cache[key] === undefined) {
-            let parsedSourceMap;
             if (await fsExtra.pathExists(sourceMapPath)) {
                 try {
                     let contents = (await fsExtra.readFile(sourceMapPath)).toString();
                     this.set(sourceMapPath, contents);
                 }
                 catch (e) {
-                    util_1.util.logDebug(`Error loading or parsing source map for '${sourceMapPath}'`, e);
+                    this.logger.error(`Error loading or parsing source map for '${sourceMapPath}'`, e);
                 }
             }
         }
@@ -55,7 +56,7 @@ class SourceMapManager {
      * and resolve the sources list to absolute paths
      */
     set(sourceMapPath, sourceMap) {
-        let key = FileUtils_1.standardizePath `${sourceMapPath.toLowerCase()}`;
+        let key = (0, FileUtils_1.standardizePath) `${sourceMapPath.toLowerCase()}`;
         try {
             let parsedSourceMap = JSON.parse(sourceMap);
             //remove the file from cache
@@ -145,8 +146,8 @@ class SourceMapManager {
                     }
                 }
             }
-            catch (e) {
-                util_1.util.logDebug(new Error('Error converting source location to staging location'), e);
+            catch (error) {
+                this.logger.error('Error converting source location to staging location', { error });
             }
         }));
         return locations;

package/dist/managers/SourceMapManager.js.map

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

package/dist/util.d.ts

@@ -1,6 +1,6 @@
 import type { SmartBuffer } from 'smart-buffer';
 import type { BrightScriptDebugSession } from './debugSession/BrightScriptDebugSession';
-import type { Position, Range } from 'vscode-languageserver';
+import type { Position, Range } from 'brighterscript';
 import type { BrightScriptDebugCompileError } from './CompileErrorProcessor';
 declare class Util {
     /**
@@ -42,13 +42,6 @@ declare class Util {
      * @param port target port to check
      */
     isPortInUse(port: number): Promise<boolean>;
-    /**
-     * With return the differences in two objects
-     * @param obj1 base target
-     * @param obj2 comparison target
-     * @param exclude fields to exclude in the comparison
-     */
-    objectDiff(obj1: Record<string, any>, obj2: Record<string, any>, exclude?: string[]): {};
     /**
      * Tries to read a string from the buffer and will throw an error if there is no null terminator.
      * @param {SmartBuffer} bufferReader
@@ -58,10 +51,6 @@ declare class Util {
      * A reference to the current debug session. Used for logging, and set in the debug session constructor
      */
     _debugSession: BrightScriptDebugSession;
-    /**
-     * Send debug server messages to the BrightScript Debug Log channel, as well as writing to console.debug
-     */
-    logDebug(...args: any[]): void;
     /**
      * Write to the standard brightscript output log so users can see it. (This also writes to the debug server output channel, and the console)
      * @param message
@@ -80,7 +69,54 @@ declare class Util {
      * @param position
      */
     rangeContains(range: Range, position: Position): boolean;
+    /**
+     * Ensures that all roku-emitted beacons are entirely on their own lines
+     */
+    ensureDebugPromptOnOwnLine(text: string): string;
+    /**
+     * Does the string end with the "Brightscript Debugger>" prompt?
+     * @param responseText
+     */
+    endsWithDebuggerPrompt(text: string): boolean;
+    /**
+     * Does the string end with the "thread attached......" text, ignoring trailing whitespace.
+     * explanation: https://regex101.com/r/pN6grB/1
+     */
+    endsWithThreadAttachedText(text: string): boolean;
+    /**
+     * Remove those pesky "Thread attached" messages and the debugger prompt following them.
+     * explanation: https://regex101.com/r/OwAWdw/4
+     */
+    removeThreadAttachedText(text: string): string;
     filterGenericErrors(errors: BrightScriptDebugCompileError[]): BrightScriptDebugCompileError[];
+    /**
+     * Look up the ip address for a hostname. This is cached for the lifetime of the app, or bypassed with the `skipCache` parameter
+     * @param host
+     * @param skipCache
+     * @returns
+     */
+    dnsLookup(host: string, skipCache?: boolean): Promise<string>;
+    private dnsCache;
+    /**
+     * Sleep for the given number of milliseconds
+     * @param milliseconds
+     * @returns
+     */
+    sleep(milliseconds: number): Promise<unknown>;
+    fence(data: string): string;
+}
+export declare function defer<T>(): {
+    promise: Promise<T>;
+    resolve: (value?: PromiseLike<T> | T) => void;
+    reject: (reason?: any) => void;
+    isResolved: boolean;
+    isRejected: boolean;
+    readonly isCompleted: boolean;
+};
+export declare const util: Util;
+export interface Deferred<T> {
+    promise: Promise<T>;
+    resolve(value?: T): any;
+    reject(error?: any): any;
 }
-declare const util: Util;
-export { util };
+export {};

package/dist/util.js

@@ -1,13 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const dateFormat = require("dateformat");
+exports.util = exports.defer = void 0;
 const fs = require("fs");
 const fsExtra = require("fs-extra");
 const net = require("net");
 const url = require("url");
 const Events_1 = require("./debugSession/Events");
 const CompileErrorProcessor_1 = require("./CompileErrorProcessor");
+const serialize_error_1 = require("serialize-error");
+const dns = require("dns");
 class Util {
+    constructor() {
+        this.dnsCache = new Map();
+    }
     /**
      * If the path does not have a trailing slash, one is appended to it
      * @param dirPath
@@ -108,52 +113,6 @@ class Util {
                 .listen(port);
         });
     }
-    /**
-     * With return the differences in two objects
-     * @param obj1 base target
-     * @param obj2 comparison target
-     * @param exclude fields to exclude in the comparison
-     */
-    objectDiff(obj1, obj2, exclude) {
-        let r = {};
-        if (!exclude) {
-            exclude = [];
-        }
-        for (let prop in obj1) {
-            if (obj1.hasOwnProperty(prop) && prop !== '__proto__') {
-                if (!exclude.includes(obj1[prop])) {
-                    // check if obj2 has prop
-                    if (!obj2.hasOwnProperty(prop)) {
-                        r[prop] = obj1[prop];
-                    }
-                    else if (obj1[prop] === Object(obj1[prop])) {
-                        let difference = this.objectDiff(obj1[prop], obj2[prop]);
-                        if (Object.keys(difference).length > 0) {
-                            r[prop] = difference;
-                        }
-                    }
-                    else if (obj1[prop] !== obj2[prop]) {
-                        if (obj1[prop] === undefined) {
-                            r[prop] = 'undefined';
-                        }
-                        if (obj1[prop] === null) {
-                            r[prop] = null;
-                        }
-                        else if (typeof obj1[prop] === 'function') {
-                            r[prop] = 'function';
-                        }
-                        else if (typeof obj1[prop] === 'object') {
-                            r[prop] = 'object';
-                        }
-                        else {
-                            r[prop] = obj1[prop];
-                        }
-                    }
-                }
-            }
-        }
-        return r;
-    }
     /**
      * Tries to read a string from the buffer and will throw an error if there is no null terminator.
      * @param {SmartBuffer} bufferReader
@@ -173,37 +132,11 @@ class Util {
         }
         return bufferReader.readStringNT();
     }
-    /**
-     * Send debug server messages to the BrightScript Debug Log channel, as well as writing to console.debug
-     */
-    logDebug(...args) {
-        args = Array.isArray(args) ? args : [];
-        let timestamp = dateFormat(new Date(), 'HH:mm:ss.l ');
-        let messages = [];
-        for (let arg of args) {
-            if (arg instanceof Error) {
-                messages.push(JSON.stringify({
-                    message: arg.message,
-                    name: arg.name,
-                    stack: arg.stack.toString()
-                }, null, 4));
-            }
-            else {
-                messages.push(arg.toString());
-            }
-        }
-        let text = messages.join(', ');
-        if (this._debugSession) {
-            this._debugSession.sendEvent(new Events_1.DebugServerLogOutputEvent(`${timestamp}: ${text}`));
-        }
-        console.log(timestamp, ...args);
-    }
     /**
      * Write to the standard brightscript output log so users can see it. (This also writes to the debug server output channel, and the console)
      * @param message
      */
     log(message) {
-        this.logDebug(message);
         if (this._debugSession) {
             this._debugSession.sendEvent(new Events_1.LogOutputEvent(`DebugServer: ${message}`));
         }
@@ -237,6 +170,68 @@ class Util {
         }
         return true;
     }
+    /**
+     * Ensures that all roku-emitted beacons are entirely on their own lines
+     */
+    ensureDebugPromptOnOwnLine(text) {
+        const regexp = /^((.*?)Brightscript\s+Debugger>\s*)(.*?)$/gm;
+        let match;
+        const splitIndexes = [];
+        // eslint-disable-next-line no-cond-assign
+        while (match = regexp.exec(text)) {
+            const leadingAndBeaconText = match[1];
+            const leadingText = match[2];
+            const trailingText = match[3];
+            //if there is text before the beacon, split the line
+            if (leadingText.length > 0) {
+                splitIndexes.push(match.index + leadingText.length);
+            }
+            //if there is text after the beacon, split the line
+            if (trailingText.length > 0) {
+                splitIndexes.push(match.index + leadingAndBeaconText.length);
+            }
+        }
+        let result = text;
+        //inject newlines between each split index
+        for (let i = splitIndexes.length - 1; i >= 0; i--) {
+            const index = splitIndexes[i];
+            result = result.substring(0, index) + '\n' + result.substring(index);
+        }
+        return result;
+    }
+    /**
+     * Does the string end with the "Brightscript Debugger>" prompt?
+     * @param responseText
+     */
+    endsWithDebuggerPrompt(text) {
+        let match = /Brightscript\s+Debugger>\s*$/im.exec(text.trim());
+        return !!match;
+    }
+    /**
+     * Does the string end with the "thread attached......" text, ignoring trailing whitespace.
+     * explanation: https://regex101.com/r/pN6grB/1
+     */
+    endsWithThreadAttachedText(text) {
+        if (/thread\s+attached\s*:.*?\(\d*\).*?[\r\n\s]*$/i.exec(text)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    /**
+     * Remove those pesky "Thread attached" messages and the debugger prompt following them.
+     * explanation: https://regex101.com/r/OwAWdw/4
+     */
+    removeThreadAttachedText(text) {
+        const match = /^([\r\n\s]*thread\s+attached\s*:.*?\(\d*\).*?[\r\n\s]*brightscript\s*debugger>\s*)+/i.exec(text);
+        if (match) {
+            return text.substring(match[0].length);
+        }
+        else {
+            return text;
+        }
+    }
     filterGenericErrors(errors) {
         const specificErrors = {};
         //ignore generic errors when a specific error exists
@@ -253,7 +248,73 @@ class Util {
             return true;
         });
     }
+    /**
+     * Look up the ip address for a hostname. This is cached for the lifetime of the app, or bypassed with the `skipCache` parameter
+     * @param host
+     * @param skipCache
+     * @returns
+     */
+    async dnsLookup(host, skipCache = false) {
+        var _a;
+        if (!this.dnsCache.has(host) || skipCache) {
+            const result = await dns.promises.lookup(host);
+            this.dnsCache.set(host, (_a = result.address) !== null && _a !== void 0 ? _a : host);
+        }
+        return this.dnsCache.get(host);
+    }
+    /**
+     * Sleep for the given number of milliseconds
+     * @param milliseconds
+     * @returns
+     */
+    sleep(milliseconds) {
+        return new Promise(resolve => {
+            setTimeout(resolve, milliseconds);
+        });
+    }
+    fence(data) {
+        const fence = '--------------------';
+        return `\n${fence}\n${data}\n${fence}\n`;
+    }
+}
+function defer() {
+    let _resolve;
+    let _reject;
+    let promise = new Promise((resolveValue, rejectValue) => {
+        _resolve = resolveValue;
+        _reject = rejectValue;
+    });
+    return {
+        promise: promise,
+        resolve: function resolve(value) {
+            if (!this.isResolved) {
+                this.isResolved = true;
+                _resolve(value);
+                _resolve = undefined;
+            }
+            else {
+                throw new Error(`Attempted to resolve a promise that was already ${this.isResolved ? 'resolved' : 'rejected'}.` +
+                    `New value: ${JSON.stringify(value)}`);
+            }
+        },
+        reject: function reject(reason) {
+            if (!this.isCompleted) {
+                this.isRejected = true;
+                _reject(reason);
+                _reject = undefined;
+            }
+            else {
+                throw new Error(`Attempted to reject a promise that was already ${this.isResolved ? 'resolved' : 'rejected'}.` +
+                    `New error message: ${JSON.stringify((0, serialize_error_1.serializeError)(reason))}`);
+            }
+        },
+        isResolved: false,
+        isRejected: false,
+        get isCompleted() {
+            return this.isResolved || this.isRejected;
+        }
+    };
 }
-const util = new Util();
-exports.util = util;
+exports.defer = defer;
+exports.util = new Util();
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

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

package/package.json

@@ -1,14 +1,15 @@
 {
     "name": "roku-debug",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "Debug adapter for Roku application development using Node.js",
     "main": "dist/index.js",
     "scripts": {
         "build": "rimraf dist && tsc",
         "preversion": "npm run build && npm run lint && npm run test",
         "lint": "eslint \"src/**\"",
-        "test": "nyc mocha \"src/**/*spec.ts\" --full-trace",
-        "test:nocover": "ts-mocha \"src/**/*.spec.ts\" --full-trace",
+        "watch": "tsc --watch",
+        "test": "nyc mocha \"src/**/*spec.ts\"",
+        "test:nocover": "mocha \"src/**/*.spec.ts\"",
         "publish-coverage": "nyc report --reporter=text-lcov | coveralls"
     },
     "typings": "dist/index.d.ts",
@@ -18,6 +19,16 @@
     },
     "author": "",
     "license": "ISC",
+    "mocha": {
+        "require": [
+            "source-map-support/register",
+            "ts-node/register"
+        ],
+        "fullTrace": true,
+        "watchExtensions": [
+            "ts"
+        ]
+    },
     "nyc": {
         "include": [
             "src/**/!(*.spec).ts"
@@ -42,53 +53,54 @@
         "branches": 100
     },
     "devDependencies": {
-        "@types/archiver": "^2.1.2",
-        "@types/chai": "^4.2.3",
-        "@types/denodeify": "^1.2.31",
-        "@types/fs-extra": "^5.0.1",
-        "@types/mocha": "^5.2.5",
-        "@types/node": "^12.12.28",
-        "@types/request": "^2.47.0",
-        "@types/sinon": "^7.0.6",
-        "@types/vscode": "^1.30.0",
-        "chai": "^4.2.0",
-        "chai-files": "^1.4.0",
-        "coveralls": "^3.0.0",
-        "eslint": "^7.21.0",
-        "eslint-plugin-github": "^4.1.1",
-        "eslint-plugin-no-only-tests": "^2.4.0",
+        "@types/chai": "^4.2.22",
+        "@types/dedent": "^0.7.0",
+        "@types/find-in-files": "^0.5.1",
+        "@types/fs-extra": "^9.0.13",
+        "@types/glob": "^7.2.0",
+        "@types/mocha": "^9.0.0",
+        "@types/node": "^16.11.6",
+        "@types/request": "^2.48.7",
+        "@types/sinon": "^10.0.6",
+        "@types/vscode": "^1.61.0",
+        "@typescript-eslint/eslint-plugin": "^5.2.0",
+        "@typescript-eslint/parser": "^5.2.0",
+        "chai": "^4.3.4",
+        "coveralls": "^3.1.1",
+        "dedent": "^0.7.0",
+        "eslint": "^8.1.0",
+        "eslint-plugin-no-only-tests": "^2.6.0",
         "get-port": "^5.1.1",
-        "mocha": "^8.2.1",
-        "mock-fs": "^4.10.3",
-        "nyc": "^14.1.1",
-        "p-defer": "^3.0.0",
-        "rimraf": "^2.6.2",
+        "mocha": "^9.1.3",
+        "nyc": "^15.1.0",
+        "p-defer": "^4.0.0",
+        "rimraf": "^3.0.2",
         "rmfr": "^2.0.0",
-        "rxjs": "^6.5.4",
-        "sinon": "^7.2.3",
-        "source-map-support": "^0.5.13",
-        "testdouble": "^3.5.2",
-        "ts-mocha": "^6.0.0",
-        "ts-node": "^8.4.1",
-        "typescript": "^3.7.2",
-        "vscode-debugadapter-testsupport": "1.33.0"
+        "rxjs": "^7.4.0",
+        "sinon": "^11.1.2",
+        "source-map-support": "^0.5.20",
+        "ts-node": "^10.4.0",
+        "typescript": "^4.4.4"
     },
     "dependencies": {
-        "dateformat": "^3.0.3",
+        "@rokucommunity/logger": "^0.1.0",
+        "brighterscript": "^0.41.2",
+        "dateformat": "^4.6.3",
         "eol": "^0.9.1",
+        "eventemitter3": "^4.0.7",
         "find-in-files": "^0.5.0",
-        "fs-extra": "^8.1.0",
+        "fs-extra": "^10.0.0",
         "natural-orderby": "^2.0.3",
-        "replace-in-file": "^5.0.2",
+        "replace-in-file": "^6.3.2",
         "replace-last": "^1.2.6",
-        "roku-deploy": "^3.4.1",
-        "semver": "^7.1.3",
-        "serialize-error": "^6.0.0",
-        "smart-buffer": "^4.1.0",
+        "roku-deploy": "^3.5.2",
+        "semver": "^7.3.5",
+        "serialize-error": "^8.1.0",
+        "smart-buffer": "^4.2.0",
         "source-map": "^0.7.3",
         "telnet-client": "^1.4.9",
-        "vscode-debugadapter": "1.33.0",
-        "vscode-debugprotocol": "1.33.0",
+        "vscode-debugadapter": "^1.49.0",
+        "vscode-debugprotocol": "^1.49.0",
         "vscode-languageserver": "^6.1.1"
     }
 }