@forge/cli-shared 9.3.1-next.1-experimental-0b00ed8 → 9.3.1-next.2-experimental-f4ce0ae

package/out/http-client/file-uploader.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpFileUploader = exports.UploadFileEmptyError = exports.UploadFileNotFoundError = exports.CannotUploadFileError = void 0;
-const tslib_1 = require("tslib");
-const http_1 = tslib_1.__importDefault(require("http"));
-const https_1 = tslib_1.__importDefault(require("https"));
-const url_1 = require("url");
 const ui_1 = require("../ui");
+const node_request_1 = require("./node-request");
 class CannotUploadFileError extends Error {
 }
 exports.CannotUploadFileError = CannotUploadFileError;
@@ -15,7 +12,6 @@ exports.UploadFileNotFoundError = UploadFileNotFoundError;
 class UploadFileEmptyError extends Error {
 }
 exports.UploadFileEmptyError = UploadFileEmptyError;
-const NODE_REQUEST_TIMEOUT_MS = 30_000;
 const validateFileContents = (filePath, fileContents) => {
     if (!fileContents) {
         throw new UploadFileNotFoundError(ui_1.Text.upload.error.notFound(filePath));
@@ -30,33 +26,6 @@ const checkResponse = async (response) => {
         throw new CannotUploadFileError(ui_1.Text.upload.error.status(response.status, await response.text()));
     }
 };
-const uploadWithNodeRequest = (url, headers, fileContents) => {
-    return new Promise((resolve, reject) => {
-        const parsedUrl = new url_1.URL(url);
-        const transport = parsedUrl.protocol === 'https:' ? https_1.default : http_1.default;
-        const request = transport.request(parsedUrl, {
-            method: 'PUT',
-            headers
-        }, (response) => {
-            const chunks = [];
-            response.on('data', (chunk) => chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
-            response.on('end', () => {
-                const body = Buffer.concat(chunks).toString('utf-8');
-                resolve(new Response(body, {
-                    status: response.statusCode ?? 500,
-                    statusText: response.statusMessage,
-                    headers: response.headers
-                }));
-            });
-        });
-        request.setTimeout(NODE_REQUEST_TIMEOUT_MS, () => {
-            request.destroy(new Error(`Request timed out after ${NODE_REQUEST_TIMEOUT_MS}ms`));
-        });
-        request.on('error', reject);
-        request.write(fileContents);
-        request.end();
-    });
-};
 class HttpFileUploader {
     fileSystem;
     constructor(fileSystem) {
@@ -69,7 +38,12 @@ class HttpFileUploader {
             'Content-Type': 'application/zip',
             'Content-Length': validFileContents.length.toString()
         };
-        const response = await uploadWithNodeRequest(url, headers, validFileContents);
+        const response = await (0, node_request_1.sendWithNodeRequest)({
+            method: 'PUT',
+            url,
+            headers,
+            body: validFileContents
+        });
         await checkResponse(response);
     }
 }

package/out/http-client/index.d.ts

@@ -1,5 +1,6 @@
 export * from './file-uploader';
 export * from './global-edge-http-client';
 export * from './feedback-post-client';
+export * from './node-request';
 export * from './trace';
 //# sourceMappingURL=index.d.ts.map

package/out/http-client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/http-client/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/http-client/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC"}

package/out/http-client/index.js

@@ -4,4 +4,5 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./file-uploader"), exports);
 tslib_1.__exportStar(require("./global-edge-http-client"), exports);
 tslib_1.__exportStar(require("./feedback-post-client"), exports);
+tslib_1.__exportStar(require("./node-request"), exports);
 tslib_1.__exportStar(require("./trace"), exports);

package/out/http-client/node-request.d.ts

@@ -0,0 +1,10 @@
+import http from 'http';
+export declare const toHeaders: (rawHeaders: http.IncomingHttpHeaders) => Headers;
+export declare const sendWithNodeRequest: ({ method, url, headers, body, timeoutMs }: {
+    method: string;
+    url: string;
+    headers?: Record<string, string>;
+    body?: Buffer | Uint8Array | string;
+    timeoutMs?: number;
+}) => Promise<Response>;
+//# sourceMappingURL=node-request.d.ts.map

package/out/http-client/node-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-request.d.ts","sourceRoot":"","sources":["../../src/http-client/node-request.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAQxB,eAAO,MAAM,SAAS,GAAI,YAAY,IAAI,CAAC,mBAAmB,KAAG,OAYhE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,2CAMjC;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,KAAG,OAAO,CAAC,QAAQ,CAsCnB,CAAC"}

package/out/http-client/node-request.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendWithNodeRequest = exports.toHeaders = void 0;
+const tslib_1 = require("tslib");
+const http_1 = tslib_1.__importDefault(require("http"));
+const https_1 = tslib_1.__importDefault(require("https"));
+const url_1 = require("url");
+const DEFAULT_HTTP_ERROR_STATUS = 500;
+const DEFAULT_NODE_REQUEST_TIMEOUT_MS = 30_000;
+const NO_BODY_STATUS_CODES = new Set([204, 205, 304]);
+const toHeaders = (rawHeaders) => {
+    const headers = new Headers();
+    Object.entries(rawHeaders).forEach(([key, value]) => {
+        if (Array.isArray(value)) {
+            value.forEach((headerValue) => headers.append(key, headerValue));
+            return;
+        }
+        if (typeof value === 'string') {
+            headers.set(key, value);
+        }
+    });
+    return headers;
+};
+exports.toHeaders = toHeaders;
+const sendWithNodeRequest = ({ method, url, headers, body, timeoutMs = DEFAULT_NODE_REQUEST_TIMEOUT_MS }) => {
+    return new Promise((resolve, reject) => {
+        const parsedUrl = new url_1.URL(url);
+        const transport = parsedUrl.protocol === 'https:' ? https_1.default : http_1.default;
+        const request = transport.request(parsedUrl, {
+            method,
+            headers
+        }, (response) => {
+            const chunks = [];
+            response.on('data', (chunk) => chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
+            response.on('error', reject);
+            response.on('end', () => {
+                const responseBody = Buffer.concat(chunks).toString('utf8');
+                const status = response.statusCode ?? DEFAULT_HTTP_ERROR_STATUS;
+                const body = NO_BODY_STATUS_CODES.has(status) ? undefined : responseBody;
+                resolve(new Response(body, {
+                    status,
+                    statusText: response.statusMessage,
+                    headers: (0, exports.toHeaders)(response.headers)
+                }));
+            });
+        });
+        request.setTimeout(timeoutMs, () => {
+            request.destroy(new Error(`Request timed out after ${timeoutMs}ms`));
+        });
+        request.on('error', reject);
+        if (body !== undefined) {
+            request.write(body);
+        }
+        request.end();
+    });
+};
+exports.sendWithNodeRequest = sendWithNodeRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "9.3.1-next.1-experimental-0b00ed8",
+  "version": "9.3.1-next.2-experimental-f4ce0ae",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -12,7 +12,7 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "13.3.0-experimental-0b00ed8",
+    "@forge/manifest": "13.3.1-next.0-experimental-f4ce0ae",
     "@forge/util": "3.0.0",
     "@forge/i18n": "1.0.0",
     "@sentry/node": "7.106.0",
@@ -39,7 +39,6 @@
     "inquirer-autocomplete-prompt": "^2.0.1",
     "io-ts": "^2.2.22",
     "keytar": "^7.9.0",
-    "node-fetch": "2.7.0",
     "ora": "^5.4.1",
     "recursive-readdir": "^2.2.3",
     "semver": "^7.6.0",
@@ -66,7 +65,6 @@
     "@types/inquirer-autocomplete-prompt": "^1.3.5",
     "@types/jest": "^29.5.14",
     "@types/node": "20.19.1",
-    "@types/node-fetch": "^2.6.12",
     "@types/recursive-readdir": "^2.2.4",
     "@types/tmp": "^0.2.6",
     "jest-matcher-specific-error": "^1.0.0",