smipper 32.0.0 → 34.0.0

package/dist/load.js

@@ -7,19 +7,32 @@ exports.load = void 0;
 const rewriteLocalControl_1 = require("./rewriteLocalControl");
 const fs_1 = __importDefault(require("fs"));
 const got_1 = __importDefault(require("got"));
-async function load(smipper, path) {
-    smipper.verbose("load", path);
-    if (path.startsWith("http://localcontrol.netflix.com/")) {
-        path = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, path);
+const path_1 = __importDefault(require("path"));
+const process_1 = __importDefault(require("process"));
+async function load(smipper, filePath) {
+    smipper.verbose("load", filePath);
+    if (filePath.startsWith("http://localcontrol.netflix.com/")) {
+        filePath = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, filePath);
     }
-    if (path.startsWith("file:///")) {
-        return fs_1.default.readFileSync(path.substring(7), "utf8");
+    if (!filePath.includes("://")) {
+        if (filePath[0] === "/" && fs_1.default.existsSync(filePath)) {
+            filePath = `file://${filePath}`;
+        }
+        else if (fs_1.default.existsSync(filePath)) {
+            filePath = `file://${path_1.default.join(process_1.default.cwd(), filePath)}`;
+        }
+        else {
+            filePath = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, filePath);
+        }
+    }
+    if (filePath.startsWith("file:///")) {
+        return fs_1.default.readFileSync(filePath.substring(7), "utf8");
     }
-    if (!path.startsWith("http://") && !path.startsWith("https://")) {
+    if (!filePath.startsWith("http://") && !filePath.startsWith("https://")) {
         throw new Error("Not a url");
     }
     if (smipper.cache && smipper.cacheKey) {
-        const response = smipper.cache.get(smipper.cacheKey, path);
+        const response = smipper.cache.get(smipper.cacheKey, filePath);
         if (response) {
             return response;
         }
@@ -29,13 +42,13 @@ async function load(smipper, path) {
     }
     // let retryIndex = 0;
     async function get() {
-        const response = await got_1.default.get(path, { timeout: 10000 });
+        const response = await got_1.default.get(filePath, { timeout: 10000 });
         smipper.verbose(response.headers);
         return response.body || "";
     }
     const response = await get();
     if (smipper.cacheEntry) {
-        smipper.cacheEntry.add(path, response);
+        smipper.cacheEntry.add(filePath, response);
     }
     return response;
 }

package/dist/loadUri.js

@@ -8,9 +8,6 @@ const load_1 = require("./load");
 const assert_1 = __importDefault(require("assert"));
 const source_map_1 = __importDefault(require("source-map"));
 function loadUri(smipper, path) {
-    if (path[0] === "/") {
-        path = "file://" + path;
-    }
     return new Promise((resolve, reject) => {
         smipper.verbose("loading", path);
         if (!(path in smipper.sourceMaps)) {
@@ -22,20 +19,25 @@ function loadUri(smipper, path) {
                 .then((jsData) => {
                 const idx = jsData.lastIndexOf("//# sourceMappingURL=");
                 smipper.verbose("Got the file", jsData.length, idx);
-                if (idx == -1) {
+                if (idx === -1) {
                     return path + ".map";
                 }
-                const mapUrl = jsData.substring(idx + 21);
+                const mapUrl = jsData.substring(idx + 21).trim();
                 const match = /^(data:.+\/.+;)base64,/.exec(mapUrl);
                 if (match) {
                     (0, assert_1.default)(match[1] !== undefined);
                     return mapUrl.substring(match[1].length);
                 }
-                if (mapUrl.indexOf("://") != -1) {
+                if (mapUrl.indexOf("://") !== -1) {
+                    return mapUrl;
+                }
+                try {
+                    return new URL(mapUrl, path).href;
+                }
+                catch (err) {
+                    smipper.verbose("Got error parsing url", err.message);
                     return mapUrl;
                 }
-                // console.log(mapUrl);
-                return new URL(mapUrl, path).href;
             })
                 .then((mapUrl) => {
                 // console.log(mapUrl.substring(0, 20));

package/dist/processFrame.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFrame = void 0;
 const loadUri_1 = require("./loadUri");
 const buildStackLine_1 = require("./buildStackLine");
-const fs_1 = __importDefault(require("fs"));
 function processFrame(smipper, functionName, url, line, column) {
     smipper.verbose("got frame", functionName, url, line, column);
     if (functionName.endsWith("@")) {
@@ -15,9 +11,6 @@ function processFrame(smipper, functionName, url, line, column) {
     return new Promise((resolve) => {
         let newUrl, newLine, newColumn;
         smipper.verbose("calling loadUri", url);
-        if (!url.includes("://") && url[0] !== "/" && fs_1.default.existsSync(url)) {
-            url = `file://${process.cwd()}/${url}`;
-        }
         return (0, loadUri_1.loadUri)(smipper, url)
             .then((smap) => {
             smipper.verbose("got map", url, Object.keys(smap));

package/dist/rewriteLocalControl.js

@@ -10,7 +10,7 @@ function findFile(dir, fn) {
     const list = fs_1.default.readdirSync(dir);
     for (let file of list) {
         const match = file === fn;
-        file = dir + "/" + file;
+        file = path_1.default.join(dir, file);
         const stat = fs_1.default.statSync(file);
         if (stat && stat.isDirectory()) {
             const ret = findFile(file, fn);
@@ -25,7 +25,17 @@ function findFile(dir, fn) {
     return undefined;
 }
 function rewriteLocalControl(smipper, url) {
-    const found = findFile(process.cwd(), path_1.default.basename(url.substring(6)));
+    let file;
+    if (url.startsWith("http://")) {
+        file = url.substring(7);
+    }
+    else if (url.startsWith("https://")) {
+        file = url.substring(8);
+    }
+    else {
+        file = url;
+    }
+    const found = findFile(process.cwd(), path_1.default.basename(file));
     smipper.verbose("Rewriting", url, "in", process.cwd(), "=>", found);
     if (found) {
         return found;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smipper",
-    "version": "32.0.0",
+    "version": "34.0.0",
     "description": "",
     "main": "./index.js",
     "bin": {