smipper 41.0.0 → 42.0.0

package/dist/LoadResult.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/init.js

@@ -7,6 +7,7 @@ exports.init = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const assert_1 = __importDefault(require("assert"));
 const Cache_1 = require("./Cache");
 function init() {
     let smipper = {
@@ -15,8 +16,18 @@ function init() {
         jsc: 0,
         cacheDir: path_1.default.join(os_1.default.homedir(), ".cache", "smipper", "cache"),
         cacheSize: 10,
-        sourceMaps: {},
-        noOriginalUrl: false
+        sourceMaps: new Map(),
+        noOriginalUrl: false,
+        mappedUrls: new Map()
+    };
+    const addMapUrl = (arg) => {
+        arg.split(" ").forEach((x, idx) => {
+            const split = x.split("=>");
+            if (split.length !== 2 || !split[0] || !split[1]) {
+                throw new Error(`Failed to parse map url: ${arg} ${idx}`);
+            }
+            smipper.mappedUrls.set(split[0], split[1]);
+        });
     };
     for (const key in process.env) {
         switch (key) {
@@ -45,7 +56,7 @@ function init() {
             }
         }
     }
-    const usage = "smipper [stack|-h|--help|-v|--verbose|--version|--jsc|--json|--file=@FILE@|-f=@FILE@|--cache-key=$CACHE_KEY$|--cache-dir=$CACHE_DIR$|--cache-size=$CACHE_SIZE$|--no-original-url|-n|-";
+    const usage = "smipper [stack|-h|--help|-v|--verbose|--version|--jsc|--json|--file=@FILE@|-f=@FILE@|--cache-key=$CACHE_KEY$|--cache-dir=$CACHE_DIR$|--cache-size=$CACHE_SIZE$|--no-original-url|-n|--map-url|-m|-";
     for (let i = 2; i < process.argv.length; ++i) {
         try {
             const arg = process.argv[i] || "";
@@ -98,6 +109,12 @@ function init() {
             else if (arg === "--no-original-url" || arg == "-n") {
                 smipper.noOriginalUrl = true;
             }
+            else if (arg === "--map-url" || arg === "-m") {
+                addMapUrl(process.argv[++i]);
+            }
+            else if (arg.startsWith("--map-url=")) {
+                addMapUrl(arg.substring(10));
+            }
             else if (arg === "-") {
                 // stdin
             }
@@ -106,7 +123,9 @@ function init() {
             }
         }
         catch (err) {
+            (0, assert_1.default)(err instanceof Error);
             console.error("Error: " + err.toString());
+            smipper.verbose(err.stack);
             process.exit(1);
         }
     }

package/dist/load.js

@@ -6,14 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = void 0;
 const rewriteLocalControl_1 = require("./rewriteLocalControl");
 const fs_1 = __importDefault(require("fs"));
-const got_1 = __importDefault(require("got"));
 const path_1 = __importDefault(require("path"));
 const process_1 = __importDefault(require("process"));
+const assert_1 = __importDefault(require("assert"));
 async function load(smipper, filePath) {
     smipper.verbose("load", filePath);
     if (filePath.startsWith("http://localcontrol.netflix.com/")) {
         filePath = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, filePath);
     }
+    smipper.verbose(smipper.mappedUrls);
+    const mapped = smipper.mappedUrls.get(filePath);
+    if (mapped) {
+        try {
+            const ret = fs_1.default.readFileSync(mapped, "utf8");
+            smipper.verbose("Loaded mapped url", filePath, mapped, "=>", ret.length);
+            return { contents: ret, resolvedUrl: mapped };
+        }
+        catch (err) {
+            (0, assert_1.default)(err instanceof Error);
+            smipper.verbose("Failed to load mapped url", filePath, mapped, err.message);
+            smipper.mappedUrls.delete(filePath);
+        }
+    }
     if (!filePath.includes("://")) {
         if (filePath[0] === "/" && fs_1.default.existsSync(filePath)) {
             filePath = `file://${filePath}`;
@@ -25,8 +39,14 @@ async function load(smipper, filePath) {
             filePath = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, filePath);
         }
     }
+    else if (filePath.startsWith("file:///") && !fs_1.default.existsSync(filePath.substring(7))) {
+        filePath = (0, rewriteLocalControl_1.rewriteLocalControl)(smipper, filePath.substring(7));
+    }
     if (filePath.startsWith("file:///")) {
-        return fs_1.default.readFileSync(filePath.substring(7), "utf8");
+        return {
+            contents: fs_1.default.readFileSync(filePath.substring(7), "utf8"),
+            resolvedUrl: filePath
+        };
     }
     if (!filePath.startsWith("http://") && !filePath.startsWith("https://")) {
         throw new Error("Not a url");
@@ -34,22 +54,25 @@ async function load(smipper, filePath) {
     if (smipper.cache && smipper.cacheKey) {
         const response = smipper.cache.get(smipper.cacheKey, filePath);
         if (response) {
-            return response;
+            return { contents: response, resolvedUrl: filePath };
         }
         if (!smipper.cacheEntry) {
             smipper.cacheEntry = smipper.cache.create(smipper.cacheKey);
         }
     }
-    // let retryIndex = 0;
     async function get() {
-        const response = await got_1.default.get(filePath, { timeout: 10000 });
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => {
+            controller.abort();
+        }, 10000);
+        const response = await fetch(filePath, { signal: controller.signal });
         smipper.verbose(response.headers);
-        return response.body || "";
+        return response.text() || "";
     }
     const response = await get();
     if (smipper.cacheEntry) {
         smipper.cacheEntry.add(filePath, response);
     }
-    return response;
+    return { contents: response, resolvedUrl: filePath };
 }
 exports.load = load;

package/dist/loadUri.js

@@ -13,17 +13,19 @@ function loadUri(smipper, path) {
     }
     return new Promise((resolve, reject) => {
         smipper.verbose("loading", path);
-        if (!(path in smipper.sourceMaps)) {
-            smipper.sourceMaps[path] = {
+        if (!smipper.sourceMaps.has(path)) {
+            smipper.sourceMaps.set(path, {
                 resolvers: [resolve],
                 rejecters: [reject]
-            };
+            });
             (0, load_1.load)(smipper, path)
-                .then((jsData) => {
+                .then((jsResult) => {
+                const jsData = jsResult.contents;
+                const baseUrl = jsResult.resolvedUrl;
                 const idx = jsData.lastIndexOf("//# sourceMappingURL=");
                 smipper.verbose("Got the file", jsData.length, idx);
                 if (idx == -1) {
-                    return path + ".map";
+                    return baseUrl + ".map";
                 }
                 const end = jsData.indexOf("\n", idx + 21);
                 const mapUrl = jsData.substring(idx + 21, end === -1 ? jsData.length : end);
@@ -35,20 +37,18 @@ function loadUri(smipper, path) {
                 if (mapUrl.indexOf("://") != -1) {
                     return mapUrl;
                 }
-                // console.log(mapUrl);
-                return new URL(mapUrl, path).href;
+                return new URL(mapUrl, baseUrl).href;
             })
                 .then((mapUrl) => {
-                // console.log(mapUrl.substring(0, 20));
                 if (mapUrl.startsWith("base64,")) {
                     return Buffer.from(mapUrl.substring(7), "base64").toString();
                 }
-                return (0, load_1.load)(smipper, mapUrl);
+                return (0, load_1.load)(smipper, mapUrl).then((r) => r.contents);
             })
                 .then(async (sourceMapData) => {
                 const parsed = JSON.parse(sourceMapData);
                 const smap = await new source_map_1.default.SourceMapConsumer(parsed);
-                const pending = smipper.sourceMaps[path];
+                const pending = smipper.sourceMaps.get(path);
                 // sourceMaps.delete(path);
                 if (pending) {
                     pending.resolvers.forEach((func) => {
@@ -57,7 +57,7 @@ function loadUri(smipper, path) {
                 }
             })
                 .catch((err) => {
-                const pending = smipper.sourceMaps[path];
+                const pending = smipper.sourceMaps.get(path);
                 if (!pending) {
                     throw new Error("Gotta have pending");
                 }
@@ -68,7 +68,7 @@ function loadUri(smipper, path) {
             });
         }
         else {
-            const cur = smipper.sourceMaps[path];
+            const cur = smipper.sourceMaps.get(path);
             smipper.verbose("path is in source maps already", cur);
             if (!cur) {
                 throw new Error("Gotta have cur");

package/dist/run.js

@@ -19,7 +19,12 @@ async function run(smipper) {
         x = x.trim();
         let match = / *at *([^ ]*).* \(?([^ ]+):([0-9]+):([0-9]+)/.exec(x);
         if (!match) {
-            match = /([^ ]+@)?(.*):([0-9]+):([0-9]+)/.exec(x);
+            // Anchor the URL/path on a scheme (e.g. http://, file://) or a leading "/"
+            // so we don't accidentally swallow log prefixes like
+            //   "00:00:00.133 [milo:0x16bb23000] SMIPPER(trace):"
+            // into the captured "url".
+            match =
+                /(?:([^\s@]+)@)?((?:[a-zA-Z][a-zA-Z0-9+.-]*:\/\/|\/)[^\s:]+):([0-9]+):([0-9]+)/.exec(x);
         }
         smipper.verbose(x, " => ", match);
         if (!match) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "smipper",
-    "version": "41.0.0",
+    "version": "42.0.0",
     "description": "",
     "main": "./index.js",
     "bin": {
@@ -16,11 +16,9 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "got": "^9.6.0",
         "source-map": "^0.7.4"
     },
     "devDependencies": {
-        "@types/got": "^9.6.12",
         "@types/node": "^18.7.18",
         "prettier": "^2.7.1",
         "typescript": "^4.8.3"