registry-sync 6.0.0 → 6.1.1

package/README.md

@@ -8,7 +8,7 @@ The local copy can then be used as a simple private NPM registry without publish
 
 ## Pre-requisites
 
-- Node.js v16.14.0 or newer
+- Node.js v18.20.0 or newer
 
 ## Installation
 
@@ -25,8 +25,8 @@ The local copy can then be used as a simple private NPM registry without publish
     --root <path>            Path to save NPM package tarballs and metadata to
     --manifest <file>        Path to a package-lock.json or yarn.lock file to use as catalog for mirrored NPM packages
     --localUrl <url>         URL to use as root in stored package metadata (i.e. where folder defined as --root will be exposed at)
-    --binaryAbi <list>       Optional comma-separated list of node C++ ABI numbers to download pre-built binaries for.
-                             See NODE_MODULE_VERSION column in https://nodejs.org/en/download/releases/.
+    --binaryAbi <list>       Optional comma-separated list of node C++ ABI numbers (NODE_MODULE_VERSION) to download pre-built binaries for.
+                             Look for NODE_MODULE_VERSION in release ChangeLogs via https://nodejs.org/en/download/releases/.
                              Default value is from the current Node.js process.
     --binaryArch <list>      Optional comma-separated list of CPU architectures to download pre-built binaries for.
                              Valid values: arm, arm64, ia32, and x64.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "registry-sync",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "description": "synchronize a remote npm registry for private use",
   "repository": "https://github.com/heikkipora/registry-sync",
   "bin": {
@@ -13,26 +13,26 @@
     "eslint": "eslint --fix --format=codeframe --ext .ts .",
     "eslint:check": "eslint --max-warnings=0 --format=codeframe --ext .ts .",
     "lint-staged": "lint-staged --verbose",
-    "test": "mocha -r ts-node/register --timeout 120000 test/*.ts",
+    "test": "mocha -r ts-node/register --config test/.mocharc.js --timeout 120000 test/*.ts",
     "release-test": "cd release-test && ./run-sync-install-cycle.sh"
   },
   "author": "Heikki Pora",
   "license": "MIT",
   "dependencies": {
     "@yarnpkg/lockfile": "1.1.0",
-    "axios": "1.7.2",
+    "axios": "1.7.4",
     "commander": "12.1.0",
     "lru-cache": "10.2.2",
-    "semver": "7.6.2",
+    "semver": "7.6.3",
     "ssri": "10.0.6",
     "tar-fs": "3.0.6"
   },
   "devDependencies": {
     "@arkweid/lefthook": "0.7.7",
-    "@types/chai": "4.3.16",
-    "@types/lodash": "4.17.4",
-    "@types/mocha": "10.0.6",
-    "@types/node": "20.12.12",
+    "@types/chai": "4.3.17",
+    "@types/lodash": "4.17.7",
+    "@types/mocha": "10.0.7",
+    "@types/node": "20.14.8",
     "@types/semver": "7.5.8",
     "@types/ssri": "7.1.5",
     "@types/tar-fs": "2.0.4",
@@ -43,13 +43,13 @@
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-codeframe": "7.32.1",
-    "eslint-plugin-mocha": "10.4.3",
+    "eslint-plugin-mocha": "10.5.0",
     "express": "4.19.2",
-    "lint-staged": "15.2.5",
-    "mocha": "10.4.0",
-    "prettier": "3.2.5",
+    "lint-staged": "15.2.9",
+    "mocha": "10.7.3",
+    "prettier": "3.3.3",
     "ts-node": "10.9.2",
-    "typescript": "5.4.5"
+    "typescript": "5.5.4"
   },
   "keywords": [
     "registry",

package/src/client.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchBinaryData = exports.fetchJsonWithCacheCloned = void 0;
+exports.fetchJsonWithCacheCloned = fetchJsonWithCacheCloned;
+exports.fetchBinaryData = fetchBinaryData;
 const https = require("https");
 const axios_1 = require("axios");
 const lru_cache_1 = require("lru-cache");
@@ -17,11 +18,9 @@ async function fetchJsonWithCacheCloned(url, token) {
     metadataCache.set(url, value);
     return structuredClone(value);
 }
-exports.fetchJsonWithCacheCloned = fetchJsonWithCacheCloned;
 function fetchBinaryData(url, token) {
     return fetch(url, 'arraybuffer', token);
 }
-exports.fetchBinaryData = fetchBinaryData;
 async function fetch(url, responseType, token) {
     const config = { responseType };
     if (token !== '') {

package/src/download.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAll = void 0;
+exports.downloadAll = downloadAll;
 const fs = require("fs");
 const path = require("path");
 const semver = require("semver");
@@ -15,7 +15,6 @@ async function downloadAll(packages, { localUrl, prebuiltBinaryProperties, regis
         await downloadFromRegistry(pkg);
     }
 }
-exports.downloadAll = downloadAll;
 async function download(registryUrl, registryToken, localUrl, rootFolder, prebuiltBinaryProperties, enforceTarballsOverHttps, { name, version }) {
     const registryMetadata = await fetchMetadataCloned(name, registryUrl, registryToken);
     const versionMetadata = registryMetadata.versions[version];
@@ -48,9 +47,21 @@ async function updateMetadata(versionMetadata, defaultMetadata, registryUrl, loc
     const localMetadata = await loadMetadata(localMetadataPath, defaultMetadata);
     localMetadata.versions[version] = versionMetadata;
     localMetadata.time[version] = defaultMetadata.time[version];
-    localMetadata['dist-tags'].latest = Object.keys(localMetadata.versions).sort(semver.compare).pop();
+    localMetadata['dist-tags'] = collectDistTags(localMetadata, defaultMetadata);
     await saveMetadata(localMetadataPath, localMetadata);
 }
+// Collect thise dist-tags entries (name -> version) from registry metadata,
+// which point to versions we have locally available.
+// Override 'latest' tag to ensure its validity as we might not have the version
+// that is tagged latest in registry
+function collectDistTags(localMetadata, defaultMetadata) {
+    const availableVersions = Object.keys(localMetadata.versions);
+    const validDistTags = Object.entries(defaultMetadata['dist-tags']).filter(([, version]) => availableVersions.includes(version));
+    return {
+        ...Object.fromEntries(validDistTags),
+        latest: availableVersions.sort(semver.compare).pop()
+    };
+}
 async function loadMetadata(path, defaultMetadata) {
     try {
         const json = await fs.promises.readFile(path, 'utf8');

package/src/integrity.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sha512 = exports.sha1 = exports.verifyIntegrity = void 0;
+exports.verifyIntegrity = verifyIntegrity;
+exports.sha1 = sha1;
+exports.sha512 = sha512;
 const ssri = require("ssri");
 function verifyIntegrity(data, id, { integrity, shasum }) {
     if (!integrity && !shasum) {
@@ -15,12 +17,9 @@ function verifyIntegrity(data, id, { integrity, shasum }) {
         throw new Error(`Integrity check with SHA1 failed for failed for ${id}`);
     }
 }
-exports.verifyIntegrity = verifyIntegrity;
 function sha1(data) {
     return ssri.fromData(data, { algorithms: ['sha1'] }).hexDigest();
 }
-exports.sha1 = sha1;
 function sha512(data) {
     return ssri.fromData(data, { algorithms: ['sha512'] }).toString();
 }
-exports.sha512 = sha512;

package/src/metadata.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tarballFilename = exports.extractTgz = exports.rewriteMetadataInTarball = exports.rewriteVersionMetadata = void 0;
+exports.rewriteVersionMetadata = rewriteVersionMetadata;
+exports.rewriteMetadataInTarball = rewriteMetadataInTarball;
+exports.extractTgz = extractTgz;
+exports.tarballFilename = tarballFilename;
 const fs = require("fs");
 const path = require("path");
 const tar = require("tar-fs");
@@ -17,7 +20,6 @@ function rewriteVersionMetadata(versionMetadata, data, localUrl) {
         versionMetadata.dist.shasum = (0, integrity_1.sha1)(data);
     }
 }
-exports.rewriteVersionMetadata = rewriteVersionMetadata;
 async function rewriteMetadataInTarball(data, versionMetadata, localUrl, localFolder) {
     const tmpFolder = path.join(localFolder, '.tmp');
     await fs.promises.mkdir(tmpFolder, { recursive: true });
@@ -32,7 +34,6 @@ async function rewriteMetadataInTarball(data, versionMetadata, localUrl, localFo
     await fs.promises.rm(tmpFolder, { recursive: true });
     return updatedData;
 }
-exports.rewriteMetadataInTarball = rewriteMetadataInTarball;
 function createPrebuiltBinaryRemotePath(url, versionMetadata) {
     return `${removeTrailingSlash(url.pathname)}/${versionMetadata.name}/${versionMetadata.version}/`;
 }
@@ -43,7 +44,6 @@ function extractTgz(data, folder) {
         tgz.on('error', reject);
     });
 }
-exports.extractTgz = extractTgz;
 function compressTgz(folder) {
     return new Promise((resolve, reject) => {
         const chunks = [];
@@ -60,7 +60,6 @@ function tarballFilename(name, version) {
     const normalized = name.replace(/\//g, '-');
     return `${normalized}-${version}.tgz`;
 }
-exports.tarballFilename = tarballFilename;
 function removeTrailingSlash(str) {
     return str.replace(/\/$/, '');
 }

package/src/normalize-yarn-pattern.js

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 // From https://github.com/yarnpkg/yarn/blob/953c8b6a20e360b097625d64189e6e56ed813e0f/src/util/normalize-pattern.js#L2
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeYarnPackagePattern = void 0;
+exports.normalizeYarnPackagePattern = normalizeYarnPackagePattern;
 function normalizeYarnPackagePattern(pattern) {
     let hasVersion = false;
     let range = 'latest';
@@ -58,4 +58,3 @@ function normalizeYarnPackagePattern(pattern) {
     }
     return { name, range, hasVersion };
 }
-exports.normalizeYarnPackagePattern = normalizeYarnPackagePattern;

package/src/pregyp.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadPrebuiltBinaries = exports.hasPrebuiltBinaries = void 0;
+exports.hasPrebuiltBinaries = hasPrebuiltBinaries;
+exports.downloadPrebuiltBinaries = downloadPrebuiltBinaries;
 const fs = require("fs");
 const path = require("path");
 const semver = require("semver");
@@ -9,7 +10,6 @@ const client_1 = require("./client");
 function hasPrebuiltBinaries({ binary }) {
     return Boolean(binary && binary.module_name);
 }
-exports.hasPrebuiltBinaries = hasPrebuiltBinaries;
 async function downloadPrebuiltBinaries(versionMetadata, localFolder, prebuiltBinaryProperties) {
     const { binary, name, version } = versionMetadata;
     if (!binary.napi_versions) {
@@ -24,7 +24,6 @@ async function downloadPrebuiltBinaries(versionMetadata, localFolder, prebuiltBi
         }
     }
 }
-exports.downloadPrebuiltBinaries = downloadPrebuiltBinaries;
 async function downloadPrebuiltBinary(localFolder, name, version, binary, abi, platform, arch, napiVersion) {
     try {
         const data = await fetchPrebuiltBinary(name, version, binary, abi, platform, arch, napiVersion);

package/src/resolve.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dependenciesFromPackageLock = exports.dependenciesNotInCache = exports.updateDependenciesCache = void 0;
+exports.updateDependenciesCache = updateDependenciesCache;
+exports.dependenciesNotInCache = dependenciesNotInCache;
+exports.dependenciesFromPackageLock = dependenciesFromPackageLock;
 const fs = require("fs");
 const pathLib = require("path");
 const readline = require("readline");
@@ -19,7 +21,6 @@ async function updateDependenciesCache(newDependencies, cacheFilePath, prebuiltB
     };
     return fs.promises.writeFile(cacheFilePath, JSON.stringify(data), 'utf8');
 }
-exports.updateDependenciesCache = updateDependenciesCache;
 async function dependenciesNotInCache(dependencies, cacheFilePath, prebuiltBinaryProperties) {
     const { dependencies: cachedDependencies, prebuiltBinaryProperties: cachedPrebuiltBinaryProperties, prebuiltBinaryNApiSupport } = await loadCache(cacheFilePath);
     if (cachedDependencies.length > 0 &&
@@ -30,7 +31,6 @@ async function dependenciesNotInCache(dependencies, cacheFilePath, prebuiltBinar
     const packageIdsInCache = cachedDependencies.map(pkg => pkg.id);
     return dependencies.filter(pkg => !packageIdsInCache.includes(pkg.id));
 }
-exports.dependenciesNotInCache = dependenciesNotInCache;
 async function loadCache(cacheFilePath) {
     try {
         const data = JSON.parse(await fs.promises.readFile(cacheFilePath, 'utf8'));
@@ -169,7 +169,6 @@ async function dependenciesFromPackageLock(path, includeDevDependencies) {
         : await parseDependenciesFromNpmLockFile(path, includeDevDependencies);
     return dependencies.sort(sortById).filter(uniqueById).filter(isNotLocal);
 }
-exports.dependenciesFromPackageLock = dependenciesFromPackageLock;
 function sortById(a, b) {
     return a.id.localeCompare(b.id);
 }

package/src/sync.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.synchronize = void 0;
+exports.synchronize = synchronize;
 const download_1 = require("./download");
 const resolve_1 = require("./resolve");
 async function synchronize(options) {
@@ -18,4 +18,3 @@ async function synchronize(options) {
     }
     return newPackages;
 }
-exports.synchronize = synchronize;