refactor: split error trace from message

unjs · Jun 20, 2022 · dee7308 · dee7308
1 parent 155afac
commit dee7308
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/ipx.ts b/src/ipx.ts
@@ -93,7 +93,7 @@ export function createIPX (userOptions: Partial<IPXOptions>): IPX {
     const getSrc = cachedPromise(() => {
       const source = hasProtocol(id) ? 'http' : 'filesystem'
       if (!ctx.sources[source]) {
-        throw createError('Unknown source: ' + source, 400)
+        throw createError('Unknown source', 400, source)
       }
       return ctx.sources[source](id, reqOptions)
     })

diff --git a/src/sources/filesystem.ts b/src/sources/filesystem.ts
@@ -14,21 +14,21 @@ export const createFilesystemSource: SourceFactory<FilesystemSourceOptions> = (o
   return async (id: string) => {
     const fsPath = resolve(join(rootDir, id))
     if (!isValidPath(fsPath) || !fsPath.startsWith(rootDir)) {
-      throw createError('Forbidden path:' + id, 403)
+      throw createError('Forbidden path', 403, id)
     }
 
     let stats: Stats
     try {
       stats = await fsp.stat(fsPath)
     } catch (err) {
       if (err.code === 'ENOENT') {
-        throw createError('File not found: ' + fsPath, 404)
+        throw createError('File not found', 404, fsPath)
       } else {
-        throw createError('File access error for ' + fsPath + ':' + err.code, 403)
+        throw createError('File access error ' + err.code, 403, fsPath)
       }
     }
     if (!stats.isFile()) {
-      throw createError('Path should be a file: ' + fsPath, 400)
+      throw createError('Path should be a file', 400, fsPath)
     }
 
     return {

diff --git a/src/sources/http.ts b/src/sources/http.ts
@@ -28,10 +28,10 @@ export const createHTTPSource: SourceFactory<HTTPSourceOptions> = (options) => {
 
     // Check host
     if (!url.hostname) {
-      throw createError('Hostname is missing: ' + id, 403)
+      throw createError('Hostname is missing', 403, id)
     }
     if (!reqOptions?.bypassDomain && !hosts.find(host => url.hostname === host)) {
-      throw createError('Forbidden host: ' + url.hostname, 403)
+      throw createError('Forbidden host', 403, url.hostname)
     }
 
     const response = await fetch(id, {
@@ -41,7 +41,7 @@ export const createHTTPSource: SourceFactory<HTTPSourceOptions> = (options) => {
     })
 
     if (!response.ok) {
-      throw createError(response.statusText || 'fetch error', response.status || 500)
+      throw createError('Fetch error', response.status || 500, response.statusText)
     }
 
     let maxAge = options.maxAge

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,5 @@
 import destr from 'destr'
+import xss from 'xss'
 
 export function getEnv (name: string, defaultValue: any) {
   return destr(process.env[name]) ?? defaultValue
@@ -20,9 +21,9 @@ export class IPXError extends Error {
   statusMessage?: string
 }
 
-export function createError (message: string, statusCode: number): IPXError {
-  const err = new IPXError(message)
-  err.statusMessage = 'IPX: ' + message
+export function createError (statusMessage: string, statusCode: number, trace?: string): IPXError {
+  const err = new IPXError(statusMessage + (trace ? ` (${trace})` : ''))
+  err.statusMessage = 'IPX: ' + statusMessage
   err.statusCode = statusCode
   return err
 }