@forge/bundler 4.10.4-next.9 → 4.10.4

package/CHANGELOG.md

@@ -1,5 +1,148 @@
 # @forge/bundler
 
+## 4.10.4
+
+### Patch Changes
+
+- 88be9538: Use HTTP polyfill to call proxy
+- 7ade714: Bumping dependencies via Renovate:
+
+  - @typescript-eslint/eslint-plugin
+  - @typescript-eslint/parser
+  - @typescript-eslint/typescript-estree
+
+- 48a4ea4: Renovate
+- 79b19f2: Bumping dependencies via Renovate:
+
+  - prettier
+
+- 8105c45: Bumping dependencies via Renovate:
+
+  - @types/jest
+  - jest
+  - jest-environment-jsdom
+
+- 4999c4b: Renovate
+- 02ff3939d: Bumping dependencies via Renovate:
+
+  - @babel/core
+
+- 508de66a4: Support static initialisation blocks
+- Updated dependencies [88be9538]
+- Updated dependencies [7ade714]
+- Updated dependencies [801ea11]
+- Updated dependencies [48a4ea4]
+- Updated dependencies [07eb84d]
+- Updated dependencies [8105c45]
+- Updated dependencies [4999c4b]
+- Updated dependencies [665f1b2]
+- Updated dependencies [467d04a]
+- Updated dependencies [94b724a]
+- Updated dependencies [d672827]
+- Updated dependencies [593cb3e]
+  - @forge/runtime@4.4.5
+  - @forge/api@2.18.3
+  - @forge/lint@3.6.3
+  - @forge/util@1.3.1
+  - @forge/cli-shared@3.17.0
+  - @forge/babel-plugin-transform-ui@1.1.5
+
+## 4.10.4-next.20
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.0-next.15
+- @forge/lint@3.6.3-next.16
+
+## 4.10.4-next.19
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.0-next.14
+- @forge/lint@3.6.3-next.15
+
+## 4.10.4-next.18
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.0-next.13
+- @forge/lint@3.6.3-next.14
+
+## 4.10.4-next.17
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.0-next.12
+- @forge/lint@3.6.3-next.13
+
+## 4.10.4-next.16
+
+### Patch Changes
+
+- Updated dependencies [593cb3ea]
+  - @forge/cli-shared@3.17.0-next.11
+  - @forge/lint@3.6.3-next.12
+
+## 4.10.4-next.15
+
+### Patch Changes
+
+- @forge/cli-shared@3.17.0-next.10
+- @forge/lint@3.6.3-next.11
+
+## 4.10.4-next.14
+
+### Patch Changes
+
+- 4999c4b: Renovate
+- Updated dependencies [4999c4b]
+  - @forge/babel-plugin-transform-ui@1.1.5-next.0
+  - @forge/util@1.3.1-next.2
+  - @forge/api@2.18.3-next.4
+  - @forge/cli-shared@3.17.0-next.9
+  - @forge/runtime@4.4.5-next.4
+  - @forge/lint@3.6.3-next.10
+
+## 4.10.4-next.13
+
+### Patch Changes
+
+- Updated dependencies [801ea11]
+  - @forge/util@1.3.1-next.1
+  - @forge/api@2.18.3-next.3
+  - @forge/cli-shared@3.17.0-next.8
+  - @forge/runtime@4.4.5-next.3
+  - @forge/lint@3.6.3-next.9
+
+## 4.10.4-next.12
+
+### Patch Changes
+
+- Updated dependencies [94b724a]
+  - @forge/util@1.3.1-next.0
+  - @forge/api@2.18.3-next.2
+  - @forge/cli-shared@3.17.0-next.7
+  - @forge/runtime@4.4.5-next.2
+  - @forge/lint@3.6.3-next.8
+
+## 4.10.4-next.11
+
+### Patch Changes
+
+- 48a4ea41: Renovate
+- Updated dependencies [48a4ea41]
+  - @forge/cli-shared@3.17.0-next.6
+  - @forge/lint@3.6.3-next.7
+
+## 4.10.4-next.10
+
+### Patch Changes
+
+- 88be9538: Use HTTP polyfill to call proxy
+- Updated dependencies [88be9538]
+  - @forge/runtime@4.4.5-next.1
+  - @forge/api@2.18.3-next.1
+
 ## 4.10.4-next.9
 
 ### Patch Changes

package/out/stubs/http-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-node.d.ts","sourceRoot":"","sources":["../../src/stubs/http-node.ts"],"names":[],"mappings":"AAkEA,wBAAgB,YAAY,SAK3B;AAED,wBAAgB,YAAY,SAG3B"}
+{"version":3,"file":"http-node.d.ts","sourceRoot":"","sources":["../../src/stubs/http-node.ts"],"names":[],"mappings":"AAqQA,wBAAgB,YAAY,SAG3B;AAED,wBAAgB,YAAY,SAG3B"}

package/out/stubs/http-node.js

@@ -1,37 +1,137 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreHttps = exports.replaceHttps = void 0;
+const http_1 = require("http");
+const perf_hooks_1 = require("perf_hooks");
 const url_1 = require("url");
-const http_impl_1 = require("./http-impl");
+const http_shared_1 = require("./http-shared");
+const api_1 = require("@forge/api");
 const https = require('https');
+const FORGE_PROXY_UPSTREAM_LATENCY_HEADER = 'forge-proxy-upstream-latency';
+const FORGE_PROXY_RELATIVE_LOCATION_HEADER = 'forge-proxy-relative-location';
+const REDIRECT_STATUS = new Set([300, 301, 302, 303, 307, 308]);
 const originalHttpsRequest = https.request;
 const originalHttpsGet = https.get;
 function parseArgs(args) {
     const result = {
         options: {}
     };
-    if (args.length > 0 && (0, http_impl_1.isStringOrURL)(args[0])) {
-        const url = (0, http_impl_1.isString)(args[0]) ? new url_1.URL(args[0]) : args[0];
+    if (args.length > 0 && (0, http_shared_1.isStringOrURL)(args[0])) {
+        const url = (0, http_shared_1.isString)(args[0]) ? new url_1.URL(args[0]) : args[0];
         result.options = (0, url_1.urlToHttpOptions)(url);
         args.shift();
     }
-    if (args.length > 0 && (0, http_impl_1.isRequestOptions)(args[0])) {
+    if (args.length > 0 && (0, http_shared_1.isRequestOptions)(args[0])) {
         result.options = Object.assign(result.options, args[0]);
         args.shift();
     }
-    if (args.length > 0 && (0, http_impl_1.isCallback)(args[0])) {
+    if (args.length > 0 && (0, http_shared_1.isCallback)(args[0])) {
         result.callback = args[0];
         args.shift();
     }
     return result;
 }
+const AUTH_PROVIDERS = ['app', 'user', 'none'];
+function isAuthProvider(provider) {
+    return AUTH_PROVIDERS.includes(provider);
+}
+const REMOTE_APIS = ['jira', 'confluence', 'stargate', 'bitbucket'];
+function isRemoteAPI(remote) {
+    return REMOTE_APIS.includes(remote);
+}
+function getProxyPath(args) {
+    switch (args.type) {
+        case 'egress':
+            return '/egress';
+        case 'fpp':
+            return `/fpp/provider/${args.provider}/remote/${args.remote}`;
+    }
+}
+const providerToMetric = {
+    app: 'asApp',
+    user: 'asUser'
+};
+const remoteToMetric = {
+    jira: 'requestJira',
+    confluence: 'requestConfluence',
+    bitbucket: 'requestBitbucket',
+    stargate: 'requestAtlassian'
+};
+const METRICS_TAGS = { proxy: 'true' };
+function getMetricsName(args) {
+    switch (args.type) {
+        case 'egress':
+            return 'api.fetch';
+        case 'fpp':
+            const { provider, remote } = args;
+            if (provider === 'none') {
+                return `api.${remoteToMetric[remote]}`;
+            }
+            return `api.${providerToMetric[provider]}.${remoteToMetric[remote]}`;
+    }
+}
+function getSingleString(values) {
+    if (typeof values === 'string') {
+        return values;
+    }
+    if (Array.isArray(values)) {
+        return values[0];
+    }
+}
+function getSingleHeader(response, header) {
+    return getSingleString(response.headers[header]);
+}
 function request(...args) {
-    var _a;
+    var _a, _b;
     const { options, callback } = parseArgs(args);
-    if ((_a = options === null || options === void 0 ? void 0 : options.headers) === null || _a === void 0 ? void 0 : _a['Forge-Proxy-Authorization']) {
-        return originalHttpsRequest(options, callback);
+    let proxyArgs = { type: 'egress' };
+    const host = (_a = options.host) !== null && _a !== void 0 ? _a : options.hostname;
+    if ((options === null || options === void 0 ? void 0 : options.agent) === 'FORGE_PRODUCT_REQUEST') {
+        delete options.agent;
+        if (host && isRemoteAPI(host)) {
+            const authorization = getSingleString((_b = options.headers) === null || _b === void 0 ? void 0 : _b.authorization);
+            if (authorization === null || authorization === void 0 ? void 0 : authorization.startsWith('Forge ')) {
+                const [, provider] = authorization.split(' ');
+                if (isAuthProvider(provider)) {
+                    proxyArgs = { type: 'fpp', provider, remote: host };
+                }
+            }
+        }
+    }
+    const { metrics, proxy } = (0, api_1.getRuntime)();
+    const metricsName = getMetricsName(proxyArgs);
+    const headers = Object.assign(Object.assign({}, options.headers), { 'forge-proxy-authorization': `Bearer ${proxy.token}` });
+    if (proxy.host) {
+        headers['Host'] = proxy.host;
+    }
+    switch (proxyArgs.type) {
+        case 'egress':
+            headers['forge-proxy-target'] = (0, http_shared_1.formatUrl)(options);
+            break;
+        case 'fpp':
+            headers['forge-proxy-target'] = options.path;
+            break;
     }
-    return new http_impl_1.Request(options, callback);
+    const proxyOptions = Object.assign(Object.assign(Object.assign({}, options), (0, url_1.urlToHttpOptions)(new url_1.URL(`${proxy.url}${getProxyPath(proxyArgs)}`))), { headers });
+    metrics.counter(metricsName, METRICS_TAGS).incr();
+    const originalRequest = proxyOptions.protocol === 'http:' ? http_1.request : originalHttpsRequest;
+    const requestStart = perf_hooks_1.performance.now();
+    return originalRequest(proxyOptions, (response) => {
+        const requestEnd = perf_hooks_1.performance.now();
+        metrics.timing(metricsName, METRICS_TAGS).set(requestEnd - requestStart);
+        const upstreamLatencyHeader = getSingleHeader(response, FORGE_PROXY_UPSTREAM_LATENCY_HEADER);
+        if (upstreamLatencyHeader !== undefined) {
+            const proxyUpstreamLatency = parseInt(upstreamLatencyHeader);
+            metrics.timing('proxy-success-overhead', METRICS_TAGS).set(requestEnd - requestStart - proxyUpstreamLatency);
+        }
+        if (response.statusCode && REDIRECT_STATUS.has(response.statusCode)) {
+            const relativeLocation = getSingleHeader(response, FORGE_PROXY_RELATIVE_LOCATION_HEADER);
+            if (relativeLocation) {
+                response.headers['location'] = `https://${host}${relativeLocation}`;
+            }
+        }
+        callback === null || callback === void 0 ? void 0 : callback(response);
+    });
 }
 function get(...args) {
     const { options, callback } = parseArgs(args);
@@ -45,7 +145,7 @@ function replaceHttps() {
 }
 exports.replaceHttps = replaceHttps;
 function restoreHttps() {
-    https.request = originalHttpsGet;
+    https.request = originalHttpsRequest;
     https.get = originalHttpsGet;
 }
 exports.restoreHttps = restoreHttps;

package/out/stubs/{http-impl.d.ts → http-sandbox-impl.d.ts}

@@ -1,24 +1,16 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
-import { IncomingMessage } from 'http';
-import { RequestOptions, AgentOptions } from 'https';
+import { RequestOptions } from 'https';
 import { Writable } from 'readable-stream';
 import { URL } from 'url';
 import { FetchOptions } from '@forge/api';
-export interface ChainableOptions {
+import { Callback } from './http-shared';
+interface ChainableOptions {
     timeout?: number;
     headers: {
         [key: string]: string;
     };
 }
-export type Callback = (res: IncomingMessage) => void;
-export type Arg = RequestOptions | string | URL | Callback;
-export declare const isCallback: (options: Arg) => options is Callback;
-export declare const isString: (options: Arg) => options is string;
-export declare const isURL: (options: Arg) => options is URL;
-export declare const isStringOrURL: (options: Arg) => options is string | URL;
-export declare const isRequestOptions: (options: Arg) => options is RequestOptions;
 export declare class Request extends Writable {
     private reqBody;
     private chainableOptions;
@@ -27,7 +19,6 @@ export declare class Request extends Writable {
     setTimeout(value: number, callback?: () => void): Request;
     private fetch;
     _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
-    static formatUrl(options: RequestOptions): string;
     static urlFromFetchArgs(options: RequestOptions | string | URL): string;
     static convertToForgeFetchArgs(options: RequestOptions | string | URL, chainableOptions: ChainableOptions): {
         url: string;
@@ -35,7 +26,5 @@ export declare class Request extends Writable {
     };
     abort(): void;
 }
-export declare class Agent {
-    constructor(options: AgentOptions);
-}
-//# sourceMappingURL=http-impl.d.ts.map
+export {};
+//# sourceMappingURL=http-sandbox-impl.d.ts.map

package/out/stubs/http-sandbox-impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-sandbox-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox-impl.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAA6C,MAAM,eAAe,CAAC;AAEpF,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,QAAQ;IAahE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;IAQhE,OAAO,CAAC,KAAK;IAsBN,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM;IAiBvE,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;IAuBtC,KAAK;CAGN"}

package/out/stubs/{http-impl.js → http-sandbox-impl.js}

@@ -1,71 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Agent = exports.Request = exports.isRequestOptions = exports.isStringOrURL = exports.isURL = exports.isString = exports.isCallback = void 0;
+exports.Request = void 0;
 const readable_stream_1 = require("readable-stream");
 const api_1 = require("@forge/api");
-const HEADERS_DISCARD_DUPLICATES = new Set([
-    'age',
-    'authorization',
-    'content-length',
-    'content-type',
-    'etag',
-    'expires',
-    'from',
-    'host',
-    'if-modified-since',
-    'if-unmodified-since',
-    'last-modified',
-    'location',
-    'max-forwards',
-    'proxy-authorization',
-    'referer',
-    'retry-after',
-    'server',
-    'user-agent'
-]);
-class Response extends readable_stream_1.Readable {
-    constructor(content, response) {
-        super();
-        this.statusCode = response.status;
-        this.statusMessage = response.statusText;
-        this.headers = {};
-        this.headersDistinct = {};
-        const rawHeaders = response.headers.raw();
-        for (const [name, values] of Object.entries(rawHeaders)) {
-            if (name === 'content-encoding') {
-                continue;
-            }
-            let value;
-            if (HEADERS_DISCARD_DUPLICATES.has(name)) {
-                value = values[0];
-            }
-            else if (name === 'set-cookie') {
-                value = values;
-            }
-            else if (name === 'cookie') {
-                value = values.join('; ');
-            }
-            else {
-                value = values.join(', ');
-            }
-            this.headers[name] = value;
-            this.headersDistinct[name] = values;
-        }
-        this._read = () => { };
-        this.push(Buffer.from(content));
-        this.push(null);
-    }
-}
-const isCallback = (options) => typeof options === 'function';
-exports.isCallback = isCallback;
-const isString = (options) => typeof options === 'string';
-exports.isString = isString;
-const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
-exports.isURL = isURL;
-const isStringOrURL = (options) => (0, exports.isString)(options) || (0, exports.isURL)(options);
-exports.isStringOrURL = isStringOrURL;
-const isRequestOptions = (options) => !(0, exports.isStringOrURL)(options) && !(0, exports.isCallback)(options);
-exports.isRequestOptions = isRequestOptions;
+const http_shared_1 = require("./http-shared");
 class Request extends readable_stream_1.Writable {
     constructor(options, callback) {
         super();
@@ -126,25 +64,16 @@ class Request extends readable_stream_1.Writable {
             callback(err);
         }
     }
-    static formatUrl(options) {
-        var _a, _b;
-        const protocol = 'https:';
-        const auth = options.auth ? `${options.auth}@` : '';
-        const host = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host;
-        const port = options.port ? `:${options.port}` : '';
-        const path = (_b = options.path) !== null && _b !== void 0 ? _b : '/';
-        return `${protocol}//${auth}${host}${port}${path}`;
-    }
     static urlFromFetchArgs(options) {
-        if ((0, exports.isString)(options)) {
+        if ((0, http_shared_1.isString)(options)) {
             return options;
         }
-        else if ((0, exports.isURL)(options)) {
+        else if ((0, http_shared_1.isURL)(options)) {
             return options.toString();
         }
         else {
             try {
-                return Request.formatUrl(options);
+                return (0, http_shared_1.formatUrl)(options);
             }
             catch (err) {
                 console.error('Unable to make request with unrecognised URL options:', options);
@@ -154,7 +83,7 @@ class Request extends readable_stream_1.Writable {
     }
     static convertToForgeFetchArgs(options, chainableOptions) {
         const url = Request.urlFromFetchArgs(options);
-        if ((0, exports.isStringOrURL)(options)) {
+        if ((0, http_shared_1.isStringOrURL)(options)) {
             return { url, init: chainableOptions };
         }
         else {
@@ -178,13 +107,56 @@ class Request extends readable_stream_1.Writable {
     }
 }
 exports.Request = Request;
-const NUM_SUPPORTED_AGENT_OPTIONS = 1;
-class Agent {
-    constructor(options) {
-        if (Object.keys(options).length > NUM_SUPPORTED_AGENT_OPTIONS) {
-            console.warn("Forge only supports 'keepAlive' as an option to http.Agent");
+const HEADERS_DISCARD_DUPLICATES = new Set([
+    'age',
+    'authorization',
+    'content-length',
+    'content-type',
+    'etag',
+    'expires',
+    'from',
+    'host',
+    'if-modified-since',
+    'if-unmodified-since',
+    'last-modified',
+    'location',
+    'max-forwards',
+    'proxy-authorization',
+    'referer',
+    'retry-after',
+    'server',
+    'user-agent'
+]);
+class Response extends readable_stream_1.Readable {
+    constructor(content, response) {
+        super();
+        this.statusCode = response.status;
+        this.statusMessage = response.statusText;
+        this.headers = {};
+        this.headersDistinct = {};
+        const rawHeaders = response.headers.raw();
+        for (const [name, values] of Object.entries(rawHeaders)) {
+            if (name === 'content-encoding') {
+                continue;
+            }
+            let value;
+            if (HEADERS_DISCARD_DUPLICATES.has(name)) {
+                value = values[0];
+            }
+            else if (name === 'set-cookie') {
+                value = values;
+            }
+            else if (name === 'cookie') {
+                value = values.join('; ');
+            }
+            else {
+                value = values.join(', ');
+            }
+            this.headers[name] = value;
+            this.headersDistinct[name] = values;
         }
-        return { keepAlive: options.keepAlive };
+        this._read = () => { };
+        this.push(Buffer.from(content));
+        this.push(null);
     }
 }
-exports.Agent = Agent;

package/out/stubs/http-sandbox.d.ts

@@ -1,2 +1,13 @@
-export {};
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { AgentOptions, IncomingMessage } from 'http';
+import { RequestOptions } from 'https';
+import { URL } from 'url';
+import { Request } from './http-sandbox-impl';
+export declare function request(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): Request;
+export declare function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): Request;
+export declare class Agent {
+    constructor(options: AgentOptions);
+}
 //# sourceMappingURL=http-sandbox.d.ts.map

package/out/stubs/http-sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":""}
+{"version":3,"file":"http-sandbox.d.ts","sourceRoot":"","sources":["../../src/stubs/http-sandbox.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAElH;AAED,wBAAgB,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAO9G;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}

package/out/stubs/http-sandbox.js

@@ -1,17 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const http_impl_1 = require("./http-impl");
-module.exports = {
-    request: (options, callback) => {
-        return new http_impl_1.Request(options, callback);
-    },
-    get: (options, callback) => {
-        if ((0, http_impl_1.isRequestOptions)(options)) {
-            options = Object.assign(Object.assign({}, options), { method: 'GET' });
+exports.Agent = exports.get = exports.request = void 0;
+const http_shared_1 = require("./http-shared");
+const http_sandbox_impl_1 = require("./http-sandbox-impl");
+function request(options, callback) {
+    return new http_sandbox_impl_1.Request(options, callback);
+}
+exports.request = request;
+function get(options, callback) {
+    if ((0, http_shared_1.isRequestOptions)(options)) {
+        options = Object.assign(Object.assign({}, options), { method: 'GET' });
+    }
+    const result = new http_sandbox_impl_1.Request(options, callback);
+    result.end();
+    return result;
+}
+exports.get = get;
+const NUM_SUPPORTED_AGENT_OPTIONS = 1;
+class Agent {
+    constructor(options) {
+        if (Object.keys(options).length > NUM_SUPPORTED_AGENT_OPTIONS) {
+            console.warn("Forge only supports 'keepAlive' as an option to http.Agent");
         }
-        const result = new http_impl_1.Request(options, callback);
-        result.end();
-        return result;
-    },
-    Agent: http_impl_1.Agent
-};
+        return { keepAlive: options.keepAlive };
+    }
+}
+exports.Agent = Agent;

package/out/stubs/http-shared.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
+import { RequestOptions } from 'https';
+import { URL } from 'url';
+export type Callback = (res: IncomingMessage) => void;
+export type Arg = RequestOptions | string | URL | Callback;
+export declare const isCallback: (options: Arg) => options is Callback;
+export declare const isString: (options: Arg) => options is string;
+export declare const isURL: (options: Arg) => options is URL;
+export declare const isStringOrURL: (options: Arg) => options is string | URL;
+export declare const isRequestOptions: (options: Arg) => options is RequestOptions;
+export declare function formatUrl(options: RequestOptions): string;
+//# sourceMappingURL=http-shared.d.ts.map

package/out/stubs/http-shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-shared.d.ts","sourceRoot":"","sources":["../../src/stubs/http-shared.ts"],"names":[],"mappings":";;;AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAC;AAEtD,MAAM,MAAM,GAAG,GAAG,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;AAE3D,eAAO,MAAM,UAAU,YAAa,GAAG,wBAAuD,CAAC;AAC/F,eAAO,MAAM,QAAQ,YAAa,GAAG,sBAAmD,CAAC;AACzF,eAAO,MAAM,KAAK,YAAa,GAAG,mBACiC,CAAC;AAEpE,eAAO,MAAM,aAAa,YAAa,GAAG,4BAAiE,CAAC;AAE5G,eAAO,MAAM,gBAAgB,YAAa,GAAG,8BACI,CAAC;AAElD,wBAAgB,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAQzD"}

package/out/stubs/http-shared.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatUrl = exports.isRequestOptions = exports.isStringOrURL = exports.isURL = exports.isString = exports.isCallback = void 0;
+const isCallback = (options) => typeof options === 'function';
+exports.isCallback = isCallback;
+const isString = (options) => typeof options === 'string';
+exports.isString = isString;
+const isURL = (options) => typeof options === 'object' && options.constructor.name === 'URL';
+exports.isURL = isURL;
+const isStringOrURL = (options) => (0, exports.isString)(options) || (0, exports.isURL)(options);
+exports.isStringOrURL = isStringOrURL;
+const isRequestOptions = (options) => !(0, exports.isStringOrURL)(options) && !(0, exports.isCallback)(options);
+exports.isRequestOptions = isRequestOptions;
+function formatUrl(options) {
+    var _a, _b;
+    const protocol = 'https:';
+    const auth = options.auth ? `${options.auth}@` : '';
+    const host = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host;
+    const port = options.port ? `:${options.port}` : '';
+    const path = (_b = options.path) !== null && _b !== void 0 ? _b : '/';
+    return `${protocol}//${auth}${host}${port}${path}`;
+}
+exports.formatUrl = formatUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/bundler",
-  "version": "4.10.4-next.9",
+  "version": "4.10.4",
   "description": "Default bundler for Forge apps",
   "license": "UNLICENSED",
   "author": "Atlassian",
@@ -19,12 +19,12 @@
     "@babel/plugin-transform-optional-chaining": "^7.22.6",
     "@babel/plugin-transform-react-jsx": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@forge/api": "2.18.3-next.0",
-    "@forge/babel-plugin-transform-ui": "1.1.4",
-    "@forge/cli-shared": "3.17.0-next.5",
-    "@forge/lint": "3.6.3-next.6",
-    "@forge/runtime": "4.4.5-next.0",
-    "@forge/util": "1.3.0",
+    "@forge/api": "2.18.3",
+    "@forge/babel-plugin-transform-ui": "1.1.5",
+    "@forge/cli-shared": "3.17.0",
+    "@forge/lint": "3.6.3",
+    "@forge/runtime": "4.4.5",
+    "@forge/util": "1.3.1",
     "assert": "^1.5.0",
     "babel-loader": "^8.3.0",
     "browserify-zlib": "^0.2.0",
@@ -50,12 +50,12 @@
     "typescript": "^4.9.5",
     "url": "^0.11.1",
     "util": "^0.12.5",
-    "webpack": "5.88.1",
+    "webpack": "5.88.2",
     "webpack-bundle-analyzer": "^4.9.0",
     "whatwg-url": "^7.1.0"
   },
   "devDependencies": {
-    "@atlassian/xen-test-util": "^1.16.0",
+    "@atlassian/xen-test-util": "^2.1.3",
     "@types/jest": "^29.5.3",
     "@types/node": "14.18.53",
     "@types/react": "^17.0.53",

package/out/stubs/http-impl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-impl.d.ts","sourceRoot":"","sources":["../../src/stubs/http-impl.ts"],"names":[],"mappings":";;;AAMA,OAAO,EAAuB,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAY,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAe,YAAY,EAAS,MAAM,YAAY,CAAC;AAwE9D,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,CAAC;CACH;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,CAAC;AAEtD,MAAM,MAAM,GAAG,GAAG,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC;AAE3D,eAAO,MAAM,UAAU,YAAa,GAAG,wBAAuD,CAAC;AAC/F,eAAO,MAAM,QAAQ,YAAa,GAAG,sBAAmD,CAAC;AACzF,eAAO,MAAM,KAAK,YAAa,GAAG,mBACiC,CAAC;AAEpE,eAAO,MAAM,aAAa,YAAa,GAAG,4BAAiE,CAAC;AAE5G,eAAO,MAAM,gBAAgB,YAAa,GAAG,8BACI,CAAC;AAElD,qBAAa,OAAQ,SAAQ,QAAQ;IACnC,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,QAAQ;IAahE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAM/C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO;IAQhE,OAAO,CAAC,KAAK;IAsBN,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI;IAe3F,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM;IAUjD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,GAAG,MAAM;IAiBvE,MAAM,CAAC,uBAAuB,CAC5B,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,GAAG,EACtC,gBAAgB,EAAE,gBAAgB,GACjC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;IAuBtC,KAAK;CAGN;AAID,qBAAa,KAAK;gBACJ,OAAO,EAAE,YAAY;CAOlC"}