@vercel/node 1.13.0 → 1.13.1-canary.2

package/dist/dev-server.js

@@ -76,8 +76,7 @@ if (!process.env.VERCEL_DEV_IS_ESM) {
     useRequire = true;
 }
 const http_1 = require("http");
-// @ts-ignore - copied to the `dist` output as-is
-const launcher_js_1 = require("./launcher.js");
+const launcher_js_1 = require("@vercel/node-bridge/launcher.js");
 function listen(server, port, host) {
     return new Promise(resolve => {
         server.listen(port, host, () => {
@@ -99,6 +98,9 @@ async function main() {
         helpersPath: './helpers.js',
         shouldAddHelpers,
         useRequire,
+        // not used
+        bridgePath: '',
+        sourcemapSupportPath: '',
     });
     bridge = launcher();
     const address = proxyServer.address();

package/dist/index.d.ts

@@ -1,10 +1,8 @@
-import { Files, PrepareCacheOptions, BuildOptions, StartDevServerOptions, StartDevServerResult, shouldServe } from '@vercel/build-utils';
+import { shouldServe, BuildV3, PrepareCache, StartDevServer } from '@vercel/build-utils';
 export { shouldServe };
-export { NowRequest, NowResponse, VercelRequest, VercelResponse, } from './types';
+export type { NowRequest, NowResponse, VercelRequest, VercelResponse, } from './types';
 export * from './types';
 export declare const version = 3;
-export declare function build({ files, entrypoint, workPath, repoRootPath, config, meta, }: BuildOptions): Promise<{
-    output: import("@vercel/build-utils").Lambda;
-}>;
-export declare function prepareCache({ workPath, }: PrepareCacheOptions): Promise<Files>;
-export declare function startDevServer(opts: StartDevServerOptions): Promise<StartDevServerResult>;
+export declare const build: BuildV3;
+export declare const prepareCache: PrepareCache;
+export declare const startDevServer: StartDevServer;

package/dist/index.js

@@ -306897,8 +306897,6 @@ const once_1 = __importDefault(__webpack_require__(8478));
 const nft_1 = __webpack_require__(39582);
 const build_utils_1 = __webpack_require__(63445);
 Object.defineProperty(exports, "shouldServe", ({ enumerable: true, get: function () { return build_utils_1.shouldServe; } }));
-// @ts-ignore - copied to the `dist` output as-is
-const launcher_js_1 = __webpack_require__(59767);
 const typescript_1 = __webpack_require__(80774);
 function isPortInfo(v) {
     return v && typeof v.port === 'number';
@@ -306907,10 +306905,6 @@ const require_ = eval('require');
 const tscPath = path_1.resolve(path_1.dirname(require_.resolve('typescript')), '../bin/tsc');
 // eslint-disable-next-line no-useless-escape
 const libPathRegEx = /^node_modules|[\/\\]node_modules[\/\\]/;
-const LAUNCHER_FILENAME = '__launcher.js';
-const BRIDGE_FILENAME = '__bridge.js';
-const HELPERS_FILENAME = '__helpers.js';
-const SOURCEMAP_SUPPORT_FILENAME = '__sourcemap_support.js';
 async function downloadInstallAndBundle({ files, entrypoint, workPath, config, meta, }) {
     const downloadedFiles = await build_utils_1.download(files, workPath, meta);
     const entrypointFsDirname = path_1.join(workPath, path_1.dirname(entrypoint));
@@ -306937,7 +306931,7 @@ function renameTStoJS(path) {
     }
     return path;
 }
-async function compile(workPath, baseDir, entrypointPath, entrypoint, config) {
+async function compile(workPath, baseDir, entrypointPath, config) {
     const inputFiles = new Set([entrypointPath]);
     const preparedFiles = {};
     const sourceCache = new Map();
@@ -307021,7 +307015,7 @@ async function compile(workPath, baseDir, entrypointPath, entrypoint, config) {
         },
     });
     for (const warning of warnings) {
-        if (warning && warning.stack) {
+        if (warning === null || warning === void 0 ? void 0 : warning.stack) {
             build_utils_1.debug(warning.stack.replace('Error: ', 'Warning: '));
         }
     }
@@ -307114,8 +307108,7 @@ function getAWSLambdaHandler(entrypoint, config) {
 // Ensures that everything from `types.ts` is exported in the final `index.d.ts` file.
 __exportStar(__webpack_require__(25748), exports);
 exports.version = 3;
-async function build({ files, entrypoint, workPath, repoRootPath, config = {}, meta = {}, }) {
-    const shouldAddHelpers = !(config.helpers === false || process.env.NODEJS_HELPERS === '0');
+const build = async ({ files, entrypoint, workPath, repoRootPath, config = {}, meta = {}, }) => {
     const baseDir = repoRootPath || workPath;
     const awsLambdaHandler = getAWSLambdaHandler(entrypoint, config);
     const { entrypointPath, entrypointFsDirname, nodeVersion, spawnOpts } = await downloadInstallAndBundle({
@@ -307130,57 +307123,26 @@ async function build({ files, entrypoint, workPath, repoRootPath, config = {}, m
     ['vercel-build', 'now-build'], spawnOpts);
     build_utils_1.debug('Tracing input files...');
     const traceTime = Date.now();
-    const { preparedFiles, shouldAddSourcemapSupport } = await compile(workPath, baseDir, entrypointPath, entrypoint, config);
+    const { preparedFiles, shouldAddSourcemapSupport } = await compile(workPath, baseDir, entrypointPath, config);
     build_utils_1.debug(`Trace complete [${Date.now() - traceTime}ms]`);
-    const getFileName = (str) => `___vc/${str}`;
-    const launcher = awsLambdaHandler ? launcher_js_1.makeAwsLauncher : launcher_js_1.makeVercelLauncher;
-    const launcherSource = launcher({
-        entrypointPath: `../${renameTStoJS(path_1.relative(baseDir, entrypointPath))}`,
-        bridgePath: `./${BRIDGE_FILENAME}`,
-        helpersPath: `./${HELPERS_FILENAME}`,
-        sourcemapSupportPath: `./${SOURCEMAP_SUPPORT_FILENAME}`,
+    const shouldAddHelpers = !(config.helpers === false || process.env.NODEJS_HELPERS === '0');
+    const lambda = new build_utils_1.NodejsLambda({
+        files: preparedFiles,
+        handler: renameTStoJS(path_1.relative(baseDir, entrypointPath)),
+        runtime: nodeVersion.runtime,
         shouldAddHelpers,
         shouldAddSourcemapSupport,
         awsLambdaHandler,
     });
-    const launcherFiles = {
-        [getFileName('package.json')]: new build_utils_1.FileBlob({
-            data: JSON.stringify({ type: 'commonjs' }),
-        }),
-        [getFileName(LAUNCHER_FILENAME)]: new build_utils_1.FileBlob({
-            data: launcherSource,
-        }),
-        [getFileName(BRIDGE_FILENAME)]: new build_utils_1.FileFsRef({
-            fsPath: path_1.join(__dirname, 'bridge.js'),
-        }),
-    };
-    if (shouldAddSourcemapSupport) {
-        launcherFiles[getFileName(SOURCEMAP_SUPPORT_FILENAME)] = new build_utils_1.FileFsRef({
-            fsPath: path_1.join(__dirname, 'source-map-support.js'),
-        });
-    }
-    if (shouldAddHelpers) {
-        launcherFiles[getFileName(HELPERS_FILENAME)] = new build_utils_1.FileFsRef({
-            fsPath: path_1.join(__dirname, 'helpers.js'),
-        });
-    }
-    const lambda = await build_utils_1.createLambda({
-        files: {
-            ...preparedFiles,
-            ...launcherFiles,
-        },
-        handler: `${getFileName(LAUNCHER_FILENAME).slice(0, -3)}.launcher`,
-        runtime: nodeVersion.runtime,
-    });
     return { output: lambda };
-}
+};
 exports.build = build;
-async function prepareCache({ workPath, }) {
+const prepareCache = async ({ workPath }) => {
     const cache = await build_utils_1.glob('node_modules/**', workPath);
     return cache;
-}
+};
 exports.prepareCache = prepareCache;
-async function startDevServer(opts) {
+const startDevServer = async (opts) => {
     const { entrypoint, workPath, config, meta = {} } = opts;
     const entryDir = path_1.join(workPath, path_1.dirname(entrypoint));
     const projectTsConfig = await build_utils_1.walkParentDirs({
@@ -307234,7 +307196,7 @@ async function startDevServer(opts) {
         const reason = signal ? `"${signal}" signal` : `exit code ${exitCode}`;
         throw new Error(`\`node ${entrypoint}\` failed with ${reason}`);
     }
-}
+};
 exports.startDevServer = startDevServer;
 async function doTypeCheck({ entrypoint, workPath, meta = {} }, projectTsConfig) {
     const { devCacheDir = path_1.join(workPath, '.now', 'cache') } = meta;
@@ -307640,14 +307602,6 @@ function filterDiagnostics(diagnostics, ignore) {
 }
 
 
-/***/ }),
-
-/***/ 59767:
-/***/ ((module) => {
-
-module.exports = eval("require")("./launcher.js");
-
-
 /***/ }),
 
 /***/ 80918:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "1.13.0",
+  "version": "1.13.1-canary.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -11,7 +11,6 @@
   },
   "scripts": {
     "build": "node build",
-    "test-unit": "jest --env node --verbose --runInBand --bail test/helpers.test.js",
     "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
     "prepublishOnly": "node build"
   },
@@ -32,10 +31,10 @@
     "@types/cookie": "0.3.3",
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
-    "@vercel/build-utils": "2.14.0",
+    "@vercel/build-utils": "2.14.1-canary.2",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.17.5",
-    "@vercel/node-bridge": "2.1.1",
+    "@vercel/node-bridge": "2.1.2-canary.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",
@@ -44,5 +43,5 @@
     "source-map-support": "0.5.12",
     "test-listen": "1.1.0"
   },
-  "gitHead": "99fa729966c4334aa2d64c592421cc65e1644bdb"
+  "gitHead": "82ba9324471e7bf3f4426793c86694fdeb4530a4"
 }

package/dist/bridge.js

@@ -1,242 +0,0 @@
-const { request } = require('http');
-
-/**
- * If the `http.Server` handler function throws an error asynchronously,
- * then it ends up being an unhandled rejection which doesn't kill the node
- * process which causes the HTTP request to hang indefinitely. So print the
- * error here and force the process to exit so that the lambda invocation
- * returns an Unhandled error quickly.
- */
-process.on('unhandledRejection', err => {
-  console.error('Unhandled rejection:', err);
-  process.exit(1);
-});
-
-/**
- * @param {import('./types').VercelProxyEvent} event
- */
-function normalizeProxyEvent(event) {
-  let bodyBuffer;
-  const { method, path, headers, encoding, body } = JSON.parse(event.body);
-
-  if (body) {
-    if (encoding === 'base64') {
-      bodyBuffer = Buffer.from(body, encoding);
-    } else if (encoding === undefined) {
-      bodyBuffer = Buffer.from(body);
-    } else {
-      throw new Error(`Unsupported encoding: ${encoding}`);
-    }
-  } else {
-    bodyBuffer = Buffer.alloc(0);
-  }
-
-  return { isApiGateway: false, method, path, headers, body: bodyBuffer };
-}
-
-/**
- * @param {import('aws-lambda').APIGatewayProxyEvent} event
- */
-function normalizeAPIGatewayProxyEvent(event) {
-  let bodyBuffer;
-  const { httpMethod: method, path, headers, body } = event;
-
-  if (body) {
-    if (event.isBase64Encoded) {
-      bodyBuffer = Buffer.from(body, 'base64');
-    } else {
-      bodyBuffer = Buffer.from(body);
-    }
-  } else {
-    bodyBuffer = Buffer.alloc(0);
-  }
-
-  return { isApiGateway: true, method, path, headers, body: bodyBuffer };
-}
-
-/**
- * @param {import('./types').VercelProxyEvent | import('aws-lambda').APIGatewayProxyEvent} event
- */
-function normalizeEvent(event) {
-  if ('Action' in event) {
-    if (event.Action === 'Invoke') {
-      return normalizeProxyEvent(event);
-    } else {
-      throw new Error(`Unexpected event.Action: ${event.Action}`);
-    }
-  } else {
-    return normalizeAPIGatewayProxyEvent(event);
-  }
-}
-
-class Bridge {
-  /**
-   * @param {import('./types').ServerLike | null} server
-   * @param {boolean} shouldStoreEvents
-   */
-  constructor(server = null, shouldStoreEvents = false) {
-    this.server = server;
-    this.shouldStoreEvents = shouldStoreEvents;
-    this.launcher = this.launcher.bind(this);
-    this.reqIdSeed = 1;
-    /**
-     * @type {{ [key: string]: import('./types').VercelProxyRequest }}
-     */
-    this.events = {};
-
-    this.listening = new Promise(resolve => {
-      this.resolveListening = resolve;
-    });
-  }
-
-  /**
-   * @param {import('./types').ServerLike} server
-   */
-  setServer(server) {
-    this.server = server;
-  }
-
-  /**
-   * @param {boolean} shouldStoreEvents
-   */
-  setStoreEvents(shouldStoreEvents) {
-    this.shouldStoreEvents = shouldStoreEvents;
-  }
-
-  listen() {
-    const { server, resolveListening } = this;
-    if (!server) {
-      throw new Error('Server has not been set!');
-    }
-
-    if (typeof server.timeout === 'number' && server.timeout > 0) {
-      // Disable timeout (usually 2 minutes until Node 13).
-      // Instead, user should assign function `maxDuration`.
-      server.timeout = 0;
-    }
-
-    return server.listen(
-      {
-        host: '127.0.0.1',
-        port: 0,
-      },
-      function listeningCallback() {
-        if (!this || typeof this.address !== 'function') {
-          throw new Error(
-            'Missing server.address() function on `this` in server.listen()'
-          );
-        }
-
-        const addr = this.address();
-
-        if (!addr) {
-          throw new Error('`server.address()` returned `null`');
-        }
-
-        if (typeof addr === 'string') {
-          throw new Error(
-            `Unexpected string for \`server.address()\`: ${addr}`
-          );
-        }
-
-        resolveListening(addr);
-      }
-    );
-  }
-
-  /**
-   *
-   * @param {import('./types').VercelProxyEvent | import('aws-lambda').APIGatewayProxyEvent} event
-   * @param {import('aws-lambda').Context} context
-   * @return {Promise<{statusCode: number, headers: import('http').IncomingHttpHeaders,  body: string, encoding: 'base64'}>}
-   */
-  async launcher(event, context) {
-    context.callbackWaitsForEmptyEventLoop = false;
-    const { port } = await this.listening;
-
-    const normalizedEvent = normalizeEvent(event);
-    const { isApiGateway, method, headers, body } = normalizedEvent;
-    let { path } = normalizedEvent;
-
-    if (this.shouldStoreEvents) {
-      const reqId = `${this.reqIdSeed++}`;
-      this.events[reqId] = normalizedEvent;
-      headers['x-now-bridge-request-id'] = reqId;
-    }
-
-    // eslint-disable-next-line consistent-return
-    return new Promise((resolve, reject) => {
-      // if the path is improperly encoded we need to encode it or
-      // http.request will throw an error (related check: https://github.com/nodejs/node/blob/4ece669c6205ec78abfdadfe78869bbb8411463e/lib/_http_client.js#L84)
-      if (path && /[^\u0021-\u00ff]/.test(path)) {
-        path = encodeURI(path);
-      }
-
-      const opts = { hostname: '127.0.0.1', port, path, method };
-      const req = request(opts, res => {
-        const response = res;
-        /**
-         * @type {Buffer[]}
-         */
-        const respBodyChunks = [];
-        response.on('data', chunk => respBodyChunks.push(Buffer.from(chunk)));
-        response.on('error', reject);
-        response.on('end', () => {
-          const bodyBuffer = Buffer.concat(respBodyChunks);
-          delete response.headers.connection;
-
-          if (isApiGateway) {
-            delete response.headers['content-length'];
-          } else if (response.headers['content-length']) {
-            response.headers['content-length'] = String(bodyBuffer.length);
-          }
-
-          resolve({
-            statusCode: response.statusCode || 200,
-            headers: response.headers,
-            body: bodyBuffer.toString('base64'),
-            encoding: 'base64',
-          });
-        });
-      });
-
-      req.on('error', error => {
-        setTimeout(() => {
-          // this lets express print the true error of why the connection was closed.
-          // it is probably 'Cannot set headers after they are sent to the client'
-          reject(error);
-        }, 2);
-      });
-
-      for (const [name, value] of Object.entries(headers)) {
-        if (value === undefined) {
-          console.error(
-            `Skipping HTTP request header "${name}" because value is undefined`
-          );
-          continue;
-        }
-        try {
-          req.setHeader(name, value);
-        } catch (err) {
-          console.error(`Skipping HTTP request header: "${name}: ${value}"`);
-          console.error(err.message);
-        }
-      }
-
-      if (body) req.write(body);
-      req.end();
-    });
-  }
-
-  /**
-   * @param {string} reqId
-   * @return {import('./types').VercelProxyRequest}
-   */
-  consumeEvent(reqId) {
-    const event = this.events[reqId];
-    delete this.events[reqId];
-    return event;
-  }
-}
-
-module.exports = { Bridge };

package/dist/example-import.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/helpers.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="node" />
-import { VercelRequest, VercelResponse } from './types';
-import { Server } from 'http';
-import type { Bridge } from '@vercel/node-bridge/bridge';
-export declare class ApiError extends Error {
-    readonly statusCode: number;
-    constructor(statusCode: number, message: string);
-}
-export declare function sendError(res: VercelResponse, statusCode: number, message: string): void;
-export declare function createServerWithHelpers(handler: (req: VercelRequest, res: VercelResponse) => void | Promise<void>, bridge: Bridge): Server;