@pnpm/network.auth-header 1101.1.5 → 1101.1.6

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @pnpm/network.auth-header
 
+## 1101.1.6
+
+### Patch Changes
+
+- Republished every package: the tarballs published by the v11.13.1 through v11.16.0 releases were missing most of their compiled files due to a packing bug [#13164](https://github.com/pnpm/pnpm/issues/13164).
+
+- Updated dependencies:
+  - @pnpm/error@1100.1.0
+  - @pnpm/types@1101.6.0
+
 ## 1101.1.5
 
 ### Patch Changes

package/lib/getAuthHeadersFromConfig.d.ts

@@ -0,0 +1,9 @@
+import { type RegistryConfig, type TokenHelper } from '@pnpm/types';
+export interface AuthHeaders {
+    authHeaderValueByURI: Record<string, string>;
+    scopedAuthHeaderValueByURI: Record<string, Record<string, string>>;
+}
+export type AuthHeadersByScope = Record<string, Record<string, string>>;
+export declare function getAuthHeadersFromCreds(configByUri: Record<string, RegistryConfig>): AuthHeaders;
+export declare function getAuthHeadersByScope(authHeaders: AuthHeaders): AuthHeadersByScope;
+export declare function executeTokenHelper(tokenHelper: TokenHelper, timeoutMs?: number): string;

package/lib/getAuthHeadersFromConfig.js

@@ -0,0 +1,92 @@
+import { spawnSync } from 'node:child_process';
+import { PnpmError } from '@pnpm/error';
+import { DEFAULT_REGISTRY_SCOPE } from '@pnpm/types';
+export function getAuthHeadersFromCreds(configByUri) {
+    const authHeaders = {
+        authHeaderValueByURI: {},
+        scopedAuthHeaderValueByURI: {},
+    };
+    for (const [uri, registryConfig] of Object.entries(configByUri)) {
+        const normalizedUri = normalizeAuthKey(uri);
+        const header = credsToHeader(registryConfig[DEFAULT_REGISTRY_SCOPE]);
+        if (header) {
+            authHeaders.authHeaderValueByURI[normalizedUri] = header;
+        }
+        for (const scope of getRegistryScopes(registryConfig)) {
+            if (scope === DEFAULT_REGISTRY_SCOPE)
+                continue;
+            const scopedCreds = registryConfig[scope];
+            const scopedHeader = credsToHeader(scopedCreds);
+            if (scopedHeader) {
+                authHeaders.scopedAuthHeaderValueByURI[normalizedUri] ??= {};
+                authHeaders.scopedAuthHeaderValueByURI[normalizedUri][scope] = scopedHeader;
+            }
+        }
+    }
+    return authHeaders;
+}
+export function getAuthHeadersByScope(authHeaders) {
+    const result = {};
+    for (const [registryURI, authHeader] of Object.entries(authHeaders.authHeaderValueByURI)) {
+        result[registryURI] ??= {};
+        result[registryURI][DEFAULT_REGISTRY_SCOPE] = authHeader;
+    }
+    for (const [registryURI, scopedAuthHeaders] of Object.entries(authHeaders.scopedAuthHeaderValueByURI)) {
+        result[registryURI] ??= {};
+        for (const [scope, authHeader] of Object.entries(scopedAuthHeaders)) {
+            result[registryURI][scope] = authHeader;
+        }
+    }
+    return result;
+}
+function getRegistryScopes(registryConfig) {
+    return Object.keys(registryConfig).filter((scope) => scope.startsWith('@'));
+}
+function normalizeAuthKey(uri) {
+    if (!uri)
+        return uri;
+    return uri.endsWith('/') ? uri : `${uri}/`;
+}
+function credsToHeader(creds) {
+    if (!creds)
+        return undefined;
+    if (creds.tokenHelper) {
+        return executeTokenHelper(creds.tokenHelper);
+    }
+    if (creds.authToken) {
+        return `Bearer ${creds.authToken}`;
+    }
+    if (creds.basicAuth) {
+        return `Basic ${Buffer.from(`${creds.basicAuth.username}:${creds.basicAuth.password}`, 'utf8').toString('base64')}`;
+    }
+    return undefined;
+}
+// A token helper only prints a token, so this is a generous bound that turns a
+// hung helper (deadlock, stuck I/O) into a clear error instead of a command
+// that hangs forever. Matches pacquet's `TOKEN_HELPER_TIMEOUT`.
+const TOKEN_HELPER_TIMEOUT = 60_000;
+export function executeTokenHelper(tokenHelper, timeoutMs = TOKEN_HELPER_TIMEOUT) {
+    const [cmd, ...args] = tokenHelper;
+    // On Windows, .bat/.cmd files require a shell to execute.
+    const shell = process.platform === 'win32' && /\.(?:bat|cmd)$/i.test(cmd);
+    const spawnResult = spawnSync(cmd, args, { stdio: 'pipe', shell, timeout: timeoutMs });
+    // A helper that outlives the timeout is killed; spawnSync then reports the
+    // kill signal rather than a clean exit, so surface it as a distinct error.
+    if (spawnResult.error != null && spawnResult.error.code === 'ETIMEDOUT') {
+        throw new PnpmError('TOKEN_HELPER_TIMEOUT', `Token helper "${cmd}" timed out after ${timeoutMs} ms`);
+    }
+    if (spawnResult.status !== 0) {
+        throw new PnpmError('TOKEN_HELPER_ERROR_STATUS', `Error running "${cmd}" as a token helper. Exit code ${spawnResult.status?.toString() ?? ''}`);
+    }
+    const token = spawnResult.stdout.toString('utf8').trimEnd();
+    if (!token) {
+        throw new PnpmError('TOKEN_HELPER_EMPTY_TOKEN', `Token helper "${cmd}" returned an empty token`);
+    }
+    // If the token already contains an auth scheme (e.g. "Bearer ...", "Basic ..."),
+    // return it as-is.
+    if (/^[A-Z]+ /i.test(token)) {
+        return token;
+    }
+    return `Bearer ${token}`;
+}
+//# sourceMappingURL=getAuthHeadersFromConfig.js.map

package/lib/helpers/removePort.d.ts

@@ -0,0 +1,2 @@
+import type { URL } from 'node:url';
+export declare function removePort(urlObj: URL): string;

package/lib/helpers/removePort.js

@@ -0,0 +1,7 @@
+export function removePort(urlObj) {
+    if (urlObj.port === '')
+        return urlObj.href;
+    urlObj.port = '';
+    return urlObj.toString();
+}
+//# sourceMappingURL=removePort.js.map

package/lib/index.d.ts

@@ -0,0 +1,7 @@
+import type { RegistryConfig } from '@pnpm/types';
+import { type AuthHeaders, type AuthHeadersByScope, getAuthHeadersByScope, getAuthHeadersFromCreds } from './getAuthHeadersFromConfig.js';
+export { type AuthHeaders, type AuthHeadersByScope, getAuthHeadersByScope, getAuthHeadersFromCreds };
+interface GetAuthHeaderOptions {
+    pkgName?: string;
+}
+export declare function createGetAuthHeaderByURI(configByUri: Record<string, RegistryConfig>): (uri: string, opts?: GetAuthHeaderOptions) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/network.auth-header",
-  "version": "1101.1.5",
+  "version": "1101.1.6",
   "description": "Gets the authorization header for the given URI",
   "keywords": [
     "pnpm",
@@ -29,12 +29,12 @@
   ],
   "dependencies": {
     "@pnpm/config.nerf-dart": "^2.0.1",
-    "@pnpm/error": "1100.0.1",
-    "@pnpm/types": "1101.5.0"
+    "@pnpm/error": "1100.1.0",
+    "@pnpm/types": "1101.6.0"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/network.auth-header": "1101.1.5",
+    "@pnpm/network.auth-header": "1101.1.6",
     "safe-buffer": "5.2.1"
   },
   "engines": {