smipper 6.0.0 → 9.0.0

package/index.js

@@ -2,10 +2,91 @@
 "use strict";
 
 const fs = require("fs");
-const loader = require("path-loader");
+const got = require("got");
+const path = require("path");
 const sourceMap = require("source-map");
 const url = require("url");
+
 let verbose = false;
+let stack;
+let json = false;
+let retries = 3;
+let jsc = 0;
+
+let hasInput = false;
+for (let i=2; i<process.argv.length; ++i) {
+    try {
+        const arg = process.argv[i];
+        if (verbose)
+            console.error("got arg", arg);
+        if (arg === "-f" || arg === "--file") {
+            stack = fs.readFileSync(process.argv[++i]).toString();
+        } else if ( arg.startsWith("-f") === 0) {
+            stack = fs.readFileSync(arg.substr(2)).toString();
+        } else if (arg.startsWith("--file=") === 0) {
+            stack = fs.readFileSync(arg.substr(7)).toString();
+        } else if (arg === "--verbose" || arg === "-v") {
+            verbose = true;
+        } else if (arg === "--version") {
+            console.log(JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8")).version);
+            process.exit(0);
+        } else if (arg === "--json") {
+            json = true;
+        } else if (arg === "--jsc") { // jsc has the wrong column for some reason
+            jsc = 1;
+        } else if (arg.startsWith("--retries")) {
+            retries = parseInt(arg.substr(9));
+            if (isNaN(retries) || retries < 0) {
+                console.error("smipper [stack|-h|--help|-v|--verbose|--version|--retries=<number>|--jsc|--json|-f=@FILE@|-");
+                process.exit(1);
+            }
+        } else if (arg === "-h" || arg === "--help") {
+            console.error("smipper [stack|-h|--help|-v|--verbose|--version|--retries=<number>|--jsc|--json|-f=@FILE@|-");
+            process.exit(0);
+        } else if (arg === "-") {
+            // stdin
+        } else {
+            stack = arg;
+        }
+    } catch (err) {
+        console.error("Error: " + err.toString());
+        process.exit(1);
+    }
+}
+
+if (!stack) {
+    stack = fs.readFileSync("/dev/stdin").toString();
+    if (!stack) {
+        console.error("Nothing to do");
+        process.exit(0);
+    }
+}
+
+function load(path)
+{
+    return new Promise((resolve, reject) => {
+        if (path.startsWith("file:///")) {
+            try {
+                resolve(fs.readFileSync(path.substr(7), "utf8"));
+            } catch (err) {
+                reject(err);
+            }
+            return;
+        }
+        let retryIndex = 0;
+        async function get()
+        {
+            try {
+                const response = await got.get(path, { retry: { limit: retries } });
+                return response.body;
+            } catch (err) {
+                reject(err);
+            }
+        }
+
+        get().then(resolve, reject);
+    });
+}
 
 const sourceMaps = {};
 function loadUri(path) {
@@ -13,12 +94,14 @@ function loadUri(path) {
         path = "file://" + path;
     }
     return new Promise((resolve, reject) => {
+        if (verbose)
+            console.log("loading", path);
         if (!(path in sourceMaps)) {
             sourceMaps[path] = {
                 resolvers: [ resolve ],
                 rejecters: [ reject  ]
             };
-            loader.load(path).then(jsData => {
+            load(path).then(jsData => {
                 const idx = jsData.lastIndexOf("//# sourceMappingURL=");
                 if (verbose)
                     console.error("Got the file", jsData.length, idx);
@@ -31,7 +114,7 @@ function loadUri(path) {
                 }
                 return (new url.URL(mapUrl, path)).href;
             }).then(mapUrl => {
-                return loader.load(mapUrl);
+                return load(mapUrl);
             }).then(sourceMapData => {
                 const parsed = JSON.parse(sourceMapData);
                 const smap = new sourceMap.SourceMapConsumer(parsed);
@@ -55,42 +138,6 @@ function loadUri(path) {
     });
 }
 
-let stack;
-let json = false;
-for (let i=2; i<process.argv.length; ++i) {
-    try {
-        const arg = process.argv[i];
-        if (verbose)
-            console.error("got arg", arg);
-        if (arg === "-") {
-            stack = fs.readFileSync("/dev/stdin").toString();
-        } else if (arg === "-f" || arg === "--file") {
-            stack = fs.readFileSync(process.argv[++i]).toString();
-        } else if ( arg.lastIndexOf("-f", 0) === 0) {
-            stack = fs.readFileSync(arg.substr(2)).toString();
-        } else if (arg.lastIndexOf("--file=", 0) === 0) {
-            stack = fs.readFileSync(arg.substr(7)).toString();
-        } else if (arg === "--verbose" || arg === "-v") {
-            verbose = true;
-        } else if (arg === "--json") {
-            json = true;
-        } else if (arg === "-h" || arg === "--help") {
-            console.error("smipper [stack|-h|--help|-v|--verbose|--json|-f=@FILE@|-");
-            process.exit(0);
-        } else {
-            stack = arg;
-        }
-    } catch (err) {
-        console.error("Error: " + err.toString());
-        process.exit(1);
-    }
-}
-
-if (!stack) {
-    console.error("Nothing to do");
-    process.exit(0);
-}
-
 function processFrame(functionName, url, line, column)
 {
     if (verbose)
@@ -110,8 +157,7 @@ function processFrame(functionName, url, line, column)
 
             // it appears that we're supposed to reduce the column
             // number by 1 when we get this from jsc
-            --column;
-            const pos = smap.originalPositionFor({ line, column });
+            const pos = smap.originalPositionFor({ line, column: column - jsc });
             if (!pos.source) {
                 if (verbose)
                     console.error("nothing here", pos);
@@ -204,6 +250,9 @@ if (json) {
         }
         return processFrame(match[1] || "", match[2], parseInt(match[3]), parseInt(match[4]));
     })).then((results) => {
+        if (!results.length) {
+            throw new Error("Empty output");
+        }
         results.forEach(str => {
             console.log(str);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smipper",
-    "version": "6.0.0",
+    "version": "9.0.0",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -12,7 +12,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "path-loader": "^1.0.10",
+        "got": "^9.6.0",
         "source-map": "^0.7.3"
     }
 }