@vercel/client 12.1.11 → 12.2.0

package/dist/create-deployment.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -6,6 +9,9 @@ const hashes_1 = require("./utils/hashes");
 const upload_1 = require("./upload");
 const utils_1 = require("./utils");
 const errors_1 = require("./errors");
+const build_utils_1 = require("@vercel/build-utils");
+const tar_fs_1 = __importDefault(require("tar-fs"));
+const zlib_1 = require("zlib");
 function buildCreateDeployment() {
     return async function* createDeployment(clientOptions, deploymentOptions = {}) {
         const { path } = clientOptions;
@@ -52,7 +58,7 @@ function buildCreateDeployment() {
         else {
             debug(`Provided 'path' is a single file`);
         }
-        const { fileList } = await utils_1.buildFileTree(path, clientOptions, debug);
+        let { fileList } = await utils_1.buildFileTree(path, clientOptions, debug);
         // This is a useful warning because it prevents people
         // from getting confused about a deployment that renders 404.
         if (fileList.length === 0) {
@@ -62,7 +68,32 @@ function buildCreateDeployment() {
                 payload: 'There are no files inside your deployment.',
             };
         }
-        const files = await hashes_1.hashes(fileList);
+        // Populate Files -> FileFsRef mapping
+        const workPath = typeof path === 'string' ? path : path[0];
+        let files;
+        if (clientOptions.archive === 'tgz') {
+            debug('Packing tarball');
+            const tarStream = tar_fs_1.default
+                .pack(workPath, {
+                entries: fileList.map(file => path_1.relative(workPath, file)),
+            })
+                .pipe(zlib_1.createGzip());
+            const tarBuffer = await build_utils_1.streamToBuffer(tarStream);
+            debug('Packed tarball');
+            files = new Map([
+                [
+                    hashes_1.hash(tarBuffer),
+                    {
+                        names: [path_1.join(workPath, '.vercel/source.tgz')],
+                        data: tarBuffer,
+                        mode: 0o666,
+                    },
+                ],
+            ]);
+        }
+        else {
+            files = await hashes_1.hashes(fileList);
+        }
         debug(`Yielding a 'hashes-calculated' event with ${files.size} hashes`);
         yield { type: 'hashes-calculated', payload: hashes_1.mapToObject(files) };
         if (clientOptions.apiUrl) {

package/dist/types.d.ts

@@ -4,6 +4,8 @@ export { DeploymentEventType } from './utils';
 export interface Dictionary<T> {
     [key: string]: T;
 }
+export declare const VALID_ARCHIVE_FORMATS: readonly ["tgz"];
+export declare type ArchiveFormat = typeof VALID_ARCHIVE_FORMATS[number];
 export interface VercelClientOptions {
     token: string;
     path: string | string[];
@@ -18,6 +20,7 @@ export interface VercelClientOptions {
     defaultName?: string;
     isDirectory?: boolean;
     skipAutoDetectionConfirmation?: boolean;
+    archive?: ArchiveFormat;
 }
 /** @deprecated Use VercelClientOptions instead. */
 export declare type NowClientOptions = VercelClientOptions;
@@ -27,6 +30,7 @@ export interface Deployment {
     id: string;
     deploymentId?: string;
     url: string;
+    inspectorUrl: string;
     name: string;
     meta: Dictionary<string | number | boolean>;
     version: 2;
@@ -39,12 +43,14 @@ export interface Deployment {
     ownerId: string;
     readyState: 'INITIALIZING' | 'ANALYZING' | 'BUILDING' | 'DEPLOYING' | 'READY' | 'QUEUED' | 'CANCELED' | 'ERROR';
     state?: 'INITIALIZING' | 'ANALYZING' | 'BUILDING' | 'DEPLOYING' | 'READY' | 'QUEUED' | 'CANCELED' | 'ERROR';
+    ready?: number;
     createdAt: number;
     createdIn: string;
     buildingAt?: number;
     creator?: {
         uid?: string;
         email?: string;
+        name?: string;
         username?: string;
     };
     env: Dictionary<string>;

package/dist/types.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileNameSymbol = void 0;
+exports.fileNameSymbol = exports.VALID_ARCHIVE_FORMATS = void 0;
+exports.VALID_ARCHIVE_FORMATS = ['tgz'];
 exports.fileNameSymbol = Symbol('fileName');

package/dist/upload.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upload = void 0;
 const https_1 = require("https");
+const stream_1 = require("stream");
+const events_1 = require("events");
 const async_retry_1 = __importDefault(require("async-retry"));
 const async_sema_1 = require("async-sema");
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("./utils");
 const errors_1 = require("./errors");
 const deploy_1 = require("./deploy");
@@ -31,13 +32,13 @@ async function* upload(files, clientOptions, deploymentOptions) {
         debug(`Neither 'files', 'token' nor 'teamId are present. Exiting`);
         return;
     }
-    let missingFiles = [];
+    let shas = [];
     debug('Determining necessary files for upload...');
     for await (const event of deploy_1.deploy(files, clientOptions, deploymentOptions)) {
         if (event.type === 'error') {
             if (event.payload.code === 'missing_files') {
-                missingFiles = event.payload.missing;
-                debug(`${missingFiles.length} files are required to upload`);
+                shas = event.payload.missing;
+                debug(`${shas.length} files are required to upload`);
             }
             else {
                 return yield event;
@@ -52,13 +53,19 @@ async function* upload(files, clientOptions, deploymentOptions) {
             yield event;
         }
     }
-    const shas = missingFiles;
-    yield { type: 'file-count', payload: { total: files, missing: shas } };
+    const uploads = shas.map(sha => {
+        return new UploadProgress(sha, files.get(sha));
+    });
+    yield {
+        type: 'file-count',
+        payload: { total: files, missing: shas, uploads },
+    };
     const uploadList = {};
     debug('Building an upload list...');
     const semaphore = new async_sema_1.Sema(50, { capacity: 50 });
     const agent = new https_1.Agent({ keepAlive: true });
-    shas.map((sha) => {
+    shas.forEach((sha, index) => {
+        const uploadProgress = uploads[index];
         uploadList[sha] = async_retry_1.default(async (bail) => {
             const file = files.get(sha);
             if (!file) {
@@ -66,16 +73,25 @@ async function* upload(files, clientOptions, deploymentOptions) {
                 return bail(new Error(`File ${sha} is undefined`));
             }
             await semaphore.acquire();
-            const fPath = file.names[0];
-            let body = null;
-            const stat = await fs_extra_1.default.lstat(fPath);
-            if (stat.isSymbolicLink()) {
-                body = await fs_extra_1.default.readlink(fPath);
-            }
-            else {
-                body = fs_extra_1.default.createReadStream(fPath);
-            }
             const { data } = file;
+            uploadProgress.bytesUploaded = 0;
+            // Split out into chunks
+            const body = new stream_1.Readable();
+            const originalRead = body.read.bind(body);
+            body.read = function (...args) {
+                const chunk = originalRead(...args);
+                if (chunk) {
+                    uploadProgress.bytesUploaded += chunk.length;
+                    uploadProgress.emit('progress');
+                }
+                return chunk;
+            };
+            const chunkSize = 16384; /* 16kb - default Node.js `highWaterMark` */
+            for (let i = 0; i < data.length; i += chunkSize) {
+                const chunk = data.slice(i, i + chunkSize);
+                body.push(chunk);
+            }
+            body.push(null);
             let err;
             let result;
             try {
@@ -117,12 +133,6 @@ async function* upload(files, clientOptions, deploymentOptions) {
                 debug(`An unexpected error occurred in upload promise:\n${e}`);
                 err = new Error(e);
             }
-            finally {
-                if (body && typeof body !== 'string') {
-                    body.close();
-                    body.destroy();
-                }
-            }
             semaphore.release();
             if (err) {
                 if (isClientNetworkError(err)) {
@@ -172,3 +182,11 @@ async function* upload(files, clientOptions, deploymentOptions) {
     }
 }
 exports.upload = upload;
+class UploadProgress extends events_1.EventEmitter {
+    constructor(sha, file) {
+        super();
+        this.sha = sha;
+        this.file = file;
+        this.bytesUploaded = 0;
+    }
+}

package/dist/utils/hashes.d.ts

@@ -4,6 +4,13 @@ export interface DeploymentFile {
     data: Buffer;
     mode: number;
 }
+/**
+ * Computes a hash for the given buf.
+ *
+ * @param {Buffer} file data
+ * @return {String} hex digest
+ */
+export declare function hash(buf: Buffer): string;
 /**
  * Transforms map to object
  * @param map with hashed files

package/dist/utils/hashes.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashes = exports.mapToObject = void 0;
+exports.hashes = exports.mapToObject = exports.hash = void 0;
 const crypto_1 = require("crypto");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const async_sema_1 = require("async-sema");
@@ -16,6 +16,7 @@ const async_sema_1 = require("async-sema");
 function hash(buf) {
     return crypto_1.createHash('sha1').update(buf).digest('hex');
 }
+exports.hash = hash;
 /**
  * Transforms map to object
  * @param map with hashed files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "12.1.11",
+  "version": "12.2.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -31,6 +31,7 @@
     "@types/node": "12.0.4",
     "@types/node-fetch": "2.5.4",
     "@types/recursive-readdir": "2.2.0",
+    "@types/tar-fs": "^2.0.1",
     "typescript": "4.3.4"
   },
   "jest": {
@@ -42,7 +43,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "5.3.0",
+    "@vercel/build-utils": "5.3.1",
     "@vercel/routing-utils": "2.0.2",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
@@ -55,5 +56,5 @@
     "querystring": "^0.2.0",
     "sleep-promise": "8.0.1"
   },
-  "gitHead": "47e3381c6df661168e8be335cc58df03f3cf2414"
+  "gitHead": "b52d01f809b80734ed1ab61df82f299f11a04720"
 }