netlify-cli 17.26.3 → 17.28.0

package/dist/utils/proxy-server.d.ts

@@ -10,9 +10,10 @@ interface InspectSettings {
     address?: string;
 }
 export declare const generateInspectSettings: (edgeInspect: boolean | string, edgeInspectBrk: boolean | string) => InspectSettings;
-export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
+export declare const startProxyServer: ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
     accountId: string;
     addonsUrls: $TSFixMe;
+    api?: (import("netlify").NetlifyAPI & Record<string, (...args: any) => Promise<any>>) | undefined;
     blobsContext?: BlobsContextWithEdgeAccess | undefined;
     command: BaseCommand;
     config: NetlifyOptions['config'];

package/dist/utils/proxy-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,MAAM,kBACb,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB;eAuBhB,MAAM;gBACL,QAAQ;;aAEX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;0BACQ,OAAO;SACxB,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;qBACzB,eAAe;sBACd,MAAM,QAAQ,MAAM,CAAC;qBACtB,MAAM;gBACX,MAAM;cACR,cAAc;aACf,OAAO;UACV,QAAQ;cACJ,QAAQ;gBACN,MAAM;;WAEX,WAAW;;qBA+BnB,CAAA"}
+{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,MAAM,kBACb,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB;eAwBhB,MAAM;gBACL,QAAQ;;;aAGX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;0BACQ,OAAO;SACxB,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;qBACzB,eAAe;sBACd,MAAM,QAAQ,MAAM,CAAC;qBACtB,MAAM;gBACX,MAAM;cACR,cAAc;aACf,OAAO;UACV,QAAQ;cACJ,QAAQ;gBACN,MAAM;;WAEX,WAAW;;qBAgCnB,CAAA"}

package/dist/utils/proxy-server.js

@@ -17,7 +17,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
         address: getAddress(),
     };
 };
-export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
+export const startProxyServer = async ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
     const url = await startProxy({
         addonsUrls,
         blobsContext,
@@ -39,6 +39,7 @@ export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, co
         siteInfo,
         accountId,
         repositoryRoot,
+        api,
     });
     if (!url) {
         log(NETLIFYDEVERR, `Unable to start proxy server on port '${settings.port}'`);

package/dist/utils/proxy.d.ts

@@ -2,7 +2,7 @@ import { BaseCommand } from '../commands/index.js';
 import { $TSFixMe } from '../commands/types.js';
 import { ServerSettings } from './types.js';
 export declare const getProxyUrl: (settings: Pick<ServerSettings, 'https' | 'port'>) => string;
-export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
+export declare const startProxy: ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     command: BaseCommand;
     settings: ServerSettings;
     disableEdgeFunctions: boolean;

package/dist/utils/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAywB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAqBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CA2GjF,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAqxB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAsBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CA4GjF,CAAA"}

package/dist/utils/proxy.js

@@ -5,6 +5,7 @@ import http from 'http';
 import https from 'https';
 import { isIPv6 } from 'net';
 import path from 'path';
+import process from 'process';
 import util from 'util';
 import zlib from 'zlib';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cont... Remove this comment to see the full error message
@@ -21,6 +22,7 @@ import { jwtDecode } from 'jwt-decode';
 import { locatePath } from 'locate-path';
 import pFilter from 'p-filter';
 import toReadableStream from 'to-readable-stream';
+import throttle from 'lodash/throttle.js';
 import { handleProxyRequest, initializeProxy as initializeEdgeFunctionsProxy, isEdgeFunctionsRequest, } from '../lib/edge-functions/proxy.js';
 import { fileExistsAsync, isFileAsync } from '../lib/fs.js';
 import { getFormHandler } from '../lib/functions/form-submissions-handler.js';
@@ -176,6 +178,12 @@ const alternativePathsFor = function (url) {
     }
     return paths;
 };
+const notifyActivity = throttle((api, siteId, devServerId) => {
+    // eslint-disable-next-line promise/prefer-await-to-callbacks, promise/prefer-await-to-then
+    api.markDevServerActivity({ siteId, devServerId }).catch((error) => {
+        console.error(`${NETLIFYDEVWARN} Failed to notify activity`, error);
+    });
+}, 30 * 1000);
 const serveRedirect = async function ({ env, functionsRegistry, imageProxy, match, options, proxy, req, res, siteInfo, }) {
     if (!match)
         return proxy.web(req, res, options);
@@ -552,7 +560,7 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
     };
     return handlers;
 };
-const onRequest = async ({ addonsUrls, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, settings, siteInfo, }, req, res) => {
+const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, settings, siteInfo, }, req, res) => {
     req.originalBody =
         req.method && ['GET', 'OPTIONS', 'HEAD'].includes(req.method) ? null : await createStreamPromise(req, BYTES_LIMIT);
     if (isImageRequest(req)) {
@@ -614,13 +622,16 @@ const onRequest = async ({ addonsUrls, edgeFunctionsProxy, env, functionsRegistr
         (ct.endsWith('/x-www-form-urlencoded') || ct === 'multipart/form-data')) {
         return proxy.web(req, res, { target: functionsServer });
     }
+    if (req.method === 'GET' && api && process.env.NETLIFY_DEV_SERVER_ID) {
+        notifyActivity(api, siteInfo.id, process.env.NETLIFY_DEV_SERVER_ID);
+    }
     proxy.web(req, res, options);
 };
 export const getProxyUrl = function (settings) {
     const scheme = settings.https ? 'https' : 'http';
     return `${scheme}://localhost:${settings.port}`;
 };
-export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
+export const startProxy = async function ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
     const secondaryServerPort = settings.https ? await getAvailablePort() : null;
     const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null;
     let edgeFunctionsProxy;
@@ -685,6 +696,7 @@ export const startProxy = async function ({ accountId, addonsUrls, blobsContext,
         imageProxy,
         siteInfo,
         env,
+        api,
     });
     const primaryServer = settings.https
         ? https.createServer({ cert: settings.https.cert, key: settings.https.key }, onRequestWithOptions)