@appland/appmap 3.67.2 → 3.68.0

package/built/lib/serveAndOpen.js

@@ -0,0 +1,124 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serveAndOpenAppMap = exports.serveAndOpenSequenceDiagram = void 0;
+const fs_1 = require("fs");
+const http_1 = require("http");
+const open_1 = __importDefault(require("open"));
+const path_1 = require("path");
+const url_1 = require("url");
+const utils_1 = require("../utils");
+const userInteraction_1 = __importDefault(require("../cmds/userInteraction"));
+function mimeTypeOfName(filename) {
+    return ({
+        js: 'application/javascript',
+        css: 'text/css',
+        json: 'application/json',
+        map: 'application/json',
+    }[(0, path_1.extname)(filename)] || 'application/octet-stream');
+}
+async function serveAndOpen(file, resources, verifyInSubdir, onListen) {
+    userInteraction_1.default.progress(`Opening ${file}`);
+    const baseDir = (0, path_1.join)(__dirname, '..', '..', 'built', 'html');
+    if (!(await (0, utils_1.exists)((0, path_1.join)(baseDir, file))))
+        throw new Error(`File ${file} does not exist`);
+    const server = (0, http_1.createServer)(async (req, res) => {
+        const send404 = () => {
+            res.writeHead(404);
+            res.end();
+        };
+        const serveStaticFile = (dir, fileName, contentType) => {
+            const path = (0, path_1.isAbsolute)(fileName) ? fileName : (0, path_1.join)(dir, fileName);
+            if (verifyInSubdir && !path.startsWith(dir))
+                return send404();
+            if (!contentType)
+                contentType = mimeTypeOfName(fileName);
+            res.writeHead(200, 'OK', { 'Content-Type': contentType });
+            const fileStream = (0, fs_1.createReadStream)(path);
+            fileStream.pipe(res);
+            fileStream.on('open', function () {
+                if ((0, utils_1.verbose)()) {
+                    console.log(`${path}: 200`);
+                }
+                res.writeHead(200);
+            });
+            fileStream.on('error', function (e) {
+                if ((0, utils_1.verbose)()) {
+                    console.log(`${path}: 404 (${e})`);
+                }
+                send404();
+            });
+        };
+        try {
+            if ((0, utils_1.verbose)()) {
+                console.log(req.url);
+            }
+            const requestUrl = (0, url_1.parse)(req.url);
+            const pathname = requestUrl.pathname;
+            if (pathname === '/') {
+                return serveStaticFile(baseDir, file, 'text/html');
+            }
+            else if (pathname === '/resource') {
+                const pathname = requestUrl.query;
+                if (pathname)
+                    serveStaticFile(process.cwd(), decodeURIComponent(pathname));
+                else
+                    send404();
+            }
+            else {
+                serveStaticFile(baseDir, (pathname || '/').slice(1));
+            }
+        }
+        catch (e) {
+            console.log(e.stack);
+            res.writeHead(500);
+            res.end(); // end the response so browsers don't hang
+        }
+    })
+        .listen(0, '127.0.0.1', () => {
+        const port = server.address().port;
+        const params = new URLSearchParams();
+        for (const [key, value] of Object.entries(resources)) {
+            params.append(key, value);
+        }
+        const url = new URL(`http://localhost:${port}/?${params.toString()}`);
+        onListen(url.toString());
+    })
+        .on('connection', function (socket) {
+        // Don't let the open socket keep the process alive.
+        socket.unref();
+    })
+        .unref();
+}
+exports.default = serveAndOpen;
+async function serveAndOpenSequenceDiagram(diagramFile, verifyInSubdir, onListen) {
+    return new Promise((resolve) => {
+        serveAndOpen('sequenceDiagram.html', {
+            diagram: diagramFile,
+        }, verifyInSubdir, async (url) => {
+            onListen(url);
+            resolve(url);
+        });
+    });
+}
+exports.serveAndOpenSequenceDiagram = serveAndOpenSequenceDiagram;
+async function serveAndOpenAppMap(appMapFile, verifyInSubdir) {
+    return new Promise((resolve) => {
+        serveAndOpen('appmap.html', {
+            appmap: appMapFile,
+        }, verifyInSubdir, async (url) => {
+            await tryOpen(url);
+            resolve(url);
+        });
+    });
+}
+exports.serveAndOpenAppMap = serveAndOpenAppMap;
+async function tryOpen(url) {
+    const showMessage = () => userInteraction_1.default.warn(`\nWe could not open the browser automatically.\nOpen ${url} to view the content.\n`);
+    const cp = await (0, open_1.default)(url);
+    cp.once('error', showMessage);
+    cp.once('exit', (code, signal) => (code || signal) && showMessage());
+}
+//# sourceMappingURL=serveAndOpen.js.map

package/built/lib/serveAndOpen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serveAndOpen.js","sourceRoot":"","sources":["../../src/lib/serveAndOpen.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.67.2",
+  "version": "3.68.0",
   "description": "",
   "bin": "built/cli.js",
   "publishConfig": {
@@ -26,14 +26,14 @@
       "prettier --write"
     ]
   },
-  "author": "",
+  "author": "AppLand, Inc",
   "license": "MIT",
   "devDependencies": {
     "@craftamap/esbuild-plugin-html": "^0.4.0",
     "@types/fs-extra": "^9.0.13",
     "@types/gitconfiglocal": "^2.0.1",
     "@types/inquirer": "^9.0.3",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^29.4.1",
     "@types/jest-sinon": "^1.0.2",
     "@types/jsdom": "^16.2.13",
     "@types/node": "^16",
@@ -48,8 +48,8 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-prettier": "^3.4.0",
-    "jest": "^27.4.7",
-    "jest-sinon": "^1.0.4",
+    "jest": "^29.5.0",
+    "jest-sinon": "^1.1.0",
     "lint-staged": "^10.5.4",
     "memfs": "^3.4.13",
     "openapi-types": "^12.1.0",
@@ -57,7 +57,7 @@
     "sinon": "^11.1.2",
     "tmp": "^0.2.1",
     "tmp-promise": "^3.0.3",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "ts-sinon": "^2.0.2",
     "tsc": "^2.0.3",
@@ -108,6 +108,7 @@
     "port-pid": "^0.0.7",
     "pretty-bytes": "^5.6.0",
     "ps-node": "^0.1.6",
+    "puppeteer": "^19.7.5",
     "read-pkg-up": "^7.0.1",
     "semver": "^7.3.5",
     "strip-ansi": "^6.0.0",

package/built/cmds/open/serveAndOpenAppMap.js

@@ -1,91 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const http_1 = require("http");
-const open_1 = __importDefault(require("open"));
-const path_1 = require("path");
-const url_1 = require("url");
-const utils_1 = require("../../utils");
-const userInteraction_1 = __importDefault(require("../userInteraction"));
-function mimeTypeOfName(filename) {
-    return ({
-        js: 'application/javascript',
-        css: 'text/css',
-        map: 'application/json',
-    }[(0, path_1.extname)(filename)] || 'application/octet-stream');
-}
-async function serveAndOpenAppMap(appMapFile) {
-    userInteraction_1.default.progress(`Opening ${appMapFile}`);
-    const baseDir = (0, path_1.join)(__dirname, '..', '..', '..', 'built', 'html');
-    const server = (0, http_1.createServer)(async (req, res) => {
-        const serveStaticFile = (fileName, contentType) => {
-            res.writeHead(200, 'OK', { 'Content-Type': contentType });
-            const fileStream = (0, fs_1.createReadStream)(fileName);
-            fileStream.pipe(res);
-            fileStream.on('open', function () {
-                if ((0, utils_1.verbose)()) {
-                    console.log(`${fileName}: 200`);
-                }
-                res.writeHead(200);
-            });
-            fileStream.on('error', function (e) {
-                if ((0, utils_1.verbose)()) {
-                    console.log(`${fileName}: 404`);
-                }
-                res.writeHead(404);
-                res.end();
-            });
-        };
-        try {
-            if ((0, utils_1.verbose)()) {
-                console.log(req.url);
-            }
-            var requestUrl = (0, url_1.parse)(req.url);
-            const pathname = requestUrl.pathname;
-            if (pathname === '/') {
-                return serveStaticFile((0, path_1.join)(baseDir, 'appmap.html'), 'text/html');
-            }
-            else if (pathname === '/appmap') {
-                const urlParams = new URLSearchParams(requestUrl.query);
-                const appMapFile = urlParams.get('file');
-                if (appMapFile) {
-                    return serveStaticFile(appMapFile, 'application/json');
-                }
-            }
-            else if (pathname && !pathname.startsWith('.')) {
-                const path = (0, path_1.join)(baseDir, pathname);
-                return serveStaticFile(path, mimeTypeOfName(path));
-            }
-            if ((0, utils_1.verbose)()) {
-                console.log(`${pathname}: 404`);
-            }
-            res.writeHead(404);
-            res.end();
-        }
-        catch (e) {
-            console.log(e.stack);
-            res.writeHead(500);
-            res.end(); // end the response so browsers don't hang
-        }
-    })
-        .listen(0, '127.0.0.1', () => {
-        const port = server.address().port;
-        tryOpen(`http://localhost:${port}/?appmap=${encodeURIComponent(appMapFile)}`);
-    })
-        .on('connection', function (socket) {
-        // Don't let the open socket keep the process alive.
-        socket.unref();
-    })
-        .unref();
-}
-exports.default = serveAndOpenAppMap;
-async function tryOpen(url) {
-    const showMessage = () => userInteraction_1.default.warn(`\nWe could not open the browser automatically.\nOpen ${url} to see the AppMap.\n`);
-    const cp = await (0, open_1.default)(url);
-    cp.once('error', showMessage);
-    cp.once('exit', (code, signal) => (code || signal) && showMessage());
-}
-//# sourceMappingURL=serveAndOpenAppMap.js.map

package/built/cmds/open/serveAndOpenAppMap.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"serveAndOpenAppMap.js","sourceRoot":"","sources":["../../../src/cmds/open/serveAndOpenAppMap.ts"],"names":[],"mappings":"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"}