Skip to content

Fixed: CLI crashes/stops responding after ~80 console.logs #2295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Fixed: CLI crashes/stops responding after ~80 console.logs #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 36 files
+2 −0 .gitignore
+4 −1 .npmignore
+11 −11 Gruntfile.js
+1 −0 appbuilder/declarations.d.ts
+2 −1 appbuilder/project-constants.ts
+18 −3 appbuilder/services/npm-service.ts
+2 −1 codeGeneration/code-printer.ts
+2 −2 declarations.d.ts
+13 −6 decorators.ts
+0 −711 definitions/bluebird.d.ts
+3 −2 definitions/colors.d.ts
+2 −2 definitions/node-uuid-cjs.d.ts
+5 −2 errors.ts
+1 −1 file-system.ts
+26 −10 helpers.ts
+1 −1 logger.ts
+1 −1 mobile/android/android-emulator-services.ts
+2 −1 mobile/android/device-android-debug-bridge.ts
+15 −13 mobile/ios/simulator/ios-emulator-services.ts
+3 −1 mobile/mobile-core/android-device-discovery.ts
+4 −4 package.json
+2 −1 queue.ts
+15 −0 scripts/node-args.js
+6 −6 services/livesync-service-base.ts
+5 −3 services/messages-service.ts
+19 −0 test-scripts/istanbul.js
+15 −0 test-scripts/mocha.js
+6 −0 test/mocha.opts
+9 −3 test/unit-tests/appbuilder/device-emitter.ts
+1 −2 test/unit-tests/decorators.ts
+4 −4 test/unit-tests/mobile/application-manager-base.ts
+5 −5 test/unit-tests/stubs.ts
+371 −90 test/unit-tests/yok.ts
+4 −1 tsconfig.json
+17 −14 verify-node-version.ts
+3 −8 yok.ts
68 changes: 44 additions & 24 deletions lib/services/ios-log-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,59 @@
let sourcemap = require("source-map");
import * as path from "path";
import fs = require("fs");

export class IOSLogFilter implements Mobile.IPlatformLogFilter {

private $projectData: IProjectData;
private partialLine: string = null;

constructor(
private $fs: IFileSystem,
private $loggingLevels: Mobile.ILoggingLevels) { }
constructor(private $fs: IFileSystem, private $loggingLevels: Mobile.ILoggingLevels) {
}

public filterData(data: string, logLevel: string, pid?: string): string {

if (pid && data && data.indexOf(`[${pid}]`) === -1) {
return null;
}

let skipLastLine = data[data.length-1] !== "\n";

if (data) {
if (data.indexOf("SecTaskCopyDebugDescription") !== -1 ||
data.indexOf("NativeScript loaded bundle") !== -1 ||
(data.indexOf("assertion failed:") !== -1 && data.indexOf("libxpc.dylib") !== -1)) {
return null;
}
// CONSOLE LOG messages comme in the following form:
// <date> <domain> <app>[pid] CONSOLE LOG file:///location:row:column: <actual message goes here>
// This code removes unnecessary information from log messages. The output looks like:
// CONSOLE LOG file:///location:row:column: <actual message goes here>
if (pid) {
let searchString = "["+pid+"]: ";
let pidIndex = data.indexOf(searchString);
if (pidIndex > 0) {
data = data.substring(pidIndex + searchString.length, data.length);
let lines = data.split("\n");
let result = "";
for (let i = 0; i<lines.length; i++) {
let line = lines[i];
if (i === 0 && this.partialLine) {
line = this.partialLine + line;
this.partialLine = null;
}
if (line.length < 1 ||
line.indexOf("SecTaskCopyDebugDescription") !== -1 ||
line.indexOf("NativeScript loaded bundle") !== -1 ||
(line.indexOf("assertion failed:") !== -1 && data.indexOf("libxpc.dylib") !== -1)) {
continue;
}
// CONSOLE LOG messages comme in the following form:
// <date> <domain> <app>[pid] CONSOLE LOG file:///location:row:column: <actual message goes here>
// This code removes unnecessary information from log messages. The output looks like:
// CONSOLE LOG file:///location:row:column: <actual message goes here>
if (pid) {
let searchString = "["+pid+"]: ";
let pidIndex = line.indexOf(searchString);
if (pidIndex > 0) {
line = line.substring(pidIndex + searchString.length, line.length);
this.getOriginalFileLocation(line);
result += this.getOriginalFileLocation(line) + "\n";
continue;
}
}
if (skipLastLine && i === lines.length-1) {
this.partialLine = line;
} else {
result += this.getOriginalFileLocation(line) + "\n";
}
}
data = this.getOriginalFileLocation(data);
return data.trim();
return result;
}

return data;
Expand All @@ -47,11 +67,11 @@ export class IOSLogFilter implements Mobile.IPlatformLogFilter {
if (parts.length >= 4) {
let file = parts[0];
if (this.ensureProjectData()) {
let sourceMapFile = path.join(this.$projectData.projectDir, file + ".map");
let row = parseInt(parts[1]);
let column = parseInt(parts[2]);
if (this.$fs.exists(sourceMapFile).wait()) {
let sourceMap = this.$fs.readText(sourceMapFile, "utf8").wait();
let sourceMapFile = path.join(this.$projectData.projectDir, file + ".map");
let row = parseInt(parts[1]);
let column = parseInt(parts[2]);
if (fs.existsSync(sourceMapFile)) {
let sourceMap = fs.readFileSync(sourceMapFile, "utf8");
let smc = new sourcemap.SourceMapConsumer(sourceMap);
let originalPosition = smc.originalPositionFor({line:row,column:column});
let sourceFile = smc.sources.length > 0 ? file.replace(smc.file, smc.sources[0]) : file;
Expand Down