nativescript 9.0.6-rc.2 → 9.0.6

package/lib/.d.ts

@@ -256,7 +256,6 @@
 /// <reference path="definitions/data.d.ts" />
 /// <reference path="definitions/debug.d.ts" />
 /// <reference path="definitions/deploy.d.ts" />
-/// <reference path="definitions/devtools-host-service.d.ts" />
 /// <reference path="definitions/file-log-service.d.ts" />
 /// <reference path="definitions/files-hash-service.d.ts" />
 /// <reference path="definitions/gradle.d.ts" />
@@ -357,7 +356,6 @@
 /// <reference path="services/debug-data-service.ts" />
 /// <reference path="services/debug-service-base.ts" />
 /// <reference path="services/device/device-install-app-service.ts" />
-/// <reference path="services/devtools-host-service.ts" />
 /// <reference path="services/doctor-service.ts" />
 /// <reference path="services/extensibility-service.ts" />
 /// <reference path="services/files-hash-service.ts" />

package/lib/bootstrap.js

@@ -191,7 +191,6 @@ yok_1.injector.require("testInitializationService", "./services/test-initializat
 yok_1.injector.require("networkConnectivityValidator", "./helpers/network-connectivity-validator");
 yok_1.injector.requirePublic("cleanupService", "./services/cleanup-service");
 yok_1.injector.require("bundlerCompilerService", "./services/bundler/bundler-compiler-service");
-yok_1.injector.require("devtoolsHostService", "./services/devtools-host-service");
 yok_1.injector.require("applePortalSessionService", "./services/apple-portal/apple-portal-session-service");
 yok_1.injector.require("applePortalCookieService", "./services/apple-portal/apple-portal-cookie-service");
 yok_1.injector.require("applePortalApplicationService", "./services/apple-portal/apple-portal-application-service");

package/lib/controllers/run-controller.js

@@ -15,7 +15,7 @@ const util = require("util");
 const _ = require("lodash");
 const yok_1 = require("../common/yok");
 class RunController extends events_1.EventEmitter {
-    constructor($analyticsService, $buildController, $debugController, $deviceInstallAppService, $devicesService, $errors, $injector, $hmrStatusService, $hooksService, $liveSyncServiceResolver, $liveSyncProcessDataService, $logger, $mobileHelper, $platformsDataService, $pluginsService, $prepareController, $prepareDataService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $devtoolsHostService) {
+    constructor($analyticsService, $buildController, $debugController, $deviceInstallAppService, $devicesService, $errors, $injector, $hmrStatusService, $hooksService, $liveSyncServiceResolver, $liveSyncProcessDataService, $logger, $mobileHelper, $platformsDataService, $pluginsService, $prepareController, $prepareDataService, $prepareNativePlatformService, $projectChangesService, $projectDataService) {
         super();
         this.$analyticsService = $analyticsService;
         this.$buildController = $buildController;
@@ -37,7 +37,6 @@ class RunController extends events_1.EventEmitter {
         this.$prepareNativePlatformService = $prepareNativePlatformService;
         this.$projectChangesService = $projectChangesService;
         this.$projectDataService = $projectDataService;
-        this.$devtoolsHostService = $devtoolsHostService;
         this.prepareReadyEventHandler = null;
     }
     async run(runData) {
@@ -110,7 +109,6 @@ class RunController extends events_1.EventEmitter {
                     await liveSyncProcessInfo.actionsChain;
                 }
                 liveSyncProcessInfo.deviceDescriptors = [];
-                await this.$devtoolsHostService.stopAll();
                 if (this.prepareReadyEventHandler) {
                     this.$prepareController.removeListener(constants_2.PREPARE_READY_EVENT_NAME, this.prepareReadyEventHandler);
                     this.prepareReadyEventHandler = null;

package/lib/helpers/livesync-command-helper.js

@@ -5,7 +5,7 @@ const _ = require("lodash");
 const yok_1 = require("../common/yok");
 const constants_1 = require("../constants");
 class LiveSyncCommandHelper {
-    constructor($androidBundleValidatorHelper, $buildDataService, $projectData, $options, $deployController, $iosDeviceOperations, $mobileHelper, $devicesService, $injector, $buildController, $analyticsService, $errors, $iOSSimulatorLogProvider, $cleanupService, $runController, $devtoolsHostService) {
+    constructor($androidBundleValidatorHelper, $buildDataService, $projectData, $options, $deployController, $iosDeviceOperations, $mobileHelper, $devicesService, $injector, $buildController, $analyticsService, $errors, $iOSSimulatorLogProvider, $cleanupService, $runController) {
         this.$androidBundleValidatorHelper = $androidBundleValidatorHelper;
         this.$buildDataService = $buildDataService;
         this.$projectData = $projectData;
@@ -21,7 +21,6 @@ class LiveSyncCommandHelper {
         this.$iOSSimulatorLogProvider = $iOSSimulatorLogProvider;
         this.$cleanupService = $cleanupService;
         this.$runController = $runController;
-        this.$devtoolsHostService = $devtoolsHostService;
     }
     get $platformsDataService() {
         return this.$injector.resolve("platformsDataService");
@@ -126,7 +125,6 @@ class LiveSyncCommandHelper {
             return;
         }
         else {
-            await this.startDevtoolsHostIfDebugging(deviceDescriptors);
             await this.$runController.run({
                 liveSyncInfo,
                 deviceDescriptors,
@@ -152,16 +150,6 @@ class LiveSyncCommandHelper {
         }
         return result;
     }
-    async startDevtoolsHostIfDebugging(deviceDescriptors) {
-        const platforms = _.uniq(deviceDescriptors
-            .filter((d) => { var _a; return d.debuggingEnabled && ((_a = d.buildData) === null || _a === void 0 ? void 0 : _a.platform); })
-            .map((d) => d.buildData.platform.toLowerCase()));
-        for (const platform of platforms) {
-            // DevtoolsHostService swallows port/bind failures and returns null;
-            // a missing source-map origin degrades DevTools gracefully.
-            await this.$devtoolsHostService.start(this.$projectData, platform);
-        }
-    }
     async executeLiveSyncOperationCore(devices, platform, additionalOptions) {
         if (!devices || !devices.length) {
             if (platform) {

package/lib/services/bundler/bundler-compiler-service.js

@@ -19,7 +19,7 @@ const package_path_helper_1 = require("../../helpers/package-path-helper");
 const debugLog = false;
 class BundlerCompilerService extends events_1.EventEmitter {
     constructor($options, $errors, $childProcess, $fs, $hooksService, $hostInfo, $logger, $mobileHelper, $cleanupService, $packageManager, $packageInstallationManager, // private $sharedEventBus: ISharedEventBus
-    $projectConfigService, $devtoolsHostService) {
+    $projectConfigService) {
         super();
         this.$options = $options;
         this.$errors = $errors;
@@ -33,7 +33,6 @@ class BundlerCompilerService extends events_1.EventEmitter {
         this.$packageManager = $packageManager;
         this.$packageInstallationManager = $packageInstallationManager;
         this.$projectConfigService = $projectConfigService;
-        this.$devtoolsHostService = $devtoolsHostService;
         this.bundlerProcesses = {};
         this.expectedHashes = {};
     }
@@ -363,10 +362,6 @@ class BundlerCompilerService extends events_1.EventEmitter {
         if (prepareData.uniqueBundle > 0) {
             envData.uniqueBundle = prepareData.uniqueBundle;
         }
-        const devtoolsOrigin = this.$devtoolsHostService.getOrigin(platform);
-        if (devtoolsOrigin) {
-            envData.devtoolsHost = devtoolsOrigin;
-        }
         return envData;
     }
     async buildEnvCommandLineParams(envData, platformData, projectData, prepareData) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.0.6-rc.2",
+  "version": "9.0.6",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

package/lib/definitions/devtools-host-service.d.ts

@@ -1,44 +0,0 @@
-import { IProjectData } from "./project";
-
-/**
- * Origin of a running loopback HTTP server for a single platform,
- * e.g. "http://127.0.0.1:41500".
- */
-export interface IDevtoolsHostOrigin {
-	platform: string;
-	origin: string;
-}
-
-/**
- * Loopback HTTP server (per platform) that serves the webpack output
- * directory with CORS so Chrome DevTools (served from
- * https://chrome-devtools-frontend.appspot.com) can fetch .map / .js
- * files while a debug session is active.
- *
- * Bound to 127.0.0.1 only; never exposed to the network.
- */
-export interface IDevtoolsHostService {
-	/**
-	 * Start (or return existing) HTTP server for a platform. Idempotent
-	 * per platform — subsequent calls return the same origin.
-	 */
-	start(
-		projectData: IProjectData,
-		platform: string,
-	): Promise<IDevtoolsHostOrigin | null>;
-
-	/**
-	 * Stop the server for a single platform. Quiet no-op if nothing running.
-	 */
-	stop(platform: string): Promise<void>;
-
-	/**
-	 * Stop all running servers.
-	 */
-	stopAll(): Promise<void>;
-
-	/**
-	 * Current origin for a platform, or null if not running.
-	 */
-	getOrigin(platform: string): string | null;
-}

package/lib/services/devtools-host-service.js

@@ -1,178 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevtoolsHostService = void 0;
-const http = require("http");
-const path = require("path");
-const fs = require("fs");
-const constants_1 = require("../constants");
-const yok_1 = require("../common/yok");
-const LOOPBACK_HOST = "127.0.0.1";
-const PORT_RANGE_START = 41500;
-const PORT_RANGE_END = 41999;
-// Allowed Chrome DevTools origins. Bundled DevTools (devtools://devtools)
-// is the default flow opened by chrome://inspect; the appspot frontend is
-// used when the CLI prints a hosted URL. Any other origin (including
-// custom NS DevTools forks) gets a permissive ACAO since loopback bind
-// is the real security boundary anyway.
-const KNOWN_DEVTOOLS_ORIGINS = new Set([
-    "devtools://devtools",
-    "https://chrome-devtools-frontend.appspot.com",
-]);
-const CONTENT_TYPES = {
-    ".map": "application/json; charset=utf-8",
-    ".json": "application/json; charset=utf-8",
-    ".js": "application/javascript; charset=utf-8",
-    ".mjs": "application/javascript; charset=utf-8",
-    ".css": "text/css; charset=utf-8",
-};
-class DevtoolsHostService {
-    constructor($net, $logger, $platformsDataService) {
-        this.$net = $net;
-        this.$logger = $logger;
-        this.$platformsDataService = $platformsDataService;
-        this.servers = new Map();
-    }
-    async start(projectData, platform) {
-        var _a, _b;
-        const key = platform.toLowerCase();
-        const existing = this.servers.get(key);
-        if (existing) {
-            return { platform: key, origin: this.formatOrigin(existing.port) };
-        }
-        const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
-        // Webpack writes to <appDestinationDirectoryPath>/app on both iOS
-        // (platforms/ios/<appName>/app) and Android
-        // (platforms/android/app/src/main/assets/app). Match that exactly so
-        // requests for /bundle.mjs.map resolve to the actual emitted file.
-        const rootDir = (platformData === null || platformData === void 0 ? void 0 : platformData.appDestinationDirectoryPath)
-            ? path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME)
-            : null;
-        if (!rootDir) {
-            this.$logger.warn(`DevTools host: unable to resolve output directory for ${platform}.`);
-            return null;
-        }
-        let port;
-        try {
-            port = await this.$net.getAvailablePortInRange(PORT_RANGE_START, PORT_RANGE_END);
-        }
-        catch (err) {
-            this.$logger.warn(`DevTools host: no free port in ${PORT_RANGE_START}-${PORT_RANGE_END}. Source maps will not load in Chrome DevTools. (${(err === null || err === void 0 ? void 0 : err.message) || err})`);
-            return null;
-        }
-        const server = http.createServer((req, res) => this.handleRequest(req, res, rootDir));
-        try {
-            await new Promise((resolve, reject) => {
-                const onError = (err) => reject(err);
-                server.once("error", onError);
-                server.listen(port, LOOPBACK_HOST, () => {
-                    server.off("error", onError);
-                    resolve();
-                });
-            });
-        }
-        catch (err) {
-            this.$logger.warn(`DevTools host: failed to bind ${LOOPBACK_HOST}:${port} (${(err === null || err === void 0 ? void 0 : err.message) || err}).`);
-            return null;
-        }
-        // `.unref()` so a lingering server doesn't keep the CLI process alive.
-        server.unref();
-        const actualPort = (_b = (_a = server.address()) === null || _a === void 0 ? void 0 : _a.port) !== null && _b !== void 0 ? _b : port;
-        const entry = { server, port: actualPort, rootDir };
-        this.servers.set(key, entry);
-        const origin = this.formatOrigin(actualPort);
-        this.$logger.info(`DevTools host (${platform}) serving ${rootDir} at ${origin}`);
-        return { platform: key, origin };
-    }
-    async stop(platform) {
-        const key = platform.toLowerCase();
-        const entry = this.servers.get(key);
-        if (!entry) {
-            return;
-        }
-        this.servers.delete(key);
-        await new Promise((resolve) => {
-            entry.server.close(() => resolve());
-        });
-    }
-    async stopAll() {
-        const platforms = Array.from(this.servers.keys());
-        await Promise.all(platforms.map((p) => this.stop(p)));
-    }
-    getOrigin(platform) {
-        const entry = this.servers.get(platform.toLowerCase());
-        return entry ? this.formatOrigin(entry.port) : null;
-    }
-    formatOrigin(port) {
-        return `http://${LOOPBACK_HOST}:${port}`;
-    }
-    handleRequest(req, res, rootDir) {
-        const requestOrigin = req.headers.origin;
-        const allowOrigin = requestOrigin && KNOWN_DEVTOOLS_ORIGINS.has(requestOrigin)
-            ? requestOrigin
-            : "*";
-        res.setHeader("Access-Control-Allow-Origin", allowOrigin);
-        res.setHeader("Vary", "Origin");
-        res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS");
-        res.setHeader("Access-Control-Allow-Headers", "*");
-        res.setHeader("Cache-Control", "no-cache");
-        if (req.method === "OPTIONS") {
-            res.writeHead(204);
-            res.end();
-            return;
-        }
-        if (req.method !== "GET" && req.method !== "HEAD") {
-            res.writeHead(405);
-            res.end();
-            return;
-        }
-        let urlPath;
-        try {
-            urlPath = decodeURIComponent(new URL(req.url || "/", "http://x").pathname);
-        }
-        catch (_a) {
-            res.writeHead(400);
-            res.end();
-            return;
-        }
-        const ext = path.extname(urlPath).toLowerCase();
-        if (!CONTENT_TYPES[ext]) {
-            res.writeHead(403);
-            res.end();
-            return;
-        }
-        const resolvedRoot = path.resolve(rootDir);
-        const filePath = path.resolve(resolvedRoot, "." + urlPath);
-        if (filePath !== resolvedRoot &&
-            !filePath.startsWith(resolvedRoot + path.sep)) {
-            res.writeHead(403);
-            res.end();
-            return;
-        }
-        fs.stat(filePath, (statErr, stats) => {
-            if (statErr || !stats.isFile()) {
-                res.writeHead(404);
-                res.end();
-                return;
-            }
-            res.setHeader("Content-Type", CONTENT_TYPES[ext]);
-            res.setHeader("Content-Length", String(stats.size));
-            if (req.method === "HEAD") {
-                res.writeHead(200);
-                res.end();
-                return;
-            }
-            const stream = fs.createReadStream(filePath);
-            stream.on("error", () => {
-                if (!res.headersSent) {
-                    res.writeHead(500);
-                }
-                res.end();
-            });
-            res.writeHead(200);
-            stream.pipe(res);
-        });
-    }
-}
-exports.DevtoolsHostService = DevtoolsHostService;
-yok_1.injector.register("devtoolsHostService", DevtoolsHostService);
-//# sourceMappingURL=devtools-host-service.js.map