@appland/scanner 1.76.4 → 1.76.6

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [@appland/scanner-v1.76.6](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.76.5...@appland/scanner-v1.76.6) (2023-02-25)
+
+
+### Bug Fixes
+
+* update internal dependencies for sequence diagram release ([4f6ddeb](https://github.com/getappmap/appmap-js/commit/4f6ddebedf3ecdfb18429ddca5a117e91498bc5c))
+
+# [@appland/scanner-v1.76.5](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.76.4...@appland/scanner-v1.76.5) (2023-02-24)
+
+
+### Bug Fixes
+
+* Remove http-dependent code from openapi ([2cae20f](https://github.com/getappmap/appmap-js/commit/2cae20f6cc0ca72123c2288178d1f7a234099cc5))
+* Update minimatch version to match appmap ([2720750](https://github.com/getappmap/appmap-js/commit/2720750d1e3b95c83c4e86a489636267397a9c11))
+
 # [@appland/scanner-v1.76.4](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.76.3...@appland/scanner-v1.76.4) (2023-02-24)
 
 

package/built/rules/incompatibleHttpClientRequest.js

@@ -14,6 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const openapi_1 = require("../openapi");
 const parseRuleDescription_1 = __importDefault(require("./lib/parseRuleDescription"));
+const openapiProvider_1 = __importDefault(require("./lib/openapiProvider"));
+const assert_1 = __importDefault(require("assert"));
 class Options {
     constructor() {
         this.schemata = {};
@@ -29,7 +31,11 @@ function build(options) {
     function matcher(event) {
         return __awaiter(this, void 0, void 0, function* () {
             const clientFragment = (0, openapi_1.forClientRequest)(event);
-            const serverSchema = yield (0, openapi_1.forURL)(event.httpClientRequest.url, options.schemata);
+            (0, assert_1.default)(event.httpClientRequest);
+            if (!event.httpClientRequest.url)
+                return [];
+            const host = new URL(event.httpClientRequest.url).host;
+            const serverSchema = yield (0, openapiProvider_1.default)(host, options.schemata);
             const clientSchema = {
                 openapi: '3.0.0',
                 info: {

package/built/rules/lib/openapiProvider.js

@@ -0,0 +1,81 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const js_yaml_1 = require("js-yaml");
+const url_1 = require("url");
+const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
+const promises_1 = require("fs/promises");
+const URLLoader = (protocol) => {
+    return (url) => {
+        return new Promise((resolve, reject) => {
+            protocol
+                .get(url)
+                .on('response', (response) => {
+                if (response.statusCode !== 200) {
+                    return reject(`${response.statusCode || ''} ${response.statusMessage || ''}`);
+                }
+                const data = [];
+                response
+                    .on('data', (chunk) => {
+                    data.push(Buffer.from(chunk));
+                })
+                    .on('end', () => {
+                    resolve(Buffer.concat(data));
+                });
+            })
+                .on('error', reject);
+        });
+    };
+};
+const FileLoader = (url) => {
+    return (0, promises_1.readFile)((0, url_1.fileURLToPath)(url));
+};
+const ProtocolLoader = {
+    'http:': URLLoader(http_1.default),
+    'https:': URLLoader(https_1.default),
+    'file:': FileLoader,
+};
+const fetch = (urlStr) => {
+    const url = new url_1.URL(urlStr);
+    const loader = ProtocolLoader[url.protocol];
+    if (!loader) {
+        throw new Error(`No schema loader for protocol ${url.protocol}`);
+    }
+    return loader(url);
+};
+const SchemaCache = {};
+const schemaCache = (key, fn) => __awaiter(void 0, void 0, void 0, function* () {
+    const cachedResult = SchemaCache[key];
+    if (cachedResult) {
+        return cachedResult;
+    }
+    const result = yield fn(key);
+    SchemaCache[key] = result;
+    return result;
+});
+const fetchSchema = (sourceURL) => __awaiter(void 0, void 0, void 0, function* () {
+    return schemaCache(sourceURL, (sourceURL) => __awaiter(void 0, void 0, void 0, function* () {
+        const data = yield fetch(sourceURL);
+        return (0, js_yaml_1.load)(data.toString());
+    }));
+});
+const lookup = (host, openapiSchemata) => __awaiter(void 0, void 0, void 0, function* () {
+    const sourceURL = openapiSchemata[host];
+    if (!sourceURL) {
+        throw new Error(`No OpenAPI schema URL configured for host ${host}. Available hosts are: ${Object.keys(openapiSchemata).join(', ')}`);
+    }
+    return yield fetchSchema(sourceURL);
+});
+exports.default = lookup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.76.4",
+  "version": "1.76.6",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "files": [
@@ -61,8 +61,8 @@
   },
   "dependencies": {
     "@appland/client": "^1.5.0",
-    "@appland/models": "^2.0.0",
-    "@appland/openapi": "1.4.2",
+    "@appland/models": "^2.2.0",
+    "@appland/openapi": "1.4.4",
     "@appland/sql-parser": "^1.5.0",
     "@types/cli-progress": "^3.9.2",
     "ajv": "^8.8.2",
@@ -78,7 +78,7 @@
     "inquirer": "^8.1.2",
     "js-yaml": "^4.1.0",
     "lru-cache": "^6.0.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^5.1.2",
     "octokat": "^0.10.0",
     "openapi-diff": "^0.23.5",
     "ora": "~5",