netlify-cli 27.14.2 → 27.14.3

package/dist/commands/clone/clone.js

@@ -5,19 +5,9 @@ import { normalizeRepoUrl } from '../../utils/normalize-repo-url.js';
 import { chalk, logAndThrowError, log, getToken, netlifyCommand } from '../../utils/command-helpers.js';
 import { runGit } from '../../utils/run-git.js';
 import execa from '../../utils/execa.js';
-import { NETLIFY_GIT_HOST } from '../git-credential/git-credential.js';
+import { isNetlifyGitUrl, NETLIFY_GIT_HOST } from '../../utils/netlify-git.js';
 import { link } from '../link/link.js';
 import { startSpinner } from '../../lib/spinner.js';
-const NETLIFY_GIT_SERVICE_HOST = 'hgit.services-prod.nsvcs.net';
-const isNetlifyGitServiceUrl = (repoUrl) => {
-    try {
-        const host = new URL(repoUrl).host;
-        return host === NETLIFY_GIT_HOST || host === NETLIFY_GIT_SERVICE_HOST;
-    }
-    catch {
-        return false;
-    }
-};
 const getTargetDir = async (defaultDir) => {
     return await input({
         message: 'Where should we clone the repository?',
@@ -192,7 +182,7 @@ export const clone = async (options, command, args) => {
         }
         siteSpinner.success(`Found site ${chalk.cyan(siteInfo.name)}`);
         const connectedRepoUrl = siteInfo.build_settings?.repo_url;
-        if (connectedRepoUrl && isNetlifyGitServiceUrl(connectedRepoUrl)) {
+        if (connectedRepoUrl && isNetlifyGitUrl(connectedRepoUrl)) {
             log(`Site is connected to Netlify's managed git service.`);
             log(`Cloning from Netlify's managed git service...`);
             log();

package/dist/commands/deploy/deploy.js

@@ -19,6 +19,7 @@ import { NETLIFY_CYAN_HEX, NETLIFYDEVERR, NETLIFYDEVLOG, chalk, logAndThrowError
 import { DEFAULT_CONCURRENT_HASH, DEFAULT_DEPLOY_TIMEOUT } from '../../utils/deploy/constants.js';
 import { deploySite } from '../../utils/deploy/deploy-site.js';
 import { getDeploySourceFields } from '../../utils/deploy/deploy-source.js';
+import { getDeployUrls } from '../../utils/deploy/deploy-urls.js';
 import { uploadSourceZip } from '../../utils/deploy/upload-source-zip.js';
 import { getEnvelopeEnv } from '../../utils/env/index.js';
 import { mergeDeployEnvVars } from '../../utils/env/deploy-env-vars.js';
@@ -472,24 +473,11 @@ const runDeploy = async ({ alias, api, command, config, deployFolder, deployTime
         }
         return reportDeployError({ error: error, failAndExit: logAndThrowError });
     }
-    const siteUrl = results.deploy.ssl_url || results.deploy.url;
-    const deployUrl = results.deploy.deploy_ssl_url || results.deploy.deploy_url;
-    const logsUrl = `${results.deploy.admin_url}/deploys/${results.deploy.id}`;
-    let functionLogsUrl = `${results.deploy.admin_url}/logs/functions`;
-    let edgeFunctionLogsUrl = `${results.deploy.admin_url}/logs/edge-functions`;
-    if (!deployToProduction) {
-        functionLogsUrl += `?scope=deploy:${deployId}`;
-        edgeFunctionLogsUrl += `?scope=deployid:${deployId}`;
-    }
     return {
         siteId: results.deploy.site_id,
         siteName: results.deploy.name,
         deployId: results.deployId,
-        siteUrl,
-        deployUrl,
-        logsUrl,
-        functionLogsUrl,
-        edgeFunctionLogsUrl,
+        ...getDeployUrls(results.deploy, { deployToProduction }),
         sourceZipFileName: uploadSourceZipResult?.sourceZipFileName,
     };
 };

package/dist/commands/git-credential/git-credential.d.ts

@@ -1,6 +1,5 @@
 import type { Readable, Writable } from 'stream';
 import type { GitCredentialOptionValues } from './option_values.js';
-export declare const NETLIFY_GIT_HOST = "git.netlify.com";
 export declare const parseGitCredentialInput: (input: Readable) => Promise<Partial<Record<string, string>>>;
 export declare const writeCredentials: (output: Writable, token: string) => void;
 export declare const gitCredential: (operation: string, _options: GitCredentialOptionValues) => Promise<void>;

package/dist/commands/git-credential/git-credential.js

@@ -1,7 +1,7 @@
 import process from 'process';
 import readline from 'readline';
 import { getToken } from '../../utils/command-helpers.js';
-export const NETLIFY_GIT_HOST = 'git.netlify.com';
+import { NETLIFY_GIT_HOST } from '../../utils/netlify-git.js';
 export const parseGitCredentialInput = async (input) => {
     const rl = readline.createInterface({
         input,

package/dist/commands/logs/build.js

@@ -1,6 +1,7 @@
 import { select } from '@inquirer/prompts';
 import { log, chalk } from '../../utils/command-helpers.js';
 import { getWebSocket } from '../../utils/websockets/index.js';
+import { SOCKETEER_URL } from '../../utils/socketeer.js';
 export function getName({ deploy, userId }) {
     let normalisedName = '';
     const isUserDeploy = deploy.user_id === userId;
@@ -51,7 +52,7 @@ export const logsBuild = async (_options, command) => {
         deploy = deploys.find((dep) => dep.id === result) || deploy;
     }
     const { id } = deploy;
-    const ws = getWebSocket(`wss://socketeer.services.netlify.com/build/logs`);
+    const ws = getWebSocket(`${SOCKETEER_URL}/build/logs`);
     ws.on('open', function open() {
         ws.send(JSON.stringify({ deploy_id: id, site_id: siteId, access_token: client.accessToken }));
     });

package/dist/commands/logs/sources/deploy.js

@@ -1,4 +1,5 @@
 import { getWebSocket } from '../../../utils/websockets/index.js';
+import { SOCKETEER_URL } from '../../../utils/socketeer.js';
 const DEPLOY_LOG_REPLAY_TIMEOUT_MS = 30_000;
 const DEPLOY_STREAM_START_TIMEOUT_MS = 20_000;
 const parseDeployLogTimestamp = (message) => {
@@ -29,7 +30,7 @@ const parseDeployLogMessage = (data) => {
 };
 export const fetchDeployHistoricalLogs = async ({ siteId, accessToken, deployId, from, to, }) => {
     const collected = [];
-    const ws = getWebSocket('wss://socketeer.services.netlify.com/build/logs');
+    const ws = getWebSocket(`${SOCKETEER_URL}/build/logs`);
     await new Promise((resolve, reject) => {
         let settled = false;
         const finish = (error) => {
@@ -84,7 +85,7 @@ export const fetchDeployHistoricalLogs = async ({ siteId, accessToken, deployId,
         .sort((a, b) => a.ts - b.ts);
 };
 export const streamDeploy = (siteId, deployId, accessToken, onEntry, onClose, { closeWhenIdleMs } = {}) => {
-    const ws = getWebSocket('wss://socketeer.services.netlify.com/build/logs');
+    const ws = getWebSocket(`${SOCKETEER_URL}/build/logs`);
     let closeTimer;
     const scheduleClose = (ms) => {
         clearTimeout(closeTimer);

package/dist/commands/logs/sources/edge-functions.js

@@ -1,4 +1,5 @@
 import { getWebSocket } from '../../../utils/websockets/index.js';
+import { SOCKETEER_URL } from '../../../utils/socketeer.js';
 import { buildEdgeFunctionLogsUrl, debugFetch, fetchHistoricalLogs } from '../log-api.js';
 export const listEdgeFunctions = async (apiBase, accessToken, deployId) => {
     const response = await debugFetch(`${apiBase}/api/v1/deploys/${encodeURIComponent(deployId)}/edge_functions`, {
@@ -41,7 +42,7 @@ export const fetchEdgeFunctionHistoricalLogs = async ({ siteId, accessToken, fro
     }));
 };
 export const streamEdgeFunctions = (siteId, deployId, accessToken, filterNames, onEntry) => {
-    const ws = getWebSocket('wss://socketeer.services.netlify.com/edge-function/logs');
+    const ws = getWebSocket(`${SOCKETEER_URL}/edge-function/logs`);
     ws.on('open', () => {
         ws.send(JSON.stringify({
             deploy_id: deployId,

package/dist/commands/logs/sources/functions.js

@@ -1,4 +1,5 @@
 import { getWebSocket } from '../../../utils/websockets/index.js';
+import { SOCKETEER_URL } from '../../../utils/socketeer.js';
 import { buildFunctionLogsUrl, fetchHistoricalLogs } from '../log-api.js';
 const MAX_CONCURRENT_FUNCTIONS = 10;
 export const listFunctions = async (client, siteId, deployId) => {
@@ -45,7 +46,7 @@ export const fetchFunctionHistoricalLogs = async ({ functions, siteId, accessTok
 export const streamFunctions = (functions, siteId, accessToken, onEntry) => {
     const sockets = [];
     for (const fn of functions) {
-        const ws = getWebSocket('wss://socketeer.services.netlify.com/function/logs');
+        const ws = getWebSocket(`${SOCKETEER_URL}/function/logs`);
         sockets.push(ws);
         ws.on('open', () => {
             ws.send(JSON.stringify({

package/dist/utils/deploy/deploy-urls.d.ts

@@ -0,0 +1,20 @@
+export interface DeployUrls {
+    siteUrl: string;
+    deployUrl: string;
+    logsUrl: string;
+    functionLogsUrl: string;
+    edgeFunctionLogsUrl: string;
+}
+interface DeployUrlFields {
+    id?: string;
+    ssl_url?: string;
+    url?: string;
+    deploy_ssl_url?: string;
+    deploy_url?: string;
+    admin_url?: string;
+}
+export declare const getDeployUrls: (deploy: DeployUrlFields, { deployToProduction }: {
+    deployToProduction: boolean;
+}) => DeployUrls;
+export {};
+//# sourceMappingURL=deploy-urls.d.ts.map

package/dist/utils/deploy/deploy-urls.js

@@ -0,0 +1,14 @@
+export const getDeployUrls = (deploy, { deployToProduction }) => {
+    const functionLogsUrl = `${deploy.admin_url ?? ''}/logs/functions`;
+    const edgeFunctionLogsUrl = `${deploy.admin_url ?? ''}/logs/edge-functions`;
+    return {
+        siteUrl: deploy.ssl_url ?? deploy.url ?? '',
+        deployUrl: deploy.deploy_ssl_url ?? deploy.deploy_url ?? '',
+        logsUrl: `${deploy.admin_url ?? ''}/deploys/${deploy.id ?? ''}`,
+        functionLogsUrl: deployToProduction ? functionLogsUrl : `${functionLogsUrl}?scope=deploy:${deploy.id ?? ''}`,
+        edgeFunctionLogsUrl: deployToProduction
+            ? edgeFunctionLogsUrl
+            : `${edgeFunctionLogsUrl}?scope=deployid:${deploy.id ?? ''}`,
+    };
+};
+//# sourceMappingURL=deploy-urls.js.map

package/dist/utils/netlify-git.d.ts

@@ -0,0 +1,3 @@
+export declare const NETLIFY_GIT_HOST = "git.netlify.com";
+export declare const isNetlifyGitUrl: (repoUrl: string) => boolean;
+//# sourceMappingURL=netlify-git.d.ts.map

package/dist/utils/netlify-git.js

@@ -0,0 +1,12 @@
+export const NETLIFY_GIT_HOST = 'git.netlify.com';
+const NETLIFY_GIT_SERVICE_HOST = 'hgit.services-prod.nsvcs.net';
+export const isNetlifyGitUrl = (repoUrl) => {
+    try {
+        const { host } = new URL(repoUrl);
+        return host === NETLIFY_GIT_HOST || host === NETLIFY_GIT_SERVICE_HOST;
+    }
+    catch {
+        return false;
+    }
+};
+//# sourceMappingURL=netlify-git.js.map

package/dist/utils/proxy.js

@@ -582,6 +582,9 @@ const onRequest = async ({ api, edgeFunctionsProxy, env, functionsRegistry, func
                     for (let index = 0; index < req.rawHeaders.length; index += 2) {
                         headers.append(req.rawHeaders[index], req.rawHeaders[index + 1]);
                     }
+                    // The server handler gets a `Request` with no socket, so it reads the
+                    // client's address from this header to set `context.ip`.
+                    headers.set('x-forwarded-for', req.socket.remoteAddress ?? '');
                     const response = await serverMatch.handle(new Request(requestURL, {
                         body: req.originalBody,
                         headers,

package/dist/utils/socketeer.d.ts

@@ -0,0 +1,2 @@
+export declare const SOCKETEER_URL: string;
+//# sourceMappingURL=socketeer.d.ts.map

package/dist/utils/socketeer.js

@@ -0,0 +1,2 @@
+export const SOCKETEER_URL = process.env.NETLIFY_SOCKETEER_URL ?? 'wss://socketeer.services.netlify.com';
+//# sourceMappingURL=socketeer.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify-cli",
-  "version": "27.14.2",
+  "version": "27.14.3",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -139,7 +139,7 @@
     "semver": "^7.7.2",
     "source-map-support": "^0.5.21",
     "terminal-link": "^5.0.0",
-    "toml": "^4.0.0",
+    "toml": "^5.0.0",
     "tomlify-j0.4": "^3.0.0",
     "ulid": "^3.0.1",
     "update-notifier": "^7.3.1",