paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

blueslip_stacktrace: Handle promises in sourceCache.

Browse Source 
Fixes “TypeError: sourceContent.split is not a function” at
blueslip_stacktrace.ts:60 when there’s another error during page load.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-02-03 15:23:38 -08:00
committed by Tim Abbott
parent df5345705c
commit 849c7f83a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/blueslip_stacktrace.ts
View File

@@ -48,12 +48,12 @@ export function clean_function_name(
}; };
} }
const sourceCache: { [source: string]: string } = {}; const sourceCache: { [source: string]: string | Promise<string> } = {};
const stack_trace_gps = new StackTraceGPS({ sourceCache }); const stack_trace_gps = new StackTraceGPS({ sourceCache });
function get_context(location: StackFrame.StackFrame): NumberedLine[] | undefined { async function get_context(location: StackFrame.StackFrame): Promise<NumberedLine[] | undefined> {
const sourceContent = sourceCache[location.getFileName()]; const sourceContent = await sourceCache[location.getFileName()];
if (sourceContent === undefined) { if (sourceContent === undefined) {
return undefined; return undefined;
} }
@@ -84,7 +84,7 @@ export async function display_stacktrace(error: string, stack: string): Promise<
show_path: clean_path(location.getFileName()), show_path: clean_path(location.getFileName()),
line_number: location.getLineNumber(), line_number: location.getLineNumber(),
function_name: clean_function_name(location.getFunctionName()), function_name: clean_function_name(location.getFunctionName()),
context: get_context(location), context: await get_context(location),
}; };
}) })
); );

2
static/js/types/stacktrace-gps/index.d.ts vendored
View File

@@ -5,7 +5,7 @@ import SourceMap from "source-map";
declare namespace StackTraceGPS { declare namespace StackTraceGPS {
type StackTraceGPSOptions = { type StackTraceGPSOptions = {
sourceCache?: { [url: string]: string }; sourceCache?: { [url: string]: string | Promise<string> };
sourceMapConsumerCache?: { [sourceMappingUrl: string]: SourceMap.SourceMapConsumer }; sourceMapConsumerCache?: { [sourceMappingUrl: string]: SourceMap.SourceMapConsumer };
offline?: boolean; offline?: boolean;
ajax?(url: string): Promise<string>; ajax?(url: string): Promise<string>;