fix price and modular

.output/server/node_modules/detect-libc/lib/detect-libc.js

@@ -5,8 +5,10 @@
 
 const childProcess = require('child_process');
 const { isLinux, getReport } = require('./process');
-const { LDD_PATH, readFile, readFileSync } = require('./filesystem');
+const { LDD_PATH, SELF_PATH, readFile, readFileSync } = require('./filesystem');
+const { interpreterPath } = require('./elf');
 
+let cachedFamilyInterpreter;
 let cachedFamilyFilesystem;
 let cachedVersionFilesystem;
 
@@ -82,7 +84,19 @@ const familyFromCommand = (out) => {
   return null;
 };
 
+const familyFromInterpreterPath = (path) => {
+  if (path) {
+    if (path.includes('/ld-musl-')) {
+      return MUSL;
+    } else if (path.includes('/ld-linux-')) {
+      return GLIBC;
+    }
+  }
+  return null;
+};
+
 const getFamilyFromLddContent = (content) => {
+  content = content.toString();
   if (content.includes('musl')) {
     return MUSL;
   }
@@ -116,6 +130,32 @@ const familyFromFilesystemSync = () => {
   return cachedFamilyFilesystem;
 };
 
+const familyFromInterpreter = async () => {
+  if (cachedFamilyInterpreter !== undefined) {
+    return cachedFamilyInterpreter;
+  }
+  cachedFamilyInterpreter = null;
+  try {
+    const selfContent = await readFile(SELF_PATH);
+    const path = interpreterPath(selfContent);
+    cachedFamilyInterpreter = familyFromInterpreterPath(path);
+  } catch (e) {}
+  return cachedFamilyInterpreter;
+};
+
+const familyFromInterpreterSync = () => {
+  if (cachedFamilyInterpreter !== undefined) {
+    return cachedFamilyInterpreter;
+  }
+  cachedFamilyInterpreter = null;
+  try {
+    const selfContent = readFileSync(SELF_PATH);
+    const path = interpreterPath(selfContent);
+    cachedFamilyInterpreter = familyFromInterpreterPath(path);
+  } catch (e) {}
+  return cachedFamilyInterpreter;
+};
+
 /**
  * Resolves with the libc family when it can be determined, `null` otherwise.
  * @returns {Promise<?string>}
@@ -123,13 +163,16 @@ const familyFromFilesystemSync = () => {
 const family = async () => {
   let family = null;
   if (isLinux()) {
-    family = await familyFromFilesystem();
+    family = await familyFromInterpreter();
     if (!family) {
-      family = familyFromReport();
-    }
-    if (!family) {
-      const out = await safeCommand();
-      family = familyFromCommand(out);
+      family = await familyFromFilesystem();
+      if (!family) {
+        family = familyFromReport();
+      }
+      if (!family) {
+        const out = await safeCommand();
+        family = familyFromCommand(out);
+      }
     }
   }
   return family;
@@ -142,13 +185,16 @@ const family = async () => {
 const familySync = () => {
   let family = null;
   if (isLinux()) {
-    family = familyFromFilesystemSync();
+    family = familyFromInterpreterSync();
     if (!family) {
-      family = familyFromReport();
-    }
-    if (!family) {
-      const out = safeCommandSync();
-      family = familyFromCommand(out);
+      family = familyFromFilesystemSync();
+      if (!family) {
+        family = familyFromReport();
+      }
+      if (!family) {
+        const out = safeCommandSync();
+        family = familyFromCommand(out);
+      }
     }
   }
   return family;

.output/server/node_modules/detect-libc/lib/elf.js

@@ -0,0 +1,39 @@
+// Copyright 2017 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+const interpreterPath = (elf) => {
+  if (elf.length < 64) {
+    return null;
+  }
+  if (elf.readUInt32BE(0) !== 0x7F454C46) {
+    // Unexpected magic bytes
+    return null;
+  }
+  if (elf.readUInt8(4) !== 2) {
+    // Not a 64-bit ELF
+    return null;
+  }
+  if (elf.readUInt8(5) !== 1) {
+    // Not little-endian
+    return null;
+  }
+  const offset = elf.readUInt32LE(32);
+  const size = elf.readUInt16LE(54);
+  const count = elf.readUInt16LE(56);
+  for (let i = 0; i < count; i++) {
+    const headerOffset = offset + (i * size);
+    const type = elf.readUInt32LE(headerOffset);
+    if (type === 3) {
+      const fileOffset = elf.readUInt32LE(headerOffset + 8);
+      const fileSize = elf.readUInt32LE(headerOffset + 32);
+      return elf.subarray(fileOffset, fileOffset + fileSize).toString().replace(/\0.*$/g, '');
+    }
+  }
+  return null;
+};
+
+module.exports = {
+  interpreterPath
+};

.output/server/node_modules/detect-libc/lib/filesystem.js

@@ -5,37 +5,47 @@
 
 const fs = require('fs');
 
-/**
- * The path where we can find the ldd
- */
 const LDD_PATH = '/usr/bin/ldd';
+const SELF_PATH = '/proc/self/exe';
+const MAX_LENGTH = 2048;
 
 /**
  * Read the content of a file synchronous
  *
  * @param {string} path
- * @returns {string}
+ * @returns {Buffer}
  */
-const readFileSync = (path) => fs.readFileSync(path, 'utf-8');
+const readFileSync = (path) => {
+  const fd = fs.openSync(path, 'r');
+  const buffer = Buffer.alloc(MAX_LENGTH);
+  const bytesRead = fs.readSync(fd, buffer, 0, MAX_LENGTH, 0);
+  fs.close(fd, () => {});
+  return buffer.subarray(0, bytesRead);
+};
 
 /**
  * Read the content of a file
  *
  * @param {string} path
- * @returns {Promise<string>}
+ * @returns {Promise<Buffer>}
  */
 const readFile = (path) => new Promise((resolve, reject) => {
-  fs.readFile(path, 'utf-8', (err, data) => {
+  fs.open(path, 'r', (err, fd) => {
     if (err) {
       reject(err);
     } else {
-      resolve(data);
+      const buffer = Buffer.alloc(MAX_LENGTH);
+      fs.read(fd, buffer, 0, MAX_LENGTH, 0, (_, bytesRead) => {
+        resolve(buffer.subarray(0, bytesRead));
+        fs.close(fd, () => {});
+      });
     }
   });
 });
 
 module.exports = {
   LDD_PATH,
+  SELF_PATH,
   readFileSync,
   readFile
 };

.output/server/node_modules/detect-libc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "detect-libc",
-  "version": "2.0.4",
+  "version": "2.1.2",
   "description": "Node.js module to detect the C standard library (libc) implementation family and version",
   "main": "lib/detect-libc.js",
   "files": [
@@ -9,12 +9,13 @@
   ],
   "scripts": {
     "test": "semistandard && nyc --reporter=text --check-coverage --branches=100 ava test/unit.js",
+    "changelog": "conventional-changelog -i CHANGELOG.md -s",
     "bench": "node benchmark/detect-libc",
     "bench:calls": "node benchmark/call-familySync.js && sleep 1 && node benchmark/call-isNonGlibcLinuxSync.js && sleep 1 && node benchmark/call-versionSync.js"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/lovell/detect-libc"
+    "url": "git://github.com/lovell/detect-libc.git"
   },
   "keywords": [
     "libc",
@@ -30,6 +31,8 @@
   "devDependencies": {
     "ava": "^2.4.0",
     "benchmark": "^2.1.4",
+    "conventional-changelog-cli": "^5.0.0",
+    "eslint-config-standard": "^13.0.1",
     "nyc": "^15.1.0",
     "proxyquire": "^2.1.3",
     "semistandard": "^14.2.3"