@akylas/nativescript-cli 8.8.2 → 8.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/android-tools-info.js +9 -20
- package/lib/base-package-manager.js +47 -64
- package/lib/bun-package-manager.js +65 -88
- package/lib/color.js +2 -2
- package/lib/commands/add-platform.js +14 -30
- package/lib/commands/apple-login.js +18 -29
- package/lib/commands/appstore-list.js +34 -45
- package/lib/commands/appstore-upload.js +55 -68
- package/lib/commands/build.js +57 -86
- package/lib/commands/clean.js +161 -176
- package/lib/commands/command-base.js +14 -27
- package/lib/commands/config.js +51 -70
- package/lib/commands/create-project.js +210 -229
- package/lib/commands/debug.js +66 -88
- package/lib/commands/deploy.js +28 -44
- package/lib/commands/embedding/embed.js +33 -52
- package/lib/commands/extensibility/install-extension.js +5 -16
- package/lib/commands/extensibility/list-extensions.js +13 -24
- package/lib/commands/extensibility/uninstall-extension.js +4 -15
- package/lib/commands/fonts.js +30 -41
- package/lib/commands/generate-assets.js +13 -28
- package/lib/commands/generate-help.js +2 -13
- package/lib/commands/generate.js +17 -26
- package/lib/commands/info.js +2 -13
- package/lib/commands/install.js +34 -49
- package/lib/commands/list-platforms.js +14 -25
- package/lib/commands/migrate.js +15 -26
- package/lib/commands/native-add.js +23 -46
- package/lib/commands/platform-clean.js +19 -32
- package/lib/commands/plugin/add-plugin.js +12 -25
- package/lib/commands/plugin/build-plugin.js +34 -39
- package/lib/commands/plugin/create-plugin.js +110 -133
- package/lib/commands/plugin/list-plugins.js +22 -33
- package/lib/commands/plugin/remove-plugin.js +20 -33
- package/lib/commands/plugin/update-plugin.js +20 -33
- package/lib/commands/post-install.js +20 -33
- package/lib/commands/prepare.js +19 -35
- package/lib/commands/preview.js +49 -62
- package/lib/commands/remove-platform.js +7 -18
- package/lib/commands/resources/resources-update.js +13 -26
- package/lib/commands/run.js +55 -76
- package/lib/commands/start.js +6 -19
- package/lib/commands/test-init.js +123 -134
- package/lib/commands/test.js +66 -89
- package/lib/commands/typings.js +126 -142
- package/lib/commands/update-platform.js +22 -35
- package/lib/commands/update.js +30 -43
- package/lib/common/child-process.js +53 -72
- package/lib/common/codeGeneration/code-entity.js +1 -1
- package/lib/common/codeGeneration/code-printer.js +1 -1
- package/lib/common/command-params.js +7 -18
- package/lib/common/commands/analytics.js +27 -40
- package/lib/common/commands/autocompletion.js +39 -56
- package/lib/common/commands/device/device-log-stream.js +12 -23
- package/lib/common/commands/device/get-file.js +22 -33
- package/lib/common/commands/device/list-applications.js +12 -23
- package/lib/common/commands/device/list-devices.js +72 -87
- package/lib/common/commands/device/list-files.js +23 -34
- package/lib/common/commands/device/put-file.js +22 -33
- package/lib/common/commands/device/run-application.js +12 -25
- package/lib/common/commands/device/stop-application.js +11 -22
- package/lib/common/commands/device/uninstall-application.js +6 -17
- package/lib/common/commands/generate-messages.js +17 -28
- package/lib/common/commands/help.js +20 -33
- package/lib/common/commands/package-manager-get.js +6 -17
- package/lib/common/commands/package-manager-set.js +9 -20
- package/lib/common/commands/post-install.js +2 -13
- package/lib/common/commands/preuninstall.js +23 -38
- package/lib/common/commands/proxy/proxy-base.js +8 -19
- package/lib/common/commands/proxy/proxy-clear.js +4 -15
- package/lib/common/commands/proxy/proxy-get.js +3 -14
- package/lib/common/commands/proxy/proxy-set.js +87 -100
- package/lib/common/constants.js +11 -11
- package/lib/common/decorators.js +10 -22
- package/lib/common/dispatchers.js +79 -96
- package/lib/common/errors.js +89 -104
- package/lib/common/file-system.js +106 -127
- package/lib/common/header.js +1 -2
- package/lib/common/helpers.js +149 -178
- package/lib/common/host-info.js +37 -50
- package/lib/common/http-client.js +93 -108
- package/lib/common/logger/appenders/cli-appender.js +1 -2
- package/lib/common/logger/appenders/emit-appender.js +1 -2
- package/lib/common/logger/layouts/cli-layout.js +1 -2
- package/lib/common/logger/logger.js +1 -1
- package/lib/common/mobile/android/android-application-manager.js +121 -142
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
- package/lib/common/mobile/android/android-debug-bridge.js +87 -112
- package/lib/common/mobile/android/android-device-file-system.js +98 -131
- package/lib/common/mobile/android/android-device-hash-service.js +50 -75
- package/lib/common/mobile/android/android-device.js +74 -91
- package/lib/common/mobile/android/android-emulator-services.js +105 -130
- package/lib/common/mobile/android/android-log-filter.js +1 -1
- package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
- package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
- package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
- package/lib/common/mobile/android/logcat-helper.js +108 -127
- package/lib/common/mobile/application-manager-base.js +84 -107
- package/lib/common/mobile/device-log-provider-base.js +7 -18
- package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
- package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
- package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
- package/lib/common/mobile/ios/device/ios-device.js +20 -36
- package/lib/common/mobile/ios/ios-device-base.js +58 -81
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
- package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
- package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
- package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
- package/lib/common/mobile/mobile-core/devices-service.js +385 -436
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
- package/lib/common/mobile/mobile-helper.js +15 -26
- package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
- package/lib/common/opener.js +2 -2
- package/lib/common/plist-parser.js +3 -3
- package/lib/common/prompter.js +90 -105
- package/lib/common/queue.js +9 -20
- package/lib/common/services/auto-completion-service.js +39 -52
- package/lib/common/services/cancellation.js +17 -28
- package/lib/common/services/commands-service.js +146 -169
- package/lib/common/services/help-service.js +132 -157
- package/lib/common/services/hooks-service.js +93 -108
- package/lib/common/services/ios-notification-service.js +21 -34
- package/lib/common/services/json-file-settings-service.js +52 -71
- package/lib/common/services/lock-service.js +35 -52
- package/lib/common/services/message-contract-generator.js +35 -46
- package/lib/common/services/micro-templating-service.js +4 -15
- package/lib/common/services/net-service.js +90 -107
- package/lib/common/services/project-files-manager.js +10 -23
- package/lib/common/services/proxy-service.js +13 -24
- package/lib/common/services/qr.js +13 -24
- package/lib/common/services/settings-service.js +1 -1
- package/lib/common/services/xcode-select-service.js +20 -35
- package/lib/common/utils.js +2 -2
- package/lib/common/validators/project-name-validator.js +1 -1
- package/lib/common/validators/validation-result.js +1 -1
- package/lib/common/verify-node-version.js +2 -3
- package/lib/common/yok.js +23 -36
- package/lib/config.js +7 -58
- package/lib/constants.js +24 -24
- package/lib/controllers/build-controller.js +82 -99
- package/lib/controllers/debug-controller.js +107 -128
- package/lib/controllers/deploy-controller.js +17 -22
- package/lib/controllers/migrate-controller.js +722 -795
- package/lib/controllers/platform-controller.js +72 -87
- package/lib/controllers/prepare-controller.js +266 -299
- package/lib/controllers/run-controller.js +392 -406
- package/lib/controllers/update-controller-base.js +16 -29
- package/lib/controllers/update-controller.js +94 -119
- package/lib/data/prepare-data.js +4 -1
- package/lib/definitions/ios-debugger-port-service.d.ts +1 -1
- package/lib/definitions/livesync.d.ts +1 -1
- package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
- package/lib/detached-processes/cleanup-process.js +16 -25
- package/lib/device-path-provider.js +23 -34
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
- package/lib/device-sockets/ios/notification.js +1 -1
- package/lib/device-sockets/ios/socket-request-executor.js +24 -39
- package/lib/helpers/android-bundle-validator-helper.js +1 -1
- package/lib/helpers/deploy-command-helper.js +45 -49
- package/lib/helpers/key-command-helper.js +4 -13
- package/lib/helpers/livesync-command-helper.js +137 -152
- package/lib/helpers/network-connectivity-validator.js +6 -17
- package/lib/helpers/options-track-helper.js +6 -17
- package/lib/helpers/platform-command-helper.js +99 -120
- package/lib/key-commands/index.js +161 -211
- package/lib/nativescript-cli.js +5 -14
- package/lib/node-package-manager.js +81 -104
- package/lib/options.js +3 -12
- package/lib/package-installation-manager.js +130 -165
- package/lib/package-manager.js +63 -86
- package/lib/platform-command-param.js +4 -15
- package/lib/pnpm-package-manager.js +59 -78
- package/lib/project-data.js +1 -1
- package/lib/providers/project-files-provider.js +1 -1
- package/lib/services/analytics/analytics-broker-process.js +13 -22
- package/lib/services/analytics/analytics-broker.js +17 -30
- package/lib/services/analytics/analytics-service.js +161 -198
- package/lib/services/analytics/google-analytics-provider.js +41 -56
- package/lib/services/analytics-settings-service.js +15 -32
- package/lib/services/android/android-bundle-tool-service.js +43 -60
- package/lib/services/android/gradle-build-args-service.js +9 -20
- package/lib/services/android/gradle-build-service.js +34 -47
- package/lib/services/android/gradle-command-service.js +22 -35
- package/lib/services/android-device-debug-service.js +90 -117
- package/lib/services/android-plugin-build-service.js +230 -256
- package/lib/services/android-project-service.js +163 -199
- package/lib/services/android-resources-migration-service.js +51 -64
- package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
- package/lib/services/apple-portal/apple-portal-session-service.js +171 -188
- package/lib/services/assets-generation/assets-generation-service.js +98 -115
- package/lib/services/build-artifacts-service.js +9 -20
- package/lib/services/build-info-file-service.js +20 -35
- package/lib/services/cleanup-service.js +47 -76
- package/lib/services/cocoapods-service.js +115 -136
- package/lib/services/device/device-install-app-service.js +73 -90
- package/lib/services/doctor-service.js +99 -118
- package/lib/services/extensibility-service.js +81 -100
- package/lib/services/files-hash-service.js +26 -43
- package/lib/services/hmr-status-service.js +1 -1
- package/lib/services/initialize-service.js +37 -50
- package/lib/services/ios/export-options-plist-service.js +38 -51
- package/lib/services/ios/ios-signing-service.js +161 -180
- package/lib/services/ios/spm-service.js +40 -53
- package/lib/services/ios/xcodebuild-args-service.js +77 -94
- package/lib/services/ios/xcodebuild-command-service.js +14 -25
- package/lib/services/ios/xcodebuild-service.js +50 -69
- package/lib/services/ios-debugger-port-service.js +23 -36
- package/lib/services/ios-device-debug-service.js +75 -102
- package/lib/services/ios-entitlements-service.js +31 -42
- package/lib/services/ios-extensions-service.js +18 -29
- package/lib/services/ios-project-service.js +405 -460
- package/lib/services/ios-provision-service.js +108 -129
- package/lib/services/ios-watch-app-service.js +21 -32
- package/lib/services/ip-service.js +38 -53
- package/lib/services/itmstransporter-service.js +129 -152
- package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
- package/lib/services/livesync/android-device-livesync-service.js +120 -149
- package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
- package/lib/services/livesync/android-livesync-service.js +14 -35
- package/lib/services/livesync/android-livesync-tool.js +89 -112
- package/lib/services/livesync/device-livesync-service-base.js +15 -28
- package/lib/services/livesync/ios-device-livesync-service.js +114 -143
- package/lib/services/livesync/ios-livesync-service.js +42 -58
- package/lib/services/livesync/platform-livesync-service-base.js +94 -119
- package/lib/services/log-parser-service.js +1 -1
- package/lib/services/log-source-map-service.js +30 -41
- package/lib/services/marking-mode-service.js +15 -28
- package/lib/services/npm-config-service.js +1 -1
- package/lib/services/pacote-service.js +49 -64
- package/lib/services/performance-service.js +1 -1
- package/lib/services/platform/add-platform-service.js +50 -71
- package/lib/services/platform/platform-validation-service.js +22 -33
- package/lib/services/platform/prepare-native-platform-service.js +49 -62
- package/lib/services/platform-environment-requirements.js +26 -37
- package/lib/services/plugins-service.js +122 -147
- package/lib/services/project-backup-service.js +1 -1
- package/lib/services/project-changes-service.js +124 -141
- package/lib/services/project-cleanup-service.js +64 -77
- package/lib/services/project-config-service.js +71 -80
- package/lib/services/project-data-service.js +101 -118
- package/lib/services/project-name-service.js +28 -43
- package/lib/services/project-service.js +84 -103
- package/lib/services/project-templates-service.js +52 -67
- package/lib/services/start-service.js +41 -59
- package/lib/services/temp-service.js +8 -21
- package/lib/services/terminal-spinner-service.js +13 -24
- package/lib/services/test-execution-service.js +59 -72
- package/lib/services/test-initialization-service.js +2 -2
- package/lib/services/timeline-profiler-service.js +1 -1
- package/lib/services/versions-service.js +119 -138
- package/lib/services/webpack/webpack-compiler-service.js +211 -231
- package/lib/services/xcconfig-service.js +8 -19
- package/lib/sys-info.js +45 -62
- package/lib/tools/node-modules/node-modules-builder.js +16 -27
- package/lib/yarn-package-manager.js +59 -78
- package/lib/yarn2-package-manager.js +60 -79
- package/package.json +56 -54
- package/vendor/aab-tool/bundletool.jar +0 -0
- package/lib/common/resources/platform-tools/android/darwin/NOTICE.txt +0 -3407
- package/lib/common/resources/platform-tools/android/darwin/adb +0 -0
- package/lib/common/resources/platform-tools/android/linux/NOTICE.txt +0 -4451
- package/lib/common/resources/platform-tools/android/linux/adb +0 -0
- package/lib/common/resources/platform-tools/android/win32/AdbWinApi.dll +0 -0
- package/lib/common/resources/platform-tools/android/win32/AdbWinUsbApi.dll +0 -0
- package/lib/common/resources/platform-tools/android/win32/NOTICE.txt +0 -4451
- package/lib/common/resources/platform-tools/android/win32/adb.exe +0 -0
- package/lib/common/resources/platform-tools/android/win32/fastboot.exe +0 -0
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.LogcatHelper = void 0;
|
|
13
4
|
const byline = require("byline");
|
|
@@ -23,80 +14,76 @@ class LogcatHelper {
|
|
|
23
14
|
this.$devicesService = $devicesService;
|
|
24
15
|
this.mapDevicesLoggingData = Object.create(null);
|
|
25
16
|
}
|
|
26
|
-
start(options) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
this.$logger.trace("ADB process exited with code " + code.toString());
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
catch (err) {
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
lineStream.on("data", (lineBuffer) => {
|
|
56
|
-
const lines = (lineBuffer.toString() || "").split("\n");
|
|
57
|
-
for (const line of lines) {
|
|
58
|
-
this.$deviceLogProvider.logData(line, this.$devicePlatformsConstants.Android, deviceIdentifier);
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
const appStartTrackingStream = yield this.getAppStartTrackingLogcatStream(deviceIdentifier, options.appId);
|
|
62
|
-
this.mapDevicesLoggingData[deviceIdentifier].appStartTrackingProcess =
|
|
63
|
-
appStartTrackingStream;
|
|
64
|
-
const rawLineStream = byline(appStartTrackingStream.stdout);
|
|
65
|
-
this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
|
|
66
|
-
rawLineStream;
|
|
67
|
-
rawLineStream.on("data", (lineBuffer) => {
|
|
68
|
-
var _a, _b, _c, _d;
|
|
69
|
-
if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
|
|
70
|
-
return;
|
|
71
|
-
const lines = (lineBuffer.toString() || "").split("\n");
|
|
72
|
-
for (let line of lines) {
|
|
73
|
-
const startProc = /Start proc (?<pid>[0-9]+):(?<appId>.+?)\//.exec(line);
|
|
74
|
-
if (startProc &&
|
|
75
|
-
((_b = startProc.groups) === null || _b === void 0 ? void 0 : _b.appId) === options.appId &&
|
|
76
|
-
((_c = startProc.groups) === null || _c === void 0 ? void 0 : _c.pid) !== options.pid) {
|
|
77
|
-
this.forceStop(deviceIdentifier);
|
|
78
|
-
(_d = options.onAppRestarted) === null || _d === void 0 ? void 0 : _d.call(options);
|
|
79
|
-
}
|
|
17
|
+
async start(options) {
|
|
18
|
+
const deviceIdentifier = options.deviceIdentifier;
|
|
19
|
+
if (deviceIdentifier && !this.mapDevicesLoggingData[deviceIdentifier]) {
|
|
20
|
+
this.mapDevicesLoggingData[deviceIdentifier] = {
|
|
21
|
+
loggingProcess: null,
|
|
22
|
+
lineStream: null,
|
|
23
|
+
keepSingleProcess: options.keepSingleProcess,
|
|
24
|
+
appStartTrackingProcess: null,
|
|
25
|
+
rawLineStream: null,
|
|
26
|
+
};
|
|
27
|
+
const logcatStream = await this.getLogcatStream(deviceIdentifier, options.pid);
|
|
28
|
+
const lineStream = byline(logcatStream.stdout);
|
|
29
|
+
this.mapDevicesLoggingData[deviceIdentifier].loggingProcess =
|
|
30
|
+
logcatStream;
|
|
31
|
+
this.mapDevicesLoggingData[deviceIdentifier].lineStream = lineStream;
|
|
32
|
+
logcatStream.stderr.on("data", (data) => {
|
|
33
|
+
this.$logger.trace("ADB logcat stderr: " + data.toString());
|
|
34
|
+
});
|
|
35
|
+
logcatStream.on("close", (code) => {
|
|
36
|
+
try {
|
|
37
|
+
this.forceStop(deviceIdentifier);
|
|
38
|
+
if (code !== 0) {
|
|
39
|
+
this.$logger.trace("ADB process exited with code " + code.toString());
|
|
80
40
|
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
dump(deviceIdentifier) {
|
|
86
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
87
|
-
const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
|
|
88
|
-
const logcatDumpStream = yield adb.executeCommand(["logcat", "-d"], {
|
|
89
|
-
returnChildProcess: true,
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
}
|
|
90
44
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
const
|
|
94
|
-
|
|
45
|
+
lineStream.on("data", (lineBuffer) => {
|
|
46
|
+
const lines = (lineBuffer.toString() || "").split("\n");
|
|
47
|
+
for (const line of lines) {
|
|
48
|
+
this.$deviceLogProvider.logData(line, this.$devicePlatformsConstants.Android, deviceIdentifier);
|
|
49
|
+
}
|
|
95
50
|
});
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
51
|
+
const appStartTrackingStream = await this.getAppStartTrackingLogcatStream(deviceIdentifier, options.appId);
|
|
52
|
+
this.mapDevicesLoggingData[deviceIdentifier].appStartTrackingProcess =
|
|
53
|
+
appStartTrackingStream;
|
|
54
|
+
const rawLineStream = byline(appStartTrackingStream.stdout);
|
|
55
|
+
this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
|
|
56
|
+
rawLineStream;
|
|
57
|
+
rawLineStream.on("data", (lineBuffer) => {
|
|
58
|
+
var _a, _b, _c, _d;
|
|
59
|
+
if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
|
|
60
|
+
return;
|
|
61
|
+
const lines = (lineBuffer.toString() || "").split("\n");
|
|
62
|
+
for (let line of lines) {
|
|
63
|
+
const startProc = /Start proc (?<pid>[0-9]+):(?<appId>.+?)\//.exec(line);
|
|
64
|
+
if (startProc &&
|
|
65
|
+
((_b = startProc.groups) === null || _b === void 0 ? void 0 : _b.appId) === options.appId &&
|
|
66
|
+
((_c = startProc.groups) === null || _c === void 0 ? void 0 : _c.pid) !== options.pid) {
|
|
67
|
+
this.forceStop(deviceIdentifier);
|
|
68
|
+
(_d = options.onAppRestarted) === null || _d === void 0 ? void 0 : _d.call(options);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
99
71
|
});
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async dump(deviceIdentifier) {
|
|
75
|
+
const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
|
|
76
|
+
const logcatDumpStream = await adb.executeCommand(["logcat", "-d"], {
|
|
77
|
+
returnChildProcess: true,
|
|
78
|
+
});
|
|
79
|
+
const lineStream = byline(logcatDumpStream.stdout);
|
|
80
|
+
lineStream.on("data", (line) => {
|
|
81
|
+
const lineText = line.toString();
|
|
82
|
+
this.$logger.trace(lineText);
|
|
83
|
+
});
|
|
84
|
+
logcatDumpStream.on("close", (code) => {
|
|
85
|
+
logcatDumpStream.removeAllListeners();
|
|
86
|
+
lineStream.removeAllListeners();
|
|
100
87
|
});
|
|
101
88
|
}
|
|
102
89
|
stop(deviceIdentifier) {
|
|
@@ -115,59 +102,53 @@ class LogcatHelper {
|
|
|
115
102
|
(_e = loggingData.lineStream) === null || _e === void 0 ? void 0 : _e.removeAllListeners();
|
|
116
103
|
delete this.mapDevicesLoggingData[deviceIdentifier];
|
|
117
104
|
}
|
|
118
|
-
isLogcatPidSupported(deviceIdentifier) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
semver.gte(semver.coerce(device.deviceInfo.version), minAndroidWithLogcatPidSupport));
|
|
124
|
-
});
|
|
105
|
+
async isLogcatPidSupported(deviceIdentifier) {
|
|
106
|
+
const device = await this.$devicesService.getDevice(deviceIdentifier);
|
|
107
|
+
const minAndroidWithLogcatPidSupport = "7.0.0";
|
|
108
|
+
return (!!device.deviceInfo.version &&
|
|
109
|
+
semver.gte(semver.coerce(device.deviceInfo.version), minAndroidWithLogcatPidSupport));
|
|
125
110
|
}
|
|
126
|
-
getLogcatStream(deviceIdentifier, pid) {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
logcatCommand.push("-s", tag);
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
const logcatStream = yield adb.executeCommand(logcatCommand, {
|
|
146
|
-
returnChildProcess: true,
|
|
111
|
+
async getLogcatStream(deviceIdentifier, pid) {
|
|
112
|
+
const isLogcatPidSupported = await this.isLogcatPidSupported(deviceIdentifier);
|
|
113
|
+
const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
|
|
114
|
+
const logcatCommand = ["logcat", "-T", "1"];
|
|
115
|
+
const acceptedTags = [
|
|
116
|
+
"chromium",
|
|
117
|
+
'"Web Console"',
|
|
118
|
+
"JS",
|
|
119
|
+
"System.err",
|
|
120
|
+
"TNS.Native",
|
|
121
|
+
"TNS.Java",
|
|
122
|
+
];
|
|
123
|
+
if (pid && isLogcatPidSupported) {
|
|
124
|
+
logcatCommand.push(`--pid=${pid}`);
|
|
125
|
+
acceptedTags.forEach((tag) => {
|
|
126
|
+
logcatCommand.push("-s", tag);
|
|
147
127
|
});
|
|
148
|
-
|
|
128
|
+
}
|
|
129
|
+
const logcatStream = await adb.executeCommand(logcatCommand, {
|
|
130
|
+
returnChildProcess: true,
|
|
149
131
|
});
|
|
132
|
+
return logcatStream;
|
|
150
133
|
}
|
|
151
|
-
getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
returnChildProcess: true,
|
|
168
|
-
});
|
|
169
|
-
return appStartTrackingStream;
|
|
134
|
+
async getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
|
|
135
|
+
const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
|
|
136
|
+
const logcatCommand = [
|
|
137
|
+
`logcat`,
|
|
138
|
+
`-b`,
|
|
139
|
+
`system`,
|
|
140
|
+
`-T`,
|
|
141
|
+
`1`,
|
|
142
|
+
"-s",
|
|
143
|
+
"ActivityManager",
|
|
144
|
+
];
|
|
145
|
+
if (appId) {
|
|
146
|
+
logcatCommand.push(`--regex=START.*${appId}`);
|
|
147
|
+
}
|
|
148
|
+
const appStartTrackingStream = await adb.executeCommand(logcatCommand, {
|
|
149
|
+
returnChildProcess: true,
|
|
170
150
|
});
|
|
151
|
+
return appStartTrackingStream;
|
|
171
152
|
}
|
|
172
153
|
}
|
|
173
154
|
exports.LogcatHelper = LogcatHelper;
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ApplicationManagerBase = void 0;
|
|
13
4
|
const events_1 = require("events");
|
|
@@ -21,115 +12,101 @@ class ApplicationManagerBase extends events_1.EventEmitter {
|
|
|
21
12
|
this.$deviceLogProvider = $deviceLogProvider;
|
|
22
13
|
this.lastAvailableDebuggableAppViews = {};
|
|
23
14
|
}
|
|
24
|
-
setTransferredAppFiles(files) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
});
|
|
15
|
+
async setTransferredAppFiles(files) {
|
|
16
|
+
for (const file of files) {
|
|
17
|
+
await this.$deviceLogProvider.setSourceFileLocation(file);
|
|
18
|
+
}
|
|
30
19
|
}
|
|
31
|
-
reinstallApplication(appIdentifier, packageFilePath, buildData) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
yield this.installApplication(packageFilePath, appIdentifier, buildData);
|
|
38
|
-
});
|
|
20
|
+
async reinstallApplication(appIdentifier, packageFilePath, buildData) {
|
|
21
|
+
const isApplicationInstalled = await this.isApplicationInstalled(appIdentifier);
|
|
22
|
+
if (isApplicationInstalled && (buildData === null || buildData === void 0 ? void 0 : buildData.clean)) {
|
|
23
|
+
await this.uninstallApplication(appIdentifier);
|
|
24
|
+
}
|
|
25
|
+
await this.installApplication(packageFilePath, appIdentifier, buildData);
|
|
39
26
|
}
|
|
40
|
-
restartApplication(appData) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
yield this.startApplication(appData);
|
|
44
|
-
});
|
|
27
|
+
async restartApplication(appData) {
|
|
28
|
+
await this.stopApplication(appData);
|
|
29
|
+
await this.startApplication(appData);
|
|
45
30
|
}
|
|
46
|
-
isApplicationInstalled(appIdentifier) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return _.includes(this.lastInstalledAppIdentifiers, appIdentifier);
|
|
50
|
-
});
|
|
31
|
+
async isApplicationInstalled(appIdentifier) {
|
|
32
|
+
await this.checkForApplicationUpdates();
|
|
33
|
+
return _.includes(this.lastInstalledAppIdentifiers, appIdentifier);
|
|
51
34
|
}
|
|
52
|
-
checkForApplicationUpdates() {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
resolve();
|
|
75
|
-
}
|
|
35
|
+
async checkForApplicationUpdates() {
|
|
36
|
+
if (!this.checkForApplicationUpdatesPromise) {
|
|
37
|
+
this.checkForApplicationUpdatesPromise = new Promise(async (resolve, reject) => {
|
|
38
|
+
let isFulfilled = false;
|
|
39
|
+
try {
|
|
40
|
+
const currentlyInstalledAppIdentifiers = await this.getInstalledApplications();
|
|
41
|
+
const previouslyInstalledAppIdentifiers = this.lastInstalledAppIdentifiers || [];
|
|
42
|
+
const newAppIdentifiers = _.difference(currentlyInstalledAppIdentifiers, previouslyInstalledAppIdentifiers);
|
|
43
|
+
const removedAppIdentifiers = _.difference(previouslyInstalledAppIdentifiers, currentlyInstalledAppIdentifiers);
|
|
44
|
+
this.lastInstalledAppIdentifiers = currentlyInstalledAppIdentifiers;
|
|
45
|
+
_.each(newAppIdentifiers, (appIdentifier) => this.emit("applicationInstalled", appIdentifier));
|
|
46
|
+
_.each(removedAppIdentifiers, (appIdentifier) => this.emit("applicationUninstalled", appIdentifier));
|
|
47
|
+
await this.checkForAvailableDebuggableAppsChanges();
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
isFulfilled = true;
|
|
51
|
+
reject(err);
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
this.checkForApplicationUpdatesPromise = null;
|
|
55
|
+
if (!isFulfilled) {
|
|
56
|
+
resolve();
|
|
76
57
|
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
return this.checkForApplicationUpdatesPromise;
|
|
81
62
|
}
|
|
82
|
-
tryStartApplication(appData) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
63
|
+
async tryStartApplication(appData) {
|
|
64
|
+
try {
|
|
65
|
+
await this.startApplication(appData);
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
this.$logger.trace(`Unable to start application ${appData.appId} with name ${appData.projectName}. Error is: ${err.message}`);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
async checkForAvailableDebuggableAppsChanges() {
|
|
72
|
+
const currentlyAvailableDebuggableApps = await this.getDebuggableApps();
|
|
73
|
+
const previouslyAvailableDebuggableApps = this.lastAvailableDebuggableApps || [];
|
|
74
|
+
const newAvailableDebuggableApps = _.differenceBy(currentlyAvailableDebuggableApps, previouslyAvailableDebuggableApps, "appIdentifier");
|
|
75
|
+
const notAvailableAppsForDebugging = _.differenceBy(previouslyAvailableDebuggableApps, currentlyAvailableDebuggableApps, "appIdentifier");
|
|
76
|
+
this.lastAvailableDebuggableApps = currentlyAvailableDebuggableApps;
|
|
77
|
+
_.each(newAvailableDebuggableApps, (appInfo) => {
|
|
78
|
+
this.emit("debuggableAppFound", appInfo);
|
|
79
|
+
});
|
|
80
|
+
_.each(notAvailableAppsForDebugging, (appInfo) => {
|
|
81
|
+
this.emit("debuggableAppLost", appInfo);
|
|
82
|
+
if (_.has(this.lastAvailableDebuggableAppViews, appInfo.appIdentifier)) {
|
|
83
|
+
delete this.lastAvailableDebuggableAppViews[appInfo.appIdentifier];
|
|
89
84
|
}
|
|
90
85
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
_.
|
|
100
|
-
|
|
86
|
+
const cordovaDebuggableAppIdentifiers = _(currentlyAvailableDebuggableApps)
|
|
87
|
+
.filter((c) => c.framework === constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova)
|
|
88
|
+
.map((c) => c.appIdentifier)
|
|
89
|
+
.value();
|
|
90
|
+
const currentlyAvailableAppViews = await this.getDebuggableAppViews(cordovaDebuggableAppIdentifiers);
|
|
91
|
+
_.each(currentlyAvailableAppViews, (currentlyAvailableViews, appIdentifier) => {
|
|
92
|
+
const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[appIdentifier];
|
|
93
|
+
const newAvailableViews = _.differenceBy(currentlyAvailableViews, previouslyAvailableViews, "id");
|
|
94
|
+
const notAvailableViews = _.differenceBy(previouslyAvailableViews, currentlyAvailableViews, "id");
|
|
95
|
+
_.each(notAvailableViews, (debugWebViewInfo) => {
|
|
96
|
+
this.emit("debuggableViewLost", appIdentifier, debugWebViewInfo);
|
|
101
97
|
});
|
|
102
|
-
_.each(
|
|
103
|
-
this.emit("
|
|
104
|
-
if (_.has(this.lastAvailableDebuggableAppViews, appInfo.appIdentifier)) {
|
|
105
|
-
delete this.lastAvailableDebuggableAppViews[appInfo.appIdentifier];
|
|
106
|
-
}
|
|
98
|
+
_.each(newAvailableViews, (debugWebViewInfo) => {
|
|
99
|
+
this.emit("debuggableViewFound", appIdentifier, debugWebViewInfo);
|
|
107
100
|
});
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
.
|
|
111
|
-
.
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[appIdentifier];
|
|
115
|
-
const newAvailableViews = _.differenceBy(currentlyAvailableViews, previouslyAvailableViews, "id");
|
|
116
|
-
const notAvailableViews = _.differenceBy(previouslyAvailableViews, currentlyAvailableViews, "id");
|
|
117
|
-
_.each(notAvailableViews, (debugWebViewInfo) => {
|
|
118
|
-
this.emit("debuggableViewLost", appIdentifier, debugWebViewInfo);
|
|
119
|
-
});
|
|
120
|
-
_.each(newAvailableViews, (debugWebViewInfo) => {
|
|
121
|
-
this.emit("debuggableViewFound", appIdentifier, debugWebViewInfo);
|
|
122
|
-
});
|
|
123
|
-
const keptViews = _.differenceBy(currentlyAvailableViews, newAvailableViews, "id");
|
|
124
|
-
_.each(keptViews, (view) => {
|
|
125
|
-
const previousTimeViewInfo = _.find(previouslyAvailableViews, (previousView) => previousView.id === view.id);
|
|
126
|
-
if (!_.isEqual(view, previousTimeViewInfo)) {
|
|
127
|
-
this.emit("debuggableViewChanged", appIdentifier, view);
|
|
128
|
-
}
|
|
129
|
-
});
|
|
130
|
-
this.lastAvailableDebuggableAppViews[appIdentifier] =
|
|
131
|
-
currentlyAvailableViews;
|
|
101
|
+
const keptViews = _.differenceBy(currentlyAvailableViews, newAvailableViews, "id");
|
|
102
|
+
_.each(keptViews, (view) => {
|
|
103
|
+
const previousTimeViewInfo = _.find(previouslyAvailableViews, (previousView) => previousView.id === view.id);
|
|
104
|
+
if (!_.isEqual(view, previousTimeViewInfo)) {
|
|
105
|
+
this.emit("debuggableViewChanged", appIdentifier, view);
|
|
106
|
+
}
|
|
132
107
|
});
|
|
108
|
+
this.lastAvailableDebuggableAppViews[appIdentifier] =
|
|
109
|
+
currentlyAvailableViews;
|
|
133
110
|
});
|
|
134
111
|
}
|
|
135
112
|
}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.DeviceLogProviderBase = void 0;
|
|
13
4
|
const events_1 = require("events");
|
|
@@ -20,15 +11,13 @@ class DeviceLogProviderBase extends events_1.EventEmitter {
|
|
|
20
11
|
this.$logSourceMapService = $logSourceMapService;
|
|
21
12
|
this.devicesLogOptions = {};
|
|
22
13
|
}
|
|
23
|
-
setSourceFileLocation(pathToOriginalFile) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
});
|
|
14
|
+
async setSourceFileLocation(pathToOriginalFile) {
|
|
15
|
+
try {
|
|
16
|
+
await this.$logSourceMapService.setSourceMapConsumerForFile(pathToOriginalFile);
|
|
17
|
+
}
|
|
18
|
+
catch (err) {
|
|
19
|
+
this.$logger.trace("Error while trying to set source map file", err);
|
|
20
|
+
}
|
|
32
21
|
}
|
|
33
22
|
setApplicationPidForDevice(deviceIdentifier, pid) {
|
|
34
23
|
this.setDeviceLogOptionsProperty(deviceIdentifier, (deviceLogOptions) => deviceLogOptions.applicationPid, pid);
|